homeassistant-stubs 2025.8.3__py3-none-any.whl → 2025.9.0__py3-none-any.whl

homeassistant-stubs/components/zone/condition.pyi

@@ -14,8 +14,8 @@ class ZoneCondition(Condition):
     _config: Incomplete
     def __init__(self, hass: HomeAssistant, config: ConfigType) -> None: ...
     @classmethod
-    async def async_validate_condition_config(cls, hass: HomeAssistant, config: ConfigType) -> ConfigType: ...
-    async def async_condition_from_config(self) -> ConditionCheckerType: ...
+    async def async_validate_config(cls, hass: HomeAssistant, config: ConfigType) -> ConfigType: ...
+    async def async_get_checker(self) -> ConditionCheckerType: ...
 
 CONDITIONS: dict[str, type[Condition]]
 

homeassistant-stubs/components/zwave_js/__init__.pyi

@@ -2,10 +2,10 @@ import asyncio
 from .addon import get_addon_manager as get_addon_manager
 from .api import async_register_api as async_register_api
 from .const import ATTR_ACKNOWLEDGED_FRAMES as ATTR_ACKNOWLEDGED_FRAMES, ATTR_COMMAND_CLASS as ATTR_COMMAND_CLASS, ATTR_COMMAND_CLASS_NAME as ATTR_COMMAND_CLASS_NAME, ATTR_DATA_TYPE as ATTR_DATA_TYPE, ATTR_DATA_TYPE_LABEL as ATTR_DATA_TYPE_LABEL, ATTR_DIRECTION as ATTR_DIRECTION, ATTR_ENDPOINT as ATTR_ENDPOINT, ATTR_EVENT as ATTR_EVENT, ATTR_EVENT_DATA as ATTR_EVENT_DATA, ATTR_EVENT_LABEL as ATTR_EVENT_LABEL, ATTR_EVENT_TYPE as ATTR_EVENT_TYPE, ATTR_EVENT_TYPE_LABEL as ATTR_EVENT_TYPE_LABEL, ATTR_HOME_ID as ATTR_HOME_ID, ATTR_LABEL as ATTR_LABEL, ATTR_NODE_ID as ATTR_NODE_ID, ATTR_PARAMETERS as ATTR_PARAMETERS, ATTR_PROPERTY as ATTR_PROPERTY, ATTR_PROPERTY_KEY as ATTR_PROPERTY_KEY, ATTR_PROPERTY_KEY_NAME as ATTR_PROPERTY_KEY_NAME, ATTR_PROPERTY_NAME as ATTR_PROPERTY_NAME, ATTR_STATUS as ATTR_STATUS, ATTR_TEST_NODE_ID as ATTR_TEST_NODE_ID, ATTR_TYPE as ATTR_TYPE, ATTR_VALUE as ATTR_VALUE, ATTR_VALUE_RAW as ATTR_VALUE_RAW, CONF_ADDON_DEVICE as CONF_ADDON_DEVICE, CONF_ADDON_LR_S2_ACCESS_CONTROL_KEY as CONF_ADDON_LR_S2_ACCESS_CONTROL_KEY, CONF_ADDON_LR_S2_AUTHENTICATED_KEY as CONF_ADDON_LR_S2_AUTHENTICATED_KEY, CONF_ADDON_NETWORK_KEY as CONF_ADDON_NETWORK_KEY, CONF_ADDON_S0_LEGACY_KEY as CONF_ADDON_S0_LEGACY_KEY, CONF_ADDON_S2_ACCESS_CONTROL_KEY as CONF_ADDON_S2_ACCESS_CONTROL_KEY, CONF_ADDON_S2_AUTHENTICATED_KEY as CONF_ADDON_S2_AUTHENTICATED_KEY, CONF_ADDON_S2_UNAUTHENTICATED_KEY as CONF_ADDON_S2_UNAUTHENTICATED_KEY, CONF_DATA_COLLECTION_OPTED_IN as CONF_DATA_COLLECTION_OPTED_IN, CONF_INSTALLER_MODE as CONF_INSTALLER_MODE, CONF_INTEGRATION_CREATED_ADDON as CONF_INTEGRATION_CREATED_ADDON, CONF_KEEP_OLD_DEVICES as CONF_KEEP_OLD_DEVICES, CONF_LR_S2_ACCESS_CONTROL_KEY as CONF_LR_S2_ACCESS_CONTROL_KEY, CONF_LR_S2_AUTHENTICATED_KEY as CONF_LR_S2_AUTHENTICATED_KEY, CONF_NETWORK_KEY as CONF_NETWORK_KEY, CONF_S0_LEGACY_KEY as CONF_S0_LEGACY_KEY, CONF_S2_ACCESS_CONTROL_KEY as CONF_S2_ACCESS_CONTROL_KEY, CONF_S2_AUTHENTICATED_KEY as CONF_S2_AUTHENTICATED_KEY, CONF_S2_UNAUTHENTICATED_KEY as CONF_S2_UNAUTHENTICATED_KEY, CONF_USB_PATH as CONF_USB_PATH, CONF_USE_ADDON as CONF_USE_ADDON, DOMAIN as DOMAIN, EVENT_DEVICE_ADDED_TO_REGISTRY as EVENT_DEVICE_ADDED_TO_REGISTRY, EVENT_VALUE_UPDATED as EVENT_VALUE_UPDATED, LIB_LOGGER as LIB_LOGGER, LOGGER as LOGGER, LR_ADDON_VERSION as LR_ADDON_VERSION, USER_AGENT as USER_AGENT, ZWAVE_JS_NOTIFICATION_EVENT as ZWAVE_JS_NOTIFICATION_EVENT, ZWAVE_JS_VALUE_NOTIFICATION_EVENT as ZWAVE_JS_VALUE_NOTIFICATION_EVENT, ZWAVE_JS_VALUE_UPDATED_EVENT as ZWAVE_JS_VALUE_UPDATED_EVENT
