homeassistant 2025.7.3__py3-none-any.whl → 2025.8.0b0__py3-none-any.whl

homeassistant/components/zwave_js/__init__.py

@@ -29,7 +29,7 @@ from zwave_js_server.model.value import Value, ValueNotification
 
 from homeassistant.components.hassio import AddonError, AddonManager, AddonState
 from homeassistant.components.persistent_notification import async_create
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import (
     ATTR_DEVICE_ID,
     ATTR_DOMAIN,
@@ -104,7 +104,6 @@ from .const import (
     CONF_S2_UNAUTHENTICATED_KEY,
     CONF_USB_PATH,
     CONF_USE_ADDON,
-    DATA_CLIENT,
     DOMAIN,
     DRIVER_READY_TIMEOUT,
     EVENT_DEVICE_ADDED_TO_REGISTRY,
@@ -133,10 +132,10 @@ from .helpers import (
     get_valueless_base_unique_id,
 )
 from .migrate import async_migrate_discovered_value
+from .models import ZwaveJSConfigEntry, ZwaveJSData
 from .services import async_setup_services
 
 CONNECT_TIMEOUT = 10
-DATA_DRIVER_EVENTS = "driver_events"
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -148,6 +147,7 @@ CONFIG_SCHEMA = vol.Schema(
     },
     extra=vol.ALLOW_EXTRA,
 )
+MIN_CONTROLLER_FIRMWARE_SDK_VERSION = AwesomeVersion("6.50.0")
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -182,7 +182,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ZwaveJSConfigEntry) -> bool:
     """Set up Z-Wave JS from a config entry."""
     if use_addon := entry.data.get(CONF_USE_ADDON):
         await async_ensure_addon_running(hass, entry)
@@ -260,10 +260,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     LOGGER.debug("Connection to Zwave JS Server initialized")
 
-    entry_runtime_data = entry.runtime_data = {
-        DATA_CLIENT: client,
-    }
-    entry_runtime_data[DATA_DRIVER_EVENTS] = driver_events = DriverEvents(hass, entry)
+    driver_events = DriverEvents(hass, entry)
+    entry_runtime_data = ZwaveJSData(
+        client=client,
+        driver_events=driver_events,
+    )
+    entry.runtime_data = entry_runtime_data
 
     driver = client.driver
     # When the driver is ready we know it's set on the client.
@@ -276,39 +278,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         # and we'll handle the clean up below.
         await driver_events.setup(driver)
 
-    if (old_unique_id := entry.unique_id) is not None and old_unique_id != (
-        new_unique_id := str(driver.controller.home_id)
-    ):
-        device_registry = dr.async_get(hass)
-        controller_model = "Unknown model"
-        if (
-            (own_node := driver.controller.own_node)
-            and (
-                controller_device_entry := device_registry.async_get_device(
-                    identifiers={get_device_id(driver, own_node)}
-                )
-            )
-            and (model := controller_device_entry.model)
-        ):
-            controller_model = model
-        async_create_issue(
-            hass,
-            DOMAIN,
-            f"migrate_unique_id.{entry.entry_id}",
-            data={
-                "config_entry_id": entry.entry_id,
-                "config_entry_title": entry.title,
-                "controller_model": controller_model,
-                "new_unique_id": new_unique_id,
-                "old_unique_id": old_unique_id,
-            },
-            is_fixable=True,
-            severity=IssueSeverity.ERROR,
-            translation_key="migrate_unique_id",
-        )
-    else:
-        async_delete_issue(hass, DOMAIN, f"migrate_unique_id.{entry.entry_id}")
-
     # If the listen task is already failed, we need to raise ConfigEntryNotReady
     if listen_task.done():
         listen_error, error_message = _get_listen_task_error(listen_task)
@@ -348,7 +317,7 @@ class DriverEvents:
 
     driver: Driver
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, entry: ZwaveJSConfigEntry) -> None:
         """Set up the driver events instance."""
         self.config_entry = entry
         self.dev_reg = dr.async_get(hass)
@@ -386,28 +355,6 @@ class DriverEvents:
             self.hass.bus.async_listen(EVENT_LOGGING_CHANGED, handle_logging_changed)
         )
 
