Merge branch 'dev' into synesthesiam-20250925-aioesphomeapi-bump

Bump pySmartThings to 3.3.0 (#152977 )
Update mvglive component (#146479 )
2026-05-04 11:54:35 +02:00 · 2025-09-25 11:00:33 -05:00 · 2025-09-25 17:57:30 +02:00 · 2025-09-25 17:20:43 +02:00 · 2025-09-25 17:18:24 +02:00 · 2025-09-25 09:46:38 -05:00
48 changed files with 836 additions and 450 deletions
@@ -40,7 +40,7 @@ env:
  CACHE_VERSION: 8
  UV_CACHE_VERSION: 1
  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.10"
+  HA_SHORT_VERSION: "2025.11"
  DEFAULT_PYTHON: "3.13"
  ALL_PYTHON_VERSIONS: "['3.13']"
  # 10.3 is the oldest supported version
@@ -263,7 +263,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          key: >-
@@ -279,7 +279,7 @@ jobs:
          uv pip install "$(cat requirements_test.txt | grep pre-commit)"
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          lookup-only: true
@@ -309,7 +309,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -318,7 +318,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -349,7 +349,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -358,7 +358,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -389,7 +389,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -398,7 +398,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -505,7 +505,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          key: >-
@@ -513,7 +513,7 @@ jobs:
            needs.info.outputs.python_cache_key }}
      - name: Restore uv wheel cache
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: ${{ env.UV_CACHE_DIR }}
          key: >-
@@ -525,7 +525,7 @@ jobs:
            env.HA_SHORT_VERSION }}-
      - name: Check if apt cache exists
        id: cache-apt-check
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          lookup-only: ${{ steps.cache-venv.outputs.cache-hit == 'true' }}
          path: |
@@ -570,7 +570,7 @@ jobs:
          fi
      - name: Save apt cache
        if: steps.cache-apt-check.outputs.cache-hit != 'true'
-        uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
@@ -622,7 +622,7 @@ jobs:
      - base
    steps:
      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
+        uses: actions/cache/restore@v4.3.0
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
@@ -651,7 +651,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -684,7 +684,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -741,7 +741,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -784,7 +784,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -831,7 +831,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -883,7 +883,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -891,7 +891,7 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Restore mypy cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: .mypy_cache
          key: >-
@@ -935,7 +935,7 @@ jobs:
    name: Split tests for full run
    steps:
      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
+        uses: actions/cache/restore@v4.3.0
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
@@ -967,7 +967,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1009,7 +1009,7 @@ jobs:
      Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
    steps:
      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
+        uses: actions/cache/restore@v4.3.0
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
@@ -1042,7 +1042,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1156,7 +1156,7 @@ jobs:
      Run ${{ matrix.mariadb-group }} tests Python ${{ matrix.python-version }}
    steps:
      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
+        uses: actions/cache/restore@v4.3.0
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
@@ -1189,7 +1189,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1310,7 +1310,7 @@ jobs:
      Run ${{ matrix.postgresql-group }} tests Python ${{ matrix.python-version }}
    steps:
      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
+        uses: actions/cache/restore@v4.3.0
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
@@ -1345,7 +1345,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1485,7 +1485,7 @@ jobs:
      Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
    steps:
      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
+        uses: actions/cache/restore@v4.3.0
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
@@ -1518,7 +1518,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -160,7 +160,7 @@ jobs:

      # home-assistant/wheels doesn't support sha pinning
      - name: Build wheels
-        uses: home-assistant/wheels@2025.07.0
+        uses: home-assistant/wheels@2025.09.0
        with:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
@@ -221,7 +221,7 @@ jobs:

      # home-assistant/wheels doesn't support sha pinning
      - name: Build wheels
-        uses: home-assistant/wheels@2025.07.0
+        uses: home-assistant/wheels@2025.09.0
        with:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
@@ -7,6 +7,6 @@
  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
-  "quality_scale": "silver",
+  "quality_scale": "platinum",
  "requirements": ["aioamazondevices==6.0.0"]
 }
@@ -13,6 +13,6 @@
  "integration_type": "system",
  "iot_class": "cloud_push",
  "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==1.1.1"],
+  "requirements": ["hass-nabucasa==1.1.2"],
  "single_config_entry": true
 }
@@ -7,6 +7,6 @@
  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["aiocomelit"],
-  "quality_scale": "silver",
+  "quality_scale": "platinum",
  "requirements": ["aiocomelit==0.12.3"]
 }
@@ -6,12 +6,13 @@ from typing import TYPE_CHECKING, Any, Protocol

 import voluptuous as vol

-from homeassistant.const import CONF_DOMAIN
+from homeassistant.const import CONF_DOMAIN, CONF_OPTIONS
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.condition import (
    Condition,
    ConditionCheckerType,
+    ConditionConfig,
    trace_condition_function,
 )
 from homeassistant.helpers.typing import ConfigType
@@ -55,19 +56,40 @@ class DeviceAutomationConditionProtocol(Protocol):
 class DeviceCondition(Condition):
    """Device condition."""

-    def __init__(self, hass: HomeAssistant, config: ConfigType) -> None:
-        """Initialize condition."""
-        self._config = config
-        self._hass = hass
+    _hass: HomeAssistant
+    _config: ConfigType
+
+    @classmethod
+    async def async_validate_complete_config(
+        cls, hass: HomeAssistant, complete_config: ConfigType
+    ) -> ConfigType:
+        """Validate complete config."""
+        complete_config = await async_validate_device_automation_config(
+            hass,
+            complete_config,
+            cv.DEVICE_CONDITION_SCHEMA,
+            DeviceAutomationType.CONDITION,
+        )
+        # Since we don't want to migrate device conditions to a new format
+        # we just pass the entire config as options.
+        complete_config[CONF_OPTIONS] = complete_config.copy()
+        return complete_config

    @classmethod
    async def async_validate_config(
        cls, hass: HomeAssistant, config: ConfigType
    ) -> ConfigType:
-        """Validate device condition config."""
-        return await async_validate_device_automation_config(
-            hass, config, cv.DEVICE_CONDITION_SCHEMA, DeviceAutomationType.CONDITION
-        )
+        """Validate config.
+
+        This is here just to satisfy the abstract class interface. It is never called.
+        """
+        raise NotImplementedError
+
+    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+        """Initialize condition."""
+        self._hass = hass
+        assert config.options is not None
+        self._config = config.options

    async def async_get_checker(self) -> condition.ConditionCheckerType:
        """Test a device condition."""
@@ -57,6 +57,7 @@ from .manager import async_replace_device

 ERROR_REQUIRES_ENCRYPTION_KEY = "requires_encryption_key"
 ERROR_INVALID_ENCRYPTION_KEY = "invalid_psk"
+ERROR_INVALID_PASSWORD_AUTH = "invalid_auth"
 _LOGGER = logging.getLogger(__name__)

 ZERO_NOISE_PSK = "MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA="
@@ -137,6 +138,11 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
            self._password = ""
            return await self._async_authenticate_or_add()

+        if error == ERROR_INVALID_PASSWORD_AUTH or (
+            error is None and self._device_info and self._device_info.uses_password
+        ):
+            return await self.async_step_authenticate()
+
        if error is None and entry_data.get(CONF_NOISE_PSK):
            # Device was configured with encryption but now connects without it.
            # Check if it's the same device before offering to remove encryption.
@@ -690,13 +696,15 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
        cli = APIClient(
            host,
            port or DEFAULT_PORT,
-            "",
+            self._password or "",
            zeroconf_instance=zeroconf_instance,
            noise_psk=noise_psk,
        )
        try:
            await cli.connect()
            self._device_info = await cli.device_info()
+        except InvalidAuthAPIError:
+            return ERROR_INVALID_PASSWORD_AUTH
        except RequiresEncryptionAPIError:
            return ERROR_REQUIRES_ENCRYPTION_KEY
        except InvalidEncryptionKeyAPIError as ex:
@@ -372,6 +372,9 @@ class ESPHomeManager:
        """Subscribe to states and list entities on successful API login."""
        try:
            await self._on_connect()
+        except InvalidAuthAPIError as err:
+            _LOGGER.warning("Authentication failed for %s: %s", self.host, err)
+            await self._start_reauth_and_disconnect()
        except APIConnectionError as err:
            _LOGGER.warning(
                "Error getting setting up connection for %s: %s", self.host, err
@@ -641,7 +644,14 @@ class ESPHomeManager:
                    if self.reconnect_logic:
                        await self.reconnect_logic.stop()
                    return
+        await self._start_reauth_and_disconnect()
+
+    async def _start_reauth_and_disconnect(self) -> None:
+        """Start reauth flow and stop reconnection attempts."""
        self.entry.async_start_reauth(self.hass)
+        await self.cli.disconnect()
+        if self.reconnect_logic:
+            await self.reconnect_logic.stop()

    async def _handle_dynamic_encryption_key(
        self, device_info: EsphomeDeviceInfo
@@ -17,7 +17,7 @@
  "mqtt": ["esphome/discover/#"],
  "quality_scale": "platinum",
  "requirements": [
-    "aioesphomeapi==41.9.0",
+    "aioesphomeapi==41.10.0",
    "esphome-dashboard-api==1.3.0",
    "bleak-esphome==3.3.0"
  ],
@@ -20,5 +20,5 @@
  "documentation": "https://www.home-assistant.io/integrations/frontend",
  "integration_type": "system",
  "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20250924.0"]
+  "requirements": ["home-assistant-frontend==20250925.0"]
 }
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/libre_hardware_monitor",
  "iot_class": "local_polling",
  "quality_scale": "silver",
-  "requirements": ["librehardwaremonitor-api==1.3.1"]
+  "requirements": ["librehardwaremonitor-api==1.4.0"]
 }
@@ -28,7 +28,7 @@ rules:
  docs-configuration-parameters:
    status: done
    comment: No options to configure
-  docs-installation-parameters: todo
+  docs-installation-parameters: done
  entity-unavailable: todo
  integration-owner: done
  log-when-unavailable: todo
@@ -2,10 +2,8 @@
  "domain": "mvglive",
  "name": "MVG",
  "codeowners": [],
-  "disabled": "This integration is disabled because it uses non-open source code to operate.",
  "documentation": "https://www.home-assistant.io/integrations/mvglive",
  "iot_class": "cloud_polling",
-  "loggers": ["MVGLive"],
-  "quality_scale": "legacy",
-  "requirements": ["PyMVGLive==1.1.4"]
+  "loggers": ["MVG"],
+  "requirements": ["mvg==1.4.0"]
 }
@@ -1,13 +1,14 @@
 """Support for departure information for public transport in Munich."""

-# mypy: ignore-errors
 from __future__ import annotations

+from collections.abc import Mapping
 from copy import deepcopy
 from datetime import timedelta
 import logging
+from typing import Any

