Merge branch 'dev' into block_pyserial_asyncio

Disable blackbird integration (#157817 )
Fix incorrect status updates for lcn (#159251 )
2026-04-29 10:23:46 +02:00 · 2025-12-18 08:52:07 +01:00 · 2025-12-18 08:51:54 +01:00 · 2025-12-18 08:11:22 +01:00 · 2025-12-18 08:05:46 +01:00 · 2025-12-17 20:22:38 -10:00
672 changed files with 17790 additions and 3818 deletions
@@ -51,6 +51,9 @@ 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+
@@ -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.11.3"
+  BASE_IMAGE_VERSION: "2025.12.0"
  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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: translations
          path: translations.tar.gz
@@ -169,7 +169,7 @@ jobs:
          fi

      - name: Download translations
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
          name: translations

@@ -482,7 +482,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}

      - name: Download translations
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
          name: translations

@@ -263,7 +263,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: &actions-cache actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: &actions-cache actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: &actions-cache-restore actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: &actions-cache-save actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: &actions-upload-artifact actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.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@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: &actions-download-artifact actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
          name: pytest_buckets
      - &compile-english-translations
@@ -24,11 +24,11 @@ jobs:
        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
        with:
          languages: python

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
        with:
          category: "/language:python"
@@ -10,7 +10,7 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
+      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
        with:
          github-token: ${{ github.token }}
          issue-inactive-days: "30"
@@ -74,7 +74,7 @@ jobs:
          ) > .env_file

      - name: Upload env_file
-        uses: &actions-upload-artifact actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: &actions-upload-artifact actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.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@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: &actions-download-artifact actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
          name: env_file

@@ -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 @mkmer
-/tests/components/blink/ @fronzbot @mkmer
+/homeassistant/components/blink/ @fronzbot
+/tests/components/blink/ @fronzbot
 /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
-/tests/components/control4/ @lawtancool
+/homeassistant/components/control4/ @lawtancool @davidrecordon
+/tests/components/control4/ @lawtancool @davidrecordon
 /homeassistant/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
 /tests/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
 /homeassistant/components/cookidoo/ @miaucl
@@ -665,6 +665,7 @@ 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
@@ -30,7 +30,7 @@ RUN \
    # Verify go2rtc can be executed
    go2rtc --version \
    # Install uv
-    && pip3 install uv==0.9.6
+    && pip3 install uv==0.9.17

 WORKDIR /usr/src

@@ -624,13 +624,16 @@ async def async_enable_logging(

    if log_file is None:
        default_log_path = hass.config.path(ERROR_LOG_FILENAME)
-        if "SUPERVISOR" in os.environ:
-            _LOGGER.info("Running in Supervisor, not logging to file")
+        if "SUPERVISOR" in os.environ and "HA_DUPLICATE_LOG_FILE" not in os.environ:
            # Rename the default log file if it exists, since previous versions created
            # it even on Supervisor
-            if os.path.isfile(default_log_path):
-                with contextlib.suppress(OSError):
-                    os.rename(default_log_path, f"{default_log_path}.old")
+            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)
            err_log_path = None
        else:
            err_log_path = default_log_path
@@ -9,8 +9,9 @@ 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
+from .const import _LOGGER, DOMAIN
 from .coordinator import (
    ActronAirConfigEntry,
    ActronAirRuntimeData,
@@ -29,12 +30,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ActronAirConfigEntry) ->
    try:
        systems = await api.get_ac_systems()
        await api.update_status()
-    except ActronAirAuthError:
-        _LOGGER.error("Authentication error while setting up Actron Air integration")
-        raise
+    except ActronAirAuthError as err:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="auth_error",
+        ) from err
    except ActronAirAPIError as err:
-        _LOGGER.error("API error while setting up Actron Air integration: %s", err)
-        raise
+        raise ConfigEntryNotReady from err

    system_coordinators: dict[str, ActronAirSystemCoordinator] = {}
    for system in systems:
