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

Explicitly pass in the config_entry in toon coordinator (#137899)

Browse Source 
explicitly pass in the config_entry in coordinator
This commit is contained in:
Michael 2025-02-08 22:02:30 +01:00 committed by GitHub
parent dfa2c218e4
commit 999badf675
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/toon/__init__.py
View File

@ -89,7 +89,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
implementation = await async_get_config_entry_implementation(hass, entry) implementation = await async_get_config_entry_implementation(hass, entry)
session = OAuth2Session(hass, entry, implementation) session = OAuth2Session(hass, entry, implementation)
coordinator = ToonDataUpdateCoordinator(hass, entry=entry, session=session) coordinator = ToonDataUpdateCoordinator(hass, entry, session)
await coordinator.toon.activate_agreement( await coordinator.toon.activate_agreement(
agreement_id=entry.data[CONF_AGREEMENT_ID] agreement_id=entry.data[CONF_AGREEMENT_ID]
) )

45
homeassistant/components/toon/coordinator.py
View File

@ -28,12 +28,13 @@ _LOGGER = logging.getLogger(__name__)
class ToonDataUpdateCoordinator(DataUpdateCoordinator[Status]): class ToonDataUpdateCoordinator(DataUpdateCoordinator[Status]):
"""Class to manage fetching Toon data from single endpoint.""" """Class to manage fetching Toon data from single endpoint."""
config_entry: ConfigEntry
def __init__( def __init__(
self, hass: HomeAssistant, *, entry: ConfigEntry, session: OAuth2Session self, hass: HomeAssistant, entry: ConfigEntry, session: OAuth2Session
) -> None: ) -> None:
"""Initialize global Toon data updater.""" """Initialize global Toon data updater."""
self.session = session self.session = session
self.entry = entry
async def async_token_refresh() -> str: async def async_token_refresh() -> str:
await session.async_ensure_token_valid() await session.async_ensure_token_valid()
@ -46,49 +47,55 @@ class ToonDataUpdateCoordinator(DataUpdateCoordinator[Status]):
) )
super().__init__( super().__init__(
hass, _LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL hass,
_LOGGER,
config_entry=entry,
name=DOMAIN,
update_interval=DEFAULT_SCAN_INTERVAL,
) )
async def register_webhook(self, event: Event | None = None) -> None: async def register_webhook(self, event: Event | None = None) -> None:
"""Register a webhook with Toon to get live updates.""" """Register a webhook with Toon to get live updates."""
if CONF_WEBHOOK_ID not in self.entry.data: if CONF_WEBHOOK_ID not in self.config_entry.data:
data = {**self.entry.data, CONF_WEBHOOK_ID: secrets.token_hex()} data = {**self.config_entry.data, CONF_WEBHOOK_ID: secrets.token_hex()}
self.hass.config_entries.async_update_entry(self.entry, data=data) self.hass.config_entries.async_update_entry(self.config_entry, data=data)
if cloud.async_active_subscription(self.hass): if cloud.async_active_subscription(self.hass):
if CONF_CLOUDHOOK_URL not in self.entry.data: if CONF_CLOUDHOOK_URL not in self.config_entry.data:
try: try:
webhook_url = await cloud.async_create_cloudhook( webhook_url = await cloud.async_create_cloudhook(
self.hass, self.entry.data[CONF_WEBHOOK_ID] self.hass, self.config_entry.data[CONF_WEBHOOK_ID]
) )
except cloud.CloudNotConnected: except cloud.CloudNotConnected:
webhook_url = webhook.async_generate_url( webhook_url = webhook.async_generate_url(
self.hass, self.entry.data[CONF_WEBHOOK_ID] self.hass, self.config_entry.data[CONF_WEBHOOK_ID]
) )
else: else:
data = {**self.entry.data, CONF_CLOUDHOOK_URL: webhook_url} data = {**self.config_entry.data, CONF_CLOUDHOOK_URL: webhook_url}
self.hass.config_entries.async_update_entry(self.entry, data=data) self.hass.config_entries.async_update_entry(
self.config_entry, data=data
)
else: else:
webhook_url = self.entry.data[CONF_CLOUDHOOK_URL] webhook_url = self.config_entry.data[CONF_CLOUDHOOK_URL]
else: else:
webhook_url = webhook.async_generate_url( webhook_url = webhook.async_generate_url(
self.hass, self.entry.data[CONF_WEBHOOK_ID] self.hass, self.config_entry.data[CONF_WEBHOOK_ID]
) )
# Ensure the webhook is not registered already # Ensure the webhook is not registered already
webhook_unregister(self.hass, self.entry.data[CONF_WEBHOOK_ID]) webhook_unregister(self.hass, self.config_entry.data[CONF_WEBHOOK_ID])
webhook_register( webhook_register(
self.hass, self.hass,
DOMAIN, DOMAIN,
"Toon", "Toon",
self.entry.data[CONF_WEBHOOK_ID], self.config_entry.data[CONF_WEBHOOK_ID],
self.handle_webhook, self.handle_webhook,
) )
try: try:
await self.toon.subscribe_webhook( await self.toon.subscribe_webhook(
application_id=self.entry.entry_id, url=webhook_url application_id=self.config_entry.entry_id, url=webhook_url
) )
_LOGGER.debug("Registered Toon webhook: %s", webhook_url) _LOGGER.debug("Registered Toon webhook: %s", webhook_url)
except ToonError as err: except ToonError as err:
@ -131,14 +138,14 @@ class ToonDataUpdateCoordinator(DataUpdateCoordinator[Status]):
async def unregister_webhook(self, event: Event | None = None) -> None: async def unregister_webhook(self, event: Event | None = None) -> None:
"""Remove / Unregister webhook for toon.""" """Remove / Unregister webhook for toon."""
_LOGGER.debug( _LOGGER.debug(
"Unregistering Toon webhook (%s)", self.entry.data[CONF_WEBHOOK_ID] "Unregistering Toon webhook (%s)", self.config_entry.data[CONF_WEBHOOK_ID]
) )
try: try:
await self.toon.unsubscribe_webhook(self.entry.entry_id) await self.toon.unsubscribe_webhook(self.config_entry.entry_id)
except ToonError as err: except ToonError as err:
_LOGGER.error("Failed unregistering Toon webhook - %s", err) _LOGGER.error("Failed unregistering Toon webhook - %s", err)
webhook_unregister(self.hass, self.entry.data[CONF_WEBHOOK_ID]) webhook_unregister(self.hass, self.config_entry.data[CONF_WEBHOOK_ID])
async def _async_update_data(self) -> Status: async def _async_update_data(self) -> Status:
"""Fetch data from Toon.""" """Fetch data from Toon."""