-import MVGLive
+from mvg import MvgApi, MvgApiError, TransportType
 import voluptuous as vol

 from homeassistant.components.sensor import (
@@ -19,6 +20,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+import homeassistant.util.dt as dt_util

 _LOGGER = logging.getLogger(__name__)

@@ -44,53 +46,55 @@ ICONS = {
    "SEV": "mdi:checkbox-blank-circle-outline",
    "-": "mdi:clock",
 }
-ATTRIBUTION = "Data provided by MVG-live.de"
+
+ATTRIBUTION = "Data provided by mvg.de"

 SCAN_INTERVAL = timedelta(seconds=30)

-PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_NEXT_DEPARTURE): [
-            {
-                vol.Required(CONF_STATION): cv.string,
-                vol.Optional(CONF_DESTINATIONS, default=[""]): cv.ensure_list_csv,
-                vol.Optional(CONF_DIRECTIONS, default=[""]): cv.ensure_list_csv,
-                vol.Optional(CONF_LINES, default=[""]): cv.ensure_list_csv,
-                vol.Optional(
-                    CONF_PRODUCTS, default=DEFAULT_PRODUCT
-                ): cv.ensure_list_csv,
-                vol.Optional(CONF_TIMEOFFSET, default=0): cv.positive_int,
-                vol.Optional(CONF_NUMBER, default=1): cv.positive_int,
-                vol.Optional(CONF_NAME): cv.string,
-            }
-        ]
-    }
+PLATFORM_SCHEMA = vol.All(
+    cv.deprecated(CONF_DIRECTIONS),
+    SENSOR_PLATFORM_SCHEMA.extend(
+        {
+            vol.Required(CONF_NEXT_DEPARTURE): [
+                {
+                    vol.Required(CONF_STATION): cv.string,
+                    vol.Optional(CONF_DESTINATIONS, default=[""]): cv.ensure_list_csv,
+                    vol.Optional(CONF_DIRECTIONS, default=[""]): cv.ensure_list_csv,
+                    vol.Optional(CONF_LINES, default=[""]): cv.ensure_list_csv,
+                    vol.Optional(
+                        CONF_PRODUCTS, default=DEFAULT_PRODUCT
+                    ): cv.ensure_list_csv,
+                    vol.Optional(CONF_TIMEOFFSET, default=0): cv.positive_int,
+                    vol.Optional(CONF_NUMBER, default=1): cv.positive_int,
+                    vol.Optional(CONF_NAME): cv.string,
+                }
+            ]
+        }
+    ),
 )


-def setup_platform(
+async def async_setup_platform(
    hass: HomeAssistant,
    config: ConfigType,
    add_entities: AddEntitiesCallback,
    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
    """Set up the MVGLive sensor."""
-    add_entities(
-        (
-            MVGLiveSensor(
-                nextdeparture.get(CONF_STATION),
-                nextdeparture.get(CONF_DESTINATIONS),
-                nextdeparture.get(CONF_DIRECTIONS),
-                nextdeparture.get(CONF_LINES),
-                nextdeparture.get(CONF_PRODUCTS),
-                nextdeparture.get(CONF_TIMEOFFSET),
-                nextdeparture.get(CONF_NUMBER),
-                nextdeparture.get(CONF_NAME),
-            )
-            for nextdeparture in config[CONF_NEXT_DEPARTURE]
-        ),
-        True,
-    )
+    sensors = [
+        MVGLiveSensor(
+            hass,
+            nextdeparture.get(CONF_STATION),
+            nextdeparture.get(CONF_DESTINATIONS),
+            nextdeparture.get(CONF_LINES),
+            nextdeparture.get(CONF_PRODUCTS),
+            nextdeparture.get(CONF_TIMEOFFSET),
+            nextdeparture.get(CONF_NUMBER),
+            nextdeparture.get(CONF_NAME),
+        )
+        for nextdeparture in config[CONF_NEXT_DEPARTURE]
+    ]
+    add_entities(sensors, True)


 class MVGLiveSensor(SensorEntity):
@@ -100,38 +104,38 @@ class MVGLiveSensor(SensorEntity):

    def __init__(
        self,
-        station,
+        hass: HomeAssistant,
+        station_name,
        destinations,
-        directions,
        lines,
        products,
        timeoffset,
        number,
        name,
-    ):
+    ) -> None:
        """Initialize the sensor."""
-        self._station = station
        self._name = name
+        self._station_name = station_name
        self.data = MVGLiveData(
-            station, destinations, directions, lines, products, timeoffset, number
+            hass, station_name, destinations, lines, products, timeoffset, number
        )
        self._state = None
        self._icon = ICONS["-"]

    @property
-    def name(self):
+    def name(self) -> str | None:
        """Return the name of the sensor."""
        if self._name:
            return self._name
-        return self._station
+        return self._station_name

    @property
-    def native_value(self):
+    def native_value(self) -> str | None:
        """Return the next departure time."""
        return self._state

    @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> Mapping[str, Any] | None:
        """Return the state attributes."""
        if not (dep := self.data.departures):
            return None
@@ -140,88 +144,114 @@ class MVGLiveSensor(SensorEntity):
        return attr

    @property
-    def icon(self):
+    def icon(self) -> str | None:
        """Icon to use in the frontend, if any."""
        return self._icon

    @property
-    def native_unit_of_measurement(self):
+    def native_unit_of_measurement(self) -> str | None:
        """Return the unit this state is expressed in."""
        return UnitOfTime.MINUTES

-    def update(self) -> None:
+    async def async_update(self) -> None:
        """Get the latest data and update the state."""
-        self.data.update()
+        await self.data.update()
        if not self.data.departures:
-            self._state = "-"
+            self._state = None
            self._icon = ICONS["-"]
        else:
-            self._state = self.data.departures[0].get("time", "-")
-            self._icon = ICONS[self.data.departures[0].get("product", "-")]
+            self._state = self.data.departures[0].get("time_in_mins", "-")
+            self._icon = self.data.departures[0].get("icon", ICONS["-"])
+
+
+def _get_minutes_until_departure(departure_time: int) -> int:
+    """Calculate the time difference in minutes between the current time and a given departure time.
+
+    Args:
+        departure_time: Unix timestamp of the departure time, in seconds.
+
+    Returns:
+        The time difference in minutes, as an integer.
+
+    """
+    current_time = dt_util.utcnow()
+    departure_datetime = dt_util.utc_from_timestamp(departure_time)
+    time_difference = (departure_datetime - current_time).total_seconds()
+    return int(time_difference / 60.0)


 class MVGLiveData:
-    """Pull data from the mvg-live.de web page."""
+    """Pull data from the mvg.de web page."""

    def __init__(
-        self, station, destinations, directions, lines, products, timeoffset, number
-    ):
+        self,
+        hass: HomeAssistant,
+        station_name,
+        destinations,
+        lines,
+        products,
+        timeoffset,
+        number,
+    ) -> None:
        """Initialize the sensor."""
-        self._station = station
+        self._hass = hass
+        self._station_name = station_name
+        self._station_id = None
        self._destinations = destinations
-        self._directions = directions
        self._lines = lines
        self._products = products
        self._timeoffset = timeoffset
        self._number = number
-        self._include_ubahn = "U-Bahn" in self._products
-        self._include_tram = "Tram" in self._products
-        self._include_bus = "Bus" in self._products
-        self._include_sbahn = "S-Bahn" in self._products
-        self.mvg = MVGLive.MVGLive()
-        self.departures = []
+        self.departures: list[dict[str, Any]] = []

-    def update(self):
+    async def update(self):
        """Update the connection data."""
+        if self._station_id is None:
+            try:
+                station = await MvgApi.station_async(self._station_name)
+                self._station_id = station["id"]
+            except MvgApiError as err:
+                _LOGGER.error(
+                    "Failed to resolve station %s: %s", self._station_name, err
+                )
+                self.departures = []
+                return
+
        try:
-            _departures = self.mvg.getlivedata(
-                station=self._station,
-                timeoffset=self._timeoffset,
-                ubahn=self._include_ubahn,
-                tram=self._include_tram,
-                bus=self._include_bus,
-                sbahn=self._include_sbahn,
+            _departures = await MvgApi.departures_async(
+                station_id=self._station_id,
+                offset=self._timeoffset,
+                limit=self._number,
+                transport_types=[
+                    transport_type
+                    for transport_type in TransportType
+                    if transport_type.value[0] in self._products
+                ]
+                if self._products
+                else None,
            )
        except ValueError:
            self.departures = []
            _LOGGER.warning("Returned data not understood")
            return
        self.departures = []
-        for i, _departure in enumerate(_departures):
-            # find the first departure meeting the criteria
+        for _departure in _departures:
            if (
                "" not in self._destinations[:1]
                and _departure["destination"] not in self._destinations
            ):
                continue

-            if (
-                "" not in self._directions[:1]
-                and _departure["direction"] not in self._directions
-            ):
+            if "" not in self._lines[:1] and _departure["line"] not in self._lines:
                continue

-            if "" not in self._lines[:1] and _departure["linename"] not in self._lines:
+            time_to_departure = _get_minutes_until_departure(_departure["time"])
+
+            if time_to_departure < self._timeoffset:
                continue

-            if _departure["time"] < self._timeoffset:
-                continue
-
-            # now select the relevant data
            _nextdep = {}
-            for k in ("destination", "linename", "time", "direction", "product"):
+            for k in ("destination", "line", "type", "cancelled", "icon"):
                _nextdep[k] = _departure.get(k, "")
-            _nextdep["time"] = int(_nextdep["time"])
+            _nextdep["time_in_mins"] = time_to_departure
            self.departures.append(_nextdep)
-            if i == self._number - 1:
-                break
@@ -131,7 +131,15 @@ class PortainerContainerSensor(PortainerContainerEntity, BinarySensorEntity):
        self.entity_description = entity_description
        super().__init__(device_info, coordinator, via_device)

-        self._attr_unique_id = f"{coordinator.config_entry.entry_id}_{device_info.id}_{entity_description.key}"
+        # Container ID's are ephemeral, so use the container name for the unique ID
+        # The first one, should always be unique, it's fine if users have aliases
+        # According to Docker's API docs, the first name is unique
+        device_identifier = (
+            self._device_info.names[0].replace("/", " ").strip()
+            if self._device_info.names
+            else None
+        )
+        self._attr_unique_id = f"{coordinator.config_entry.entry_id}_{device_identifier}_{entity_description.key}"

    @property
    def available(self) -> bool:
@@ -60,7 +60,7 @@ class PortainerContainerEntity(PortainerCoordinatorEntity):

        self._attr_device_info = DeviceInfo(
            identifiers={
-                (DOMAIN, f"{self.coordinator.config_entry.entry_id}_{self.device_id}")
+                (DOMAIN, f"{self.coordinator.config_entry.entry_id}_{device_name}")
            },
            manufacturer=DEFAULT_NAME,
            model="Container",
@@ -351,13 +351,9 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
    def _set_current_map(self) -> None:
        if (
            self.roborock_device_info.props.status is not None
-            and self.roborock_device_info.props.status.map_status is not None
+            and self.roborock_device_info.props.status.current_map is not None
        ):
-            # The map status represents the map flag as flag * 4 + 3 -
-            # so we have to invert that in order to get the map flag that we can use to set the current map.
-            self.current_map = (
-                self.roborock_device_info.props.status.map_status - 3
-            ) // 4
+            self.current_map = self.roborock_device_info.props.status.current_map

    async def set_current_map_rooms(self) -> None:
        """Fetch all of the rooms for the current map and set on RoborockMapInfo."""
@@ -440,7 +436,7 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
            # If either of these fail, we don't care, and we want to continue.
            await asyncio.gather(*tasks, return_exceptions=True)

-        if len(self.maps) != 1:
+        if len(self.maps) > 1:
            # Set the map back to the map the user previously had selected so that it
            # does not change the end user's app.
            # Only needs to happen when we changed maps above.
@@ -30,5 +30,5 @@
  "iot_class": "cloud_push",
  "loggers": ["pysmartthings"],
  "quality_scale": "bronze",
-  "requirements": ["pysmartthings==3.2.9"]
+  "requirements": ["pysmartthings==3.3.0"]
 }
@@ -610,7 +610,7 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):

    def _play_media_queue(
        self, soco: SoCo, item: MusicServiceItem, enqueue: MediaPlayerEnqueue
-    ):
+    ) -> None:
        """Manage adding, replacing, playing items onto the sonos queue."""
        _LOGGER.debug(
            "_play_media_queue item_id [%s] title [%s] enqueue [%s]",
@@ -639,7 +639,7 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
        media_type: MediaType | str,
        media_id: str,
        enqueue: MediaPlayerEnqueue,
-    ):
+    ) -> None:
        """Play a directory from a music library share."""
        item = media_browser.get_media(self.media.library, media_id, media_type)
        if not item:
