Update xiaomi-ble to use entry.runtime_data (#122306)

homeassistant/components/xiaomi_ble/__init__.py

@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
+from functools import partial
 import logging
 from typing import cast
 
 from xiaomi_ble import EncryptionScheme, SensorUpdate, XiaomiBluetoothDeviceData
 
-from homeassistant import config_entries
 from homeassistant.components.bluetooth import (
     DOMAIN as BLUETOOTH_DOMAIN,
     BluetoothScanningMode,
@@ -29,6 +29,7 @@ from .const import (
     XiaomiBleEvent,
 )
 from .coordinator import XiaomiActiveBluetoothProcessorCoordinator
+from .types import XiaomiBLEConfigEntry
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.EVENT, Platform.SENSOR]
 
@@ -37,16 +38,14 @@ _LOGGER = logging.getLogger(__name__)
 
 def process_service_info(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
+    entry: XiaomiBLEConfigEntry,
-    data: XiaomiBluetoothDeviceData,
-    service_info: BluetoothServiceInfoBleak,
     device_registry: DeviceRegistry,
+    service_info: BluetoothServiceInfoBleak,
 ) -> SensorUpdate:
     """Process a BluetoothServiceInfoBleak, running side effects and returning sensor data."""
+    coordinator = entry.runtime_data
+    data = coordinator.device_data
     update = data.update(service_info)
-    coordinator: XiaomiActiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
-        entry.entry_id
-    ]
     discovered_event_classes = coordinator.discovered_event_classes
     if entry.data.get(CONF_SLEEPY_DEVICE, False) != data.sleepy_device:
         hass.config_entries.async_update_entry(
@@ -165,38 +164,29 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         return await data.async_poll(connectable_device)
 
     device_registry = dr.async_get(hass)
-    coordinator = hass.data.setdefault(DOMAIN, {})[entry.entry_id] = (
+    coordinator = XiaomiActiveBluetoothProcessorCoordinator(
-        XiaomiActiveBluetoothProcessorCoordinator(
+        hass,
-            hass,
+        _LOGGER,
-            _LOGGER,
+        address=address,
-            address=address,
+        mode=BluetoothScanningMode.PASSIVE,
-            mode=BluetoothScanningMode.PASSIVE,
+        update_method=partial(process_service_info, hass, entry, device_registry),
-            update_method=lambda service_info: process_service_info(
+        needs_poll_method=_needs_poll,
-                hass, entry, data, service_info, device_registry
+        device_data=data,
-            ),
+        discovered_event_classes=set(entry.data.get(CONF_DISCOVERED_EVENT_CLASSES, [])),
-            needs_poll_method=_needs_poll,
+        poll_method=_async_poll,
-            device_data=data,
+        # We will take advertisements from non-connectable devices
-            discovered_event_classes=set(
+        # since we will trade the BLEDevice for a connectable one
-                entry.data.get(CONF_DISCOVERED_EVENT_CLASSES, [])
+        # if we need to poll it
-            ),
+        connectable=False,
-            poll_method=_async_poll,
+        entry=entry,
-            # We will take advertisements from non-connectable devices
-            # since we will trade the BLEDevice for a connectable one
-            # if we need to poll it
-            connectable=False,
-            entry=entry,
-        )
     )
+    entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    entry.async_on_unload(
+    # only start after all platforms have had a chance to subscribe
-        coordinator.async_start()
+    entry.async_on_unload(coordinator.async_start())
-    )  # only start after all platforms have had a chance to subscribe
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: XiaomiBLEConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok

homeassistant/components/xiaomi_ble/binary_sensor.py

@@ -8,7 +8,6 @@ from xiaomi_ble.parser import (
     SensorUpdate,
 )
 
-from homeassistant import config_entries
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
@@ -22,12 +21,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
-from .const import DOMAIN
+from .coordinator import XiaomiPassiveBluetoothDataProcessor
-from .coordinator import (
-    XiaomiActiveBluetoothProcessorCoordinator,
-    XiaomiPassiveBluetoothDataProcessor,
-)
 from .device import device_key_to_bluetooth_entity_key
+from .types import XiaomiBLEConfigEntry
 
 BINARY_SENSOR_DESCRIPTIONS = {
     XiaomiBinarySensorDeviceClass.BATTERY: BinarySensorEntityDescription(
@@ -134,13 +130,11 @@ def sensor_update_to_bluetooth_data_update(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
+    entry: XiaomiBLEConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi BLE sensors."""
-    coordinator: XiaomiActiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
+    coordinator = entry.runtime_data
-        entry.entry_id
-    ]
     processor = XiaomiPassiveBluetoothDataProcessor(
         sensor_update_to_bluetooth_data_update
     )

homeassistant/components/xiaomi_ble/coordinator.py

@@ -16,11 +16,11 @@ from homeassistant.components.bluetooth.active_update_processor import (
 from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothDataProcessor,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.debounce import Debouncer
 
 from .const import CONF_SLEEPY_DEVICE
+from .types import XiaomiBLEConfigEntry
 
 
 class XiaomiActiveBluetoothProcessorCoordinator(
@@ -45,7 +45,7 @@ class XiaomiActiveBluetoothProcessorCoordinator(
         ]
         | None = None,
         poll_debouncer: Debouncer[Coroutine[Any, Any, None]] | None = None,
-        entry: ConfigEntry,
+        entry: XiaomiBLEConfigEntry,
         connectable: bool = True,
     ) -> None:
         """Initialize the Xiaomi Bluetooth Active Update Processor Coordinator."""

homeassistant/components/xiaomi_ble/event.py

@@ -9,7 +9,6 @@ from homeassistant.components.event import (
     EventEntity,
     EventEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -29,7 +28,7 @@ from .const import (
     EVENT_TYPE,
     XiaomiBleEvent,
 )
-from .coordinator import XiaomiActiveBluetoothProcessorCoordinator
+from .types import XiaomiBLEConfigEntry
 
 DESCRIPTIONS_BY_EVENT_CLASS = {
     EVENT_CLASS_BUTTON: EventEntityDescription(
@@ -183,13 +182,11 @@ class XiaomiEventEntity(EventEntity):
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: XiaomiBLEConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up Xiaomi event."""
-    coordinator: XiaomiActiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
+    coordinator = entry.runtime_data
-        entry.entry_id
-    ]
     address = coordinator.address
     ent_reg = er.async_get(hass)
     async_add_entities(

homeassistant/components/xiaomi_ble/sensor.py

@@ -7,7 +7,6 @@ from typing import cast
 from xiaomi_ble import DeviceClass, SensorUpdate, Units
 from xiaomi_ble.parser import ExtendedSensorDeviceClass
 
-from homeassistant import config_entries
 from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothDataUpdate,
     PassiveBluetoothProcessorEntity,
@@ -35,12 +34,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
-from .const import DOMAIN
+from .coordinator import XiaomiPassiveBluetoothDataProcessor
-from .coordinator import (
-    XiaomiActiveBluetoothProcessorCoordinator,
-    XiaomiPassiveBluetoothDataProcessor,
-)
 from .device import device_key_to_bluetooth_entity_key
+from .types import XiaomiBLEConfigEntry
 
 SENSOR_DESCRIPTIONS = {
     (DeviceClass.BATTERY, Units.PERCENTAGE): SensorEntityDescription(
@@ -193,13 +189,11 @@ def sensor_update_to_bluetooth_data_update(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
+    entry: XiaomiBLEConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi BLE sensors."""
-    coordinator: XiaomiActiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
+    coordinator = entry.runtime_data
-        entry.entry_id
-    ]
     processor = XiaomiPassiveBluetoothDataProcessor(
         sensor_update_to_bluetooth_data_update
     )

homeassistant/components/xiaomi_ble/types.py

@@ -0,0 +1,10 @@
+"""Support for xiaomi ble."""
+
+from typing import TYPE_CHECKING
+
+from homeassistant.config_entries import ConfigEntry
+
+if TYPE_CHECKING:
+    from .coordinator import XiaomiActiveBluetoothProcessorCoordinator
+
+type XiaomiBLEConfigEntry = ConfigEntry[XiaomiActiveBluetoothProcessorCoordinator]