-from .discovery import ZwaveDiscoveryInfo as ZwaveDiscoveryInfo, async_discover_node_values as async_discover_node_values, async_discover_single_value as async_discover_single_value
+from .discovery import async_discover_node_values as async_discover_node_values, async_discover_single_value as async_discover_single_value
 from .helpers import async_disable_server_logging_if_needed as async_disable_server_logging_if_needed, async_enable_server_logging_if_needed as async_enable_server_logging_if_needed, async_enable_statistics as async_enable_statistics, get_device_id as get_device_id, get_device_id_ext as get_device_id_ext, get_network_identifier_for_notification as get_network_identifier_for_notification, get_unique_id as get_unique_id, get_valueless_base_unique_id as get_valueless_base_unique_id
 from .migrate import async_migrate_discovered_value as async_migrate_discovered_value
-from .models import ZwaveJSConfigEntry as ZwaveJSConfigEntry, ZwaveJSData as ZwaveJSData
+from .models import PlatformZwaveDiscoveryInfo as PlatformZwaveDiscoveryInfo, ZwaveJSConfigEntry as ZwaveJSConfigEntry, ZwaveJSData as ZwaveJSData
 from .services import async_setup_services as async_setup_services
 from _typeshed import Incomplete
 from homeassistant.components.hassio import AddonError as AddonError, AddonManager as AddonManager, AddonState as AddonState
@@ -71,14 +71,14 @@ class NodeEvents:
     hass: Incomplete
     def __init__(self, hass: HomeAssistant, controller_events: ControllerEvents) -> None: ...
     async def async_on_node_ready(self, node: ZwaveNode) -> None: ...
-    async def async_handle_discovery_info(self, device: dr.DeviceEntry, disc_info: ZwaveDiscoveryInfo, value_updates_disc_info: dict[str, ZwaveDiscoveryInfo]) -> None: ...
-    async def async_on_value_added(self, value_updates_disc_info: dict[str, ZwaveDiscoveryInfo], value: Value) -> None: ...
+    async def async_handle_discovery_info(self, device: dr.DeviceEntry, disc_info: PlatformZwaveDiscoveryInfo, value_updates_disc_info: dict[str, PlatformZwaveDiscoveryInfo]) -> None: ...
+    async def async_on_value_added(self, value_updates_disc_info: dict[str, PlatformZwaveDiscoveryInfo], value: Value) -> None: ...
     @callback
     def async_on_value_notification(self, notification: ValueNotification) -> None: ...
     @callback
     def async_on_notification(self, event: dict[str, Any]) -> None: ...
     @callback
-    def async_on_value_updated_fire_event(self, value_updates_disc_info: dict[str, ZwaveDiscoveryInfo], value: Value) -> None: ...
+    def async_on_value_updated_fire_event(self, value_updates_disc_info: dict[str, PlatformZwaveDiscoveryInfo], value: Value) -> None: ...
 
 async def client_listen(hass: HomeAssistant, entry: ZwaveJSConfigEntry, client: ZwaveClient, driver_ready: asyncio.Event) -> None: ...
 async def async_unload_entry(hass: HomeAssistant, entry: ZwaveJSConfigEntry) -> bool: ...

homeassistant-stubs/components/zwave_js/binary_sensor.pyi

@@ -1,14 +1,15 @@
 from .const import DOMAIN as DOMAIN
-from .discovery import ZwaveDiscoveryInfo as ZwaveDiscoveryInfo
-from .entity import ZWaveBaseEntity as ZWaveBaseEntity
-from .models import ZwaveJSConfigEntry as ZwaveJSConfigEntry
+from .entity import NewZwaveDiscoveryInfo as NewZwaveDiscoveryInfo, ZWaveBaseEntity as ZWaveBaseEntity
+from .models import NewZWaveDiscoverySchema as NewZWaveDiscoverySchema, ValueType as ValueType, ZWaveValueDiscoverySchema as ZWaveValueDiscoverySchema, ZwaveDiscoveryInfo as ZwaveDiscoveryInfo, ZwaveJSConfigEntry as ZwaveJSConfigEntry
 from _typeshed import Incomplete
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from homeassistant.components.binary_sensor import BinarySensorDeviceClass as BinarySensorDeviceClass, BinarySensorEntity as BinarySensorEntity, BinarySensorEntityDescription as BinarySensorEntityDescription
-from homeassistant.const import EntityCategory as EntityCategory
+from homeassistant.const import EntityCategory as EntityCategory, Platform as Platform
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect as async_dispatcher_connect
+from homeassistant.helpers.entity import Entity as Entity
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
+from zwave_js_server.const.command_class.notification import NotificationEvent as NotificationEvent
 from zwave_js_server.model.driver import Driver as Driver
 
 PARALLEL_UPDATES: int
@@ -31,21 +32,26 @@ NOTIFICATION_WEATHER: str
 NOTIFICATION_IRRIGATION: str
 NOTIFICATION_GAS: str
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class NotificationZWaveJSEntityDescription(BinarySensorEntityDescription):
-    off_state: str = ...
-    states: tuple[str, ...] | None = ...
+    not_states: set[NotificationEvent | int] = field(default_factory=Incomplete)
+    states: set[NotificationEvent | int] | None = ...
 
 @dataclass(frozen=True, kw_only=True)
 class PropertyZWaveJSEntityDescription(BinarySensorEntityDescription):
     on_states: tuple[str, ...]
 
+@dataclass(frozen=True, kw_only=True)
+class NewNotificationZWaveJSEntityDescription(BinarySensorEntityDescription):
+    state_key: str
+
+MIGRATED_NOTIFICATION_TYPES: Incomplete
 NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...]
 PROPERTY_SENSOR_MAPPINGS: dict[str, PropertyZWaveJSEntityDescription]
 BOOLEAN_SENSOR_MAPPINGS: dict[tuple[int, int | str], BinarySensorEntityDescription]
 
 @callback