@@ -660,6 +660,7 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
        enqueue: MediaPlayerEnqueue,
        title: str,
    ) -> None:
+        """Play a sharelink."""
        share_link = self.coordinator.share_link
        kwargs = {}
        if title:
@@ -1,5 +1,6 @@
 """The Squeezebox integration."""

+import asyncio
 from asyncio import timeout
 from dataclasses import dataclass, field
 from datetime import datetime
@@ -31,11 +32,11 @@ from homeassistant.helpers.device_registry import (
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_call_later
+from homeassistant.util.hass_dict import HassKey

 from .const import (
    CONF_HTTPS,
    DISCOVERY_INTERVAL,
-    DISCOVERY_TASK,
    DOMAIN,
    SERVER_MANUFACTURER,
    SERVER_MODEL,
@@ -64,6 +65,8 @@ PLATFORMS = [
    Platform.UPDATE,
 ]

+SQUEEZEBOX_HASS_DATA: HassKey[asyncio.Task] = HassKey(DOMAIN)
+

@dataclass
 class SqueezeboxData:
@@ -240,7 +243,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: SqueezeboxConfigEntry)
    current_entries = hass.config_entries.async_entries(DOMAIN)
    if len(current_entries) == 1 and current_entries[0] == entry:
        _LOGGER.debug("Stopping server discovery task")
-        hass.data[DOMAIN][DISCOVERY_TASK].cancel()
-        hass.data[DOMAIN].pop(DISCOVERY_TASK)
+        hass.data[SQUEEZEBOX_HASS_DATA].cancel()
+        hass.data.pop(SQUEEZEBOX_HASS_DATA)

    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
@@ -1,7 +1,6 @@
 """Constants for the Squeezebox component."""

 CONF_HTTPS = "https"
-DISCOVERY_TASK = "discovery_task"
 DOMAIN = "squeezebox"
 DEFAULT_PORT = 9000
 PLAYER_DISCOVERY_UNSUB = "player_discovery_unsub"
@@ -44,6 +44,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.start import async_at_start
 from homeassistant.util.dt import utcnow

+from . import SQUEEZEBOX_HASS_DATA
 from .browse_media import (
    BrowseData,
    build_item_response,
@@ -58,7 +59,6 @@ from .const import (
    CONF_VOLUME_STEP,
    DEFAULT_BROWSE_LIMIT,
    DEFAULT_VOLUME_STEP,
-    DISCOVERY_TASK,
    DOMAIN,
    SERVER_MANUFACTURER,
    SERVER_MODEL,
@@ -110,12 +110,10 @@ async def start_server_discovery(hass: HomeAssistant) -> None:
            },
        )

-    hass.data.setdefault(DOMAIN, {})
-    if DISCOVERY_TASK not in hass.data[DOMAIN]:
+    if not hass.data.get(SQUEEZEBOX_HASS_DATA):
        _LOGGER.debug("Adding server discovery task for squeezebox")
-        hass.data[DOMAIN][DISCOVERY_TASK] = hass.async_create_background_task(
-            async_discover(_discovered_server),
-            name="squeezebox server discovery",
+        hass.data[SQUEEZEBOX_HASS_DATA] = hass.async_create_background_task(
+            async_discover(_discovered_server), name="squeezebox server discovery"
        )


@@ -3,16 +3,18 @@
 from __future__ import annotations

 from datetime import datetime, timedelta
-from typing import cast
+from typing import Any, cast

 import voluptuous as vol

-from homeassistant.const import CONF_CONDITION, SUN_EVENT_SUNRISE, SUN_EVENT_SUNSET
+from homeassistant.const import CONF_OPTIONS, SUN_EVENT_SUNRISE, SUN_EVENT_SUNSET
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import move_top_level_schema_fields_to_options
 from homeassistant.helpers.condition import (
    Condition,
    ConditionCheckerType,
+    ConditionConfig,
    condition_trace_set_result,
    condition_trace_update_result,
    trace_condition_function,
@@ -21,20 +23,22 @@ from homeassistant.helpers.sun import get_astral_event_date
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 from homeassistant.util import dt as dt_util

-_CONDITION_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            **cv.CONDITION_BASE_SCHEMA,
-            vol.Required(CONF_CONDITION): "sun",
-            vol.Optional("before"): cv.sun_event,
-            vol.Optional("before_offset"): cv.time_period,
-            vol.Optional("after"): vol.All(
-                vol.Lower, vol.Any(SUN_EVENT_SUNSET, SUN_EVENT_SUNRISE)
-            ),
-            vol.Optional("after_offset"): cv.time_period,
-        }
+_OPTIONS_SCHEMA_DICT: dict[vol.Marker, Any] = {
+    vol.Optional("before"): cv.sun_event,
+    vol.Optional("before_offset"): cv.time_period,
+    vol.Optional("after"): vol.All(
+        vol.Lower, vol.Any(SUN_EVENT_SUNSET, SUN_EVENT_SUNRISE)
    ),
-    cv.has_at_least_one_key("before", "after"),
+    vol.Optional("after_offset"): cv.time_period,
+}
+
+_CONDITION_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_OPTIONS): vol.All(
+            _OPTIONS_SCHEMA_DICT,
+            cv.has_at_least_one_key("before", "after"),
+        )
+    }
 )