@@ -1,11 +1,12 @@
 """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 ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_TOKEN
 from homeassistant.exceptions import HomeAssistantError

@@ -95,8 +96,16 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):

        unique_id = str(user_data["id"])
        await self.async_set_unique_id(unique_id)
-        self._abort_if_unique_id_configured()

+        # 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},
@@ -114,6 +123,21 @@ 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:
@@ -5,16 +5,23 @@ from __future__ import annotations
 from dataclasses import dataclass
 from datetime import timedelta

-from actron_neo_api import ActronAirACSystem, ActronAirAPI, ActronAirStatus
+from actron_neo_api import (
+    ActronAirACSystem,
+    ActronAirAPI,
+    ActronAirAuthError,
+    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
+from .const import _LOGGER, DOMAIN

-STALE_DEVICE_TIMEOUT = timedelta(hours=24)
+SCAN_INTERVAL = timedelta(seconds=30)
+STALE_DEVICE_TIMEOUT = timedelta(minutes=5)
 ERROR_NO_SYSTEMS_FOUND = "no_systems_found"
 ERROR_UNKNOWN = "unknown_error"

@@ -29,9 +36,6 @@ 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."""
@@ -59,7 +63,14 @@ class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirACSystem]):

    async def _async_update_data(self) -> ActronAirStatus:
        """Fetch updates and merge incremental changes into the full state."""
-        await self.api.update_status()
+        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
@@ -10,7 +10,8 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/actron_air",
+  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "quality_scale": "bronze",
-  "requirements": ["actron-neo-api==0.1.87"]
+  "requirements": ["actron-neo-api==0.2.0"]
 }
@@ -36,7 +36,7 @@ rules:
  integration-owner: done
  log-when-unavailable: done
  parallel-updates: done
-  reauthentication-flow: todo
+  reauthentication-flow: done
  test-coverage: todo

  # Gold
@@ -2,10 +2,12 @@
  "config": {
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "oauth2_error": "Failed to start OAuth2 flow"
+      "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."
    },
    "error": {
-      "oauth2_error": "Failed to start OAuth2 flow. Please try again later."
+      "oauth2_error": "Failed to start authentication 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."
@@ -16,14 +18,23 @@
        "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 authorization process timed out. Please try again.",
-        "title": "Authorization timeout"
+        "description": "The authentication process timed out. Please try again.",
+        "title": "Authentication timeout"
      },
      "user": {
-        "title": "Actron Air OAuth2 Authorization"
+        "title": "Actron Air Authentication"
      }
    }
+  },
+  "exceptions": {
+    "auth_error": {
+      "message": "Authentication failed, please reauthenticate"
+    }
  }
 }
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "codeowners": [],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/aftership",
+  "integration_type": "service",
  "iot_class": "cloud_polling",
  "requirements": ["pyaftership==21.11.0"]
 }
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@ from __future__ import annotations

 from collections.abc import Callable
 from dataclasses import dataclass
+from datetime import datetime, timedelta

 from pyairobotrest.models import ThermostatStatus

@@ -23,6 +24,8 @@ 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
@@ -34,10 +37,15 @@ PARALLEL_UPDATES = 0
 class AirobotSensorEntityDescription(SensorEntityDescription):
    """Describes Airobot sensor entity."""

-    value_fn: Callable[[ThermostatStatus], StateType]
+    value_fn: Callable[[ThermostatStatus], StateType | datetime]
    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",
@@ -96,6 +104,14 @@ 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,
+    ),
 )


@@ -129,6 +145,6 @@ class AirobotSensor(AirobotEntity, SensorEntity):
        self._attr_unique_id = f"{coordinator.data.status.device_id}_{description.key}"

    @property
-    def native_value(self) -> StateType:
+    def native_value(self) -> StateType | datetime:
        """Return the state of the sensor."""
        return self.entity_description.value_fn(self.coordinator.data.status)
@@ -17,6 +17,7 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/airthings",
+  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["airthings"],
  "requirements": ["airthings-cloud==0.2.0"]
@@ -27,6 +27,7 @@
  "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"]
 }
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
@@ -9,6 +9,7 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/airzone",
+  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["aioairzone"],
  "requirements": ["aioairzone==1.0.4"]
@@ -4,6 +4,7 @@
  "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"]
