Use runtime_data in seventeentrack integration (#167737)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

homeassistant/components/seventeentrack/__init__.py

@@ -3,7 +3,6 @@
 from pyseventeentrack import Client as SeventeenTrackClient
 from pyseventeentrack.errors import SeventeenTrackError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -12,7 +11,7 @@ from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
-from .coordinator import SeventeenTrackCoordinator
+from .coordinator import SeventeenTrackConfigEntry, SeventeenTrackCoordinator
 from .services import async_setup_services
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
@@ -28,7 +27,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, entry: SeventeenTrackConfigEntry
+) -> bool:
     """Set up 17Track from a config entry."""
 
     session = async_create_clientsession(hass)
@@ -43,6 +44,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await seventeen_coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = seventeen_coordinator
+    entry.runtime_data = seventeen_coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True

homeassistant/components/seventeentrack/config_flow.py

@@ -9,7 +9,7 @@ from pyseventeentrack import Client as SeventeenTrackClient
 from pyseventeentrack.errors import SeventeenTrackError
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import callback
 from homeassistant.helpers import aiohttp_client
@@ -25,6 +25,7 @@ from .const import (
     DEFAULT_SHOW_DELIVERED,
     DOMAIN,
 )
+from .coordinator import SeventeenTrackConfigEntry
 
 CONF_SHOW = {
     vol.Optional(CONF_SHOW_ARCHIVED, default=DEFAULT_SHOW_ARCHIVED): bool,
@@ -54,7 +55,7 @@ class SeventeenTrackConfigFlow(ConfigFlow, domain=DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: SeventeenTrackConfigEntry,
     ) -> SchemaOptionsFlowHandler:
         """Get options flow for this handler."""
         return SchemaOptionsFlowHandler(config_entry, OPTIONS_FLOW)

homeassistant/components/seventeentrack/coordinator.py

@@ -20,6 +20,8 @@ from .const import (
     LOGGER,
 )
 
+type SeventeenTrackConfigEntry = ConfigEntry[SeventeenTrackCoordinator]
+
 
 @dataclass
 class SeventeenTrackData:
@@ -32,12 +34,12 @@ class SeventeenTrackData:
 class SeventeenTrackCoordinator(DataUpdateCoordinator[SeventeenTrackData]):
     """Class to manage fetching 17Track data."""
 
-    config_entry: ConfigEntry
+    config_entry: SeventeenTrackConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
-        config_entry: ConfigEntry,
+        config_entry: SeventeenTrackConfigEntry,
         client: SeventeenTrackClient,
     ) -> None:
         """Initialize."""

homeassistant/components/seventeentrack/sensor.py

@@ -3,25 +3,24 @@
 from __future__ import annotations
 
 from homeassistant.components.sensor import SensorEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import SeventeenTrackCoordinator
 from .const import ATTRIBUTION, DOMAIN
+from .coordinator import SeventeenTrackConfigEntry, SeventeenTrackCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: SeventeenTrackConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a 17Track sensor entry."""
 
-    coordinator: SeventeenTrackCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         SeventeenTrackSummarySensor(status, coordinator)

homeassistant/components/seventeentrack/services.py

@@ -16,7 +16,6 @@ from homeassistant.core import (
 from homeassistant.helpers import config_validation as cv, selector, service
 from homeassistant.util import slugify
 
-from . import SeventeenTrackCoordinator
 from .const import (
     ATTR_DESTINATION_COUNTRY,
     ATTR_INFO_TEXT,
@@ -34,6 +33,7 @@ from .const import (
     SERVICE_ARCHIVE_PACKAGE,
     SERVICE_GET_PACKAGES,
 )
+from .coordinator import SeventeenTrackConfigEntry
 
 SERVICE_GET_PACKAGES_SCHEMA: Final = vol.Schema(
     {
@@ -72,13 +72,11 @@ async def _get_packages(call: ServiceCall) -> ServiceResponse:
     """Get packages from 17Track."""
     package_states = call.data.get(ATTR_PACKAGE_STATE, [])
 
-    entry = service.async_get_config_entry(
+    entry: SeventeenTrackConfigEntry = service.async_get_config_entry(
         call.hass, DOMAIN, call.data[ATTR_CONFIG_ENTRY_ID]
     )
 
-    seventeen_coordinator: SeventeenTrackCoordinator = call.hass.data[DOMAIN][
-        entry.entry_id
-    ]
+    seventeen_coordinator = entry.runtime_data
     live_packages = sorted(
         await seventeen_coordinator.client.profile.packages(
             show_archived=seventeen_coordinator.show_archived
@@ -99,13 +97,11 @@ async def _add_package(call: ServiceCall) -> None:
     tracking_number = call.data[ATTR_PACKAGE_TRACKING_NUMBER]
     friendly_name = call.data[ATTR_PACKAGE_FRIENDLY_NAME]
 
-    entry = service.async_get_config_entry(
+    entry: SeventeenTrackConfigEntry = service.async_get_config_entry(
         call.hass, DOMAIN, call.data[ATTR_CONFIG_ENTRY_ID]
     )
 
-    seventeen_coordinator: SeventeenTrackCoordinator = call.hass.data[DOMAIN][
-        entry.entry_id
-    ]
+    seventeen_coordinator = entry.runtime_data
 
     await seventeen_coordinator.client.profile.add_package(
         tracking_number, friendly_name
@@ -115,13 +111,11 @@ async def _add_package(call: ServiceCall) -> None:
 async def _archive_package(call: ServiceCall) -> None:
     tracking_number = call.data[ATTR_PACKAGE_TRACKING_NUMBER]
 
-    entry = service.async_get_config_entry(
+    entry: SeventeenTrackConfigEntry = service.async_get_config_entry(
         call.hass, DOMAIN, call.data[ATTR_CONFIG_ENTRY_ID]
     )
 
-    seventeen_coordinator: SeventeenTrackCoordinator = call.hass.data[DOMAIN][
-        entry.entry_id
-    ]
+    seventeen_coordinator = entry.runtime_data
 
     await seventeen_coordinator.client.profile.archive_package(tracking_number)