-def is_valid_notification_binary_sensor(info: ZwaveDiscoveryInfo) -> bool | NotificationZWaveJSEntityDescription: ...
+def is_valid_notification_binary_sensor(info: ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo) -> bool | NotificationZWaveJSEntityDescription: ...
 async def async_setup_entry(hass: HomeAssistant, config_entry: ZwaveJSConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 
 class ZWaveBooleanBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
@@ -60,7 +66,7 @@ class ZWaveNotificationBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
     entity_description: Incomplete
     _attr_name: Incomplete
     _attr_unique_id: Incomplete
-    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo, state_key: str, description: NotificationZWaveJSEntityDescription | None = None) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo, state_key: str, description: NotificationZWaveJSEntityDescription | None = None) -> None: ...
     @property
     def is_on(self) -> bool | None: ...
 
@@ -75,3 +81,5 @@ class ZWaveConfigParameterBinarySensor(ZWaveBooleanBinarySensor):
     _attr_entity_category: Incomplete
     _attr_name: Incomplete
     def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+
+DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema]

homeassistant-stubs/components/zwave_js/const.pyi

@@ -70,7 +70,6 @@ ATTR_CURRENT_VALUE: str
 ATTR_CURRENT_VALUE_RAW: str
 ATTR_DESCRIPTION: str
 ATTR_EVENT_SOURCE: str
-ATTR_CONFIG_ENTRY_ID: str
 ATTR_PARTIAL_DICT_MATCH: str
 SERVICE_BULK_SET_PARTIAL_CONFIG_PARAMETERS: str
 SERVICE_CLEAR_LOCK_USERCODE: str

homeassistant-stubs/components/zwave_js/discovery.pyi

@@ -1,62 +1,18 @@
 from .const import COVER_POSITION_PROPERTY_KEYS as COVER_POSITION_PROPERTY_KEYS, COVER_TILT_PROPERTY_KEYS as COVER_TILT_PROPERTY_KEYS, LOGGER as LOGGER
 from .discovery_data_template import BaseDiscoverySchemaDataTemplate as BaseDiscoverySchemaDataTemplate, ConfigurableFanValueMappingDataTemplate as ConfigurableFanValueMappingDataTemplate, CoverTiltDataTemplate as CoverTiltDataTemplate, DynamicCurrentTempClimateDataTemplate as DynamicCurrentTempClimateDataTemplate, FanValueMapping as FanValueMapping, FixedFanValueMappingDataTemplate as FixedFanValueMappingDataTemplate, NumericSensorDataTemplate as NumericSensorDataTemplate
-from .helpers import ZwaveValueID as ZwaveValueID
+from .entity import NewZwaveDiscoveryInfo as NewZwaveDiscoveryInfo
+from .models import FirmwareVersionRange as FirmwareVersionRange, NewZWaveDiscoverySchema as NewZWaveDiscoverySchema, ValueType as ValueType, ZWaveValueDiscoverySchema as ZWaveValueDiscoverySchema, ZwaveDiscoveryInfo as ZwaveDiscoveryInfo, ZwaveValueID as ZwaveValueID
 from _typeshed import Incomplete
-from awesomeversion import AwesomeVersion
 from collections.abc import Generator
-from dataclasses import dataclass, field
-from enum import StrEnum
+from dataclasses import dataclass
 from homeassistant.const import EntityCategory as EntityCategory, Platform as Platform
 from homeassistant.core import callback as callback
 from homeassistant.helpers.device_registry import DeviceEntry as DeviceEntry
-from typing import Any
 from zwave_js_server.model.node import Node as ZwaveNode
 from zwave_js_server.model.value import ConfigurationValue, Value as ZwaveValue
 
-class ValueType(StrEnum):
-    ANY = 'any'
-    BOOLEAN = 'boolean'
-    NUMBER = 'number'
-    STRING = 'string'
-
-class DataclassMustHaveAtLeastOne:
-    def __post_init__(self) -> None: ...
-
-@dataclass
-class FirmwareVersionRange(DataclassMustHaveAtLeastOne):
-    min: str | None = ...
-    max: str | None = ...
-    min_ver: AwesomeVersion | None = field(default=None, init=False)
-    max_ver: AwesomeVersion | None = field(default=None, init=False)
-    def __post_init__(self) -> None: ...
-
-@dataclass
-class ZwaveDiscoveryInfo:
-    node: ZwaveNode
-    primary_value: ZwaveValue
-    assumed_state: bool
-    platform: Platform
-    platform_data: Any
-    additional_value_ids_to_watch: set[str]
-    platform_hint: str | None = ...
-    platform_data_template: BaseDiscoverySchemaDataTemplate | None = ...
-    entity_registry_enabled_default: bool = ...
-    entity_category: EntityCategory | None = ...
-
-@dataclass
-class ZWaveValueDiscoverySchema(DataclassMustHaveAtLeastOne):
-    command_class: set[int] | None = ...
-    endpoint: set[int] | None = ...
-    property: set[str | int] | None = ...
-    property_name: set[str] | None = ...
-    property_key: set[str | int | None] | None = ...
-    not_property_key: set[str | int | None] | None = ...
-    type: set[str] | None = ...
-    readable: bool | None = ...
-    writeable: bool | None = ...
-    any_available_states: set[tuple[int, str]] | None = ...
-    value: Any | None = ...
-    stateful: bool | None = ...
+NEW_DISCOVERY_SCHEMAS: dict[Platform, list[NewZWaveDiscoverySchema]]
+SUPPORTED_PLATFORMS: Incomplete
 
 @dataclass
 class ZWaveDiscoverySchema:
