jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-28 07:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly pass in the config_entry in risco coordinator (#137972)

Browse Source 
explicitly pass in the config_entry in coordinator
This commit is contained in:
Michael 2025-02-09 15:44:18 +01:00 committed by GitHub
parent 8f4a466c3d
commit 7b42dc5c35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
homeassistant/components/risco/__init__.py
View File

@ -16,7 +16,6 @@ from homeassistant.const import (
CONF_PASSWORD, CONF_PASSWORD,
CONF_PIN, CONF_PIN,
CONF_PORT, CONF_PORT,
CONF_SCAN_INTERVAL,
CONF_TYPE, CONF_TYPE,
CONF_USERNAME, CONF_USERNAME,
Platform, Platform,
@ -30,7 +29,6 @@ from .const import (
CONF_CONCURRENCY, CONF_CONCURRENCY,
DATA_COORDINATOR, DATA_COORDINATOR,
DEFAULT_CONCURRENCY, DEFAULT_CONCURRENCY,
DEFAULT_SCAN_INTERVAL,
DOMAIN, DOMAIN,
EVENTS_COORDINATOR, EVENTS_COORDINATOR,
SYSTEM_UPDATE_SIGNAL, SYSTEM_UPDATE_SIGNAL,
@ -144,12 +142,9 @@ async def _async_setup_cloud_entry(hass: HomeAssistant, entry: ConfigEntry) -> b
except UnauthorizedError as error: except UnauthorizedError as error:
raise ConfigEntryAuthFailed from error raise ConfigEntryAuthFailed from error
scan_interval = entry.options.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL) coordinator = RiscoDataUpdateCoordinator(hass, entry, risco)
coordinator = RiscoDataUpdateCoordinator(hass, risco, scan_interval)
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
events_coordinator = RiscoEventsDataUpdateCoordinator( events_coordinator = RiscoEventsDataUpdateCoordinator(hass, entry, risco)
hass, risco, entry.entry_id, 60
)
entry.async_on_unload(entry.add_update_listener(_update_listener)) entry.async_on_unload(entry.add_update_listener(_update_listener))

34
homeassistant/components/risco/coordinator.py
View File

@ -10,11 +10,13 @@ from pyrisco import CannotConnectError, OperationError, RiscoCloud, Unauthorized
from pyrisco.cloud.alarm import Alarm from pyrisco.cloud.alarm import Alarm
from pyrisco.cloud.event import Event from pyrisco.cloud.event import Event
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_SCAN_INTERVAL
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.storage import Store from homeassistant.helpers.storage import Store
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
from .const import DOMAIN from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
LAST_EVENT_STORAGE_VERSION = 1 LAST_EVENT_STORAGE_VERSION = 1
LAST_EVENT_TIMESTAMP_KEY = "last_event_timestamp" LAST_EVENT_TIMESTAMP_KEY = "last_event_timestamp"
@ -24,17 +26,26 @@ _LOGGER = logging.getLogger(__name__)
class RiscoDataUpdateCoordinator(DataUpdateCoordinator[Alarm]): class RiscoDataUpdateCoordinator(DataUpdateCoordinator[Alarm]):
"""Class to manage fetching risco data.""" """Class to manage fetching risco data."""
config_entry: ConfigEntry
def __init__( def __init__(
self, hass: HomeAssistant, risco: RiscoCloud, scan_interval: int self,
hass: HomeAssistant,
config_entry: ConfigEntry,
risco: RiscoCloud,
) -> None: ) -> None:
"""Initialize global risco data updater.""" """Initialize global risco data updater."""
self.risco = risco self.risco = risco
interval = timedelta(seconds=scan_interval)
super().__init__( super().__init__(
hass, hass,
_LOGGER, _LOGGER,
config_entry=config_entry,
name=DOMAIN, name=DOMAIN,
update_interval=interval, update_interval=timedelta(
seconds=config_entry.options.get(
CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
)
),
) )
async def _async_update_data(self) -> Alarm: async def _async_update_data(self) -> Alarm:
@ -48,20 +59,27 @@ class RiscoDataUpdateCoordinator(DataUpdateCoordinator[Alarm]):
class RiscoEventsDataUpdateCoordinator(DataUpdateCoordinator[list[Event]]): class RiscoEventsDataUpdateCoordinator(DataUpdateCoordinator[list[Event]]):
"""Class to manage fetching risco data.""" """Class to manage fetching risco data."""
config_entry: ConfigEntry
def __init__( def __init__(
self, hass: HomeAssistant, risco: RiscoCloud, eid: str, scan_interval: int self,
hass: HomeAssistant,
config_entry: ConfigEntry,
risco: RiscoCloud,
) -> None: ) -> None:
"""Initialize global risco data updater.""" """Initialize global risco data updater."""
self.risco = risco self.risco = risco
self._store = Store[dict[str, Any]]( self._store = Store[dict[str, Any]](
hass, LAST_EVENT_STORAGE_VERSION, f"risco_{eid}_last_event_timestamp" hass,
LAST_EVENT_STORAGE_VERSION,
f"risco_{config_entry.entry_id}_last_event_timestamp",
) )
interval = timedelta(seconds=scan_interval)
super().__init__( super().__init__(
hass, hass,
_LOGGER, _LOGGER,
config_entry=config_entry,
name=f"{DOMAIN}_events", name=f"{DOMAIN}_events",
update_interval=interval, update_interval=timedelta(seconds=60),
) )
async def _async_update_data(self) -> list[Event]: async def _async_update_data(self) -> list[Event]: