Load resolution evaluation, check and fixups early

supervisor/bootstrap.py

@@ -55,6 +55,7 @@ async def initialize_coresys() -> CoreSys:
     # Initialize core objects
     coresys.docker = await DockerAPI(coresys).load_config()
     coresys.resolution = await ResolutionManager(coresys).load_config()
+    await coresys.resolution.load_modules()
     coresys.jobs = await JobManager(coresys).load_config()
     coresys.core = Core(coresys)
     coresys.plugins = await PluginManager(coresys).load_config()

supervisor/resolution/check.py

@@ -32,10 +32,10 @@ def all_checks(self) -> list[CheckBase]:
         """Return all list of all checks."""
         return list(self._checks.values())
 
-    async def load(self) -> None:
+    async def load_modules(self) -> None:
         """Load all checks."""
 
-        def _load() -> dict[str, CheckBase]:
+        def _load_modules() -> dict[str, CheckBase]:
             """Load and setup checks in executor."""
             package = f"{__package__}.checks"
             checks: dict[str, CheckBase] = {}
@@ -45,7 +45,7 @@ def _load() -> dict[str, CheckBase]:
                 checks[check.slug] = check
             return checks
 
-        self._checks = await self.sys_run_in_executor(_load)
+        self._checks = await self.sys_run_in_executor(_load_modules)
 
     def get(self, slug: str) -> CheckBase:
         """Return check based on slug."""

supervisor/resolution/evaluate.py

@@ -33,10 +33,10 @@ def all_evaluations(self) -> list[EvaluateBase]:
         """Return all list of all checks."""
         return list(self._evalutions.values())
 
-    async def load(self) -> None:
+    async def load_modules(self) -> None:
         """Load all evaluations."""
 
-        def _load() -> dict[str, EvaluateBase]:
+        def _load_modules() -> dict[str, EvaluateBase]:
             """Load and setup evaluations in executor."""
             package = f"{__package__}.evaluations"
             evaluations: dict[str, EvaluateBase] = {}
@@ -46,7 +46,7 @@ def _load() -> dict[str, EvaluateBase]:
                 evaluations[evaluation.slug] = evaluation
             return evaluations
 
-        self._evalutions = await self.sys_run_in_executor(_load)
+        self._evalutions = await self.sys_run_in_executor(_load_modules)
 
     def get(self, slug: str) -> EvaluateBase:
         """Return check based on slug."""

supervisor/resolution/fixup.py

@@ -22,10 +22,10 @@ def __init__(self, coresys: CoreSys) -> None:
         self.coresys = coresys
         self._fixups: dict[str, FixupBase] = {}
 
-    async def load(self) -> None:
+    async def load_modules(self) -> None:
         """Load all fixups."""
 
-        def _load() -> dict[str, FixupBase]:
+        def _load_modules() -> dict[str, FixupBase]:
             """Load and setup fixups in executor."""
             package = f"{__package__}.fixups"
             fixups: dict[str, FixupBase] = {}
@@ -35,7 +35,7 @@ def _load() -> dict[str, FixupBase]:
                 fixups[fixup.slug] = fixup
             return fixups
 
-        self._fixups = await self.sys_run_in_executor(_load)
+        self._fixups = await self.sys_run_in_executor(_load_modules)
 
     @property
     def all_fixes(self) -> list[FixupBase]:

supervisor/resolution/module.py

@@ -46,6 +46,12 @@ def __init__(self, coresys: CoreSys):
         self._unsupported: list[UnsupportedReason] = []
         self._unhealthy: list[UnhealthyReason] = []
 
+    async def load_modules(self):
+        """Load resolution evaluation, check and fixup modules."""
+        await self._evaluate.load_modules()
+        await self._check.load_modules()
+        await self._fixup.load_modules()
+
     @property
     def data(self) -> dict[str, Any]:
         """Return data."""
@@ -195,10 +201,6 @@ def add_issue(
 
     async def load(self):
         """Load the resoulution manager."""
-        await self.check.load()
-        await self.fixup.load()
-        await self.evaluate.load()
-
         # Initial healthcheck when the manager is loaded
         await self.healthcheck()
 

tests/conftest.py

@@ -328,9 +328,6 @@ async def coresys(
     coresys_obj._store.save_data = AsyncMock()
     coresys_obj._mounts.save_data = AsyncMock()
 
-    # Load resolution center
-    await coresys_obj.resolution.load()
-
     # Mock test client
     coresys_obj._supervisor.instance._meta = {
         "Config": {"Labels": {"io.hass.arch": "amd64"}}

tests/resolution/check/test_check.py

@@ -113,6 +113,6 @@ async def test_get_checks(coresys: CoreSys):
 
 async def test_dynamic_check_loader(coresys: CoreSys):
     """Test dynamic check loader, this ensures that all checks have defined a setup function."""
-    await coresys.resolution.check.load()
+    await coresys.resolution.check.load_modules()
     for check in get_valid_modules("checks"):
         assert check in coresys.resolution.check._checks