-        # Check for nodes that no longer exist and remove them
-        stored_devices = dr.async_entries_for_config_entry(
-            self.dev_reg, self.config_entry.entry_id
-        )
-        known_devices = [
-            self.dev_reg.async_get_device(identifiers={get_device_id(driver, node)})
-            for node in controller.nodes.values()
-        ]
-        provisioned_devices = [
-            self.dev_reg.async_get(entry.additional_properties["device_id"])
-            for entry in await controller.async_get_provisioning_entries()
-            if entry.additional_properties
-            and "device_id" in entry.additional_properties
-        ]
-
-        # Devices that are in the device registry that are not known by the controller
-        # can be removed
-        if not self.config_entry.data.get(CONF_KEEP_OLD_DEVICES):
-            for device in stored_devices:
-                if device not in known_devices and device not in provisioned_devices:
-                    self.dev_reg.async_remove_device(device.id)
-
         # run discovery on controller node
         if controller.own_node:
             await self.controller_events.async_on_node_added(controller.own_node)
@@ -442,6 +389,72 @@ class DriverEvents:
             controller.on("identify", self.controller_events.async_on_identify)
         )
 
+        if (
+            old_unique_id := self.config_entry.unique_id
+        ) is not None and old_unique_id != (
+            new_unique_id := str(driver.controller.home_id)
+        ):
+            device_registry = dr.async_get(self.hass)
+            controller_model = "Unknown model"
+            if (
+                (own_node := driver.controller.own_node)
+                and (
+                    controller_device_entry := device_registry.async_get_device(
+                        identifiers={get_device_id(driver, own_node)}
+                    )
+                )
+                and (model := controller_device_entry.model)
+            ):
+                controller_model = model
+
+            # Do not clean up old stale devices if an unknown controller is connected.
+            data = {**self.config_entry.data, CONF_KEEP_OLD_DEVICES: True}
+            self.hass.config_entries.async_update_entry(self.config_entry, data=data)
+            async_create_issue(
+                self.hass,
+                DOMAIN,
+                f"migrate_unique_id.{self.config_entry.entry_id}",
+                data={
+                    "config_entry_id": self.config_entry.entry_id,
+                    "config_entry_title": self.config_entry.title,
+                    "controller_model": controller_model,
+                    "new_unique_id": new_unique_id,
+                    "old_unique_id": old_unique_id,
+                },
+                is_fixable=True,
+                severity=IssueSeverity.ERROR,
+                translation_key="migrate_unique_id",
+            )
+        else:
+            data = self.config_entry.data.copy()
+            data.pop(CONF_KEEP_OLD_DEVICES, None)
+            self.hass.config_entries.async_update_entry(self.config_entry, data=data)
+            async_delete_issue(
+                self.hass, DOMAIN, f"migrate_unique_id.{self.config_entry.entry_id}"
+            )
+
+        # Check for nodes that no longer exist and remove them
+        stored_devices = dr.async_entries_for_config_entry(
+            self.dev_reg, self.config_entry.entry_id
+        )
+        known_devices = [
+            self.dev_reg.async_get_device(identifiers={get_device_id(driver, node)})
+            for node in controller.nodes.values()
+        ]
+        provisioned_devices = [
+            self.dev_reg.async_get(entry.additional_properties["device_id"])
+            for entry in await controller.async_get_provisioning_entries()
+            if entry.additional_properties
+            and "device_id" in entry.additional_properties
+        ]
+
+        # Devices that are in the device registry that are not known by the controller
+        # can be removed
+        if not self.config_entry.data.get(CONF_KEEP_OLD_DEVICES):
+            for device in stored_devices:
+                if device not in known_devices and device not in provisioned_devices:
+                    self.dev_reg.async_remove_device(device.id)
+
 
 class ControllerEvents:
     """Represent controller events.
@@ -787,11 +800,19 @@ class NodeEvents:
             node.on("notification", self.async_on_notification)
         )
 
-        # Create a firmware update entity for each non-controller device that
+        # Create a firmware update entity for each device that
         # supports firmware updates
-        if not node.is_controller_node and any(
-            cc.id == CommandClass.FIRMWARE_UPDATE_MD.value
-            for cc in node.command_classes
+        controller = self.controller_events.driver_events.driver.controller
+        if (
+            not (is_controller_node := node.is_controller_node)
+            and any(
+                cc.id == CommandClass.FIRMWARE_UPDATE_MD.value
+                for cc in node.command_classes
+            )
+        ) or (
+            is_controller_node
+            and (sdk_version := controller.sdk_version) is not None
+            and sdk_version >= MIN_CONTROLLER_FIRMWARE_SDK_VERSION
         ):
             async_dispatcher_send(
                 self.hass,
@@ -1045,7 +1066,7 @@ class NodeEvents:
 
 async def client_listen(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: ZwaveClient,
     driver_ready: asyncio.Event,
 ) -> None:
@@ -1072,12 +1093,12 @@ async def client_listen(
         hass.config_entries.async_schedule_reload(entry.entry_id)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ZwaveJSConfigEntry) -> bool:
     """Unload a config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
     entry_runtime_data = entry.runtime_data
