diff --git a/homeassistant/components/medcom_ble/__init__.py b/homeassistant/components/medcom_ble/__init__.py index 5c508688b54..60f945f5adb 100644 --- a/homeassistant/components/medcom_ble/__init__.py +++ b/homeassistant/components/medcom_ble/__init__.py @@ -3,19 +3,17 @@ from __future__ import annotations from homeassistant.components import bluetooth -from homeassistant.config_entries import ConfigEntry from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady -from .const import DOMAIN -from .coordinator import MedcomBleUpdateCoordinator +from .coordinator import MedcomBleConfigEntry, MedcomBleUpdateCoordinator # Supported platforms PLATFORMS: list[Platform] = [Platform.SENSOR] -async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: +async def async_setup_entry(hass: HomeAssistant, entry: MedcomBleConfigEntry) -> bool: """Set up Medcom BLE radiation monitor from a config entry.""" address = entry.unique_id @@ -31,16 +29,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: await coordinator.async_config_entry_first_refresh() - hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator + entry.runtime_data = coordinator await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) return True -async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: +async def async_unload_entry(hass: HomeAssistant, entry: MedcomBleConfigEntry) -> bool: """Unload a config entry.""" - if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS): - hass.data[DOMAIN].pop(entry.entry_id) - - return unload_ok + return await hass.config_entries.async_unload_platforms(entry, PLATFORMS) diff --git a/homeassistant/components/medcom_ble/coordinator.py b/homeassistant/components/medcom_ble/coordinator.py index 2b326c4196d..eb7f91f3477 100644 --- a/homeassistant/components/medcom_ble/coordinator.py +++ b/homeassistant/components/medcom_ble/coordinator.py @@ -18,13 +18,17 @@ from .const import DEFAULT_SCAN_INTERVAL, DOMAIN _LOGGER = logging.getLogger(__name__) +type MedcomBleConfigEntry = ConfigEntry[MedcomBleUpdateCoordinator] + class MedcomBleUpdateCoordinator(DataUpdateCoordinator[MedcomBleDevice]): """Coordinator for Medcom BLE radiation monitor data.""" - config_entry: ConfigEntry + config_entry: MedcomBleConfigEntry - def __init__(self, hass: HomeAssistant, entry: ConfigEntry, address: str) -> None: + def __init__( + self, hass: HomeAssistant, entry: MedcomBleConfigEntry, address: str + ) -> None: """Initialize the coordinator.""" super().__init__( hass, diff --git a/homeassistant/components/medcom_ble/sensor.py b/homeassistant/components/medcom_ble/sensor.py index cf78b5dc41a..6ca59c07908 100644 --- a/homeassistant/components/medcom_ble/sensor.py +++ b/homeassistant/components/medcom_ble/sensor.py @@ -4,7 +4,6 @@ from __future__ import annotations import logging -from homeassistant import config_entries from homeassistant.components.sensor import ( SensorEntity, SensorEntityDescription, @@ -15,8 +14,8 @@ from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceIn from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity -from .const import DOMAIN, UNIT_CPM -from .coordinator import MedcomBleUpdateCoordinator +from .const import UNIT_CPM +from .coordinator import MedcomBleConfigEntry, MedcomBleUpdateCoordinator _LOGGER = logging.getLogger(__name__) @@ -32,12 +31,12 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = { async def async_setup_entry( hass: HomeAssistant, - entry: config_entries.ConfigEntry, + entry: MedcomBleConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback, ) -> None: """Set up Medcom BLE radiation monitor sensors.""" - coordinator: MedcomBleUpdateCoordinator = hass.data[DOMAIN][entry.entry_id] + coordinator = entry.runtime_data entities = [] _LOGGER.debug("got sensors: %s", coordinator.data.sensors)