homeassistant-stubs 2025.4.0b9__py3-none-any.whl → 2026.1.0b0__py3-none-any.whl

homeassistant-stubs/components/zwave_js/config_flow.pyi

@@ -1,24 +1,27 @@
-import abc
 import asyncio
 import voluptuous as vol
 from .addon import get_addon_manager as get_addon_manager
-from .const import ADDON_SLUG as ADDON_SLUG, CONF_ADDON_DEVICE as CONF_ADDON_DEVICE, CONF_ADDON_EMULATE_HARDWARE as CONF_ADDON_EMULATE_HARDWARE, CONF_ADDON_LOG_LEVEL as CONF_ADDON_LOG_LEVEL, 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_INTEGRATION_CREATED_ADDON as CONF_INTEGRATION_CREATED_ADDON, 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_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
+from .const import ADDON_SLUG as ADDON_SLUG, 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_ADDON_SOCKET as CONF_ADDON_SOCKET, 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_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_SOCKET_PATH as CONF_SOCKET_PATH, CONF_USB_PATH as CONF_USB_PATH, CONF_USE_ADDON as CONF_USE_ADDON, DOMAIN as DOMAIN
+from .helpers import CannotConnect as CannotConnect, async_get_version_info as async_get_version_info, async_wait_for_driver_ready_event as async_wait_for_driver_ready_event
+from .models import ZwaveJSConfigEntry as ZwaveJSConfigEntry
 from _typeshed import Incomplete
-from abc import ABC, abstractmethod
 from homeassistant.components import usb as usb
 from homeassistant.components.hassio import AddonError as AddonError, AddonInfo as AddonInfo, AddonManager as AddonManager, AddonState as AddonState
-from homeassistant.config_entries import ConfigEntriesFlowManager as ConfigEntriesFlowManager, ConfigEntry as ConfigEntry, ConfigEntryBaseFlow as ConfigEntryBaseFlow, ConfigEntryState as ConfigEntryState, ConfigFlow as ConfigFlow, ConfigFlowContext as ConfigFlowContext, ConfigFlowResult as ConfigFlowResult, OptionsFlow as OptionsFlow, OptionsFlowManager as OptionsFlowManager, SOURCE_USB as SOURCE_USB
+from homeassistant.config_entries import ConfigEntry as ConfigEntry, ConfigEntryState as ConfigEntryState, ConfigFlow as ConfigFlow, ConfigFlowResult as ConfigFlowResult, SOURCE_ESPHOME as SOURCE_ESPHOME, SOURCE_USB as SOURCE_USB
 from homeassistant.const import CONF_NAME as CONF_NAME, CONF_URL as CONF_URL
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
-from homeassistant.data_entry_flow import AbortFlow as AbortFlow, FlowManager as FlowManager
+from homeassistant.data_entry_flow import AbortFlow as AbortFlow
 from homeassistant.exceptions import HomeAssistantError as HomeAssistantError
-from homeassistant.helpers.aiohttp_client import async_get_clientsession as async_get_clientsession
+from homeassistant.helpers import selector as selector
 from homeassistant.helpers.hassio import is_hassio as is_hassio
+from homeassistant.helpers.service_info.esphome import ESPHomeServiceInfo as ESPHomeServiceInfo
 from homeassistant.helpers.service_info.hassio import HassioServiceInfo as HassioServiceInfo
 from homeassistant.helpers.service_info.usb import UsbServiceInfo as UsbServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo as ZeroconfServiceInfo
-from homeassistant.helpers.typing import VolDictType as VolDictType
+from pathlib import Path
 from typing import Any
+from zwave_js_server.client import Client as Client
+from zwave_js_server.model.driver import Driver as Driver
 from zwave_js_server.version import VersionInfo as VersionInfo
 
 _LOGGER: Incomplete
@@ -26,21 +29,26 @@ DEFAULT_URL: str
 TITLE: str
 ADDON_SETUP_TIMEOUT: int
 ADDON_SETUP_TIMEOUT_ROUNDS: int
-CONF_EMULATE_HARDWARE: str
-CONF_LOG_LEVEL: str
-SERVER_VERSION_TIMEOUT: int
-ADDON_LOG_LEVELS: Incomplete
 ADDON_USER_INPUT_MAP: Incomplete