@@ -125,24 +129,36 @@ def sun(
 class SunCondition(Condition):
    """Sun condition."""

-    def __init__(self, hass: HomeAssistant, config: ConfigType) -> None:
-        """Initialize condition."""
-        self._config = config
-        self._hass = hass
+    _options: dict[str, Any]
+
+    @classmethod
+    async def async_validate_complete_config(
+        cls, hass: HomeAssistant, complete_config: ConfigType
+    ) -> ConfigType:
+        """Validate complete config."""
+        complete_config = move_top_level_schema_fields_to_options(
+            complete_config, _OPTIONS_SCHEMA_DICT
+        )
+        return await super().async_validate_complete_config(hass, complete_config)

    @classmethod
    async def async_validate_config(
        cls, hass: HomeAssistant, config: ConfigType
    ) -> ConfigType:
        """Validate config."""
-        return _CONDITION_SCHEMA(config)  # type: ignore[no-any-return]
+        return cast(ConfigType, _CONDITION_SCHEMA(config))
+
+    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+        """Initialize condition."""
+        assert config.options is not None
+        self._options = config.options

    async def async_get_checker(self) -> ConditionCheckerType:
        """Wrap action method with sun based condition."""
-        before = self._config.get("before")
-        after = self._config.get("after")
-        before_offset = self._config.get("before_offset")
-        after_offset = self._config.get("after_offset")
+        before = self._options.get("before")
+        after = self._options.get("after")
+        before_offset = self._options.get("before_offset")
+        after_offset = self._options.get("after_offset")

        @trace_condition_function
        def sun_if(hass: HomeAssistant, variables: TemplateVarsType = None) -> bool:
@@ -3,13 +3,14 @@
 from __future__ import annotations

 from collections import Counter
-from collections.abc import Callable
+from collections.abc import Callable, Sequence
 from datetime import datetime, timedelta
 from functools import cache
 import logging
 from typing import Any, Literal, cast

 from sqlalchemy import select
+from sqlalchemy.engine.row import Row
 from sqlalchemy.orm import Session

 from homeassistant.components.recorder import get_instance
@@ -38,13 +39,11 @@ ALLOWED_DOMAINS = {
    Platform.ALARM_CONTROL_PANEL,
    Platform.BINARY_SENSOR,
    Platform.BUTTON,
-    Platform.CALENDAR,
    Platform.CAMERA,
    Platform.CLIMATE,
    Platform.COVER,
    Platform.FAN,
    Platform.HUMIDIFIER,
-    Platform.IMAGE,
    Platform.LAWN_MOWER,
    Platform.LIGHT,
    Platform.LOCK,
@@ -55,7 +54,6 @@ ALLOWED_DOMAINS = {
    Platform.SENSOR,
    Platform.SIREN,
    Platform.SWITCH,
-    Platform.TEXT,
    Platform.VACUUM,
    Platform.VALVE,
    Platform.WATER_HEATER,
@@ -93,61 +91,32 @@ async def async_predict_common_control(
    Args:
        hass: Home Assistant instance
        user_id: User ID to filter events by.
-
-    Returns:
-        Dictionary with time categories as keys and lists of most common entity IDs as values
    """
    # Get the recorder instance to ensure it's ready
    recorder = get_instance(hass)
    ent_reg = er.async_get(hass)

    # Execute the database operation in the recorder's executor
-    return await recorder.async_add_executor_job(
+    data = await recorder.async_add_executor_job(
        _fetch_with_session, hass, _fetch_and_process_data, ent_reg, user_id
    )
-
-
-def _fetch_and_process_data(
-    session: Session, ent_reg: er.EntityRegistry, user_id: str
-) -> EntityUsagePredictions:
-    """Fetch and process service call events from the database."""
    # Prepare a dictionary to track results
    results: dict[str, Counter[str]] = {
        time_cat: Counter() for time_cat in TIME_CATEGORIES
    }

+    allowed_entities = set(hass.states.async_entity_ids(ALLOWED_DOMAINS))
+    hidden_entities: set[str] = set()
+
    # Keep track of contexts that we processed so that we will only process
    # the first service call in a context, and not subsequent calls.
    context_processed: set[bytes] = set()
-    thirty_days_ago_ts = (dt_util.utcnow() - timedelta(days=30)).timestamp()
-    user_id_bytes = uuid_hex_to_bytes_or_none(user_id)
-    if not user_id_bytes:
-        raise ValueError("Invalid user_id format")
-
-    # Build the main query for events with their data
-    query = (
-        select(
-            Events.context_id_bin,
-            Events.time_fired_ts,
-            EventData.shared_data,
-        )
-        .select_from(Events)
-        .outerjoin(EventData, Events.data_id == EventData.data_id)
-        .outerjoin(EventTypes, Events.event_type_id == EventTypes.event_type_id)
-        .where(Events.time_fired_ts >= thirty_days_ago_ts)
-        .where(Events.context_user_id_bin == user_id_bytes)
-        .where(EventTypes.event_type == "call_service")
-        .order_by(Events.time_fired_ts)
-    )
-
    # Execute the query
    context_id: bytes
    time_fired_ts: float
    shared_data: str | None
    local_time_zone = dt_util.get_default_time_zone()
-    for context_id, time_fired_ts, shared_data in (
-        session.connection().execute(query).all()
-    ):
+    for context_id, time_fired_ts, shared_data in data:
        # Skip if we have already processed an event that was part of this context
        if context_id in context_processed:
            continue
@@ -156,7 +125,7 @@ def _fetch_and_process_data(
        context_processed.add(context_id)

        # Parse the event data
-        if not shared_data:
+        if not time_fired_ts or not shared_data:
            continue

        try:
@@ -190,27 +159,26 @@ def _fetch_and_process_data(
        if not isinstance(entity_ids, list):
            entity_ids = [entity_ids]

-        # Filter out entity IDs that are not in allowed domains
-        entity_ids = [
-            entity_id
-            for entity_id in entity_ids
-            if entity_id.split(".")[0] in ALLOWED_DOMAINS
-            and ((entry := ent_reg.async_get(entity_id)) is None or not entry.hidden)
-        ]
+        # Convert to local time for time category determination
+        period = time_category(
+            datetime.fromtimestamp(time_fired_ts, local_time_zone).hour
+        )
+        period_results = results[period]

-        if not entity_ids:
-            continue
+        # Count entity usage
+        for entity_id in entity_ids:
+            if entity_id not in allowed_entities or entity_id in hidden_entities:
+                continue

-        # Convert timestamp to datetime and determine time category
-        if time_fired_ts:
-            # Convert to local time for time category determination
-            period = time_category(
-                datetime.fromtimestamp(time_fired_ts, local_time_zone).hour
-            )
+            if (
+                entity_id not in period_results
+                and (entry := ent_reg.async_get(entity_id))
+                and entry.hidden
+            ):
+                hidden_entities.add(entity_id)
+                continue

-            # Count entity usage
-            for entity_id in entity_ids:
-                results[period][entity_id] += 1
+            period_results[entity_id] += 1

    return EntityUsagePredictions(
        morning=[
@@ -229,11 +197,40 @@ def _fetch_and_process_data(
    )


+def _fetch_and_process_data(
+    session: Session, ent_reg: er.EntityRegistry, user_id: str
+) -> Sequence[Row[tuple[bytes | None, float | None, str | None]]]:
+    """Fetch and process service call events from the database."""
+    thirty_days_ago_ts = (dt_util.utcnow() - timedelta(days=30)).timestamp()
+    user_id_bytes = uuid_hex_to_bytes_or_none(user_id)
+    if not user_id_bytes:
+        raise ValueError("Invalid user_id format")
+
+    # Build the main query for events with their data
+    query = (
+        select(
+            Events.context_id_bin,
+            Events.time_fired_ts,
+            EventData.shared_data,
+        )
+        .select_from(Events)
+        .outerjoin(EventData, Events.data_id == EventData.data_id)
+        .outerjoin(EventTypes, Events.event_type_id == EventTypes.event_type_id)
+        .where(Events.time_fired_ts >= thirty_days_ago_ts)
+        .where(Events.context_user_id_bin == user_id_bytes)
+        .where(EventTypes.event_type == "call_service")
+        .order_by(Events.time_fired_ts)
+    )
+    return session.connection().execute(query).all()
+
+
 def _fetch_with_session(
    hass: HomeAssistant,
-    fetch_func: Callable[[Session], EntityUsagePredictions],
+    fetch_func: Callable[
+        [Session], Sequence[Row[tuple[bytes | None, float | None, str | None]]]
+    ],
    *args: object,
-) -> EntityUsagePredictions:
+) -> Sequence[Row[tuple[bytes | None, float | None, str | None]]]:
    """Execute a fetch function with a database session."""
    with session_scope(hass=hass, read_only=True) as session:
        return fetch_func(session, *args)
@@ -2,14 +2,16 @@

 from __future__ import annotations

+from typing import Any, cast
+
 import voluptuous as vol

 from homeassistant.const import (
    ATTR_GPS_ACCURACY,
    ATTR_LATITUDE,
    ATTR_LONGITUDE,
-    CONF_CONDITION,
    CONF_ENTITY_ID,
+    CONF_OPTIONS,
    CONF_ZONE,
    STATE_UNAVAILABLE,
    STATE_UNKNOWN,
@@ -17,26 +19,25 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, State
 from homeassistant.exceptions import ConditionErrorContainer, ConditionErrorMessage
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import move_top_level_schema_fields_to_options
 from homeassistant.helpers.condition import (
    Condition,
    ConditionCheckerType,
+    ConditionConfig,
    trace_condition_function,
 )
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType

 from . import in_zone

-_CONDITION_SCHEMA = vol.Schema(
-    {
-        **cv.CONDITION_BASE_SCHEMA,
-        vol.Required(CONF_CONDITION): "zone",
-        vol.Required(CONF_ENTITY_ID): cv.entity_ids,
-        vol.Required("zone"): cv.entity_ids,
-        # To support use_trigger_value in automation
-        # Deprecated 2016/04/25
-        vol.Optional("event"): vol.Any("enter", "leave"),
-    }
-)
+_OPTIONS_SCHEMA_DICT = {
+    vol.Required(CONF_ENTITY_ID): cv.entity_ids,
+    vol.Required("zone"): cv.entity_ids,
+    # To support use_trigger_value in automation
+    # Deprecated 2016/04/25
+    vol.Optional("event"): vol.Any("enter", "leave"),
+}
+_CONDITION_SCHEMA = vol.Schema({CONF_OPTIONS: _OPTIONS_SCHEMA_DICT})


 def zone(
@@ -95,21 +96,34 @@ def zone(
 class ZoneCondition(Condition):
    """Zone condition."""

-    def __init__(self, hass: HomeAssistant, config: ConfigType) -> None:
-        """Initialize condition."""
-        self._config = config
+    _options: dict[str, Any]
+
+    @classmethod
+    async def async_validate_complete_config(
+        cls, hass: HomeAssistant, complete_config: ConfigType
+    ) -> ConfigType:
+        """Validate complete config."""
+        complete_config = move_top_level_schema_fields_to_options(
+            complete_config, _OPTIONS_SCHEMA_DICT
+        )
+        return await super().async_validate_complete_config(hass, complete_config)

    @classmethod
    async def async_validate_config(
        cls, hass: HomeAssistant, config: ConfigType
    ) -> ConfigType:
        """Validate config."""
-        return _CONDITION_SCHEMA(config)  # type: ignore[no-any-return]
+        return cast(ConfigType, _CONDITION_SCHEMA(config))
+
+    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+        """Initialize condition."""
+        assert config.options is not None
+        self._options = config.options

    async def async_get_checker(self) -> ConditionCheckerType:
        """Wrap action method with zone based condition."""
-        entity_ids = self._config.get(CONF_ENTITY_ID, [])
-        zone_entity_ids = self._config.get(CONF_ZONE, [])
+        entity_ids = self._options.get(CONF_ENTITY_ID, [])
+        zone_entity_ids = self._options.get(CONF_ZONE, [])

        @trace_condition_function
        def if_in_zone(hass: HomeAssistant, variables: TemplateVarsType = None) -> bool:
@@ -21,6 +21,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers.automation import move_top_level_schema_fields_to_options
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.trigger import (
    Trigger,
@@ -28,7 +29,6 @@ from homeassistant.helpers.trigger import (
    TriggerConfig,
    TriggerData,
    TriggerInfo,
-    move_top_level_schema_fields_to_options,
 )
 from homeassistant.helpers.typing import ConfigType

@@ -20,13 +20,13 @@ from homeassistant.const import (
 )
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers.automation import move_top_level_schema_fields_to_options
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.trigger import (
    Trigger,
    TriggerActionType,
    TriggerConfig,
    TriggerInfo,
-    move_top_level_schema_fields_to_options,
 )
 from homeassistant.helpers.typing import ConfigType

@@ -25,7 +25,7 @@ if TYPE_CHECKING:

 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2025
-MINOR_VERSION: Final = 10
+MINOR_VERSION: Final = 11
 PATCH_VERSION: Final = "0.dev0"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
@@ -1,5 +1,13 @@
 """Helpers for automation."""

+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.const import CONF_OPTIONS
+
+from .typing import ConfigType
+

 def get_absolute_description_key(domain: str, key: str) -> str:
    """Return the absolute description key."""
@@ -19,3 +27,26 @@ def get_relative_description_key(domain: str, key: str) -> str:
    if not subtype:
        return "_"
    return subtype[0]
+
+
+def move_top_level_schema_fields_to_options(
+    config: ConfigType, options_schema_dict: dict[vol.Marker, Any]
+) -> ConfigType:
+    """Move top-level fields to options.
+
+    This function is used to help migrating old-style configs to new-style configs.
+    If options is already present, the config is returned as-is.
+    """
+    if CONF_OPTIONS in config:
+        return config
+
+    config = config.copy()
+    options = config.setdefault(CONF_OPTIONS, {})
+
+    # Move top-level fields to options
+    for key_marked in options_schema_dict:
+        key = key_marked.schema
+        if key in config:
+            options[key] = config.pop(key)
+
+    return config
@@ -6,6 +6,7 @@ import abc
 from collections import deque
 from collections.abc import Callable, Container, Coroutine, Generator, Iterable
 from contextlib import contextmanager
+from dataclasses import dataclass
 from datetime import datetime, time as dt_time, timedelta
 import functools as ft
 import inspect
@@ -30,8 +31,10 @@ from homeassistant.const import (
    CONF_FOR,
    CONF_ID,
    CONF_MATCH,
+    CONF_OPTIONS,
    CONF_SELECTOR,
    CONF_STATE,
+    CONF_TARGET,
    CONF_VALUE_TEMPLATE,
    CONF_WEEKDAY,
    ENTITY_MATCH_ALL,
@@ -111,17 +114,17 @@ CONDITIONS: HassKey[dict[str, str]] = HassKey("conditions")

 # Basic schemas to sanity check the condition descriptions,
 # full validation is done by hassfest.conditions
-_FIELD_SCHEMA = vol.Schema(
+_FIELD_DESCRIPTION_SCHEMA = vol.Schema(
    {
        vol.Optional(CONF_SELECTOR): selector.validate_selector,
    },
    extra=vol.ALLOW_EXTRA,
 )

-_CONDITION_SCHEMA = vol.Schema(
+_CONDITION_DESCRIPTION_SCHEMA = vol.Schema(
    {
        vol.Optional("target"): TargetSelector.CONFIG_SCHEMA,
-        vol.Optional("fields"): vol.Schema({str: _FIELD_SCHEMA}),
+        vol.Optional("fields"): vol.Schema({str: _FIELD_DESCRIPTION_SCHEMA}),
    },
    extra=vol.ALLOW_EXTRA,
 )
@@ -134,10 +137,10 @@ def starts_with_dot(key: str) -> str:
    return key


-_CONDITIONS_SCHEMA = vol.Schema(
+_CONDITIONS_DESCRIPTION_SCHEMA = vol.Schema(
    {
        vol.Remove(vol.All(str, starts_with_dot)): object,
-        cv.underscore_slug: vol.Any(None, _CONDITION_SCHEMA),
+        cv.underscore_slug: vol.Any(None, _CONDITION_DESCRIPTION_SCHEMA),
    }
 )

@@ -199,11 +202,43 @@ async def _register_condition_platform(
            _LOGGER.exception("Error while notifying condition platform listener")


+_CONDITION_SCHEMA = vol.Schema(
+    {
+        **cv.CONDITION_BASE_SCHEMA,
+        vol.Required(CONF_CONDITION): str,
+        vol.Optional(CONF_OPTIONS): object,
+        vol.Optional(CONF_TARGET): cv.TARGET_FIELDS,
+    }
+)
+
+
 class Condition(abc.ABC):
    """Condition class."""

-    def __init__(self, hass: HomeAssistant, config: ConfigType) -> None:
-        """Initialize condition."""
+    @classmethod
+    async def async_validate_complete_config(
+        cls, hass: HomeAssistant, complete_config: ConfigType
+    ) -> ConfigType:
+        """Validate complete config.
+
+        The complete config includes fields that are generic to all conditions,
+        such as the alias.
+        This method should be overridden by conditions that need to migrate
+        from the old-style config.
+        """
+        complete_config = _CONDITION_SCHEMA(complete_config)
+
+        specific_config: ConfigType = {}
+        for key in (CONF_OPTIONS, CONF_TARGET):
+            if key in complete_config:
+                specific_config[key] = complete_config.pop(key)
+        specific_config = await cls.async_validate_config(hass, specific_config)
+
+        for key in (CONF_OPTIONS, CONF_TARGET):
+            if key in specific_config:
+                complete_config[key] = specific_config[key]
+
+        return complete_config

    @classmethod
    @abc.abstractmethod
@@ -212,6 +247,9 @@ class Condition(abc.ABC):
    ) -> ConfigType:
        """Validate config."""

+    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+        """Initialize condition."""
+
    @abc.abstractmethod
    async def async_get_checker(self) -> ConditionCheckerType:
        """Get the condition checker."""
@@ -226,6 +264,14 @@ class ConditionProtocol(Protocol):
        """Return the conditions provided by this integration."""


+@dataclass(slots=True)
+class ConditionConfig:
+    """Condition config."""
+
+    options: dict[str, Any] | None = None
+    target: dict[str, Any] | None = None
+
+
 type ConditionCheckerType = Callable[[HomeAssistant, TemplateVarsType], bool | None]


@@ -355,8 +401,15 @@ async def async_from_config(
        relative_condition_key = get_relative_description_key(
            platform_domain, condition_key
        )
-        condition_instance = condition_descriptors[relative_condition_key](hass, config)
-        return await condition_instance.async_get_checker()
+        condition_cls = condition_descriptors[relative_condition_key]
+        condition = condition_cls(
+            hass,
+            ConditionConfig(
+                options=config.get(CONF_OPTIONS),
+                target=config.get(CONF_TARGET),
+            ),
+        )
+        return await condition.async_get_checker()

    for fmt in (ASYNC_FROM_CONFIG_FORMAT, FROM_CONFIG_FORMAT):
        factory = getattr(sys.modules[__name__], fmt.format(condition_key), None)
@@ -989,9 +1042,9 @@ async def async_validate_condition_config(
        )
        if not (condition_class := condition_descriptors.get(relative_condition_key)):
            raise vol.Invalid(f"Invalid condition '{condition_key}' specified")
-        return await condition_class.async_validate_config(hass, config)
+        return await condition_class.async_validate_complete_config(hass, config)

-    if platform is None and condition_key in ("numeric_state", "state"):
+    if condition_key in ("numeric_state", "state"):
        validator = cast(
            Callable[[HomeAssistant, ConfigType], ConfigType],
            getattr(
@@ -1111,7 +1164,7 @@ def _load_conditions_file(integration: Integration) -> dict[str, Any]:
    try:
        return cast(
            dict[str, Any],
-            _CONDITIONS_SCHEMA(
+            _CONDITIONS_DESCRIPTION_SCHEMA(
                load_yaml_dict(str(integration.file_path / "conditions.yaml"))
            ),
        )
@@ -401,29 +401,6 @@ class PluggableAction:
                await task


-def move_top_level_schema_fields_to_options(
-    config: ConfigType, options_schema_dict: dict[vol.Marker, Any]
-) -> ConfigType:
-    """Move top-level fields to options.
-
-    This function is used to help migrating old-style configs to new-style configs.
-    If options is already present, the config is returned as-is.
-    """
-    if CONF_OPTIONS in config:
-        return config
-
-    config = config.copy()
-    options = config.setdefault(CONF_OPTIONS, {})
-
-    # Move top-level fields to options
-    for key_marked in options_schema_dict:
-        key = key_marked.schema
-        if key in config:
-            options[key] = config.pop(key)
-
-    return config
-
-
 async def _async_get_trigger_platform(
    hass: HomeAssistant, trigger_key: str
 ) -> tuple[str, TriggerProtocol]:
@@ -121,6 +121,9 @@ BLOCKED_CUSTOM_INTEGRATIONS: dict[str, BlockedIntegration] = {
    "variable": BlockedIntegration(
        AwesomeVersion("3.4.4"), "prevents recorder from working"
    ),
+    # Added in 2025.10.0 because of
+    # https://github.com/frenck/spook/issues/1066
+    "spook": BlockedIntegration(AwesomeVersion("4.0.0"), "breaks the template engine"),
 }

 DATA_COMPONENTS: HassKey[dict[str, ModuleType | ComponentProtocol]] = HassKey(
@@ -36,10 +36,10 @@ fnv-hash-fast==1.5.0
 go2rtc-client==0.2.1
 ha-ffmpeg==3.2.2
 habluetooth==5.6.4
-hass-nabucasa==1.1.1
+hass-nabucasa==1.1.2
 hassil==3.2.0
 home-assistant-bluetooth==1.13.1
-home-assistant-frontend==20250924.0
+home-assistant-frontend==20250925.0
 home-assistant-intents==2025.9.24
 httpx==0.28.1
 ifaddr==0.2.0
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "homeassistant"
-version = "2025.10.0.dev0"
+version = "2025.11.0.dev0"
 license = "Apache-2.0"
 license-files = ["LICENSE*", "homeassistant/backports/LICENSE*"]
 description = "Open-source home automation platform running on Python 3."
@@ -47,7 +47,7 @@ dependencies = [
  "fnv-hash-fast==1.5.0",
  # hass-nabucasa is imported by helpers which don't depend on the cloud
  # integration
-  "hass-nabucasa==1.1.1",
+  "hass-nabucasa==1.1.2",
  # When bumping httpx, please check the version pins of
  # httpcore, anyio, and h11 in gen_requirements_all
  "httpx==0.28.1",
@@ -22,7 +22,7 @@ certifi>=2021.5.30
 ciso8601==2.3.3
 cronsim==2.6
 fnv-hash-fast==1.5.0
-hass-nabucasa==1.1.1
+hass-nabucasa==1.1.2
 httpx==0.28.1
 home-assistant-bluetooth==1.13.1
 ifaddr==0.2.0
@@ -247,7 +247,7 @@ aioelectricitymaps==1.1.1
 aioemonitor==1.0.5

 # homeassistant.components.esphome
-aioesphomeapi==41.9.0
+aioesphomeapi==41.10.0

 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -1145,7 +1145,7 @@ habiticalib==0.4.5
 habluetooth==5.6.4

 # homeassistant.components.cloud
-hass-nabucasa==1.1.1
+hass-nabucasa==1.1.2

 # homeassistant.components.splunk
 hass-splunk==0.1.1
@@ -1186,7 +1186,7 @@ hole==0.9.0
 holidays==0.81

 # homeassistant.components.frontend
-home-assistant-frontend==20250924.0
+home-assistant-frontend==20250925.0

 # homeassistant.components.conversation
 home-assistant-intents==2025.9.24
@@ -1364,7 +1364,7 @@ libpyfoscamcgi==0.0.7
 libpyvivotek==0.4.0

 # homeassistant.components.libre_hardware_monitor
-librehardwaremonitor-api==1.3.1
+librehardwaremonitor-api==1.4.0

 # homeassistant.components.mikrotik
 librouteros==3.2.0
@@ -1499,6 +1499,9 @@ mutagen==1.47.0
 # homeassistant.components.mutesync
 mutesync==0.0.1

+# homeassistant.components.mvglive
+mvg==1.4.0
+
 # homeassistant.components.permobil
 mypermobil==0.1.8

@@ -2381,7 +2384,7 @@ pysmappee==0.2.29
 pysmarlaapi==0.9.2

 # homeassistant.components.smartthings
-pysmartthings==3.2.9
+pysmartthings==3.3.0

 # homeassistant.components.smarty
 pysmarty2==0.10.3
@@ -235,7 +235,7 @@ aioelectricitymaps==1.1.1
 aioemonitor==1.0.5

 # homeassistant.components.esphome
-aioesphomeapi==41.9.0
+aioesphomeapi==41.10.0

 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -1006,7 +1006,7 @@ habiticalib==0.4.5
 habluetooth==5.6.4

 # homeassistant.components.cloud
-hass-nabucasa==1.1.1
+hass-nabucasa==1.1.2

 # homeassistant.components.assist_satellite
 # homeassistant.components.conversation
@@ -1035,7 +1035,7 @@ hole==0.9.0
 holidays==0.81

 # homeassistant.components.frontend
-home-assistant-frontend==20250924.0
+home-assistant-frontend==20250925.0

 # homeassistant.components.conversation
 home-assistant-intents==2025.9.24
@@ -1180,7 +1180,7 @@ letpot==0.6.2
 libpyfoscamcgi==0.0.7

 # homeassistant.components.libre_hardware_monitor
-librehardwaremonitor-api==1.3.1
+librehardwaremonitor-api==1.4.0

 # homeassistant.components.mikrotik
 librouteros==3.2.0
@@ -1987,7 +1987,7 @@ pysmappee==0.2.29
 pysmarlaapi==0.9.2

 # homeassistant.components.smartthings
-pysmartthings==3.2.9
+pysmartthings==3.3.0

 # homeassistant.components.smarty
 pysmarty2==0.10.3
@@ -1184,6 +1184,42 @@ async def test_reauth_attempt_to_change_mac_aborts(
    }


+@pytest.mark.usefixtures("mock_zeroconf", "mock_setup_entry")
+async def test_reauth_password_changed(
+    hass: HomeAssistant, mock_client: APIClient
+) -> None:
+    """Test reauth when password has changed."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053, CONF_PASSWORD: "old_password"},
+        unique_id="11:22:33:44:55:aa",
+    )
+    entry.add_to_hass(hass)
+
+    mock_client.connect.side_effect = InvalidAuthAPIError("Invalid password")
+
+    result = await entry.start_reauth_flow(hass)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "authenticate"
+    assert result["description_placeholders"] == {
+        "name": "Mock Title",
+    }
+
+    mock_client.connect.side_effect = None
+    mock_client.connect.return_value = None
+    mock_client.device_info.return_value = DeviceInfo(
+        uses_password=True, name="test", mac_address="11:22:33:44:55:aa"
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={CONF_PASSWORD: "new_password"}
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+    assert entry.data[CONF_PASSWORD] == "new_password"
+
+
@pytest.mark.usefixtures("mock_setup_entry", "mock_zeroconf")
 async def test_reauth_fixed_via_dashboard(
    hass: HomeAssistant,
@@ -1239,7 +1275,7 @@ async def test_reauth_fixed_via_dashboard_add_encryption_remove_password(
 ) -> None:
    """Test reauth fixed automatically via dashboard with password removed."""
    mock_client.device_info.side_effect = (
-        InvalidAuthAPIError,
+        InvalidEncryptionKeyAPIError("Wrong key", "test"),
        DeviceInfo(uses_password=False, name="test", mac_address="11:22:33:44:55:aa"),
    )

@@ -3,7 +3,7 @@
 from typing import Any
 from unittest.mock import patch

-from aioesphomeapi import APIClient, DeviceInfo, InvalidAuthAPIError
+from aioesphomeapi import APIClient, DeviceInfo, InvalidEncryptionKeyAPIError
 import pytest

 from homeassistant.components.esphome import CONF_NOISE_PSK, DOMAIN, dashboard
@@ -194,7 +194,7 @@ async def test_new_dashboard_fix_reauth(
 ) -> None:
    """Test config entries waiting for reauth are triggered."""
    mock_client.device_info.side_effect = (
-        InvalidAuthAPIError,
+        InvalidEncryptionKeyAPIError("Wrong key", "test"),
        DeviceInfo(uses_password=False, name="test", mac_address="11:22:33:44:55:AA"),
    )

@@ -1455,6 +1455,37 @@ async def test_no_reauth_wrong_mac(
    )


+async def test_auth_error_during_on_connect_triggers_reauth(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+) -> None:
+    """Test that InvalidAuthAPIError during on_connect triggers reauth."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="11:22:33:44:55:aa",
+        data={
+            CONF_HOST: "test.local",
+            CONF_PORT: 6053,
+            CONF_PASSWORD: "wrong_password",
+        },
+    )
+    entry.add_to_hass(hass)
+
+    mock_client.device_info_and_list_entities = AsyncMock(
+        side_effect=InvalidAuthAPIError("Invalid password!")
+    )
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    flows = hass.config_entries.flow.async_progress(DOMAIN)
+    assert len(flows) == 1
+    assert flows[0]["context"]["source"] == "reauth"
+    assert flows[0]["context"]["entry_id"] == entry.entry_id
+    assert mock_client.disconnect.call_count >= 1
+
+
 async def test_entry_missing_unique_id(
    hass: HomeAssistant,
    mock_client: APIClient,
@@ -30,7 +30,7 @@
    'suggested_object_id': None,
    'supported_features': 0,
    'translation_key': 'status',
-    'unique_id': 'portainer_test_entry_123_dd19facfb3b3ed4cd362c1e88fc89a53908ad05fb3a4103bca3f9b28292d14bf_status',
+    'unique_id': 'portainer_test_entry_123_focused_einstein_status',
    'unit_of_measurement': None,
  })
 # ---
@@ -79,7 +79,7 @@
    'suggested_object_id': None,
    'supported_features': 0,
    'translation_key': 'status',
-    'unique_id': 'portainer_test_entry_123_aa86eacfb3b3ed4cd362c1e88fc89a53908ad05fb3a4103bca3f9b28292d14bf_status',
+    'unique_id': 'portainer_test_entry_123_funny_chatelet_status',
    'unit_of_measurement': None,
  })
 # ---
@@ -177,7 +177,7 @@
    'suggested_object_id': None,
    'supported_features': 0,
    'translation_key': 'status',
-    'unique_id': 'portainer_test_entry_123_ee20facfb3b3ed4cd362c1e88fc89a53908ad05fb3a4103bca3f9b28292d14bf_status',
+    'unique_id': 'portainer_test_entry_123_practical_morse_status',
    'unit_of_measurement': None,
  })
 # ---
@@ -226,7 +226,7 @@
    'suggested_object_id': None,
    'supported_features': 0,
    'translation_key': 'status',
-    'unique_id': 'portainer_test_entry_123_bb97facfb3b3ed4cd362c1e88fc89a53908ad05fb3a4103bca3f9b28292d14bf_status',
+    'unique_id': 'portainer_test_entry_123_serene_banach_status',
    'unit_of_measurement': None,
  })
 # ---
@@ -275,7 +275,7 @@
    'suggested_object_id': None,
    'supported_features': 0,
    'translation_key': 'status',
-    'unique_id': 'portainer_test_entry_123_cc08facfb3b3ed4cd362c1e88fc89a53908ad05fb3a4103bca3f9b28292d14bf_status',
+    'unique_id': 'portainer_test_entry_123_stoic_turing_status',
    'unit_of_measurement': None,
  })
 # ---
@@ -5,6 +5,7 @@ from datetime import timedelta
 from unittest.mock import patch

 import pytest
+from roborock import MultiMapsList
 from roborock.exceptions import RoborockException
 from vacuum_map_parser_base.config.color import SupportedColor

@@ -135,3 +136,30 @@ async def test_dynamic_local_scan_interval(
        async_fire_time_changed(hass, dt_util.utcnow() + interval)

    assert hass.states.get("sensor.roborock_s7_maxv_battery").state == "20"
+
+
+async def test_no_maps(
+    hass: HomeAssistant,
+    mock_roborock_entry: MockConfigEntry,
+    bypass_api_fixture: None,
+) -> None:
+    """Test that a device with no maps is handled correctly."""
+    prop = copy.deepcopy(PROP)
+    prop.status.map_status = 252
+    with (
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.get_prop",
+            return_value=prop,
+        ),
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.get_multi_maps_list",
+            return_value=MultiMapsList(
+                max_multi_map=1, max_bak_map=1, multi_map_count=0, map_info=[]
+            ),
+        ),
+        patch(
+            "homeassistant.components.roborock.RoborockMqttClientV1.load_multi_map"
+        ) as load_map,
+    ):
+        await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
+    assert load_map.call_count == 0
@@ -83,7 +83,10 @@ async def test_if_action_before_sunrise_no_offset(
            automation.DOMAIN: {
                "id": "sun",
                "trigger": {"platform": "event", "event_type": "test_event"},
-                "condition": {"condition": "sun", "before": SUN_EVENT_SUNRISE},
+                "condition": {
+                    "condition": "sun",
+                    "options": {"before": SUN_EVENT_SUNRISE},
+                },
                "action": {"service": "test.automation"},
            }
        },
@@ -156,7 +159,10 @@ async def test_if_action_after_sunrise_no_offset(
            automation.DOMAIN: {
                "id": "sun",
                "trigger": {"platform": "event", "event_type": "test_event"},
-                "condition": {"condition": "sun", "after": SUN_EVENT_SUNRISE},
+                "condition": {
+                    "condition": "sun",
+                    "options": {"after": SUN_EVENT_SUNRISE},
+                },
                "action": {"service": "test.automation"},
            }
        },
@@ -231,8 +237,10 @@ async def test_if_action_before_sunrise_with_offset(
                "trigger": {"platform": "event", "event_type": "test_event"},
                "condition": {
                    "condition": "sun",
-                    "before": SUN_EVENT_SUNRISE,
-                    "before_offset": "+1:00:00",
+                    "options": {
+                        "before": SUN_EVENT_SUNRISE,
+                        "before_offset": "+1:00:00",
+                    },
                },
                "action": {"service": "test.automation"},
            }
@@ -356,8 +364,7 @@ async def test_if_action_before_sunset_with_offset(
                "trigger": {"platform": "event", "event_type": "test_event"},
                "condition": {
                    "condition": "sun",
-                    "before": "sunset",
-                    "before_offset": "+1:00:00",
+                    "options": {"before": "sunset", "before_offset": "+1:00:00"},
                },
                "action": {"service": "test.automation"},
            }
@@ -481,8 +488,7 @@ async def test_if_action_after_sunrise_with_offset(
                "trigger": {"platform": "event", "event_type": "test_event"},
                "condition": {
                    "condition": "sun",
-                    "after": SUN_EVENT_SUNRISE,
-                    "after_offset": "+1:00:00",
+                    "options": {"after": SUN_EVENT_SUNRISE, "after_offset": "+1:00:00"},
                },
                "action": {"service": "test.automation"},
            }
@@ -630,8 +636,7 @@ async def test_if_action_after_sunset_with_offset(
                "trigger": {"platform": "event", "event_type": "test_event"},
                "condition": {
                    "condition": "sun",
-                    "after": "sunset",
-                    "after_offset": "+1:00:00",
+                    "options": {"after": "sunset", "after_offset": "+1:00:00"},
                },
                "action": {"service": "test.automation"},
            }
@@ -707,8 +712,7 @@ async def test_if_action_after_and_before_during(
                "trigger": {"platform": "event", "event_type": "test_event"},
                "condition": {
                    "condition": "sun",
-                    "after": SUN_EVENT_SUNRISE,
-                    "before": SUN_EVENT_SUNSET,
+                    "options": {"after": SUN_EVENT_SUNRISE, "before": SUN_EVENT_SUNSET},
                },
                "action": {"service": "test.automation"},
            }
@@ -812,8 +816,7 @@ async def test_if_action_before_or_after_during(
                "trigger": {"platform": "event", "event_type": "test_event"},
                "condition": {
                    "condition": "sun",
-                    "before": SUN_EVENT_SUNRISE,
-                    "after": SUN_EVENT_SUNSET,
+                    "options": {"before": SUN_EVENT_SUNRISE, "after": SUN_EVENT_SUNSET},
                },
                "action": {"service": "test.automation"},
            }
@@ -941,7 +944,10 @@ async def test_if_action_before_sunrise_no_offset_kotzebue(
            automation.DOMAIN: {
                "id": "sun",
                "trigger": {"platform": "event", "event_type": "test_event"},
-                "condition": {"condition": "sun", "before": SUN_EVENT_SUNRISE},
+                "condition": {
+                    "condition": "sun",
+                    "options": {"before": SUN_EVENT_SUNRISE},
+                },
                "action": {"service": "test.automation"},
            }
        },
@@ -1020,7 +1026,10 @@ async def test_if_action_after_sunrise_no_offset_kotzebue(
            automation.DOMAIN: {
                "id": "sun",
                "trigger": {"platform": "event", "event_type": "test_event"},
-                "condition": {"condition": "sun", "after": SUN_EVENT_SUNRISE},
+                "condition": {
+                    "condition": "sun",
+                    "options": {"after": SUN_EVENT_SUNRISE},
+                },
                "action": {"service": "test.automation"},
            }
        },
@@ -1099,7 +1108,10 @@ async def test_if_action_before_sunset_no_offset_kotzebue(
            automation.DOMAIN: {
                "id": "sun",
                "trigger": {"platform": "event", "event_type": "test_event"},
-                "condition": {"condition": "sun", "before": SUN_EVENT_SUNSET},
+                "condition": {
+                    "condition": "sun",
+                    "options": {"before": SUN_EVENT_SUNSET},
+                },
                "action": {"service": "test.automation"},
            }
        },
@@ -1178,7 +1190,10 @@ async def test_if_action_after_sunset_no_offset_kotzebue(
            automation.DOMAIN: {
                "id": "sun",
                "trigger": {"platform": "event", "event_type": "test_event"},
-                "condition": {"condition": "sun", "after": SUN_EVENT_SUNSET},
+                "condition": {
+                    "condition": "sun",
+                    "options": {"after": SUN_EVENT_SUNSET},
+                },
                "action": {"service": "test.automation"},
            }
        },
@@ -62,9 +62,15 @@ async def test_with_service_calls(hass: HomeAssistant) -> None:
    """Test function with actual service call events in database."""
    user_id = str(uuid.uuid4())

+    hass.states.async_set("light.living_room", "off")
+    hass.states.async_set("light.kitchen", "off")
+    hass.states.async_set("climate.thermostat", "off")
+    hass.states.async_set("light.bedroom", "off")
+    hass.states.async_set("lock.front_door", "locked")
+
    # Create service call events at different times of day
    # Morning events - use separate service calls to get around context deduplication
-    with freeze_time("2023-07-01 07:00:00+00:00"):  # Morning
+    with freeze_time("2023-07-01 07:00:00"):  # Morning
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
            {
@@ -77,7 +83,7 @@ async def test_with_service_calls(hass: HomeAssistant) -> None:
        await hass.async_block_till_done()

    # Afternoon events
-    with freeze_time("2023-07-01 14:00:00+00:00"):  # Afternoon
+    with freeze_time("2023-07-01 14:00:00"):  # Afternoon
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
            {
@@ -90,7 +96,7 @@ async def test_with_service_calls(hass: HomeAssistant) -> None:
        await hass.async_block_till_done()

    # Evening events
-    with freeze_time("2023-07-01 19:00:00+00:00"):  # Evening
+    with freeze_time("2023-07-01 19:00:00"):  # Evening
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
            {
@@ -103,7 +109,7 @@ async def test_with_service_calls(hass: HomeAssistant) -> None:
        await hass.async_block_till_done()

    # Night events
-    with freeze_time("2023-07-01 23:00:00+00:00"):  # Night
+    with freeze_time("2023-07-01 23:00:00"):  # Night
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
            {
@@ -119,7 +125,7 @@ async def test_with_service_calls(hass: HomeAssistant) -> None:
    await async_wait_recording_done(hass)

    # Get predictions - make sure we're still in a reasonable timeframe
-    with freeze_time("2023-07-02 10:00:00+00:00"):  # Next day, so events are recent
+    with freeze_time("2023-07-02 10:00:00"):  # Next day, so events are recent
        results = await async_predict_common_control(hass, user_id)

    # Verify results contain the expected entities in the correct time periods
@@ -151,7 +157,12 @@ async def test_multiple_entities_in_one_call(hass: HomeAssistant) -> None:
        suggested_object_id="kitchen",
    )

-    with freeze_time("2023-07-01 10:00:00+00:00"):  # Morning
+    hass.states.async_set("light.living_room", "off")
+    hass.states.async_set("light.kitchen", "off")
+    hass.states.async_set("light.hallway", "off")
+    hass.states.async_set("not_allowed.domain", "off")
+
+    with freeze_time("2023-07-01 10:00:00"):  # Morning
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
            {
@@ -163,6 +174,7 @@ async def test_multiple_entities_in_one_call(hass: HomeAssistant) -> None:
                        "light.kitchen",
                        "light.hallway",
                        "not_allowed.domain",
+                        "light.not_in_state_machine",
                    ]
                },
            },
@@ -172,7 +184,7 @@ async def test_multiple_entities_in_one_call(hass: HomeAssistant) -> None:

    await async_wait_recording_done(hass)

-    with freeze_time("2023-07-02 10:00:00+00:00"):  # Next day, so events are recent
+    with freeze_time("2023-07-02 10:00:00"):  # Next day, so events are recent
        results = await async_predict_common_control(hass, user_id)

    # Two lights should be counted (10:00 UTC = 02:00 local = night)
@@ -189,7 +201,10 @@ async def test_context_deduplication(hass: HomeAssistant) -> None:
    user_id = str(uuid.uuid4())
    context = Context(user_id=user_id)

-    with freeze_time("2023-07-01 10:00:00+00:00"):  # Morning
+    hass.states.async_set("light.living_room", "off")
+    hass.states.async_set("switch.coffee_maker", "off")
+
+    with freeze_time("2023-07-01 10:00:00"):  # Morning
        # Fire multiple events with the same context
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
@@ -215,7 +230,7 @@ async def test_context_deduplication(hass: HomeAssistant) -> None:

    await async_wait_recording_done(hass)

-    with freeze_time("2023-07-02 10:00:00+00:00"):  # Next day, so events are recent
+    with freeze_time("2023-07-02 10:00:00"):  # Next day, so events are recent
        results = await async_predict_common_control(hass, user_id)

    # Only the first event should be processed (10:00 UTC = 02:00 local = night)
@@ -232,8 +247,11 @@ async def test_old_events_excluded(hass: HomeAssistant) -> None:
    """Test that events older than 30 days are excluded."""
    user_id = str(uuid.uuid4())

+    hass.states.async_set("light.old_event", "off")
+    hass.states.async_set("light.recent_event", "off")
+
    # Create an old event (35 days ago)
-    with freeze_time("2023-05-27 10:00:00+00:00"):  # 35 days before July 1st
+    with freeze_time("2023-05-27 10:00:00"):  # 35 days before July 1st
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
            {
@@ -246,7 +264,7 @@ async def test_old_events_excluded(hass: HomeAssistant) -> None:
        await hass.async_block_till_done()

    # Create a recent event (5 days ago)
-    with freeze_time("2023-06-26 10:00:00+00:00"):  # 5 days before July 1st
+    with freeze_time("2023-06-26 10:00:00"):  # 5 days before July 1st
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
            {
@@ -261,7 +279,7 @@ async def test_old_events_excluded(hass: HomeAssistant) -> None:
    await async_wait_recording_done(hass)

    # Query with current time
-    with freeze_time("2023-07-01 10:00:00+00:00"):
+    with freeze_time("2023-07-01 10:00:00"):
        results = await async_predict_common_control(hass, user_id)

    # Only recent event should be included (10:00 UTC = 02:00 local = night)
@@ -278,8 +296,16 @@ async def test_entities_limit(hass: HomeAssistant) -> None:
    """Test that only top entities are returned per time category."""
    user_id = str(uuid.uuid4())

+    hass.states.async_set("light.most_used", "off")
+    hass.states.async_set("light.second", "off")
+    hass.states.async_set("light.third", "off")
+    hass.states.async_set("light.fourth", "off")
+    hass.states.async_set("light.fifth", "off")
+    hass.states.async_set("light.sixth", "off")
+    hass.states.async_set("light.seventh", "off")
+
    # Create more than 5 different entities in morning
-    with freeze_time("2023-07-01 08:00:00+00:00"):
+    with freeze_time("2023-07-01 08:00:00"):
        # Create entities with different frequencies
        entities_with_counts = [
            ("light.most_used", 10),
@@ -308,7 +334,7 @@ async def test_entities_limit(hass: HomeAssistant) -> None:
    await async_wait_recording_done(hass)

    with (
-        freeze_time("2023-07-02 10:00:00+00:00"),
+        freeze_time("2023-07-02 10:00:00"),
        patch(
            "homeassistant.components.usage_prediction.common_control.RESULTS_TO_INCLUDE",
            5,
@@ -335,7 +361,10 @@ async def test_different_users_separated(hass: HomeAssistant) -> None:
    user_id_1 = str(uuid.uuid4())
    user_id_2 = str(uuid.uuid4())

-    with freeze_time("2023-07-01 10:00:00+00:00"):
+    hass.states.async_set("light.user1_light", "off")
+    hass.states.async_set("light.user2_light", "off")
+
+    with freeze_time("2023-07-01 10:00:00"):
        # User 1 events
        hass.bus.async_fire(
            EVENT_CALL_SERVICE,
@@ -363,7 +392,7 @@ async def test_different_users_separated(hass: HomeAssistant) -> None:
    await async_wait_recording_done(hass)

    # Get results for each user
-    with freeze_time("2023-07-02 10:00:00+00:00"):  # Next day, so events are recent
+    with freeze_time("2023-07-02 10:00:00"):  # Next day, so events are recent
        results_user1 = await async_predict_common_control(hass, user_id_1)
        results_user2 = await async_predict_common_control(hass, user_id_2)

@@ -12,8 +12,7 @@ async def test_zone_raises(hass: HomeAssistant) -> None:
    """Test that zone raises ConditionError on errors."""
    config = {
        "condition": "zone",
-        "entity_id": "device_tracker.cat",
-        "zone": "zone.home",
+        "options": {"entity_id": "device_tracker.cat", "zone": "zone.home"},
    }
    config = cv.CONDITION_SCHEMA(config)
    config = await condition.async_validate_condition_config(hass, config)
@@ -66,8 +65,10 @@ async def test_zone_raises(hass: HomeAssistant) -> None:

    config = {
        "condition": "zone",
-        "entity_id": ["device_tracker.cat", "device_tracker.dog"],
-        "zone": ["zone.home", "zone.work"],
+        "options": {
+            "entity_id": ["device_tracker.cat", "device_tracker.dog"],
+            "zone": ["zone.home", "zone.work"],
+        },
    }
    config = cv.CONDITION_SCHEMA(config)
    config = await condition.async_validate_condition_config(hass, config)
@@ -102,8 +103,10 @@ async def test_zone_multiple_entities(hass: HomeAssistant) -> None:
            {
                "alias": "Zone Condition",
                "condition": "zone",
-                "entity_id": ["device_tracker.person_1", "device_tracker.person_2"],
-                "zone": "zone.home",
+                "options": {
+                    "entity_id": ["device_tracker.person_1", "device_tracker.person_2"],
+                    "zone": "zone.home",
+                },
            },
        ],
    }
@@ -161,8 +164,10 @@ async def test_multiple_zones(hass: HomeAssistant) -> None:
        "conditions": [
            {
                "condition": "zone",
-                "entity_id": "device_tracker.person",
-                "zone": ["zone.home", "zone.work"],
+                "options": {
+                    "entity_id": "device_tracker.person",
+                    "zone": ["zone.home", "zone.work"],
+                },
            },
        ],
    }
@@ -1,10 +1,12 @@
 """Test automation helpers."""

 import pytest
+import voluptuous as vol

 from homeassistant.helpers.automation import (
    get_absolute_description_key,
    get_relative_description_key,
+    move_top_level_schema_fields_to_options,
 )


@@ -34,3 +36,73 @@ def test_relative_description_key(relative_key: str, absolute_key: str) -> None:
    """Test relative description key."""
    DOMAIN = "homeassistant"
    assert get_relative_description_key(DOMAIN, absolute_key) == relative_key
+
+
+@pytest.mark.parametrize(
+    ("config", "schema_dict", "expected_config"),
+    [
+        (
+            {
+                "platform": "test",
+                "entity": "sensor.test",
+                "from": "open",
+                "to": "closed",
+                "for": {"hours": 1},
+                "attribute": "state",
+                "value_template": "{{ value_json.val }}",
+                "extra_field": "extra_value",
+            },
+            {},
+            {
+                "platform": "test",
+                "entity": "sensor.test",
+                "from": "open",
+                "to": "closed",
+                "for": {"hours": 1},
+                "attribute": "state",
+                "value_template": "{{ value_json.val }}",
+                "extra_field": "extra_value",
+                "options": {},
+            },
+        ),
+        (
+            {
+                "platform": "test",
+                "entity": "sensor.test",
+                "from": "open",
+                "to": "closed",
+                "for": {"hours": 1},
+                "attribute": "state",
+                "value_template": "{{ value_json.val }}",
+                "extra_field": "extra_value",
+            },
+            {
+                vol.Required("entity"): str,
+                vol.Optional("from"): str,
+                vol.Optional("to"): str,
+                vol.Optional("for"): dict,
+                vol.Optional("attribute"): str,
+                vol.Optional("value_template"): str,
+            },
+            {
+                "platform": "test",
+                "extra_field": "extra_value",
+                "options": {
+                    "entity": "sensor.test",
+                    "from": "open",
+                    "to": "closed",
+                    "for": {"hours": 1},
+                    "attribute": "state",
+                    "value_template": "{{ value_json.val }}",
+                },
+            },
+        ),
+    ],
+)
+async def test_move_schema_fields_to_options(
+    config, schema_dict, expected_config
+) -> None:
+    """Test moving schema fields to options."""
+    assert (
+        move_top_level_schema_fields_to_options(config, schema_dict) == expected_config
+    )
@@ -32,6 +32,13 @@ from homeassistant.helpers import (
    entity_registry as er,
    trace,
 )
+from homeassistant.helpers.automation import move_top_level_schema_fields_to_options
+from homeassistant.helpers.condition import (
+    Condition,
+    ConditionCheckerType,
+    ConditionConfig,
+    async_validate_condition_config,
+)
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import Integration, async_get_integration
@@ -2105,12 +2112,9 @@ async def test_platform_async_get_conditions(hass: HomeAssistant) -> None:
 async def test_platform_multiple_conditions(hass: HomeAssistant) -> None:
    """Test a condition platform with multiple conditions."""

-    class MockCondition(condition.Condition):
+    class MockCondition(Condition):
        """Mock condition."""

-        def __init__(self, hass: HomeAssistant, config: ConfigType) -> None:
-            """Initialize condition."""
-
        @classmethod
        async def async_validate_config(
            cls, hass: HomeAssistant, config: ConfigType
@@ -2118,23 +2122,24 @@ async def test_platform_multiple_conditions(hass: HomeAssistant) -> None:
            """Validate config."""
            return config

+        def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+            """Initialize condition."""
+
    class MockCondition1(MockCondition):
        """Mock condition 1."""

-        async def async_get_checker(self) -> condition.ConditionCheckerType:
+        async def async_get_checker(self) -> ConditionCheckerType:
            """Evaluate state based on configuration."""
            return lambda hass, vars: True

    class MockCondition2(MockCondition):
        """Mock condition 2."""

-        async def async_get_checker(self) -> condition.ConditionCheckerType:
+        async def async_get_checker(self) -> ConditionCheckerType:
            """Evaluate state based on configuration."""
            return lambda hass, vars: False

-    async def async_get_conditions(
-        hass: HomeAssistant,
-    ) -> dict[str, type[condition.Condition]]:
+    async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
        return {
            "_": MockCondition1,
            "cond_2": MockCondition2,
@@ -2148,12 +2153,12 @@ async def test_platform_multiple_conditions(hass: HomeAssistant) -> None:
    config_1 = {CONF_CONDITION: "test"}
    config_2 = {CONF_CONDITION: "test.cond_2"}
    config_3 = {CONF_CONDITION: "test.unknown_cond"}
-    assert await condition.async_validate_condition_config(hass, config_1) == config_1
-    assert await condition.async_validate_condition_config(hass, config_2) == config_2
+    assert await async_validate_condition_config(hass, config_1) == config_1
+    assert await async_validate_condition_config(hass, config_2) == config_2
    with pytest.raises(
        vol.Invalid, match="Invalid condition 'test.unknown_cond' specified"
    ):
-        await condition.async_validate_condition_config(hass, config_3)
+        await async_validate_condition_config(hass, config_3)

    cond_func = await condition.async_from_config(hass, config_1)
    assert cond_func(hass, {}) is True
@@ -2165,6 +2170,74 @@ async def test_platform_multiple_conditions(hass: HomeAssistant) -> None:
        await condition.async_from_config(hass, config_3)


+async def test_platform_migrate_trigger(hass: HomeAssistant) -> None:
+    """Test a condition platform with a migration."""
+
+    OPTIONS_SCHEMA_DICT = {
+        vol.Required("option_1"): str,
+        vol.Optional("option_2"): int,
+    }
+
+    class MockCondition(Condition):
+        """Mock condition."""
+
+        @classmethod
+        async def async_validate_complete_config(
+            cls, hass: HomeAssistant, complete_config: ConfigType
+        ) -> ConfigType:
+            """Validate complete config."""
+            complete_config = move_top_level_schema_fields_to_options(
+                complete_config, OPTIONS_SCHEMA_DICT
+            )
+            return await super().async_validate_complete_config(hass, complete_config)
+
+        @classmethod
+        async def async_validate_config(
+            cls, hass: HomeAssistant, config: ConfigType
+        ) -> ConfigType:
+            """Validate config."""
+            return config
+
+    async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+        return {
+            "_": MockCondition,
+        }
+
+    mock_integration(hass, MockModule("test"))
+    mock_platform(
+        hass, "test.condition", Mock(async_get_conditions=async_get_conditions)
+    )
+
+    config_1 = {
+        "condition": "test",
+        "option_1": "value_1",
+        "option_2": 2,
+    }
+    config_2 = {
+        "condition": "test",
+        "option_1": "value_1",
+    }
+    config_1_migrated = {
+        "condition": "test",
+        "options": {"option_1": "value_1", "option_2": 2},
+    }
+    config_2_migrated = {
+        "condition": "test",
+        "options": {"option_1": "value_1"},
+    }
+
+    assert await async_validate_condition_config(hass, config_1) == config_1_migrated
+    assert await async_validate_condition_config(hass, config_2) == config_2_migrated
+    assert (
+        await async_validate_condition_config(hass, config_1_migrated)
+        == config_1_migrated
+    )
+    assert (
+        await async_validate_condition_config(hass, config_2_migrated)
+        == config_2_migrated
+    )
+
+
@pytest.mark.parametrize("enabled_value", [True, "{{ 1 == 1 }}"])
 async def test_enabled_condition(
    hass: HomeAssistant, enabled_value: bool | str
@@ -19,6 +19,7 @@ from homeassistant.core import (
 )
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import trigger
+from homeassistant.helpers.automation import move_top_level_schema_fields_to_options
 from homeassistant.helpers.trigger import (
    DATA_PLUGGABLE_ACTIONS,
    PluggableAction,
@@ -29,7 +30,6 @@ from homeassistant.helpers.trigger import (
    _async_get_trigger_platform,
    async_initialize_triggers,
    async_validate_trigger_config,
-    move_top_level_schema_fields_to_options,
 )
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import Integration, async_get_integration
@@ -449,76 +449,6 @@ async def test_pluggable_action(
    assert not plug_2


-@pytest.mark.parametrize(
-    ("config", "schema_dict", "expected_config"),
-    [
-        (
-            {
-                "platform": "test",
-                "entity": "sensor.test",
-                "from": "open",
-                "to": "closed",
-                "for": {"hours": 1},
-                "attribute": "state",
-                "value_template": "{{ value_json.val }}",
-                "extra_field": "extra_value",
-            },
-            {},
-            {
-                "platform": "test",
-                "entity": "sensor.test",
-                "from": "open",
-                "to": "closed",
-                "for": {"hours": 1},
-                "attribute": "state",
-                "value_template": "{{ value_json.val }}",
-                "extra_field": "extra_value",
-                "options": {},
-            },
-        ),
-        (
-            {
-                "platform": "test",
-                "entity": "sensor.test",
-                "from": "open",
-                "to": "closed",
-                "for": {"hours": 1},
-                "attribute": "state",
-                "value_template": "{{ value_json.val }}",
-                "extra_field": "extra_value",
-            },
-            {
-                vol.Required("entity"): str,
-                vol.Optional("from"): str,
-                vol.Optional("to"): str,
-                vol.Optional("for"): dict,
-                vol.Optional("attribute"): str,
-                vol.Optional("value_template"): str,
-            },
-            {
-                "platform": "test",
-                "extra_field": "extra_value",
-                "options": {
-                    "entity": "sensor.test",
-                    "from": "open",
-                    "to": "closed",
-                    "for": {"hours": 1},
-                    "attribute": "state",
-                    "value_template": "{{ value_json.val }}",
-                },
-            },
-        ),
-    ],
-)
-async def test_move_schema_fields_to_options(
-    config, schema_dict, expected_config
-) -> None:
-    """Test moving schema fields to options."""
-    assert (
-        move_top_level_schema_fields_to_options(config, schema_dict) == expected_config
-    )
-
-
 async def test_platform_multiple_triggers(hass: HomeAssistant) -> None:
    """Test a trigger platform with multiple trigger."""
Author	SHA1	Message	Date
Michael Hansen	90eeb25419	Merge branch 'dev' into synesthesiam-20250925-aioesphomeapi-bump	2025-09-25 11:00:33 -05:00
Joost Lekkerkerker	7ee31f0884	Bump pySmartThings to 3.3.0 (#152977 )	2025-09-25 17:57:30 +02:00
Daniel Potthast	0c5e12571a	Update mvglive component (#146479 ) Co-authored-by: Erik Montnemery <erik@montnemery.com>	2025-09-25 17:20:43 +02:00
Luke Lashley	9db973217f	Fix incorrect Roborock test (#152980 )	2025-09-25 17:18:24 +02:00
Michael Hansen	0e54ce0077	Bump aioesphomeapi to 41.10.0	2025-09-25 09:46:38 -05:00
Artur Pragacz	cf1a745283	Move condition-specific fields into options (#152635 )	2025-09-25 15:55:50 +02:00
peteS-UK	834e3f1963	Add HassKey for hass.data in Squeezebox (#149129 )	2025-09-25 14:05:40 +02:00
Joakim Sørensen	3f8f7573c9	Bump hass-nabucasa from 1.1.1 to 1.1.2 (#152950 )	2025-09-25 11:34:14 +01:00
Karsten Bade	0ae272f1f6	Add return types and docstring to sonos component (#152946 )	2025-09-25 11:34:38 +02:00
Paul Bottein	8774295e2e	Update frontend to 20250925.0 (#152945 )	2025-09-25 11:33:01 +02:00
Erwin Douna	0c8d2594ef	Portainer fix unique entity (#152941 ) Co-authored-by: Franck Nijhof <frenck@frenck.nl> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-25 09:49:22 +02:00
Simone Chemelli	205bd2676b	Update IQS to platinum for Alexa Devices (#152905 )	2025-09-25 09:45:50 +02:00
dependabot[bot]	25849fd9cc	Bump actions/cache from 4.2.4 to 4.3.0 (#152934 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-25 09:43:03 +02:00
Sab44	7d6eac9ff7	Bump librehardwaremonitor-api to version 1.4.0 (#152938 )	2025-09-25 09:42:31 +02:00
Luke Lashley	31017ebc98	Fix logical error when user has no Roborock maps (#152752 )	2025-09-25 09:39:52 +02:00
Jimmy Zhening Luo	724a7b0ecc	Quality: mark installation param doc as done (#152909 )	2025-09-25 09:06:13 +02:00
Paulus Schoutsen	91e13d447a	Prevent common control calling async methods from thread (#152931 ) Co-authored-by: J. Nick Koston <nick@home-assistant.io> Co-authored-by: J. Nick Koston <nick@koston.org>	2025-09-24 23:09:54 -04:00
J. Nick Koston	7c8ad9d535	Fix ESPHome reauth not being triggered on incorrect password (#152911 )	2025-09-24 22:27:40 -04:00
Franck Nijhof	9cd3ab853d	Add block Spook < 4.0.0 as breaking Home Assistant (#152930 )	2025-09-24 22:18:06 -04:00
Paulus Schoutsen	0b0f8c5829	Remove some more domains from common controls (#152927 )	2025-09-24 22:15:29 -04:00
J. Nick Koston	ae7bc7fb1b	Bump aioesphomeapi to 41.9.4 (#152923 )	2025-09-24 19:16:48 -05:00
Franck Nijhof	09750872b5	Bump version to 2025.11.0dev0 (#152915 )	2025-09-24 23:55:32 +02:00
Franck Nijhof	076e51017b	Bump to home-assistant/wheels@2025.09.0 (#152920 )	2025-09-24 23:12:20 +02:00
Simone Chemelli	95e7b00996	Update IQS to platinum for Comelit SimpleHome (#152906 )	2025-09-24 22:03:31 +01:00
J. Nick Koston	ddecf1ac21	Bump aioesphomeapi to 41.9.3 to fix segfault (#152912 )	2025-09-24 22:00:45 +01:00