Extract logic to config function

Author: MartinHjelmare

homeassistant/components/backup/config.py

@@ -185,14 +185,8 @@ def update(
         if automatic_backups_configured is not UNDEFINED:
             self.data.automatic_backups_configured = automatic_backups_configured
         if create_backup is not UNDEFINED:
-            if (new_agent_ids := create_backup.get("agent_ids", [])) and (
-                discarded_agent_ids := set(self.data.create_backup.agent_ids)
-                - set(new_agent_ids)
-            ):
-                for agent_id in discarded_agent_ids:
-                    delete_automatic_backup_agents_unavailable_issue(
-                        self._hass, agent_id
-                    )
+            if new_agent_ids := create_backup.get("agent_ids"):
+                check_unavailable_agents(self._hass, self._manager, new_agent_ids)
             self.data.create_backup = replace(self.data.create_backup, **create_backup)
         if retention is not UNDEFINED:
             new_retention = RetentionConfig(**retention)
@@ -576,6 +570,35 @@ def _delete_filter(
     )
 
 
+@callback
+def check_unavailable_agents(
+    hass: HomeAssistant, manager: BackupManager, new_agent_ids: list[str] | None = None
+) -> None:
+    """Check for unavailable agents."""
+    if missing_agent_ids := set(manager.config.data.create_backup.agent_ids) - set(
+        manager.backup_agents
+    ):
+        LOGGER.debug(
+            "Agents %s are configured for automatic backup but are not loaded",
+            missing_agent_ids,
+        )
+        for agent_id in missing_agent_ids:
+            create_automatic_backup_agents_unavailable_issue(hass, agent_id)
+
+    # Remove any issues for agents that are now loaded
+    for agent_id in manager.backup_agents:
+        delete_automatic_backup_agents_unavailable_issue(hass, agent_id)
+
+    if new_agent_ids is None:
+        return
+
+    # Remove issues for agents that are no longer configured
+    for agent_id in set(manager.config.data.create_backup.agent_ids) - set(
+        new_agent_ids
+    ):
+        delete_automatic_backup_agents_unavailable_issue(hass, agent_id)
+
+
 @callback
 def create_automatic_backup_agents_unavailable_issue(
     hass: HomeAssistant, agent_id: str

homeassistant/components/backup/manager.py

@@ -32,6 +32,7 @@
     instance_id,
     integration_platform,
     issue_registry as ir,
+    start,
 )
 from homeassistant.helpers.backup import DATA_BACKUP
 from homeassistant.helpers.json import json_bytes
@@ -47,8 +48,7 @@
 from .config import (
     BackupConfig,
     CreateBackupParametersDict,
-    create_automatic_backup_agents_unavailable_issue,
-    delete_automatic_backup_agents_unavailable_issue,
+    check_unavailable_agents,
     delete_backups_exceeding_configured_count,
 )
 from .const import (
@@ -418,19 +418,13 @@ async def _async_reload_backup_agents(self, domain: str) -> None:
                 if isinstance(agent, LocalBackupAgent)
             }
         )
-        if missing_agent_ids := set(self.config.data.create_backup.agent_ids) - set(
-            self.backup_agents
-        ):
-            LOGGER.debug(
-                "Agents %s are configured for automatic backup but are not loaded",
-                missing_agent_ids,
-            )
-            for agent_id in missing_agent_ids:
-                create_automatic_backup_agents_unavailable_issue(self.hass, agent_id)
 
-        # Remove any issues for agents that are now loaded
-        for agent_id in self.backup_agents:
-            delete_automatic_backup_agents_unavailable_issue(self.hass, agent_id)
+        @callback
+        def check_unavailable_agents_after_start(hass: HomeAssistant) -> None:
+            """Check unavailable agents after start."""
+            check_unavailable_agents(hass, self)
+
+        start.async_at_started(self.hass, check_unavailable_agents_after_start)
 
     async def _add_platform(
         self,