+CONF_ADDON_RF_REGION: str
+EXAMPLE_SERVER_URL: str
 ON_SUPERVISOR_SCHEMA: Incomplete
+MIN_MIGRATION_SDK_VERSION: Incomplete
+NETWORK_TYPE_NEW: str
+NETWORK_TYPE_EXISTING: str
+ZWAVE_JS_SERVER_INSTRUCTIONS: str
+ZWAVE_JS_UI_MIGRATION_INSTRUCTIONS: str
+RF_REGIONS: Incomplete
+IGNORED_USB_DEVICES: Incomplete
 
 def get_manual_schema(user_input: dict[str, Any]) -> vol.Schema: ...
 def get_on_supervisor_schema(user_input: dict[str, Any]) -> vol.Schema: ...
 async def validate_input(hass: HomeAssistant, user_input: dict) -> VersionInfo: ...
-async def async_get_version_info(hass: HomeAssistant, ws_address: str) -> VersionInfo: ...
 def get_usb_ports() -> dict[str, str]: ...
 async def async_get_usb_ports(hass: HomeAssistant) -> dict[str, str]: ...
 
-class BaseZwaveJSFlow(ConfigEntryBaseFlow, ABC, metaclass=abc.ABCMeta):
+class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
+    VERSION: int
     s0_legacy_key: str | None
     s2_access_control_key: str | None
     s2_authenticated_key: str | None
@@ -48,91 +56,79 @@ class BaseZwaveJSFlow(ConfigEntryBaseFlow, ABC, metaclass=abc.ABCMeta):
     lr_s2_access_control_key: str | None
     lr_s2_authenticated_key: str | None
     usb_path: str | None
+    socket_path: str | None
     ws_address: str | None
     restart_addon: bool
     integration_created_addon: bool
     install_task: asyncio.Task | None
     start_task: asyncio.Task | None
     version_info: VersionInfo | None
+    original_addon_config: dict[str, Any] | None
+    revert_reason: str | None
+    backup_task: asyncio.Task | None
+    restore_backup_task: asyncio.Task | None
+    backup_data: bytes | None
+    backup_filepath: Path | None
+    use_addon: bool
+    _addon_config_updates: dict[str, Any]
+    _migrating: bool
+    _reconfigure_config_entry: ZwaveJSConfigEntry | None
+    _adapter_discovered: bool
+    _recommended_install: bool
+    _rf_region: str | None
     def __init__(self) -> None: ...