@@ -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 (
-    EntityStateTriggerBase,
+    EntityTargetStateTriggerBase,
    Trigger,
-    make_conditional_entity_state_trigger,
-    make_entity_state_trigger,
+    make_entity_target_state_trigger,
+    make_entity_transition_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(EntityStateTriggerBase):
+class EntityStateTriggerRequiredFeatures(EntityTargetStateTriggerBase):
    """Trigger for entity state changes."""

    _required_features: int
@@ -38,7 +38,7 @@ class EntityStateTriggerRequiredFeatures(EntityStateTriggerBase):

 def make_entity_state_trigger_required_features(
    domain: str, to_state: str, required_features: int
-) -> type[EntityStateTriggerBase]:
+) -> type[EntityTargetStateTriggerBase]:
    """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_conditional_entity_state_trigger(
+    "armed": make_entity_transition_trigger(
        DOMAIN,
        from_states={
            AlarmControlPanelState.ARMING,
@@ -89,8 +89,12 @@ TRIGGERS: dict[str, type[Trigger]] = {
        AlarmControlPanelState.ARMED_VACATION,
        AlarmControlPanelEntityFeature.ARM_VACATION,
    ),
-    "disarmed": make_entity_state_trigger(DOMAIN, AlarmControlPanelState.DISARMED),
-    "triggered": make_entity_state_trigger(DOMAIN, AlarmControlPanelState.TRIGGERED),
+    "disarmed": make_entity_target_state_trigger(
+        DOMAIN, AlarmControlPanelState.DISARMED
+    ),
+    "triggered": make_entity_target_state_trigger(
+        DOMAIN, AlarmControlPanelState.TRIGGERED
+    ),
 }


@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
 }
@@ -4,8 +4,9 @@
  "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.0.0"]
+  "requirements": ["pyanglianwater==3.1.0"]
 }
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
 }
@@ -4,6 +4,7 @@
  "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",
@@ -4,6 +4,7 @@
  "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"],
@@ -4,6 +4,7 @@
  "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"]
 }
@@ -4,6 +4,7 @@
  "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"]
@@ -1,16 +1,22 @@
 """Provides triggers for assist satellites."""

 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.trigger import Trigger, make_entity_state_trigger
+from homeassistant.helpers.trigger import Trigger, make_entity_target_state_trigger

 from .const import DOMAIN
 from .entity import AssistSatelliteState

 TRIGGERS: dict[str, type[Trigger]] = {
-    "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),
+    "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
+    ),
 }


@@ -7,5 +7,5 @@
  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["aioasuswrt", "asusrouter", "asyncssh"],
-  "requirements": ["aioasuswrt==1.5.1", "asusrouter==1.21.3"]
+  "requirements": ["aioasuswrt==1.5.4", "asusrouter==1.21.3"]
 }
@@ -4,6 +4,7 @@
  "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"]
@@ -27,6 +27,7 @@
    }
  ],
  "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"]
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,8 @@
  "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"]
 }
@@ -6,10 +6,7 @@ rules:
      This integration does not provide additional actions.
  appropriate-polling: done
  brands: done
-  common-modules:
-    status: todo
-    comment: |
-      The entity.py file is not used in this integration.
+  common-modules: done
  config-flow-test-coverage: done
  config-flow: done
  dependency-transparency: done
@@ -204,13 +204,25 @@ async def async_setup_entry(
    async_add_entities(entities)


-class AutarcoBatterySensorEntity(
-    CoordinatorEntity[AutarcoDataUpdateCoordinator], SensorEntity
-):
+class AutarcoSensorBase(CoordinatorEntity[AutarcoDataUpdateCoordinator], SensorEntity):
+    """Base class for Autarco sensors."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AutarcoDataUpdateCoordinator,
+        description: SensorEntityDescription,
+    ) -> None:
+        """Initialize Autarco sensor base."""
+        super().__init__(coordinator)
+        self.entity_description = description
+
+
+class AutarcoBatterySensorEntity(AutarcoSensorBase):
    """Defines an Autarco battery sensor."""

    entity_description: AutarcoBatterySensorEntityDescription