-    client: ZwaveClient = entry_runtime_data[DATA_CLIENT]
+    client = entry_runtime_data.client
 
     if client.connected and (driver := client.driver):
         await async_disable_server_logging_if_needed(hass, entry, driver)
@@ -1094,7 +1115,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return unload_ok
 
 
-async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_remove_entry(hass: HomeAssistant, entry: ZwaveJSConfigEntry) -> None:
     """Remove a config entry."""
     if not entry.data.get(CONF_INTEGRATION_CREATED_ADDON):
         return
@@ -1116,7 +1137,9 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
         LOGGER.error(err)
 
 
-async def async_ensure_addon_running(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_ensure_addon_running(
+    hass: HomeAssistant, entry: ZwaveJSConfigEntry
+) -> None:
     """Ensure that Z-Wave JS add-on is installed and running."""
     addon_manager = _get_addon_manager(hass)
     try:

homeassistant/components/zwave_js/api.py

@@ -7,7 +7,7 @@ from collections.abc import Callable, Coroutine
 from contextlib import suppress
 import dataclasses
 from functools import partial, wraps
-from typing import Any, Concatenate, Literal, cast
+from typing import TYPE_CHECKING, Any, Concatenate, Literal, cast
 
 from aiohttp import web, web_exceptions, web_request
 import voluptuous as vol
@@ -70,7 +70,7 @@ from homeassistant.components.websocket_api import (
     ERR_UNKNOWN_ERROR,
     ActiveConnection,
 )
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, device_registry as dr
@@ -86,7 +86,6 @@ from .const import (
     ATTR_WAIT_FOR_RESULT,
     CONF_DATA_COLLECTION_OPTED_IN,
     CONF_INSTALLER_MODE,
-    DATA_CLIENT,
     DOMAIN,
     DRIVER_READY_TIMEOUT,
     EVENT_DEVICE_ADDED_TO_REGISTRY,
@@ -102,6 +101,10 @@ from .helpers import (
     get_device_id,
 )
 
+if TYPE_CHECKING:
+    from .models import ZwaveJSConfigEntry
+
+
 DATA_UNSUBSCRIBE = "unsubs"
 
 # general API constants
@@ -254,7 +257,7 @@ async def _async_get_entry(
     connection: ActiveConnection,
     msg: dict[str, Any],
     entry_id: str,
-) -> tuple[ConfigEntry, Client, Driver] | tuple[None, None, None]:
+) -> tuple[ZwaveJSConfigEntry, Client, Driver] | tuple[None, None, None]:
     """Get config entry and client from message data."""
     entry = hass.config_entries.async_get_entry(entry_id)
     if entry is None:
@@ -269,7 +272,7 @@ async def _async_get_entry(
         )
         return None, None, None
 
-    client: Client = entry.runtime_data[DATA_CLIENT]
+    client = entry.runtime_data.client
 
     if client.driver is None:
         connection.send_error(
@@ -284,7 +287,14 @@ async def _async_get_entry(
 
 def async_get_entry(
     orig_func: Callable[
-        [HomeAssistant, ActiveConnection, dict[str, Any], ConfigEntry, Client, Driver],
+        [
+            HomeAssistant,
+            ActiveConnection,
+            dict[str, Any],
+            ZwaveJSConfigEntry,
+            Client,
+            Driver,
+        ],
         Coroutine[Any, Any, None],
     ],
 ) -> Callable[
@@ -726,7 +736,7 @@ async def websocket_add_node(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -903,7 +913,7 @@ async def websocket_cancel_secure_bootstrap_s2(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -926,7 +936,7 @@ async def websocket_subscribe_s2_inclusion(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -979,7 +989,7 @@ async def websocket_grant_security_classes(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1007,7 +1017,7 @@ async def websocket_validate_dsk_and_enter_pin(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1077,7 +1087,7 @@ async def websocket_provision_smart_start_node(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1162,7 +1172,7 @@ async def websocket_unprovision_smart_start_node(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1212,7 +1222,7 @@ async def websocket_get_provisioning_entries(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1236,7 +1246,7 @@ async def websocket_parse_qr_code_string(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1262,7 +1272,7 @@ async def websocket_try_parse_dsk_from_qr_code_string(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1291,7 +1301,7 @@ async def websocket_lookup_device(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1323,7 +1333,7 @@ async def websocket_supports_feature(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1349,7 +1359,7 @@ async def websocket_stop_inclusion(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1376,7 +1386,7 @@ async def websocket_stop_exclusion(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1404,7 +1414,7 @@ async def websocket_remove_node(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1692,7 +1702,7 @@ async def websocket_begin_rebuilding_routes(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1719,7 +1729,7 @@ async def websocket_subscribe_rebuild_routes_progress(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -1772,7 +1782,7 @@ async def websocket_stop_rebuilding_routes(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2100,7 +2110,7 @@ async def websocket_subscribe_log_updates(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2187,7 +2197,7 @@ async def websocket_update_log_config(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2211,7 +2221,7 @@ async def websocket_get_log_config(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2238,7 +2248,7 @@ async def websocket_update_data_collection_preference(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2273,7 +2283,7 @@ async def websocket_data_collection_status(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2507,7 +2517,7 @@ async def websocket_is_any_ota_firmware_update_in_progress(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2602,7 +2612,7 @@ async def websocket_check_for_config_updates(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2631,7 +2641,7 @@ async def websocket_install_config_update(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2670,7 +2680,7 @@ async def websocket_subscribe_controller_statistics(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -2823,7 +2833,7 @@ async def websocket_hard_reset_controller(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -3000,7 +3010,7 @@ async def websocket_backup_nvm(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:
@@ -3062,7 +3072,7 @@ async def websocket_restore_nvm(
     hass: HomeAssistant,
     connection: ActiveConnection,
     msg: dict[str, Any],
-    entry: ConfigEntry,
+    entry: ZwaveJSConfigEntry,
     client: Client,
     driver: Driver,
 ) -> None:

homeassistant/components/zwave_js/binary_sensor.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-from zwave_js_server.client import Client as ZwaveClient
 from zwave_js_server.const import CommandClass
 from zwave_js_server.const.command_class.lock import DOOR_STATUS_PROPERTY
 from zwave_js_server.const.command_class.notification import (
@@ -18,15 +17,15 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_CLIENT, DOMAIN
+from .const import DOMAIN
 from .discovery import ZwaveDiscoveryInfo
 from .entity import ZWaveBaseEntity
+from .models import ZwaveJSConfigEntry
 
 PARALLEL_UPDATES = 0
 
@@ -364,11 +363,11 @@ def is_valid_notification_binary_sensor(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: ZwaveJSConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave binary sensor from config entry."""
-    client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
+    client = config_entry.runtime_data.client
 
     @callback
     def async_add_binary_sensor(info: ZwaveDiscoveryInfo) -> None:
@@ -448,7 +447,7 @@ class ZWaveBooleanBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
 
     def __init__(
         self,
-        config_entry: ConfigEntry,
+        config_entry: ZwaveJSConfigEntry,
         driver: Driver,
         info: ZwaveDiscoveryInfo,
     ) -> None:
@@ -476,7 +475,7 @@ class ZWaveNotificationBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
 
     def __init__(
         self,
-        config_entry: ConfigEntry,
+        config_entry: ZwaveJSConfigEntry,
         driver: Driver,
         info: ZwaveDiscoveryInfo,
         state_key: str,
@@ -509,7 +508,7 @@ class ZWavePropertyBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
 
     def __init__(
         self,
-        config_entry: ConfigEntry,
+        config_entry: ZwaveJSConfigEntry,
         driver: Driver,
         info: ZwaveDiscoveryInfo,
         description: PropertyZWaveJSEntityDescription,
@@ -533,7 +532,7 @@ class ZWaveConfigParameterBinarySensor(ZWaveBooleanBinarySensor):
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
     def __init__(
-        self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
+        self, config_entry: ZwaveJSConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
     ) -> None:
         """Initialize a ZWaveConfigParameterBinarySensor entity."""
         super().__init__(config_entry, driver, info)