-    @property
-    @abstractmethod
-    def flow_manager(self) -> FlowManager[ConfigFlowContext, ConfigFlowResult]: ...
     async def async_step_install_addon(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def async_step_install_failed(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def async_step_start_addon(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def async_step_start_failed(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def _async_start_addon(self) -> None: ...
-    @abstractmethod
     async def async_step_configure_addon(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    @abstractmethod
     async def async_step_finish_addon_setup(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def _async_get_addon_info(self) -> AddonInfo: ...
-    async def _async_set_addon_config(self, config: dict) -> None: ...
+    async def _async_set_addon_config(self, config_updates: dict) -> None: ...
     async def _async_install_addon(self) -> None: ...
     async def _async_get_addon_discovery_info(self) -> dict: ...
-
-class ZWaveJSConfigFlow(BaseZwaveJSFlow, ConfigFlow, domain=DOMAIN):
-    VERSION: int
-    _title: str
-    use_addon: bool
-    _usb_discovery: bool
-    def __init__(self) -> None: ...
-    @property
-    def flow_manager(self) -> ConfigEntriesFlowManager: ...
-    @staticmethod
-    @callback
-    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler: ...
     async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    ws_address: Incomplete
+    async def async_step_installation_type(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_reconfigure(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def async_step_zeroconf(self, discovery_info: ZeroconfServiceInfo) -> ConfigFlowResult: ...
     async def async_step_zeroconf_confirm(self, user_input: dict | None = None) -> ConfigFlowResult: ...
-    usb_path: Incomplete
     async def async_step_usb(self, discovery_info: UsbServiceInfo) -> ConfigFlowResult: ...
-    async def async_step_usb_confirm(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_confirm_usb_migration(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def async_step_manual(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def async_step_hassio(self, discovery_info: HassioServiceInfo) -> ConfigFlowResult: ...
     async def async_step_hassio_confirm(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    s0_legacy_key: Incomplete
-    s2_access_control_key: Incomplete
-    s2_authenticated_key: Incomplete
-    s2_unauthenticated_key: Incomplete
-    lr_s2_access_control_key: Incomplete
-    lr_s2_authenticated_key: Incomplete
+    async def async_step_intent_recommended(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_intent_custom(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_rf_region(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def async_step_on_supervisor(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    async def async_step_configure_addon(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    version_info: Incomplete
-    async def async_step_finish_addon_setup(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_configure_addon_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_network_type(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_configure_security_keys(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_finish_addon_setup_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     @callback
     def _async_create_entry_from_vars(self) -> ConfigFlowResult: ...
-
-class OptionsFlowHandler(BaseZwaveJSFlow, OptionsFlow):
-    original_addon_config: dict[str, Any] | None
-    revert_reason: str | None
-    def __init__(self) -> None: ...
-    @property
-    def flow_manager(self) -> OptionsFlowManager: ...
     @callback
-    def _async_update_entry(self, data: dict[str, Any]) -> None: ...
-    async def async_step_init(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    async def async_step_manual(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    async def async_step_on_supervisor(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    s0_legacy_key: Incomplete
-    s2_access_control_key: Incomplete
-    s2_authenticated_key: Incomplete
-    s2_unauthenticated_key: Incomplete
-    lr_s2_access_control_key: Incomplete
-    lr_s2_authenticated_key: Incomplete
-    usb_path: Incomplete
-    restart_addon: bool
-    async def async_step_configure_addon(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    async def async_step_start_failed(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
-    ws_address: Incomplete
-    version_info: Incomplete
-    async def async_step_finish_addon_setup(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    def _async_update_entry(self, updates: dict[str, Any]) -> None: ...
+    async def async_step_intent_reconfigure(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_intent_migrate(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_backup_nvm(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_restore_nvm(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_instruct_unplug(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_manual_reconfigure(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_on_supervisor_reconfigure(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_configure_addon_reconfigure(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_choose_serial_port(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_backup_failed(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_restore_failed(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_migration_done(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_finish_addon_setup_migrate(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_finish_addon_setup_reconfigure(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_esphome(self, discovery_info: ESPHomeServiceInfo) -> ConfigFlowResult: ...
     async def async_revert_addon_config(self, reason: str) -> ConfigFlowResult: ...
-
-class CannotConnect(HomeAssistantError): ...
+    async def _async_backup_network(self) -> None: ...
+    async def _async_restore_network_backup(self) -> None: ...
+    def _get_driver(self) -> Driver: ...
 
 class InvalidInput(HomeAssistantError):
     error: Incomplete

homeassistant-stubs/components/zwave_js/const.pyi

@@ -2,10 +2,9 @@ from _typeshed import Incomplete
 from homeassistant.const import APPLICATION_NAME as APPLICATION_NAME
 
 LR_ADDON_VERSION: Incomplete
+ESPHOME_ADDON_VERSION: Incomplete
 USER_AGENT: Incomplete
 CONF_ADDON_DEVICE: str
-CONF_ADDON_EMULATE_HARDWARE: str
-CONF_ADDON_LOG_LEVEL: str
 CONF_ADDON_NETWORK_KEY: str
 CONF_ADDON_S0_LEGACY_KEY: str
 CONF_ADDON_S2_ACCESS_CONTROL_KEY: str
@@ -13,8 +12,10 @@ CONF_ADDON_S2_AUTHENTICATED_KEY: str
 CONF_ADDON_S2_UNAUTHENTICATED_KEY: str
 CONF_ADDON_LR_S2_ACCESS_CONTROL_KEY: str
 CONF_ADDON_LR_S2_AUTHENTICATED_KEY: str
+CONF_ADDON_SOCKET: str
 CONF_INSTALLER_MODE: str
 CONF_INTEGRATION_CREATED_ADDON: str
+CONF_KEEP_OLD_DEVICES: str
 CONF_NETWORK_KEY: str
 CONF_S0_LEGACY_KEY: str
 CONF_S2_ACCESS_CONTROL_KEY: str
@@ -22,12 +23,11 @@ CONF_S2_AUTHENTICATED_KEY: str
 CONF_S2_UNAUTHENTICATED_KEY: str
 CONF_LR_S2_ACCESS_CONTROL_KEY: str
 CONF_LR_S2_AUTHENTICATED_KEY: str
+CONF_SOCKET_PATH: str
 CONF_USB_PATH: str
 CONF_USE_ADDON: str
 CONF_DATA_COLLECTION_OPTED_IN: str
 DOMAIN: str
-DATA_CLIENT: str
-DATA_OLD_SERVER_LOG_LEVEL: str
 EVENT_DEVICE_ADDED_TO_REGISTRY: Incomplete
 EVENT_VALUE_UPDATED: str
 LOGGER: Incomplete
@@ -73,7 +73,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
@@ -105,7 +104,10 @@ ATTR_LOCK_TIMEOUT: str
 ATTR_OPERATION_TYPE: str
 ATTR_TWIST_ASSIST: str
 ADDON_SLUG: str
-ENTITY_DESC_KEY_BATTERY: str
+ENTITY_DESC_KEY_BATTERY_LEVEL: str
+ENTITY_DESC_KEY_BATTERY_LIST_STATE: str
+ENTITY_DESC_KEY_BATTERY_MAXIMUM_CAPACITY: str
+ENTITY_DESC_KEY_BATTERY_TEMPERATURE: str
 ENTITY_DESC_KEY_CURRENT: str
 ENTITY_DESC_KEY_VOLTAGE: str
 ENTITY_DESC_KEY_ENERGY_MEASUREMENT: str

homeassistant-stubs/components/zwave_js/cover.pyi

@@ -1,10 +1,10 @@
-from .const import COVER_POSITION_PROPERTY_KEYS as COVER_POSITION_PROPERTY_KEYS, COVER_TILT_PROPERTY_KEYS as COVER_TILT_PROPERTY_KEYS, DATA_CLIENT as DATA_CLIENT, DOMAIN as DOMAIN
+from .const import COVER_POSITION_PROPERTY_KEYS as COVER_POSITION_PROPERTY_KEYS, COVER_TILT_PROPERTY_KEYS as COVER_TILT_PROPERTY_KEYS, DOMAIN as DOMAIN
 from .discovery import ZwaveDiscoveryInfo as ZwaveDiscoveryInfo
 from .discovery_data_template import CoverTiltDataTemplate as CoverTiltDataTemplate
 from .entity import ZWaveBaseEntity as ZWaveBaseEntity
+from .models import ZwaveJSConfigEntry as ZwaveJSConfigEntry
 from _typeshed import Incomplete
 from homeassistant.components.cover import ATTR_POSITION as ATTR_POSITION, ATTR_TILT_POSITION as ATTR_TILT_POSITION, CoverDeviceClass as CoverDeviceClass, CoverEntity as CoverEntity, CoverEntityFeature as CoverEntityFeature
-from homeassistant.config_entries import ConfigEntry as ConfigEntry
 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_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
@@ -14,7 +14,7 @@ from zwave_js_server.model.value import Value as ZwaveValue
 
 PARALLEL_UPDATES: int
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+async def async_setup_entry(hass: HomeAssistant, config_entry: ZwaveJSConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 
 class CoverPositionMixin(ZWaveBaseEntity, CoverEntity):
     _current_position_value: ZwaveValue | None
@@ -62,17 +62,17 @@ class CoverTiltMixin(ZWaveBaseEntity, CoverEntity):
 
 class ZWaveMultilevelSwitchCover(CoverPositionMixin):
     _attr_device_class: Incomplete
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
 
 class ZWaveTiltCover(ZWaveMultilevelSwitchCover, CoverTiltMixin):
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
 
 class ZWaveWindowCovering(CoverPositionMixin, CoverTiltMixin):
     _up_value: Incomplete
     _down_value: Incomplete
     _attr_name: Incomplete
     _attr_device_class: Incomplete
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
     @property
     def _fully_open_tilt(self) -> int: ...
     @property
@@ -87,7 +87,7 @@ class ZwaveMotorizedBarrier(ZWaveBaseEntity, CoverEntity):
     _attr_supported_features: Incomplete
     _attr_device_class: Incomplete
     _target_state: Incomplete
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
     @property
     def is_opening(self) -> bool | None: ...
     @property

homeassistant-stubs/components/zwave_js/device_automation_helpers.pyi

@@ -1,4 +1,4 @@
-from .const import DATA_CLIENT as DATA_CLIENT, DOMAIN as DOMAIN
+from .const import DOMAIN as DOMAIN
 from _typeshed import Incomplete
 from homeassistant.config_entries import ConfigEntryState as ConfigEntryState
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback

homeassistant-stubs/components/zwave_js/device_trigger.pyi

@@ -1,5 +1,4 @@
 import voluptuous as vol
-from . import trigger as trigger
 from .config_validation import VALUE_SCHEMA as VALUE_SCHEMA
 from .const import ATTR_COMMAND_CLASS as ATTR_COMMAND_CLASS, ATTR_DATA_TYPE as ATTR_DATA_TYPE, ATTR_ENDPOINT as ATTR_ENDPOINT, ATTR_EVENT as ATTR_EVENT, ATTR_EVENT_LABEL as ATTR_EVENT_LABEL, ATTR_EVENT_TYPE as ATTR_EVENT_TYPE, ATTR_LABEL as ATTR_LABEL, ATTR_PROPERTY as ATTR_PROPERTY, ATTR_PROPERTY_KEY as ATTR_PROPERTY_KEY, ATTR_TYPE as ATTR_TYPE, ATTR_VALUE as ATTR_VALUE, ATTR_VALUE_RAW as ATTR_VALUE_RAW, DOMAIN as DOMAIN, ZWAVE_JS_NOTIFICATION_EVENT as ZWAVE_JS_NOTIFICATION_EVENT, ZWAVE_JS_VALUE_NOTIFICATION_EVENT as ZWAVE_JS_VALUE_NOTIFICATION_EVENT
 from .device_automation_helpers import CONF_SUBTYPE as CONF_SUBTYPE, NODE_STATUSES as NODE_STATUSES, async_bypass_dynamic_config_validation as async_bypass_dynamic_config_validation, generate_config_parameter_subtype as generate_config_parameter_subtype
@@ -8,8 +7,8 @@ from .triggers.value_updated import ATTR_FROM as ATTR_FROM, ATTR_TO as ATTR_TO
 from _typeshed import Incomplete
 from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA as DEVICE_TRIGGER_BASE_SCHEMA, InvalidDeviceAutomationConfig as InvalidDeviceAutomationConfig
 from homeassistant.components.homeassistant.triggers import event as event, state as state
-from homeassistant.const import CONF_DEVICE_ID as CONF_DEVICE_ID, CONF_DOMAIN as CONF_DOMAIN, CONF_ENTITY_ID as CONF_ENTITY_ID, CONF_PLATFORM as CONF_PLATFORM, CONF_TYPE as CONF_TYPE
-from homeassistant.core import CALLBACK_TYPE as CALLBACK_TYPE, HomeAssistant as HomeAssistant
+from homeassistant.const import CONF_DEVICE_ID as CONF_DEVICE_ID, CONF_DOMAIN as CONF_DOMAIN, CONF_ENTITY_ID as CONF_ENTITY_ID, CONF_OPTIONS as CONF_OPTIONS, CONF_PLATFORM as CONF_PLATFORM, CONF_TYPE as CONF_TYPE
+from homeassistant.core import CALLBACK_TYPE as CALLBACK_TYPE, Context as Context, HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.exceptions import HomeAssistantError as HomeAssistantError
 from homeassistant.helpers.trigger import TriggerActionType as TriggerActionType, TriggerInfo as TriggerInfo
 from homeassistant.helpers.typing import ConfigType as ConfigType

homeassistant-stubs/components/zwave_js/diagnostics.pyi

@@ -1,8 +1,8 @@
-from .const import DATA_CLIENT as DATA_CLIENT, USER_AGENT as USER_AGENT
+from .const import USER_AGENT as USER_AGENT
 from .helpers import ZwaveValueMatcher as ZwaveValueMatcher, get_home_and_node_id_from_device_entry as get_home_and_node_id_from_device_entry, get_state_key_from_unique_id as get_state_key_from_unique_id, get_value_id_from_unique_id as get_value_id_from_unique_id, value_matches_matcher as value_matches_matcher
+from .models import ZwaveJSConfigEntry as ZwaveJSConfigEntry
 from _typeshed import Incomplete
 from homeassistant.components.diagnostics import REDACTED as REDACTED, async_redact_data as async_redact_data
-from homeassistant.config_entries import ConfigEntry as ConfigEntry
 from homeassistant.const import CONF_URL as CONF_URL
 from homeassistant.core import HomeAssistant as HomeAssistant
 from homeassistant.helpers import device_registry as dr
@@ -18,6 +18,6 @@ VALUES_TO_REDACT: Incomplete
 def _redacted_value(zwave_value: ValueDataType) -> ValueDataType: ...
 def optionally_redact_value_of_zwave_value(zwave_value: ValueDataType) -> ValueDataType: ...
 def redact_node_state(node_state: dict) -> dict: ...
-def get_device_entities(hass: HomeAssistant, node: Node, config_entry: ConfigEntry, device: dr.DeviceEntry) -> list[dict[str, Any]]: ...
-async def async_get_config_entry_diagnostics(hass: HomeAssistant, config_entry: ConfigEntry) -> dict[str, Any]: ...
-async def async_get_device_diagnostics(hass: HomeAssistant, config_entry: ConfigEntry, device: dr.DeviceEntry) -> dict[str, Any]: ...
+def get_device_entities(hass: HomeAssistant, node: Node, config_entry: ZwaveJSConfigEntry, device: dr.DeviceEntry) -> list[dict[str, Any]]: ...
+async def async_get_config_entry_diagnostics(hass: HomeAssistant, config_entry: ZwaveJSConfigEntry) -> dict[str, Any]: ...
+async def async_get_device_diagnostics(hass: HomeAssistant, config_entry: ZwaveJSConfigEntry, device: dr.DeviceEntry) -> dict[str, Any]: ...

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 as ENTITY_DESC_KEY_BATTERY, 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 .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 .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,22 +1,29 @@
 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
 from zwave_js_server.model.value import SetValueResult as SetValueResult, Value as ZwaveValue
 
 EVENT_VALUE_REMOVED: str
-EVENT_DEAD: str
-EVENT_ALIVE: 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
@@ -25,13 +32,14 @@ class ZWaveBaseEntity(Entity):
     driver: Incomplete
     info: Incomplete
     watched_value_ids: Incomplete
+    entity_description: Incomplete
+    _attr_entity_registry_enabled_default: Incomplete
+    _attr_entity_category: Incomplete
     _attr_name: Incomplete
     _attr_unique_id: Incomplete
-    _attr_entity_registry_enabled_default: bool
-    _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: ...
@@ -41,8 +49,6 @@ class ZWaveBaseEntity(Entity):
     @property
     def available(self) -> bool: ...
     @callback
-    def _node_status_alive_or_dead(self, event_data: dict) -> None: ...
-    @callback
     def _value_changed(self, event_data: dict) -> None: ...
     @callback
     def _value_removed(self, event_data: dict) -> None: ...

homeassistant-stubs/components/zwave_js/event.pyi

@@ -1,9 +1,10 @@
-from .const import ATTR_VALUE as ATTR_VALUE, DATA_CLIENT as DATA_CLIENT, DOMAIN as DOMAIN
-from .discovery import ZwaveDiscoveryInfo as ZwaveDiscoveryInfo
-from .entity import ZWaveBaseEntity as ZWaveBaseEntity
+from .const import ATTR_VALUE as ATTR_VALUE, DOMAIN as DOMAIN
+from .entity import NewZwaveDiscoveryInfo as NewZwaveDiscoveryInfo, ZWaveBaseEntity as ZWaveBaseEntity
+from .models import NewZWaveDiscoverySchema as NewZWaveDiscoverySchema, ZWaveValueDiscoverySchema as ZWaveValueDiscoverySchema, ZwaveJSConfigEntry as ZwaveJSConfigEntry
 from _typeshed import Incomplete
-from homeassistant.components.event import EventEntity as EventEntity
-from homeassistant.config_entries import ConfigEntry as ConfigEntry
+from dataclasses import dataclass
+from homeassistant.components.event import EventEntity as EventEntity, EventEntityDescription as EventEntityDescription
+from homeassistant.const import 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_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
@@ -12,14 +13,19 @@ from zwave_js_server.model.value import Value as Value, ValueNotification as Val
 
 PARALLEL_UPDATES: int
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+@dataclass(frozen=True, kw_only=True)
+class ValueNotificationZWaveJSEntityDescription(EventEntityDescription): ...
+
+async def async_setup_entry(hass: HomeAssistant, config_entry: ZwaveJSConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 def _cc_and_label(value: Value) -> str: ...
 
 class ZwaveEventEntity(ZWaveBaseEntity, EventEntity):
     states: dict[int, str]
     _attr_event_types: Incomplete
     _attr_name: Incomplete
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: NewZwaveDiscoveryInfo) -> None: ...
     @callback
     def _async_handle_event(self, value_notification: ValueNotification) -> None: ...
     async def async_added_to_hass(self) -> None: ...
+
+DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema]

homeassistant-stubs/components/zwave_js/fan.pyi

@@ -1,11 +1,11 @@
-from .const import DATA_CLIENT as DATA_CLIENT, DOMAIN as DOMAIN
+from .const import DOMAIN as DOMAIN
 from .discovery import ZwaveDiscoveryInfo as ZwaveDiscoveryInfo
 from .discovery_data_template import FanValueMapping as FanValueMapping, FanValueMappingDataTemplate as FanValueMappingDataTemplate
 from .entity import ZWaveBaseEntity as ZWaveBaseEntity
 from .helpers import get_value_of_zwave_value as get_value_of_zwave_value
+from .models import ZwaveJSConfigEntry as ZwaveJSConfigEntry
 from _typeshed import Incomplete
 from homeassistant.components.fan import FanEntity as FanEntity, FanEntityFeature as FanEntityFeature
-from homeassistant.config_entries import ConfigEntry as ConfigEntry
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.exceptions import HomeAssistantError as HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect as async_dispatcher_connect
@@ -19,13 +19,13 @@ PARALLEL_UPDATES: int
 DEFAULT_SPEED_RANGE: Incomplete
 ATTR_FAN_STATE: str
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+async def async_setup_entry(hass: HomeAssistant, config_entry: ZwaveJSConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 
 class ZwaveFan(ZWaveBaseEntity, FanEntity):
     _attr_supported_features: Incomplete
     _target_value: Incomplete
     _use_optimistic_state: bool
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
     async def async_set_percentage(self, percentage: int) -> None: ...
     async def async_turn_on(self, percentage: int | None = None, preset_mode: str | None = None, **kwargs: Any) -> None: ...
     async def async_turn_off(self, **kwargs: Any) -> None: ...
@@ -38,7 +38,7 @@ class ZwaveFan(ZWaveBaseEntity, FanEntity):
 
 class ValueMappingZwaveFan(ZwaveFan):
     data_template: Incomplete
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
     async def async_set_percentage(self, percentage: int) -> None: ...
     async def async_set_preset_mode(self, preset_mode: str) -> None: ...
     @property
@@ -66,7 +66,7 @@ class ZwaveThermostatFan(ZWaveBaseEntity, FanEntity):
     _fan_mode: ZwaveValue
     _fan_off: ZwaveValue | None
     _fan_state: ZwaveValue | None
-    def __init__(self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
+    def __init__(self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo) -> None: ...
     async def async_turn_on(self, percentage: int | None = None, preset_mode: str | None = None, **kwargs: Any) -> None: ...
     async def async_turn_off(self, **kwargs: Any) -> None: ...
     @property