-    _attr_has_entity_name = True

    def __init__(
        self,
@@ -218,10 +230,8 @@ class AutarcoBatterySensorEntity(
        coordinator: AutarcoDataUpdateCoordinator,
        description: AutarcoBatterySensorEntityDescription,
    ) -> None:
-        """Initialize Autarco sensor."""
-        super().__init__(coordinator)
-
-        self.entity_description = description
+        """Initialize Autarco battery sensor."""
+        super().__init__(coordinator, description)
        self._attr_unique_id = (
            f"{coordinator.account_site.site_id}_battery_{description.key}"
        )
@@ -239,13 +249,10 @@ class AutarcoBatterySensorEntity(
        return self.entity_description.value_fn(self.coordinator.data.battery)


-class AutarcoSolarSensorEntity(
-    CoordinatorEntity[AutarcoDataUpdateCoordinator], SensorEntity
-):
+class AutarcoSolarSensorEntity(AutarcoSensorBase):
    """Defines an Autarco solar sensor."""

    entity_description: AutarcoSolarSensorEntityDescription
-    _attr_has_entity_name = True

    def __init__(
        self,
@@ -253,10 +260,8 @@ class AutarcoSolarSensorEntity(
        coordinator: AutarcoDataUpdateCoordinator,
        description: AutarcoSolarSensorEntityDescription,
    ) -> None:
-        """Initialize Autarco sensor."""
-        super().__init__(coordinator)
-
-        self.entity_description = description
+        """Initialize Autarco solar sensor."""
+        super().__init__(coordinator, description)
        self._attr_unique_id = (
            f"{coordinator.account_site.site_id}_solar_{description.key}"
        )
@@ -273,13 +278,10 @@ class AutarcoSolarSensorEntity(
        return self.entity_description.value_fn(self.coordinator.data.solar)


-class AutarcoInverterSensorEntity(
-    CoordinatorEntity[AutarcoDataUpdateCoordinator], SensorEntity
-):
+class AutarcoInverterSensorEntity(AutarcoSensorBase):
    """Defines an Autarco inverter sensor."""

    entity_description: AutarcoInverterSensorEntityDescription
-    _attr_has_entity_name = True

    def __init__(
        self,
@@ -288,10 +290,8 @@ class AutarcoInverterSensorEntity(
        description: AutarcoInverterSensorEntityDescription,
        serial_number: str,
    ) -> None:
-        """Initialize Autarco sensor."""
-        super().__init__(coordinator)
-
-        self.entity_description = description
+        """Initialize Autarco inverter sensor."""
+        super().__init__(coordinator, description)
        self._serial_number = serial_number
        self._attr_unique_id = f"{serial_number}_{description.key}"
        self._attr_device_info = DeviceInfo(
@@ -125,13 +125,17 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
    "alarm_control_panel",
    "assist_satellite",
    "binary_sensor",
+    "button",
    "climate",
    "cover",
+    "device_tracker",
    "fan",
    "lawn_mower",
    "light",
    "media_player",
+    "switch",
    "text",
+    "update",
    "vacuum",
 }

@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"],
@@ -4,6 +4,7 @@
  "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": [
@@ -12,6 +12,7 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/balboa",
+  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["pybalboa"],
  "requirements": ["pybalboa==1.1.3"]
@@ -22,6 +22,7 @@ class BeoSource:
    NET_RADIO: Final[Source] = Source(name="B&O Radio", id="netRadio")
    SPDIF: Final[Source] = Source(name="Optical", id="spdif")
    TIDAL: Final[Source] = Source(name="Tidal", id="tidal")
+    TV: Final[Source] = Source(name="TV", id="tv")
    UNKNOWN: Final[Source] = Source(name="Unknown Source", id="unknown")
    URI_STREAMER: Final[Source] = Source(name="Audio Streamer", id="uriStreamer")

@@ -55,12 +56,13 @@ BEO_REPEAT_TO_HA: dict[str, RepeatMode] = {
 class BeoMediaType(StrEnum):
    """Bang & Olufsen specific media types."""

-    FAVOURITE = "favourite"
    DEEZER = "deezer"
+    FAVOURITE = "favourite"
+    OVERLAY_TTS = "overlay_tts"
    RADIO = "radio"
    TIDAL = "tidal"
    TTS = "provider"
-    OVERLAY_TTS = "overlay_tts"
+    TV = "tv"


 class BeoModel(StrEnum):
@@ -218,6 +218,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
        self._sources: dict[str, str] = {}
        self._state: str = MediaPlayerState.IDLE
        self._video_sources: dict[str, str] = {}
+        self._video_source_id_map: dict[str, str] = {}
        self._sound_modes: dict[str, int] = {}

        # Beolink compatible sources
@@ -355,6 +356,9 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
                and menu_item.label != "TV"
            ):
                self._video_sources[key] = menu_item.label
+                self._video_source_id_map[
+                    menu_item.content.content_uri.removeprefix("tv://")
+                ] = menu_item.label

        # Combine the source dicts
        self._sources = self._audio_sources | self._video_sources
@@ -627,10 +631,11 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
    def media_content_type(self) -> MediaType | str | None:
        """Return the current media type."""
        content_type = {
-            BeoSource.URI_STREAMER.id: MediaType.URL,
            BeoSource.DEEZER.id: BeoMediaType.DEEZER,
-            BeoSource.TIDAL.id: BeoMediaType.TIDAL,
            BeoSource.NET_RADIO.id: BeoMediaType.RADIO,
+            BeoSource.TIDAL.id: BeoMediaType.TIDAL,
+            BeoSource.TV.id: BeoMediaType.TV,
+            BeoSource.URI_STREAMER.id: MediaType.URL,
        }
        # Hard to determine content type.
        if self._source_change.id in content_type:
@@ -690,7 +695,11 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):

    @property
    def source(self) -> str | None:
-        """Return the current audio source."""
+        """Return the current audio/video source."""
+        # Associate TV content ID with a video source
+        if self.media_content_id in self._video_source_id_map:
+            return self._video_source_id_map[self.media_content_id]
+
        return self._source_change.name

    @property
@@ -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 EntityStateTriggerBase, Trigger
+from homeassistant.helpers.trigger import EntityTargetStateTriggerBase, 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(EntityStateTriggerBase):
+class BinarySensorOnOffTrigger(EntityTargetStateTriggerBase):
    """Class for binary sensor on/off triggers."""

    _device_class: BinarySensorDeviceClass | None
@@ -2,6 +2,7 @@
  "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"],
@@ -4,6 +4,7 @@
  "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"],
@@ -64,6 +64,12 @@ async def async_migrate_entry(hass: HomeAssistant, entry: BlinkConfigEntry) -> b
    if entry.version == 2:
        await _reauth_flow_wrapper(hass, entry, data)
        return False
+    if entry.version == 3:
+        # Migrate device_id to hardware_id for blinkpy 0.25.x OAuth2 compatibility
+        if "device_id" in data:
+            data["hardware_id"] = data.pop("device_id")
+            hass.config_entries.async_update_entry(entry, data=data, version=4)
+        return True
    return True


@@ -21,7 +21,7 @@ from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession

-from .const import DEVICE_ID, DOMAIN
+from .const import DOMAIN, HARDWARE_ID

 _LOGGER = logging.getLogger(__name__)

@@ -43,7 +43,7 @@ async def _send_blink_2fa_pin(blink: Blink, pin: str | None) -> bool:
 class BlinkConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a Blink config flow."""

-    VERSION = 3
+    VERSION = 4

    def __init__(self) -> None:
        """Initialize the blink flow."""
@@ -53,7 +53,7 @@ class BlinkConfigFlow(ConfigFlow, domain=DOMAIN):
    async def _handle_user_input(self, user_input: dict[str, Any]):
        """Handle user input."""
        self.auth = Auth(
-            {**user_input, "device_id": DEVICE_ID},
+            {**user_input, "hardware_id": HARDWARE_ID},
            no_prompt=True,
            session=async_get_clientsession(self.hass),
        )
@@ -3,7 +3,7 @@
 from homeassistant.const import Platform

 DOMAIN = "blink"
-DEVICE_ID = "Home Assistant"
+HARDWARE_ID = "Home Assistant"

 CONF_MIGRATE = "migrate"
 CONF_CAMERA = "camera"
@@ -1,7 +1,7 @@
 {
  "domain": "blink",
  "name": "Blink",
-  "codeowners": ["@fronzbot", "@mkmer"],
+  "codeowners": ["@fronzbot"],
  "config_flow": true,
  "dhcp": [
    {
@@ -18,7 +18,8 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/blink",
+  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["blinkpy"],
-  "requirements": ["blinkpy==0.25.1"]
+  "requirements": ["blinkpy==0.25.2"]
 }
@@ -13,32 +13,25 @@ from bluecurrent_api.exceptions import (
    RequestLimitReached,
    WebsocketError,
 )
-import voluptuous as vol

-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
-from homeassistant.const import CONF_API_TOKEN, CONF_DEVICE_ID, Platform
-from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.exceptions import (
-    ConfigEntryAuthFailed,
-    ConfigEntryNotReady,
-    ServiceValidationError,
-)
-from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_API_TOKEN, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType

 from .const import (
-    BCU_APP,
    CHARGEPOINT_SETTINGS,
    CHARGEPOINT_STATUS,
-    CHARGING_CARD_ID,
    DOMAIN,
    EVSE_ID,
    LOGGER,
    PLUG_AND_CHARGE,
-    SERVICE_START_CHARGE_SESSION,
    VALUE,
 )
+from .services import async_setup_services

 type BlueCurrentConfigEntry = ConfigEntry[Connector]

@@ -54,13 +47,12 @@ VALUE_TYPES = [CHARGEPOINT_STATUS, CHARGEPOINT_SETTINGS]

 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)

-SERVICE_START_CHARGE_SESSION_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_DEVICE_ID): cv.string,
-        # When no charging card is provided, use no charging card (BCU_APP = no charging card).
-        vol.Optional(CHARGING_CARD_ID, default=BCU_APP): cv.string,
-    }
-)
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up Blue Current."""
+
+    async_setup_services(hass)
+    return True


 async def async_setup_entry(
@@ -88,66 +80,6 @@ async def async_setup_entry(
    return True


-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up Blue Current."""
-
-    async def start_charge_session(service_call: ServiceCall) -> None:
-        """Start a charge session with the provided device and charge card ID."""
-        # When no charge card is provided, use the default charge card set in the config flow.
-        charging_card_id = service_call.data[CHARGING_CARD_ID]
-        device_id = service_call.data[CONF_DEVICE_ID]
-
-        # Get the device based on the given device ID.
-        device = dr.async_get(hass).devices.get(device_id)
-
-        if device is None:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN, translation_key="invalid_device_id"
-            )
-
-        blue_current_config_entry: ConfigEntry | None = None
-
-        for config_entry_id in device.config_entries:
-            config_entry = hass.config_entries.async_get_entry(config_entry_id)
-            if not config_entry or config_entry.domain != DOMAIN:
-                # Not the blue_current config entry.
-                continue
-
-            if config_entry.state is not ConfigEntryState.LOADED:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN, translation_key="config_entry_not_loaded"
-                )
-
-            blue_current_config_entry = config_entry
-            break
-
-        if not blue_current_config_entry:
-            # The device is not connected to a valid blue_current config entry.
-            raise ServiceValidationError(
-                translation_domain=DOMAIN, translation_key="no_config_entry"
-            )
-
-        connector = blue_current_config_entry.runtime_data
-
-        # Get the evse_id from the identifier of the device.
-        evse_id = next(
-            identifier[1]
-            for identifier in device.identifiers
-            if identifier[0] == DOMAIN
-        )
-
-        await connector.client.start_session(evse_id, charging_card_id)
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_START_CHARGE_SESSION,
-        start_charge_session,
-        SERVICE_START_CHARGE_SESSION_SCHEMA,
-    )
-
-    return True
-
-
 async def async_unload_entry(
    hass: HomeAssistant, config_entry: BlueCurrentConfigEntry
 ) -> bool:
@@ -4,6 +4,7 @@
  "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"]
@@ -0,0 +1,79 @@
+"""The Blue Current integration."""
+
+from __future__ import annotations
+
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.const import CONF_DEVICE_ID
+from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers import config_validation as cv, device_registry as dr
+
+from .const import BCU_APP, CHARGING_CARD_ID, DOMAIN, SERVICE_START_CHARGE_SESSION
+
+SERVICE_START_CHARGE_SESSION_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_DEVICE_ID): cv.string,
+        # When no charging card is provided, use no charging card (BCU_APP = no charging card).
+        vol.Optional(CHARGING_CARD_ID, default=BCU_APP): cv.string,
+    }
+)
+
+
+async def start_charge_session(service_call: ServiceCall) -> None:
+    """Start a charge session with the provided device and charge card ID."""
+    # When no charge card is provided, use the default charge card set in the config flow.
+    charging_card_id = service_call.data[CHARGING_CARD_ID]
+    device_id = service_call.data[CONF_DEVICE_ID]
+
+    # Get the device based on the given device ID.
+    device = dr.async_get(service_call.hass).devices.get(device_id)
+
+    if device is None:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN, translation_key="invalid_device_id"
+        )
+
+    blue_current_config_entry: ConfigEntry | None = None
+
+    for config_entry_id in device.config_entries:
+        config_entry = service_call.hass.config_entries.async_get_entry(config_entry_id)
+        if not config_entry or config_entry.domain != DOMAIN:
+            # Not the blue_current config entry.
+            continue
+
+        if config_entry.state is not ConfigEntryState.LOADED:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN, translation_key="config_entry_not_loaded"
+            )
+
+        blue_current_config_entry = config_entry
+        break
+
+    if not blue_current_config_entry:
+        # The device is not connected to a valid blue_current config entry.
+        raise ServiceValidationError(
+            translation_domain=DOMAIN, translation_key="no_config_entry"
+        )
+
+    connector = blue_current_config_entry.runtime_data
+
+    # Get the evse_id from the identifier of the device.
+    evse_id = next(
+        identifier[1] for identifier in device.identifiers if identifier[0] == DOMAIN
+    )
+
+    await connector.client.start_session(evse_id, charging_card_id)
+
+
+@callback
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Register the services."""
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_START_CHARGE_SESSION,
+        start_charge_session,
+        SERVICE_START_CHARGE_SESSION_SCHEMA,
+    )
@@ -11,6 +11,7 @@
  "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"]
 }
@@ -5,6 +5,7 @@
  "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": [
@@ -4,6 +4,7 @@
  "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"]
@@ -14,6 +14,7 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/bond",
+  "integration_type": "hub",
  "iot_class": "local_push",
  "loggers": ["bond_async"],
  "requirements": ["bond-async==0.2.1"],
@@ -5,6 +5,7 @@
  "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"],
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"]
@@ -7,7 +7,7 @@
  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["bsblan"],
-  "requirements": ["python-bsblan==3.1.3"],
+  "requirements": ["python-bsblan==3.1.4"],
  "zeroconf": [
    {
      "name": "bsb-lan*",
@@ -4,6 +4,7 @@
  "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"]
@@ -17,5 +17,10 @@
    "press": {
      "service": "mdi:gesture-tap-button"
    }
+  },
+  "triggers": {
+    "pressed": {
+      "trigger": "mdi:gesture-tap-button"
+    }
  }
 }