@@ -88,9 +44,9 @@ WINDOW_COVERING_SLAT_CURRENT_VALUE_SCHEMA: Incomplete
 DISCOVERY_SCHEMAS: Incomplete
 
 @callback
-def async_discover_node_values(node: ZwaveNode, device: DeviceEntry, discovered_value_ids: dict[str, set[str]]) -> Generator[ZwaveDiscoveryInfo]: ...
+def async_discover_node_values(node: ZwaveNode, device: DeviceEntry, discovered_value_ids: dict[str, set[str]]) -> Generator[ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo]: ...
 @callback
-def async_discover_single_value(value: ZwaveValue, device: DeviceEntry, discovered_value_ids: dict[str, set[str]]) -> Generator[ZwaveDiscoveryInfo]: ...
+def async_discover_single_value(value: ZwaveValue, device: DeviceEntry, discovered_value_ids: dict[str, set[str]]) -> Generator[ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo]: ...
 @callback
 def async_discover_single_configuration_value(value: ConfigurationValue) -> Generator[ZwaveDiscoveryInfo]: ...
 @callback

homeassistant-stubs/components/zwave_js/discovery_data_template.pyi

@@ -1,5 +1,5 @@
 from .const import ENTITY_DESC_KEY_BATTERY_LEVEL as ENTITY_DESC_KEY_BATTERY_LEVEL, ENTITY_DESC_KEY_BATTERY_LIST_STATE as ENTITY_DESC_KEY_BATTERY_LIST_STATE, ENTITY_DESC_KEY_BATTERY_MAXIMUM_CAPACITY as ENTITY_DESC_KEY_BATTERY_MAXIMUM_CAPACITY, ENTITY_DESC_KEY_BATTERY_TEMPERATURE as ENTITY_DESC_KEY_BATTERY_TEMPERATURE, ENTITY_DESC_KEY_CO as ENTITY_DESC_KEY_CO, ENTITY_DESC_KEY_CO2 as ENTITY_DESC_KEY_CO2, ENTITY_DESC_KEY_CURRENT as ENTITY_DESC_KEY_CURRENT, ENTITY_DESC_KEY_ENERGY_MEASUREMENT as ENTITY_DESC_KEY_ENERGY_MEASUREMENT, ENTITY_DESC_KEY_ENERGY_PRODUCTION_POWER as ENTITY_DESC_KEY_ENERGY_PRODUCTION_POWER, ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME as ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME, ENTITY_DESC_KEY_ENERGY_PRODUCTION_TODAY as ENTITY_DESC_KEY_ENERGY_PRODUCTION_TODAY, ENTITY_DESC_KEY_ENERGY_PRODUCTION_TOTAL as ENTITY_DESC_KEY_ENERGY_PRODUCTION_TOTAL, ENTITY_DESC_KEY_ENERGY_TOTAL_INCREASING as ENTITY_DESC_KEY_ENERGY_TOTAL_INCREASING, ENTITY_DESC_KEY_HUMIDITY as ENTITY_DESC_KEY_HUMIDITY, ENTITY_DESC_KEY_ILLUMINANCE as ENTITY_DESC_KEY_ILLUMINANCE, ENTITY_DESC_KEY_MEASUREMENT as ENTITY_DESC_KEY_MEASUREMENT, ENTITY_DESC_KEY_POWER as ENTITY_DESC_KEY_POWER, ENTITY_DESC_KEY_POWER_FACTOR as ENTITY_DESC_KEY_POWER_FACTOR, ENTITY_DESC_KEY_PRESSURE as ENTITY_DESC_KEY_PRESSURE, ENTITY_DESC_KEY_SIGNAL_STRENGTH as ENTITY_DESC_KEY_SIGNAL_STRENGTH, ENTITY_DESC_KEY_TARGET_TEMPERATURE as ENTITY_DESC_KEY_TARGET_TEMPERATURE, ENTITY_DESC_KEY_TEMPERATURE as ENTITY_DESC_KEY_TEMPERATURE, ENTITY_DESC_KEY_TOTAL_INCREASING as ENTITY_DESC_KEY_TOTAL_INCREASING, ENTITY_DESC_KEY_UV_INDEX as ENTITY_DESC_KEY_UV_INDEX, ENTITY_DESC_KEY_VOLTAGE as ENTITY_DESC_KEY_VOLTAGE
-from .helpers import ZwaveValueID as ZwaveValueID
+from .models import BaseDiscoverySchemaDataTemplate as BaseDiscoverySchemaDataTemplate, ZwaveValueID as ZwaveValueID
 from _typeshed import Incomplete
 from collections.abc import Iterable, Mapping
 from dataclasses import dataclass, field
@@ -9,7 +9,6 @@ from typing import Any
 from zwave_js_server.const.command_class.energy_production import EnergyProductionParameter, EnergyProductionScaleType as EnergyProductionScaleType
 from zwave_js_server.const.command_class.meter import MeterScaleType as MeterScaleType
 from zwave_js_server.const.command_class.multilevel_sensor import MultilevelSensorScaleType as MultilevelSensorScaleType, MultilevelSensorType
-from zwave_js_server.model.node import Node as ZwaveNode
 from zwave_js_server.model.value import ConfigurationValue as ZwaveConfigurationValue, Value as ZwaveValue
 
 ENERGY_PRODUCTION_DEVICE_CLASS_MAP: dict[str, list[EnergyProductionParameter]]
@@ -20,15 +19,6 @@ METER_UNIT_MAP: dict[str, list[MeterScaleType]]
 MULTILEVEL_SENSOR_UNIT_MAP: dict[str, list[MultilevelSensorScaleType]]
 _LOGGER: Incomplete
 
