mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 21:27:38 +00:00
Explicitly pass in the config_entry in switchbot_cloud coordinator (#137922)
explicitly pass in the config_entry in coordinator
This commit is contained in:
parent
7eb0171657
commit
a0e7560b1e
@ -47,13 +47,14 @@ class SwitchbotCloudData:
|
|||||||
|
|
||||||
async def coordinator_for_device(
|
async def coordinator_for_device(
|
||||||
hass: HomeAssistant,
|
hass: HomeAssistant,
|
||||||
|
entry: ConfigEntry,
|
||||||
api: SwitchBotAPI,
|
api: SwitchBotAPI,
|
||||||
device: Device | Remote,
|
device: Device | Remote,
|
||||||
coordinators_by_id: dict[str, SwitchBotCoordinator],
|
coordinators_by_id: dict[str, SwitchBotCoordinator],
|
||||||
) -> SwitchBotCoordinator:
|
) -> SwitchBotCoordinator:
|
||||||
"""Instantiate coordinator and adds to list for gathering."""
|
"""Instantiate coordinator and adds to list for gathering."""
|
||||||
coordinator = coordinators_by_id.setdefault(
|
coordinator = coordinators_by_id.setdefault(
|
||||||
device.device_id, SwitchBotCoordinator(hass, api, device)
|
device.device_id, SwitchBotCoordinator(hass, entry, api, device)
|
||||||
)
|
)
|
||||||
|
|
||||||
if coordinator.data is None:
|
if coordinator.data is None:
|
||||||
@ -64,6 +65,7 @@ async def coordinator_for_device(
|
|||||||
|
|
||||||
async def make_switchbot_devices(
|
async def make_switchbot_devices(
|
||||||
hass: HomeAssistant,
|
hass: HomeAssistant,
|
||||||
|
entry: ConfigEntry,
|
||||||
api: SwitchBotAPI,
|
api: SwitchBotAPI,
|
||||||
devices: list[Device | Remote],
|
devices: list[Device | Remote],
|
||||||
coordinators_by_id: dict[str, SwitchBotCoordinator],
|
coordinators_by_id: dict[str, SwitchBotCoordinator],
|
||||||
@ -72,7 +74,7 @@ async def make_switchbot_devices(
|
|||||||
devices_data = SwitchbotDevices()
|
devices_data = SwitchbotDevices()
|
||||||
await gather(
|
await gather(
|
||||||
*[
|
*[
|
||||||
make_device_data(hass, api, device, devices_data, coordinators_by_id)
|
make_device_data(hass, entry, api, device, devices_data, coordinators_by_id)
|
||||||
for device in devices
|
for device in devices
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@ -82,6 +84,7 @@ async def make_switchbot_devices(
|
|||||||
|
|
||||||
async def make_device_data(
|
async def make_device_data(
|
||||||
hass: HomeAssistant,
|
hass: HomeAssistant,
|
||||||
|
entry: ConfigEntry,
|
||||||
api: SwitchBotAPI,
|
api: SwitchBotAPI,
|
||||||
device: Device | Remote,
|
device: Device | Remote,
|
||||||
devices_data: SwitchbotDevices,
|
devices_data: SwitchbotDevices,
|
||||||
@ -90,7 +93,7 @@ async def make_device_data(
|
|||||||
"""Make device data."""
|
"""Make device data."""
|
||||||
if isinstance(device, Remote) and device.device_type.endswith("Air Conditioner"):
|
if isinstance(device, Remote) and device.device_type.endswith("Air Conditioner"):
|
||||||
coordinator = await coordinator_for_device(
|
coordinator = await coordinator_for_device(
|
||||||
hass, api, device, coordinators_by_id
|
hass, entry, api, device, coordinators_by_id
|
||||||
)
|
)
|
||||||
devices_data.climates.append((device, coordinator))
|
devices_data.climates.append((device, coordinator))
|
||||||
if (
|
if (
|
||||||
@ -101,7 +104,7 @@ async def make_device_data(
|
|||||||
)
|
)
|
||||||
) or isinstance(device, Remote):
|
) or isinstance(device, Remote):
|
||||||
coordinator = await coordinator_for_device(
|
coordinator = await coordinator_for_device(
|
||||||
hass, api, device, coordinators_by_id
|
hass, entry, api, device, coordinators_by_id
|
||||||
)
|
)
|
||||||
devices_data.switches.append((device, coordinator))
|
devices_data.switches.append((device, coordinator))
|
||||||
|
|
||||||
@ -117,7 +120,7 @@ async def make_device_data(
|
|||||||
"Plug Mini (JP)",
|
"Plug Mini (JP)",
|
||||||
]:
|
]:
|
||||||
coordinator = await coordinator_for_device(
|
coordinator = await coordinator_for_device(
|
||||||
hass, api, device, coordinators_by_id
|
hass, entry, api, device, coordinators_by_id
|
||||||
)
|
)
|
||||||
devices_data.sensors.append((device, coordinator))
|
devices_data.sensors.append((device, coordinator))
|
||||||
|
|
||||||
@ -128,19 +131,19 @@ async def make_device_data(
|
|||||||
"Robot Vacuum Cleaner S1 Plus",
|
"Robot Vacuum Cleaner S1 Plus",
|
||||||
]:
|
]:
|
||||||
coordinator = await coordinator_for_device(
|
coordinator = await coordinator_for_device(
|
||||||
hass, api, device, coordinators_by_id
|
hass, entry, api, device, coordinators_by_id
|
||||||
)
|
)
|
||||||
devices_data.vacuums.append((device, coordinator))
|
devices_data.vacuums.append((device, coordinator))
|
||||||
|
|
||||||
if isinstance(device, Device) and device.device_type.startswith("Smart Lock"):
|
if isinstance(device, Device) and device.device_type.startswith("Smart Lock"):
|
||||||
coordinator = await coordinator_for_device(
|
coordinator = await coordinator_for_device(
|
||||||
hass, api, device, coordinators_by_id
|
hass, entry, api, device, coordinators_by_id
|
||||||
)
|
)
|
||||||
devices_data.locks.append((device, coordinator))
|
devices_data.locks.append((device, coordinator))
|
||||||
|
|
||||||
if isinstance(device, Device) and device.device_type in ["Bot"]:
|
if isinstance(device, Device) and device.device_type in ["Bot"]:
|
||||||
coordinator = await coordinator_for_device(
|
coordinator = await coordinator_for_device(
|
||||||
hass, api, device, coordinators_by_id
|
hass, entry, api, device, coordinators_by_id
|
||||||
)
|
)
|
||||||
if coordinator.data is not None:
|
if coordinator.data is not None:
|
||||||
if coordinator.data.get("deviceMode") == "pressMode":
|
if coordinator.data.get("deviceMode") == "pressMode":
|
||||||
@ -149,10 +152,10 @@ async def make_device_data(
|
|||||||
devices_data.switches.append((device, coordinator))
|
devices_data.switches.append((device, coordinator))
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry) -> bool:
|
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||||
"""Set up SwitchBot via API from a config entry."""
|
"""Set up SwitchBot via API from a config entry."""
|
||||||
token = config.data[CONF_API_TOKEN]
|
token = entry.data[CONF_API_TOKEN]
|
||||||
secret = config.data[CONF_API_KEY]
|
secret = entry.data[CONF_API_KEY]
|
||||||
|
|
||||||
api = SwitchBotAPI(token=token, secret=secret)
|
api = SwitchBotAPI(token=token, secret=secret)
|
||||||
try:
|
try:
|
||||||
@ -168,13 +171,13 @@ async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry) -> bool:
|
|||||||
coordinators_by_id: dict[str, SwitchBotCoordinator] = {}
|
coordinators_by_id: dict[str, SwitchBotCoordinator] = {}
|
||||||
|
|
||||||
switchbot_devices = await make_switchbot_devices(
|
switchbot_devices = await make_switchbot_devices(
|
||||||
hass, api, devices, coordinators_by_id
|
hass, entry, api, devices, coordinators_by_id
|
||||||
)
|
)
|
||||||
hass.data.setdefault(DOMAIN, {})
|
hass.data.setdefault(DOMAIN, {})
|
||||||
hass.data[DOMAIN][config.entry_id] = SwitchbotCloudData(
|
hass.data[DOMAIN][entry.entry_id] = SwitchbotCloudData(
|
||||||
api=api, devices=switchbot_devices
|
api=api, devices=switchbot_devices
|
||||||
)
|
)
|
||||||
await hass.config_entries.async_forward_entry_setups(config, PLATFORMS)
|
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ from typing import Any
|
|||||||
|
|
||||||
from switchbot_api import CannotConnect, Device, Remote, SwitchBotAPI
|
from switchbot_api import CannotConnect, Device, Remote, SwitchBotAPI
|
||||||
|
|
||||||
|
from homeassistant.config_entries import ConfigEntry
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
|
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
|
||||||
|
|
||||||
@ -19,16 +20,22 @@ type Status = dict[str, Any] | None
|
|||||||
class SwitchBotCoordinator(DataUpdateCoordinator[Status]):
|
class SwitchBotCoordinator(DataUpdateCoordinator[Status]):
|
||||||
"""SwitchBot Cloud coordinator."""
|
"""SwitchBot Cloud coordinator."""
|
||||||
|
|
||||||
|
config_entry: ConfigEntry
|
||||||
_api: SwitchBotAPI
|
_api: SwitchBotAPI
|
||||||
_device_id: str
|
_device_id: str
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self, hass: HomeAssistant, api: SwitchBotAPI, device: Device | Remote
|
self,
|
||||||
|
hass: HomeAssistant,
|
||||||
|
config_entry: ConfigEntry,
|
||||||
|
api: SwitchBotAPI,
|
||||||
|
device: Device | Remote,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize SwitchBot Cloud."""
|
"""Initialize SwitchBot Cloud."""
|
||||||
super().__init__(
|
super().__init__(
|
||||||
hass,
|
hass,
|
||||||
_LOGGER,
|
_LOGGER,
|
||||||
|
config_entry=config_entry,
|
||||||
name=DOMAIN,
|
name=DOMAIN,
|
||||||
update_interval=DEFAULT_SCAN_INTERVAL,
|
update_interval=DEFAULT_SCAN_INTERVAL,
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user