@@ -27,5 +27,11 @@
      "name": "Press"
    }
  },
-  "title": "Button"
+  "title": "Button",
+  "triggers": {
+    "pressed": {
+      "description": "Triggers when a button was pressed",
+      "name": "Button pressed"
+    }
+  }
 }
@@ -0,0 +1,42 @@
+"""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
@@ -0,0 +1,4 @@
+pressed:
+  target:
+    entity:
+      domain: button
@@ -4,6 +4,7 @@
  "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"]
@@ -5,6 +5,7 @@
  "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"],
@@ -4,6 +4,7 @@
  "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"]
 }
@@ -4,5 +4,6 @@
  "codeowners": ["@jjlawren"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/cert_expiry",
+  "integration_type": "service",
  "iot_class": "cloud_polling"
 }
@@ -3,22 +3,22 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.trigger import (
    Trigger,
-    make_conditional_entity_state_trigger,
-    make_entity_state_attribute_trigger,
-    make_entity_state_trigger,
+    make_entity_target_state_attribute_trigger,
+    make_entity_target_state_trigger,
+    make_entity_transition_trigger,
 )

 from .const import ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode

 TRIGGERS: dict[str, type[Trigger]] = {
-    "started_cooling": make_entity_state_attribute_trigger(
+    "started_cooling": make_entity_target_state_attribute_trigger(
        DOMAIN, ATTR_HVAC_ACTION, HVACAction.COOLING
    ),
-    "started_drying": make_entity_state_attribute_trigger(
+    "started_drying": make_entity_target_state_attribute_trigger(
        DOMAIN, ATTR_HVAC_ACTION, HVACAction.DRYING
    ),
-    "turned_off": make_entity_state_trigger(DOMAIN, HVACMode.OFF),
-    "turned_on": make_conditional_entity_state_trigger(
+    "turned_off": make_entity_target_state_trigger(DOMAIN, HVACMode.OFF),
+    "turned_on": make_entity_transition_trigger(
        DOMAIN,
        from_states={
            HVACMode.OFF,
@@ -32,7 +32,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
            HVACMode.HEAT_COOL,
        },
    ),
-    "started_heating": make_entity_state_attribute_trigger(
+    "started_heating": make_entity_target_state_attribute_trigger(
        DOMAIN, ATTR_HVAC_ACTION, HVACAction.HEATING
    ),
 }
@@ -4,6 +4,7 @@
  "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"],
@@ -4,6 +4,7 @@
  "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"]
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["compit"],
  "quality_scale": "bronze",
-  "requirements": ["compit-inext-api==0.3.1"]
+  "requirements": ["compit-inext-api==0.3.4"]
 }
@@ -65,8 +65,10 @@ def websocket_create_area(
    data.pop("id")

    if "aliases" in data:
-        # Convert aliases to a set
-        data["aliases"] = set(data["aliases"])
+        # 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())}

    if "labels" in data:
        # Convert labels to a set
@@ -133,8 +135,10 @@ def websocket_update_area(
    data.pop("id")

    if "aliases" in data:
-        # Convert aliases to a set
-        data["aliases"] = set(data["aliases"])
+        # 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())}

    if "labels" in data:
        # Convert labels to a set
@@ -227,8 +227,10 @@ def websocket_update_entity(
            changes[key] = msg[key]

    if "aliases" in msg:
-        # Convert aliases to a set
-        changes["aliases"] = set(msg["aliases"])
+        # 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())}

    if "labels" in msg:
        # Convert labels to a set
@@ -61,8 +61,10 @@ def websocket_create_floor(
    data.pop("id")

    if "aliases" in data:
-        # Convert aliases to a set
-        data["aliases"] = set(data["aliases"])
+        # 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())}

    try:
        entry = registry.async_create(**data)
@@ -117,8 +119,10 @@ def websocket_update_floor(
    data.pop("id")

    if "aliases" in data:
-        # Convert aliases to a set
-        data["aliases"] = set(data["aliases"])
+        # 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())}

    try:
        entry = registry.async_update(**data)
@@ -1,9 +1,10 @@
 {
  "domain": "control4",
  "name": "Control4",
-  "codeowners": ["@lawtancool"],
+  "codeowners": ["@lawtancool", "@davidrecordon"],
  "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"],
@@ -4,6 +4,7 @@
  "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"]
@@ -4,6 +4,7 @@
  "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"],
@@ -4,6 +4,7 @@
  "codeowners": [],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/datadog",
+  "integration_type": "service",
  "iot_class": "local_push",
  "loggers": ["datadog"],
  "quality_scale": "legacy",
@@ -4,6 +4,7 @@
  "codeowners": ["@ol-iver", "@starkillerOG"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/denonavr",
+  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["denonavr"],
  "requirements": ["denonavr==1.2.0"],
@@ -2,7 +2,7 @@

 from __future__ import annotations

-from typing import TYPE_CHECKING, Any, Protocol
+from typing import Any, Protocol

 import voluptuous as vol

@@ -11,18 +11,15 @@ 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
+from homeassistant.helpers.typing import ConfigType, TemplateVarsType

 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.
@@ -90,15 +87,21 @@ class DeviceCondition(Condition):
        assert config.options is not None
        self._config = config.options

-    async def async_get_checker(self) -> condition.ConditionCheckerType:
+    async def async_get_checker(self) -> ConditionChecker:
        """Test a device condition."""
        platform = await async_get_device_automation_platform(
            self._hass, self._config[CONF_DOMAIN], DeviceAutomationType.CONDITION
        )
-        return trace_condition_function(
-            platform.async_condition_from_config(self._hass, self._config)
+        platform_checker = 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,
@@ -11,5 +11,13 @@
    "see": {
      "service": "mdi:account-eye"
    }
+  },
+  "triggers": {
+    "entered_home": {
+      "trigger": "mdi:account-arrow-left"
+    },
+    "left_home": {
+      "trigger": "mdi:account-arrow-right"
+    }
  }
 }
@@ -1,4 +1,8 @@
 {
+  "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",
@@ -44,6 +48,15 @@
      }
    }
  },
+  "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.",
@@ -80,5 +93,27 @@
      "name": "See"
    }
  },
-  "title": "Device tracker"
+  "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"
+    }
+  }
 }
@@ -0,0 +1,21 @@
+"""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
@@ -0,0 +1,18 @@
+.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
@@ -4,6 +4,7 @@
  "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"]
--- a/Show More
+++ b/Show More