-@dataclass
-class BaseDiscoverySchemaDataTemplate:
-    static_data: Any | None = ...
-    def resolve_data(self, value: ZwaveValue) -> Any: ...
-    def values_to_watch(self, resolved_data: Any) -> Iterable[ZwaveValue | None]: ...
-    def value_ids_to_watch(self, resolved_data: Any) -> set[str]: ...
-    @staticmethod
-    def _get_value_from_id(node: ZwaveNode, value_id_obj: ZwaveValueID) -> ZwaveValue | ZwaveConfigurationValue | None: ...
-
 @dataclass
 class DynamicCurrentTempClimateDataTemplate(BaseDiscoverySchemaDataTemplate):
     lookup_table: dict[str | int, ZwaveValueID] = field(default_factory=dict)

homeassistant-stubs/components/zwave_js/entity.pyi

@@ -1,14 +1,16 @@
 from .const import DOMAIN as DOMAIN, EVENT_VALUE_UPDATED as EVENT_VALUE_UPDATED, LOGGER as LOGGER
-from .discovery import ZwaveDiscoveryInfo as ZwaveDiscoveryInfo
+from .discovery_data_template import BaseDiscoverySchemaDataTemplate as BaseDiscoverySchemaDataTemplate
 from .helpers import get_device_id as get_device_id, get_unique_id as get_unique_id, get_valueless_base_unique_id as get_valueless_base_unique_id
+from .models import PlatformZwaveDiscoveryInfo as PlatformZwaveDiscoveryInfo, ZwaveDiscoveryInfo as ZwaveDiscoveryInfo
 from _typeshed import Incomplete
 from collections.abc import Sequence
+from dataclasses import dataclass
 from homeassistant.config_entries import ConfigEntry as ConfigEntry
 from homeassistant.core import callback as callback
 from homeassistant.exceptions import HomeAssistantError as HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo as DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect as async_dispatcher_connect
-from homeassistant.helpers.entity import Entity as Entity
+from homeassistant.helpers.entity import Entity as Entity, EntityDescription as EntityDescription
 from homeassistant.helpers.typing import UNDEFINED as UNDEFINED
 from typing import Any
 from zwave_js_server.model.driver import Driver as Driver
@@ -16,6 +18,13 @@ from zwave_js_server.model.value import SetValueResult as SetValueResult, Value
 
 EVENT_VALUE_REMOVED: str
 
+@dataclass(kw_only=True)
+class NewZwaveDiscoveryInfo(PlatformZwaveDiscoveryInfo):
+    entity_class: type[ZWaveBaseEntity]
+    entity_description: EntityDescription
+    platform_data: Any = ...
+    platform_data_template: BaseDiscoverySchemaDataTemplate | None = ...
+
 class ZWaveBaseEntity(Entity):
     _attr_should_poll: bool
     _attr_has_entity_name: bool
@@ -25,11 +34,12 @@ class ZWaveBaseEntity(Entity):
     watched_value_ids: Incomplete
     _attr_name: Incomplete
     _attr_unique_id: Incomplete
-    _attr_entity_registry_enabled_default: bool
+    entity_description: Incomplete
+    _attr_entity_registry_enabled_default: Incomplete
     _attr_entity_category: Incomplete
-    _attr_assumed_state: bool
+    _attr_assumed_state: Incomplete
     _attr_device_info: Incomplete
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo) -> None: ...
     @callback
     def on_value_update(self) -> None: ...
     async def _async_poll_value(self, value_or_id: str | ZwaveValue) -> None: ...

homeassistant-stubs/components/zwave_js/helpers.pyi

@@ -23,13 +23,6 @@ from zwave_js_server.version import VersionInfo as VersionInfo
 DRIVER_READY_EVENT_TIMEOUT: int
 SERVER_VERSION_TIMEOUT: int
 
-@dataclass
-class ZwaveValueID:
-    property_: str | int
-    command_class: int
-    endpoint: int | None = ...
-    property_key: str | int | None = ...
-
 @dataclass
 class ZwaveValueMatcher:
     property_: str | int | None = ...

homeassistant-stubs/components/zwave_js/migrate.pyi

@@ -1,6 +1,6 @@
 from .const import DOMAIN as DOMAIN
-from .discovery import ZwaveDiscoveryInfo as ZwaveDiscoveryInfo
 from .helpers import get_unique_id as get_unique_id, get_valueless_base_unique_id as get_valueless_base_unique_id
+from .models import PlatformZwaveDiscoveryInfo as PlatformZwaveDiscoveryInfo
 from _typeshed import Incomplete
 from dataclasses import dataclass
 from homeassistant.const import Platform as Platform, STATE_UNAVAILABLE as STATE_UNAVAILABLE
