From 625d7e2e44cc9786d78df5bc04dff3e53ee8f9b2 Mon Sep 17 00:00:00 2001 From: Amit Finkelstein Date: Sat, 8 Nov 2025 16:31:02 +0200 Subject: [PATCH] Address review comments in Supervisor integrattion (#155928) --- homeassistant/components/hassio/const.py | 1 - .../components/hassio/coordinator.py | 24 +++---------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/homeassistant/components/hassio/const.py b/homeassistant/components/hassio/const.py index 9a7b9020058..0df1d03858e 100644 --- a/homeassistant/components/hassio/const.py +++ b/homeassistant/components/hassio/const.py @@ -90,7 +90,6 @@ DATA_SUPERVISOR_INFO = "hassio_supervisor_info" DATA_SUPERVISOR_STATS = "hassio_supervisor_stats" DATA_ADDONS_INFO = "hassio_addons_info" DATA_ADDONS_STATS = "hassio_addons_stats" -DATA_MOUNTS_INFO = "hassio_mounts_info" HASSIO_UPDATE_INTERVAL = timedelta(minutes=5) ATTR_AUTO_UPDATE = "auto_update" diff --git a/homeassistant/components/hassio/coordinator.py b/homeassistant/components/hassio/coordinator.py index 2a73ae6d63f..e67b76458a6 100644 --- a/homeassistant/components/hassio/coordinator.py +++ b/homeassistant/components/hassio/coordinator.py @@ -10,11 +10,7 @@ from typing import TYPE_CHECKING, Any from aiohasupervisor import SupervisorError, SupervisorNotFoundError from aiohasupervisor.models import StoreInfo -from aiohasupervisor.models.mounts import ( - CIFSMountResponse, - MountsInfo, - NFSMountResponse, -) +from aiohasupervisor.models.mounts import CIFSMountResponse, NFSMountResponse from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_MANUFACTURER, ATTR_NAME @@ -50,7 +46,6 @@ from .const import ( DATA_KEY_OS, DATA_KEY_SUPERVISOR, DATA_KEY_SUPERVISOR_ISSUES, - DATA_MOUNTS_INFO, DATA_NETWORK_INFO, DATA_OS_INFO, DATA_STORE, @@ -181,16 +176,6 @@ def get_core_info(hass: HomeAssistant) -> dict[str, Any] | None: return hass.data.get(DATA_CORE_INFO) -@callback -@bind_hass -def get_mounts_info(hass: HomeAssistant) -> MountsInfo | None: - """Return Home Assistant mounts information from Supervisor. - - Async friendly. - """ - return hass.data.get(DATA_MOUNTS_INFO) - - @callback @bind_hass def get_issues_info(hass: HomeAssistant) -> SupervisorIssues | None: @@ -364,6 +349,7 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator): addons_info = get_addons_info(self.hass) or {} addons_stats = get_addons_stats(self.hass) store_data = get_store(self.hass) + mounts_info = await self.supervisor_client.mounts.info() if store_data: repositories = { @@ -398,10 +384,7 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator): **get_supervisor_stats(self.hass), } new_data[DATA_KEY_HOST] = get_host_info(self.hass) or {} - new_data[DATA_KEY_MOUNTS] = { - mount.name: mount - for mount in getattr(get_mounts_info(self.hass), "mounts", []) - } + new_data[DATA_KEY_MOUNTS] = {mount.name: mount for mount in mounts_info.mounts} # If this is the initial refresh, register all addons and return the dict if is_first_update: @@ -485,7 +468,6 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator): DATA_CORE_INFO: hassio.get_core_info(), DATA_SUPERVISOR_INFO: hassio.get_supervisor_info(), DATA_OS_INFO: hassio.get_os_info(), - DATA_MOUNTS_INFO: self.supervisor_client.mounts.info(), } if CONTAINER_STATS in container_updates[CORE_CONTAINER]: updates[DATA_CORE_STATS] = hassio.get_core_stats()