@@ -29,7 +29,7 @@ def async_migrate_old_entity(hass: HomeAssistant, ent_reg: er.EntityRegistry, re
 @callback
 def async_migrate_unique_id(ent_reg: er.EntityRegistry, platform: Platform, old_unique_id: str, new_unique_id: str) -> None: ...
 @callback
-def async_migrate_discovered_value(hass: HomeAssistant, ent_reg: er.EntityRegistry, registered_unique_ids: set[str], device: dr.DeviceEntry, driver: Driver, disc_info: ZwaveDiscoveryInfo) -> None: ...
+def async_migrate_discovered_value(hass: HomeAssistant, ent_reg: er.EntityRegistry, registered_unique_ids: set[str], device: dr.DeviceEntry, driver: Driver, disc_info: PlatformZwaveDiscoveryInfo) -> None: ...
 @callback
 def async_migrate_statistics_sensors(hass: HomeAssistant, driver: Driver, node: Node, key_map: dict[str, str]) -> None: ...
 @callback

homeassistant-stubs/components/zwave_js/models.pyi

@@ -1,8 +1,16 @@
 from . import DriverEvents as DriverEvents
-from dataclasses import dataclass
+from awesomeversion import AwesomeVersion
+from collections.abc import Iterable
+from dataclasses import dataclass, field
+from enum import StrEnum
 from homeassistant.config_entries import ConfigEntry as ConfigEntry
+from homeassistant.const import EntityCategory as EntityCategory, Platform as Platform
+from homeassistant.helpers.entity import EntityDescription as EntityDescription
+from typing import Any
 from zwave_js_server.client import Client as ZwaveClient
 from zwave_js_server.const import LogLevel as LogLevel
+from zwave_js_server.model.node import Node as ZwaveNode
+from zwave_js_server.model.value import ConfigurationValue as ZwaveConfigurationValue, Value as ZwaveValue
 
 @dataclass
 class ZwaveJSData:
@@ -10,3 +18,89 @@ class ZwaveJSData:
     driver_events: DriverEvents
     old_server_log_level: LogLevel | None = ...
 type ZwaveJSConfigEntry = ConfigEntry[ZwaveJSData]
+
+@dataclass
+class ZwaveValueID:
+    property_: str | int
+    command_class: int
+    endpoint: int | None = ...
+    property_key: str | int | None = ...
+
+class ValueType(StrEnum):
+    ANY = 'any'
+    BOOLEAN = 'boolean'
+    NUMBER = 'number'
+    STRING = 'string'
+
+class DataclassMustHaveAtLeastOne:
+    def __post_init__(self) -> None: ...
+
+@dataclass
+class FirmwareVersionRange(DataclassMustHaveAtLeastOne):
+    min: str | None = ...
+    max: str | None = ...
+    min_ver: AwesomeVersion | None = field(default=None, init=False)
+    max_ver: AwesomeVersion | None = field(default=None, init=False)
+    def __post_init__(self) -> None: ...
+
+@dataclass
+class PlatformZwaveDiscoveryInfo:
+    node: ZwaveNode
+    primary_value: ZwaveValue
+    assumed_state: bool
+    platform: Platform
+    additional_value_ids_to_watch: set[str]
+
+@dataclass
+class ZwaveDiscoveryInfo(PlatformZwaveDiscoveryInfo):
+    platform_data: Any = ...
+    platform_data_template: BaseDiscoverySchemaDataTemplate | None = ...
+    platform_hint: str | None = ...
+    entity_registry_enabled_default: bool = ...
+    entity_category: EntityCategory | None = ...
+
+@dataclass
+class ZWaveValueDiscoverySchema(DataclassMustHaveAtLeastOne):
+    command_class: set[int] | None = ...
+    endpoint: set[int] | None = ...
+    property: set[str | int] | None = ...
+    property_name: set[str] | None = ...
+    property_key: set[str | int | None] | None = ...
+    not_property_key: set[str | int | None] | None = ...
+    type: set[str] | None = ...
+    readable: bool | None = ...
+    writeable: bool | None = ...
+    any_available_states: set[tuple[int, str]] | None = ...
+    any_available_states_keys: set[int] | None = ...
+    any_available_cc_specific: set[tuple[Any, Any]] | None = ...
+    value: Any | None = ...
+    stateful: bool | None = ...
+
+@dataclass
+class NewZWaveDiscoverySchema:
+    platform: Platform
+    entity_description: EntityDescription
+    entity_class: type
+    primary_value: ZWaveValueDiscoverySchema
+    data_template: BaseDiscoverySchemaDataTemplate | None = ...
+    manufacturer_id: set[int] | None = ...
+    product_id: set[int] | None = ...
+    product_type: set[int] | None = ...
+    firmware_version_range: FirmwareVersionRange | None = ...
+    firmware_version: set[str] | None = ...
+    device_class_basic: set[str | int] | None = ...
+    device_class_generic: set[str | int] | None = ...
+    device_class_specific: set[str | int] | None = ...
+    required_values: list[ZWaveValueDiscoverySchema] | None = ...
+    absent_values: list[ZWaveValueDiscoverySchema] | None = ...
+    allow_multi: bool = ...
+    assumed_state: bool = ...
+
+@dataclass
+class BaseDiscoverySchemaDataTemplate:
+    static_data: Any | None = ...
+    def resolve_data(self, value: ZwaveValue) -> Any: ...
+    def values_to_watch(self, resolved_data: Any) -> Iterable[ZwaveValue | None]: ...
+    def value_ids_to_watch(self, resolved_data: Any) -> set[str]: ...
+    @staticmethod
+    def _get_value_from_id(node: ZwaveNode, value_id_obj: ZwaveValueID) -> ZwaveValue | ZwaveConfigurationValue | None: ...

homeassistant-stubs/components/zwave_js/triggers/event.pyi

@@ -1,15 +1,16 @@
-from ..const import ATTR_CONFIG_ENTRY_ID as ATTR_CONFIG_ENTRY_ID, ATTR_EVENT as ATTR_EVENT, ATTR_EVENT_DATA as ATTR_EVENT_DATA, ATTR_EVENT_SOURCE as ATTR_EVENT_SOURCE, ATTR_NODE_ID as ATTR_NODE_ID, ATTR_PARTIAL_DICT_MATCH as ATTR_PARTIAL_DICT_MATCH, DOMAIN as DOMAIN
+from ..const import ATTR_EVENT as ATTR_EVENT, ATTR_EVENT_DATA as ATTR_EVENT_DATA, ATTR_EVENT_SOURCE as ATTR_EVENT_SOURCE, ATTR_NODE_ID as ATTR_NODE_ID, ATTR_PARTIAL_DICT_MATCH as ATTR_PARTIAL_DICT_MATCH, DOMAIN as DOMAIN
 from ..helpers import async_get_nodes_from_targets as async_get_nodes_from_targets, get_device_id as get_device_id, get_home_and_node_id_from_device_entry as get_home_and_node_id_from_device_entry
 from .trigger_helpers import async_bypass_dynamic_config_validation as async_bypass_dynamic_config_validation
 from _typeshed import Incomplete
 from collections.abc import Callable as Callable
-from homeassistant.const import ATTR_DEVICE_ID as ATTR_DEVICE_ID, ATTR_ENTITY_ID as ATTR_ENTITY_ID, CONF_PLATFORM as CONF_PLATFORM
+from homeassistant.const import ATTR_CONFIG_ENTRY_ID as ATTR_CONFIG_ENTRY_ID, ATTR_DEVICE_ID as ATTR_DEVICE_ID, ATTR_ENTITY_ID as ATTR_ENTITY_ID, CONF_PLATFORM as CONF_PLATFORM
 from homeassistant.core import CALLBACK_TYPE as CALLBACK_TYPE, HassJob as HassJob, HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect as async_dispatcher_connect
 from homeassistant.helpers.trigger import Trigger as Trigger, TriggerActionType as TriggerActionType, TriggerInfo as TriggerInfo
 from homeassistant.helpers.typing import ConfigType as ConfigType
 from zwave_js_server.model.driver import Driver as Driver
 
+RELATIVE_PLATFORM_TYPE: Incomplete
 PLATFORM_TYPE: Incomplete
 
 def validate_non_node_event_source(obj: dict) -> dict: ...
@@ -26,5 +27,5 @@ class EventTrigger(Trigger):
     _hass: Incomplete
     def __init__(self, hass: HomeAssistant, config: ConfigType) -> None: ...
     @classmethod
-    async def async_validate_trigger_config(cls, hass: HomeAssistant, config: ConfigType) -> ConfigType: ...
-    async def async_attach_trigger(self, action: TriggerActionType, trigger_info: TriggerInfo) -> CALLBACK_TYPE: ...
+    async def async_validate_config(cls, hass: HomeAssistant, config: ConfigType) -> ConfigType: ...
+    async def async_attach(self, action: TriggerActionType, trigger_info: TriggerInfo) -> CALLBACK_TYPE: ...

homeassistant-stubs/components/zwave_js/triggers/trigger_helpers.pyi

@@ -1,6 +1,6 @@
-from ..const import ATTR_CONFIG_ENTRY_ID as ATTR_CONFIG_ENTRY_ID, DOMAIN as DOMAIN
+from ..const import DOMAIN as DOMAIN
 from homeassistant.config_entries import ConfigEntryState as ConfigEntryState
-from homeassistant.const import ATTR_DEVICE_ID as ATTR_DEVICE_ID, ATTR_ENTITY_ID as ATTR_ENTITY_ID
+from homeassistant.const import ATTR_CONFIG_ENTRY_ID as ATTR_CONFIG_ENTRY_ID, ATTR_DEVICE_ID as ATTR_DEVICE_ID, ATTR_ENTITY_ID as ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers.typing import ConfigType as ConfigType
 

homeassistant-stubs/components/zwave_js/triggers/value_updated.pyi

@@ -12,6 +12,7 @@ from homeassistant.helpers.typing import ConfigType as ConfigType
 from zwave_js_server.model.driver import Driver as Driver
 from zwave_js_server.model.value import Value as Value
 
+RELATIVE_PLATFORM_TYPE: Incomplete
 PLATFORM_TYPE: Incomplete
 ATTR_FROM: str
 ATTR_TO: str
@@ -25,5 +26,5 @@ class ValueUpdatedTrigger(Trigger):
     _hass: Incomplete
     def __init__(self, hass: HomeAssistant, config: ConfigType) -> None: ...
     @classmethod
-    async def async_validate_trigger_config(cls, hass: HomeAssistant, config: ConfigType) -> ConfigType: ...
-    async def async_attach_trigger(self, action: TriggerActionType, trigger_info: TriggerInfo) -> CALLBACK_TYPE: ...
+    async def async_validate_config(cls, hass: HomeAssistant, config: ConfigType) -> ConfigType: ...
+    async def async_attach(self, action: TriggerActionType, trigger_info: TriggerInfo) -> CALLBACK_TYPE: ...

homeassistant-stubs/components/zwave_js/update.pyi

@@ -51,7 +51,6 @@ class ZWaveFirmwareUpdateEntity(UpdateEntity):
     _attr_has_entity_name: bool
     _attr_should_poll: bool
     _latest_version_firmware: FirmwareUpdateInfo | None
-    _status_unsub: Callable[[], None] | None
     _poll_unsub: Callable[[], None] | None
     _progress_unsub: Callable[[], None] | None
     _finished_unsub: Callable[[], None] | None
@@ -66,8 +65,6 @@ class ZWaveFirmwareUpdateEntity(UpdateEntity):
     def __init__(self, driver: Driver, node: ZwaveNode, delay: timedelta, entity_description: ZWaveUpdateEntityDescription) -> None: ...
     @property
     def extra_restore_state_data(self) -> ZWaveFirmwareUpdateExtraStoredData: ...
-    @callback
-    def _update_on_status_change(self, _: dict[str, Any]) -> None: ...
     _attr_in_progress: bool
     _attr_update_percentage: Incomplete
     @callback

homeassistant-stubs/config_entries.pyi

@@ -129,6 +129,7 @@ class ConfigFlowContext(FlowContext, total=False):
 class ConfigFlowResult(FlowResult[ConfigFlowContext, str], total=False):
     minor_version: int
     options: Mapping[str, Any]
+    result: ConfigEntry
     subentries: Iterable[ConfigSubentryData]
     version: int
 
@@ -444,7 +445,11 @@ class ConfigSubentryFlow(data_entry_flow.FlowHandler[SubentryFlowContext, Subent
     @callback
     def async_create_entry(self, *, title: str | None = None, data: Mapping[str, Any], description: str | None = None, description_placeholders: Mapping[str, str] | None = None, unique_id: str | None = None) -> SubentryFlowResult: ...
     @callback
+    def _async_update(self, entry: ConfigEntry, subentry: ConfigSubentry, *, unique_id: str | None | UndefinedType = ..., title: str | UndefinedType = ..., data: Mapping[str, Any] | UndefinedType = ..., data_updates: Mapping[str, Any] | UndefinedType = ...) -> bool: ...
+    @callback
     def async_update_and_abort(self, entry: ConfigEntry, subentry: ConfigSubentry, *, unique_id: str | None | UndefinedType = ..., title: str | UndefinedType = ..., data: Mapping[str, Any] | UndefinedType = ..., data_updates: Mapping[str, Any] | UndefinedType = ...) -> SubentryFlowResult: ...
+    @callback
+    def async_update_reload_and_abort(self, entry: ConfigEntry, subentry: ConfigSubentry, *, unique_id: str | None | UndefinedType = ..., title: str | UndefinedType = ..., data: Mapping[str, Any] | UndefinedType = ..., data_updates: Mapping[str, Any] | UndefinedType = ..., reload_even_if_entry_is_unchanged: bool = True) -> SubentryFlowResult: ...
     @property
     def _entry_id(self) -> str: ...
     @property

homeassistant-stubs/const.pyi

@@ -341,6 +341,7 @@ ATTR_SERVICE_DATA: Final[str]
 ATTR_ID: Final[str]
 ATTR_NAME: Final[str]
 ATTR_ENTITY_ID: Final[str]
+ATTR_CONFIG_ENTRY_ID: Final[str]
 ATTR_AREA_ID: Final[str]
 ATTR_DEVICE_ID: Final[str]
 ATTR_FLOOR_ID: Final[str]
@@ -392,6 +393,7 @@ ATTR_TEMPERATURE: Final[str]
 ATTR_PERSONS: Final[str]
 
 class UnitOfApparentPower(StrEnum):
+    MILLIVOLT_AMPERE = 'mVA'
     VOLT_AMPERE = 'VA'
 
 class UnitOfPower(StrEnum):
@@ -404,6 +406,7 @@ class UnitOfPower(StrEnum):
     BTU_PER_HOUR = 'BTU/h'
 
 class UnitOfReactivePower(StrEnum):
+    MILLIVOLT_AMPERE_REACTIVE = 'mvar'
     VOLT_AMPERE_REACTIVE = 'var'
     KILO_VOLT_AMPERE_REACTIVE = 'kvar'
 
@@ -440,7 +443,7 @@ class UnitOfElectricCurrent(StrEnum):
     AMPERE = 'A'
 
 class UnitOfElectricPotential(StrEnum):
-    MICROVOLT = 'µV'
+    MICROVOLT = 'μV'
     MILLIVOLT = 'mV'
     VOLT = 'V'
     KILOVOLT = 'kV'
@@ -510,6 +513,7 @@ class UnitOfVolume(StrEnum):
 
 class UnitOfVolumeFlowRate(StrEnum):
     CUBIC_METERS_PER_HOUR = 'm³/h'
+    CUBIC_METERS_PER_MINUTE = 'm³/min'
     CUBIC_METERS_PER_SECOND = 'm³/s'
     CUBIC_FEET_PER_MINUTE = 'ft³/min'
     LITERS_PER_HOUR = 'L/h'
@@ -536,17 +540,17 @@ class UnitOfMass(StrEnum):
     GRAMS = 'g'
     KILOGRAMS = 'kg'
     MILLIGRAMS = 'mg'
-    MICROGRAMS = 'µg'
+    MICROGRAMS = 'μg'
     OUNCES = 'oz'
     POUNDS = 'lb'
     STONES = 'st'
 
 class UnitOfConductivity(StrEnum, deprecated={'SIEMENS': ('UnitOfConductivity.SIEMENS_PER_CM', '2025.11.0'), 'MICROSIEMENS': ('UnitOfConductivity.MICROSIEMENS_PER_CM', '2025.11.0'), 'MILLISIEMENS': ('UnitOfConductivity.MILLISIEMENS_PER_CM', '2025.11.0')}, metaclass=EnumWithDeprecatedMembers):
     SIEMENS_PER_CM = 'S/cm'
-    MICROSIEMENS_PER_CM = 'µS/cm'
+    MICROSIEMENS_PER_CM = 'μS/cm'
     MILLISIEMENS_PER_CM = 'mS/cm'
     SIEMENS = 'S/cm'
-    MICROSIEMENS = 'µS/cm'
+    MICROSIEMENS = 'μS/cm'
     MILLISIEMENS = 'mS/cm'
 
 _DEPRECATED_CONDUCTIVITY: Final[Incomplete]
@@ -571,8 +575,8 @@ class UnitOfPrecipitationDepth(StrEnum):
     CENTIMETERS = 'cm'
 
 CONCENTRATION_GRAMS_PER_CUBIC_METER: Final[str]
-CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: Final[str]
 CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER: Final[str]
+CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: Final[str]
 CONCENTRATION_MICROGRAMS_PER_CUBIC_FOOT: Final[str]
 CONCENTRATION_PARTS_PER_CUBIC_METER: Final[str]
 CONCENTRATION_PARTS_PER_MILLION: Final[str]

homeassistant-stubs/data_entry_flow.pyi

@@ -69,7 +69,6 @@ class FlowResult(TypedDict, Generic[_FlowContextT, _HandlerT], total=False):
     progress_task: asyncio.Task[Any] | None
     reason: str
     required: bool
-    result: Any
     step_id: str
     title: str
     translation_domain: str

homeassistant-stubs/helpers/automation.pyi

@@ -0,0 +1,2 @@
+def get_absolute_description_key(domain: str, key: str) -> str: ...
+def get_relative_description_key(domain: str, key: str) -> str: ...