Keep addons until core can be refactored

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
+      - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 30

requirements.txt

@@ -1,7 +1,7 @@
 aiodns==3.5.0
-aiohttp==3.13.0
+aiohttp==3.12.15
 atomicwrites-homeassistant==1.4.1
-attrs==25.4.0
+attrs==25.3.0
 awesomeversion==25.8.0
 blockbuster==1.5.25
 brotli==1.1.0
@@ -23,8 +23,8 @@ pyudev==0.24.3
 PyYAML==6.0.3
 requests==2.32.5
 securetar==2025.2.1
-sentry-sdk==2.40.0
+sentry-sdk==2.39.0
 setuptools==80.9.0
 voluptuous==0.15.2
-dbus-fast==2.44.5
+dbus-fast==2.44.3
 zlib-fast==0.2.1

requirements_tests.txt

@@ -2,13 +2,13 @@ astroid==3.3.11
 coverage==7.10.7
 mypy==1.18.2
 pre-commit==4.3.0
-pylint==3.3.9
+pylint==3.3.8
 pytest-aiohttp==1.1.0
 pytest-asyncio==0.25.2
 pytest-cov==7.0.0
 pytest-timeout==2.4.0
 pytest==8.4.2
-ruff==0.13.3
+ruff==0.13.2
 time-machine==2.19.0
 types-docker==7.1.0.20250916
 types-pyyaml==6.0.12.20250915

supervisor/addons/addon.py

@@ -226,7 +226,6 @@ class Addon(AddonModel):
         )
 
         await self._check_ingress_port()
-
         default_image = self._image(self.data)
         try:
             await self.instance.attach(version=self.version)
@@ -775,6 +774,7 @@ class Addon(AddonModel):
             raise AddonsError("Missing from store, cannot install!")
 
         await self.sys_addons.data.install(self.addon_store)
+        await self.load()
 
         def setup_data():
             if not self.path_data.is_dir():
@@ -797,9 +797,6 @@ class Addon(AddonModel):
             await self.sys_addons.data.uninstall(self)
             raise AddonsError() from err
 
-        # Finish initialization and set up listeners
-        await self.load()
-
         # Add to addon manager
         self.sys_addons.local[self.slug] = self
 

supervisor/addons/manager.py

@@ -9,6 +9,8 @@ from typing import Self, Union
 
 from attr import evolve
 
+from supervisor.jobs.const import JobConcurrency
+
 from ..const import AddonBoot, AddonStartup, AddonState
 from ..coresys import CoreSys, CoreSysAttributes
 from ..exceptions import (
@@ -19,8 +21,6 @@ from ..exceptions import (
     DockerError,
     HassioError,
 )
-from ..jobs import ChildJobSyncFilter
-from ..jobs.const import JobConcurrency
 from ..jobs.decorator import Job, JobCondition
 from ..resolution.const import ContextType, IssueType, SuggestionType
 from ..store.addon import AddonStore
@@ -182,9 +182,6 @@ class AddonManager(CoreSysAttributes):
         conditions=ADDON_UPDATE_CONDITIONS,
         on_condition=AddonsJobError,
         concurrency=JobConcurrency.QUEUE,
-        child_job_syncs=[
-            ChildJobSyncFilter("docker_interface_install", progress_allocation=1.0)
-        ],
     )
     async def install(
         self, slug: str, *, validation_complete: asyncio.Event | None = None
@@ -232,13 +229,6 @@ class AddonManager(CoreSysAttributes):
         name="addon_manager_update",
         conditions=ADDON_UPDATE_CONDITIONS,
         on_condition=AddonsJobError,
-        # We assume for now the docker image pull is 100% of this task for progress
-        # allocation. But from a user perspective that isn't true. Other steps
-        # that take time which is not accounted for in progress include:
-        # partial backup, image cleanup, apparmor update, and addon restart
-        child_job_syncs=[
-            ChildJobSyncFilter("docker_interface_install", progress_allocation=1.0)
-        ],
     )
     async def update(
         self,
@@ -281,10 +271,7 @@ class AddonManager(CoreSysAttributes):
                 addons=[addon.slug],
             )
 
-        task = await addon.update()
-
-        _LOGGER.info("Add-on '%s' successfully updated", slug)
-        return task
+        return await addon.update()
 
     @Job(
         name="addon_manager_rebuild",

supervisor/api/supervisor.py

@@ -108,8 +108,7 @@ class APISupervisor(CoreSysAttributes):
             ATTR_AUTO_UPDATE: self.sys_updater.auto_update,
             ATTR_DETECT_BLOCKING_IO: BlockBusterManager.is_enabled(),
             ATTR_COUNTRY: self.sys_config.country,
-            # Depricated
-            ATTR_WAIT_BOOT: self.sys_config.wait_boot,
+            # Deprecated
             ATTR_ADDONS: [
                 {
                     ATTR_NAME: addon.name,
@@ -123,10 +122,6 @@ class APISupervisor(CoreSysAttributes):
                 }
                 for addon in self.sys_addons.local.values()
             ],
-            ATTR_ADDONS_REPOSITORIES: [
-                {ATTR_NAME: store.name, ATTR_SLUG: store.slug}
-                for store in self.sys_store.all
-            ],
         }
 
     @api_process
@@ -182,20 +177,10 @@ class APISupervisor(CoreSysAttributes):
                 self.sys_config.detect_blocking_io = False
                 BlockBusterManager.deactivate()
 
-        # Deprecated
-        if ATTR_WAIT_BOOT in body:
-            self.sys_config.wait_boot = body[ATTR_WAIT_BOOT]
-
         # Save changes before processing addons in case of errors
         await self.sys_updater.save_data()
         await self.sys_config.save_data()
 
-        # Remove: 2022.9
-        if ATTR_ADDONS_REPOSITORIES in body:
-            await asyncio.shield(
-                self.sys_store.update_repositories(set(body[ATTR_ADDONS_REPOSITORIES]))
-            )
-
         await self.sys_resolution.evaluate.evaluate_system()
 
     @api_process

supervisor/docker/interface.py

@@ -220,12 +220,10 @@ class DockerInterface(JobGroup, ABC):
 
         await self.sys_run_in_executor(self.sys_docker.docker.login, **credentials)
 
-    def _process_pull_image_log(
-        self, install_job_id: str, reference: PullLogEntry
-    ) -> None:
+    def _process_pull_image_log(self, job_id: str, reference: PullLogEntry) -> None:
         """Process events fired from a docker while pulling an image, filtered to a given job id."""
         if (
-            reference.job_id != install_job_id
+            reference.job_id != job_id
             or not reference.id
             or not reference.status
             or not (stage := PullImageLayerStage.from_status(reference.status))
@@ -239,22 +237,21 @@ class DockerInterface(JobGroup, ABC):
                 name="Pulling container image layer",
                 initial_stage=stage.status,
                 reference=reference.id,
-                parent_id=install_job_id,
-                internal=True,
+                parent_id=job_id,
             )
             job.done = False
             return
 
         # Find our sub job to update details of
         for j in self.sys_jobs.jobs:
-            if j.parent_id == install_job_id and j.reference == reference.id:
+            if j.parent_id == job_id and j.reference == reference.id:
                 job = j
                 break
 
         # This likely only occurs if the logs came in out of sync and we got progress before the Pulling FS Layer one
         if not job:
             raise DockerLogOutOfOrder(
-                f"Received pull image log with status {reference.status} for image id {reference.id} and parent job {install_job_id} but could not find a matching job, skipping",
+                f"Received pull image log with status {reference.status} for image id {reference.id} and parent job {job_id} but could not find a matching job, skipping",
                 _LOGGER.debug,
             )
 
@@ -328,56 +325,10 @@ class DockerInterface(JobGroup, ABC):
                 else job.extra,
             )
 
-        # Once we have received a progress update for every child job, start to set status of the main one
-        install_job = self.sys_jobs.get_job(install_job_id)
-        layer_jobs = [
-            job
-            for job in self.sys_jobs.jobs
-            if job.parent_id == install_job.uuid
-            and job.name == "Pulling container image layer"
-        ]
-
-        # First set the total bytes to be downloaded/extracted on the main job
-        if not install_job.extra:
-            total = 0
-            for job in layer_jobs:
-                if not job.extra:
-                    return
-                total += job.extra["total"]
-            install_job.extra = {"total": total}
-        else:
-            total = install_job.extra["total"]
-
-        # Then determine total progress based on progress of each sub-job, factoring in size of each compared to total
-        progress = 0.0
-        stage = PullImageLayerStage.PULL_COMPLETE
-        for job in layer_jobs:
-            if not job.extra:
-                return
-            progress += job.progress * (job.extra["total"] / total)
-            job_stage = PullImageLayerStage.from_status(cast(str, job.stage))
-
-            if job_stage < PullImageLayerStage.EXTRACTING:
-                stage = PullImageLayerStage.DOWNLOADING
-            elif (
-                stage == PullImageLayerStage.PULL_COMPLETE
-                and job_stage < PullImageLayerStage.PULL_COMPLETE
-            ):
-                stage = PullImageLayerStage.EXTRACTING
-
-        # Ensure progress is 100 at this point to prevent float drift
-        if stage == PullImageLayerStage.PULL_COMPLETE:
-            progress = 100
-
-        # To reduce noise, limit updates to when result has changed by an entire percent or when stage changed
-        if stage != install_job.stage or progress >= install_job.progress + 1:
-            install_job.update(stage=stage.status, progress=progress)
-
     @Job(
         name="docker_interface_install",
         on_condition=DockerJobError,
         concurrency=JobConcurrency.GROUP_REJECT,
-        internal=True,
     )
     async def install(
         self,
@@ -400,11 +351,11 @@ class DockerInterface(JobGroup, ABC):
                 # Try login if we have defined credentials
                 await self._docker_login(image)
 
-            curr_job_id = self.sys_jobs.current.uuid
+            job_id = self.sys_jobs.current.uuid
 
             async def process_pull_image_log(reference: PullLogEntry) -> None:
                 try:
-                    self._process_pull_image_log(curr_job_id, reference)
+                    self._process_pull_image_log(job_id, reference)
                 except DockerLogOutOfOrder as err:
                     # Send all these to sentry. Missing a few progress updates
                     # shouldn't matter to users but matters to us
@@ -678,10 +629,7 @@ class DockerInterface(JobGroup, ABC):
         concurrency=JobConcurrency.GROUP_REJECT,
     )
     async def update(
-        self,
-        version: AwesomeVersion,
-        image: str | None = None,
-        latest: bool = False,
+        self, version: AwesomeVersion, image: str | None = None, latest: bool = False
     ) -> None:
         """Update a Docker image."""
         image = image or self.image

supervisor/homeassistant/core.py

@@ -28,7 +28,6 @@ from ..exceptions import (
     HomeAssistantUpdateError,
     JobException,
 )
-from ..jobs import ChildJobSyncFilter
 from ..jobs.const import JOB_GROUP_HOME_ASSISTANT_CORE, JobConcurrency, JobThrottle
 from ..jobs.decorator import Job, JobCondition
 from ..jobs.job_group import JobGroup
@@ -225,13 +224,6 @@ class HomeAssistantCore(JobGroup):
         ],
         on_condition=HomeAssistantJobError,
         concurrency=JobConcurrency.GROUP_REJECT,
-        # We assume for now the docker image pull is 100% of this task. But from
-        # a user perspective that isn't true. Other steps that take time which
-        # is not accounted for in progress include: partial backup, image
-        # cleanup, and Home Assistant restart
-        child_job_syncs=[
-            ChildJobSyncFilter("docker_interface_install", progress_allocation=1.0)
-        ],
     )
     async def update(
         self,

supervisor/jobs/__init__.py

@@ -282,10 +282,8 @@ class JobManager(FileConfiguration, CoreSysAttributes):
                 # reporting shouldn't raise and break the active job
                 continue
 
-            progress = min(
-                100,
-                sync.starting_progress
-                + (sync.progress_allocation * job_data["progress"]),
+            progress = sync.starting_progress + (
+                sync.progress_allocation * job_data["progress"]
             )
             # Using max would always trigger on change even if progress was unchanged
             # pylint: disable-next=R1731

supervisor/supervisor.py

@@ -13,8 +13,6 @@ import aiohttp
 from aiohttp.client_exceptions import ClientError
 from awesomeversion import AwesomeVersion, AwesomeVersionException
 
-from supervisor.jobs import ChildJobSyncFilter
-
 from .const import (
     ATTR_SUPERVISOR_INTERNET,
     SUPERVISOR_VERSION,
@@ -197,15 +195,6 @@ class Supervisor(CoreSysAttributes):
             if temp_dir:
                 await self.sys_run_in_executor(temp_dir.cleanup)
 
-    @Job(
-        name="supervisor_update",
-        # We assume for now the docker image pull is 100% of this task. But from
-        # a user perspective that isn't true.  Other steps that take time which
-        # is not accounted for in progress include: app armor update and restart
-        child_job_syncs=[
-            ChildJobSyncFilter("docker_interface_install", progress_allocation=1.0)
-        ],
-    )
     async def update(self, version: AwesomeVersion | None = None) -> None:
         """Update Supervisor version."""
         version = version or self.latest_version or self.version
@@ -232,7 +221,6 @@ class Supervisor(CoreSysAttributes):
 
         # Update container
         _LOGGER.info("Update Supervisor to version %s", version)
-
         try:
             await self.instance.install(version, image=image)
             await self.instance.update_start_tag(image, version)

tests/api/test_homeassistant.py

@@ -2,19 +2,16 @@
 
 import asyncio
 from pathlib import Path
-from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
+from unittest.mock import MagicMock, PropertyMock, patch
 
 from aiohttp.test_utils import TestClient
 from awesomeversion import AwesomeVersion
 import pytest
 
 from supervisor.backups.manager import BackupManager
-from supervisor.const import CoreState
 from supervisor.coresys import CoreSys
-from supervisor.docker.homeassistant import DockerHomeAssistant
 from supervisor.docker.interface import DockerInterface
-from supervisor.homeassistant.api import APIState, HomeAssistantAPI
-from supervisor.homeassistant.const import WSEvent
+from supervisor.homeassistant.api import APIState
 from supervisor.homeassistant.core import HomeAssistantCore
 from supervisor.homeassistant.module import HomeAssistant
 
@@ -274,96 +271,3 @@ async def test_background_home_assistant_update_fails_fast(
     assert resp.status == 400
     body = await resp.json()
     assert body["message"] == "Version 2025.8.3 is already installed"
-
-
-@pytest.mark.usefixtures("tmp_supervisor_data")
-async def test_api_progress_updates_home_assistant_update(
-    api_client: TestClient, coresys: CoreSys, ha_ws_client: AsyncMock
-):
-    """Test progress updates sent to Home Assistant for updates."""
-    coresys.hardware.disk.get_disk_free_space = lambda x: 5000
-    coresys.core.set_state(CoreState.RUNNING)
-    coresys.docker.docker.api.pull.return_value = load_json_fixture(
-        "docker_pull_image_log.json"
-    )
-    coresys.homeassistant.version = AwesomeVersion("2025.8.0")
-
-    with (
-        patch.object(
-            DockerHomeAssistant,
-            "version",
-            new=PropertyMock(return_value=AwesomeVersion("2025.8.0")),
-        ),
-        patch.object(
-            HomeAssistantAPI, "get_config", return_value={"components": ["frontend"]}
-        ),
-    ):
-        resp = await api_client.post("/core/update", json={"version": "2025.8.3"})
-
-    assert resp.status == 200
-
-    events = [
-        {
-            "stage": evt.args[0]["data"]["data"]["stage"],
-            "progress": evt.args[0]["data"]["data"]["progress"],
-            "done": evt.args[0]["data"]["data"]["done"],
-        }
-        for evt in ha_ws_client.async_send_command.call_args_list
-        if "data" in evt.args[0]
-        and evt.args[0]["data"]["event"] == WSEvent.JOB
-        and evt.args[0]["data"]["data"]["name"] == "home_assistant_core_update"
-    ]
-    assert events[:5] == [
-        {
-            "stage": None,
-            "progress": 0,
-            "done": None,
-        },
-        {
-            "stage": None,
-            "progress": 0,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 0.1,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 1.2,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 2.8,
-            "done": False,
-        },
-    ]
-    assert events[-5:] == [
-        {
-            "stage": None,
-            "progress": 97.2,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 98.4,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 99.4,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 100,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 100,
-            "done": True,
-        },
-    ]

tests/api/test_store.py

@@ -13,13 +13,12 @@ from supervisor.addons.addon import Addon
 from supervisor.arch import CpuArch
 from supervisor.backups.manager import BackupManager
 from supervisor.config import CoreConfig
-from supervisor.const import AddonState, CoreState
+from supervisor.const import AddonState
 from supervisor.coresys import CoreSys
 from supervisor.docker.addon import DockerAddon
 from supervisor.docker.const import ContainerState
 from supervisor.docker.interface import DockerInterface
 from supervisor.docker.monitor import DockerContainerStateEvent
-from supervisor.homeassistant.const import WSEvent
 from supervisor.homeassistant.module import HomeAssistant
 from supervisor.store.addon import AddonStore
 from supervisor.store.repository import Repository
@@ -710,101 +709,3 @@ async def test_api_store_addons_addon_availability_installed_addon(
         assert (
             "requires Home Assistant version 2023.1.1 or greater" in result["message"]
         )
-
-
-@pytest.mark.parametrize(
-    ("action", "job_name", "addon_slug"),
-    [
-        ("install", "addon_manager_install", "local_ssh"),
-        ("update", "addon_manager_update", "local_example"),
-    ],
-)
-@pytest.mark.usefixtures("tmp_supervisor_data")
-async def test_api_progress_updates_addon_install_update(
-    api_client: TestClient,
-    coresys: CoreSys,
-    ha_ws_client: AsyncMock,
-    install_addon_example: Addon,
-    action: str,
-    job_name: str,
-    addon_slug: str,
-):
-    """Test progress updates sent to Home Assistant for installs/updates."""
-    coresys.hardware.disk.get_disk_free_space = lambda x: 5000
-    coresys.core.set_state(CoreState.RUNNING)
-    coresys.docker.docker.api.pull.return_value = load_json_fixture(
-        "docker_pull_image_log.json"
-    )
-    coresys.arch._supported_arch = ["amd64"]  # pylint: disable=protected-access
-    install_addon_example.data_store["version"] = AwesomeVersion("2.0.0")
-
-    with (
-        patch.object(Addon, "load"),
-        patch.object(Addon, "need_build", new=PropertyMock(return_value=False)),
-        patch.object(Addon, "latest_need_build", new=PropertyMock(return_value=False)),
-    ):
-        resp = await api_client.post(f"/store/addons/{addon_slug}/{action}")
-
-    assert resp.status == 200
-
-    events = [
-        {
-            "stage": evt.args[0]["data"]["data"]["stage"],
-            "progress": evt.args[0]["data"]["data"]["progress"],
-            "done": evt.args[0]["data"]["data"]["done"],
-        }
-        for evt in ha_ws_client.async_send_command.call_args_list
-        if "data" in evt.args[0]
-        and evt.args[0]["data"]["event"] == WSEvent.JOB
-        and evt.args[0]["data"]["data"]["name"] == job_name
-        and evt.args[0]["data"]["data"]["reference"] == addon_slug
-    ]
-    assert events[:4] == [
-        {
-            "stage": None,
-            "progress": 0,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 0.1,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 1.2,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 2.8,
-            "done": False,
-        },
-    ]
-    assert events[-5:] == [
-        {
-            "stage": None,
-            "progress": 97.2,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 98.4,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 99.4,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 100,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 100,
-            "done": True,
-        },
-    ]

tests/api/test_supervisor.py

@@ -2,24 +2,16 @@
 
 # pylint: disable=protected-access
 import time
-from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 from aiohttp.test_utils import TestClient
-from awesomeversion import AwesomeVersion
 from blockbuster import BlockingError
 import pytest
 
-from supervisor.const import CoreState
-from supervisor.core import Core
 from supervisor.coresys import CoreSys
-from supervisor.exceptions import HassioError, HostNotSupportedError, StoreGitError
-from supervisor.homeassistant.const import WSEvent
-from supervisor.store.repository import Repository
-from supervisor.supervisor import Supervisor
-from supervisor.updater import Updater
+from supervisor.exceptions import HassioError, HostNotSupportedError
 
 from tests.api import common_test_api_advanced_logs
-from tests.common import load_json_fixture
 from tests.dbus_service_mocks.base import DBusServiceMock
 from tests.dbus_service_mocks.os_agent import OSAgent as OSAgentService
 
@@ -35,81 +27,6 @@ async def test_api_supervisor_options_debug(api_client: TestClient, coresys: Cor
     assert coresys.config.debug
 
 
-async def test_api_supervisor_options_add_repository(
-    api_client: TestClient, coresys: CoreSys, supervisor_internet: AsyncMock
-):
-    """Test add a repository via POST /supervisor/options REST API."""
-    assert REPO_URL not in coresys.store.repository_urls
-
-    with (
-        patch("supervisor.store.repository.RepositoryGit.load", return_value=None),
-        patch("supervisor.store.repository.RepositoryGit.validate", return_value=True),
-    ):
-        response = await api_client.post(
-            "/supervisor/options", json={"addons_repositories": [REPO_URL]}
-        )
-
-    assert response.status == 200
-    assert REPO_URL in coresys.store.repository_urls
-
-
-async def test_api_supervisor_options_remove_repository(
-    api_client: TestClient, coresys: CoreSys, test_repository: Repository
-):
-    """Test remove a repository via POST /supervisor/options REST API."""
-    assert test_repository.source in coresys.store.repository_urls
-    assert test_repository.slug in coresys.store.repositories
-
-    response = await api_client.post(
-        "/supervisor/options", json={"addons_repositories": []}
-    )
-
-    assert response.status == 200
-    assert test_repository.source not in coresys.store.repository_urls
-    assert test_repository.slug not in coresys.store.repositories
-
-
-@pytest.mark.parametrize("git_error", [None, StoreGitError()])
-async def test_api_supervisor_options_repositories_skipped_on_error(
-    api_client: TestClient, coresys: CoreSys, git_error: StoreGitError
-):
-    """Test repositories skipped on error via POST /supervisor/options REST API."""
-    with (
-        patch("supervisor.store.repository.RepositoryGit.load", side_effect=git_error),
-        patch("supervisor.store.repository.RepositoryGit.validate", return_value=False),
-        patch("supervisor.store.repository.RepositoryCustom.remove"),
-    ):
-        response = await api_client.post(
-            "/supervisor/options", json={"addons_repositories": [REPO_URL]}
-        )
-
-    assert response.status == 400
-    assert len(coresys.resolution.suggestions) == 0
-    assert REPO_URL not in coresys.store.repository_urls
-
-
-async def test_api_supervisor_options_repo_error_with_config_change(
-    api_client: TestClient, coresys: CoreSys
-):
-    """Test config change with add repository error via POST /supervisor/options REST API."""
-    assert not coresys.config.debug
-
-    with patch(
-        "supervisor.store.repository.RepositoryGit.load", side_effect=StoreGitError()
-    ):
-        response = await api_client.post(
-            "/supervisor/options",
-            json={"debug": True, "addons_repositories": [REPO_URL]},
-        )
-
-    assert response.status == 400
-    assert REPO_URL not in coresys.store.repository_urls
-
-    assert coresys.config.debug
-    coresys.updater.save_data.assert_called_once()
-    coresys.config.save_data.assert_called_once()
-
-
 async def test_api_supervisor_options_auto_update(
     api_client: TestClient, coresys: CoreSys
 ):
@@ -323,97 +240,3 @@ async def test_api_supervisor_options_blocking_io(
 
     # This should not raise blocking error anymore
     time.sleep(0)
-
-
-@pytest.mark.usefixtures("tmp_supervisor_data")
-async def test_api_progress_updates_supervisor_update(
-    api_client: TestClient, coresys: CoreSys, ha_ws_client: AsyncMock
-):
-    """Test progress updates sent to Home Assistant for updates."""
-    coresys.hardware.disk.get_disk_free_space = lambda x: 5000
-    coresys.core.set_state(CoreState.RUNNING)
-    coresys.docker.docker.api.pull.return_value = load_json_fixture(
-        "docker_pull_image_log.json"
-    )
-
-    with (
-        patch.object(
-            Supervisor,
-            "version",
-            new=PropertyMock(return_value=AwesomeVersion("2025.08.0")),
-        ),
-        patch.object(
-            Updater,
-            "version_supervisor",
-            new=PropertyMock(return_value=AwesomeVersion("2025.08.3")),
-        ),
-        patch.object(
-            Updater, "image_supervisor", new=PropertyMock(return_value="supervisor")
-        ),
-        patch.object(Supervisor, "update_apparmor"),
-        patch.object(Core, "stop"),
-    ):
-        resp = await api_client.post("/supervisor/update")
-
-    assert resp.status == 200
-
-    events = [
-        {
-            "stage": evt.args[0]["data"]["data"]["stage"],
-            "progress": evt.args[0]["data"]["data"]["progress"],
-            "done": evt.args[0]["data"]["data"]["done"],
-        }
-        for evt in ha_ws_client.async_send_command.call_args_list
-        if "data" in evt.args[0]
-        and evt.args[0]["data"]["event"] == WSEvent.JOB
-        and evt.args[0]["data"]["data"]["name"] == "supervisor_update"
-    ]
-    assert events[:4] == [
-        {
-            "stage": None,
-            "progress": 0,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 0.1,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 1.2,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 2.8,
-            "done": False,
-        },
-    ]
-    assert events[-5:] == [
-        {
-            "stage": None,
-            "progress": 97.2,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 98.4,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 99.4,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 100,
-            "done": False,
-        },
-        {
-            "stage": None,
-            "progress": 100,
-            "done": True,
-        },
-    ]

tests/docker/test_interface.py

@@ -26,6 +26,7 @@ from supervisor.exceptions import (
     DockerNotFound,
     DockerRequestError,
 )
+from supervisor.homeassistant.const import WSEvent
 from supervisor.jobs import JobSchedulerOptions, SupervisorJob
 
 from tests.common import load_json_fixture
@@ -416,17 +417,196 @@ async def test_install_fires_progress_events(
     ]
 
 
+async def test_install_sends_progress_to_home_assistant(
+    coresys: CoreSys, test_docker_interface: DockerInterface, ha_ws_client: AsyncMock
+):
+    """Test progress events are sent as job updates to Home Assistant."""
+    coresys.core.set_state(CoreState.RUNNING)
+    coresys.docker.docker.api.pull.return_value = load_json_fixture(
+        "docker_pull_image_log.json"
+    )
+
+    with (
+        patch.object(
+            type(coresys.supervisor), "arch", PropertyMock(return_value="i386")
+        ),
+    ):
+        # Schedule job so we can listen for the end. Then we can assert against the WS mock
+        event = asyncio.Event()
+        job, install_task = coresys.jobs.schedule_job(
+            test_docker_interface.install,
+            JobSchedulerOptions(),
+            AwesomeVersion("1.2.3"),
+            "test",
+        )
+
+        async def listen_for_job_end(reference: SupervisorJob):
+            if reference.uuid != job.uuid:
+                return
+            event.set()
+
+        coresys.bus.register_event(BusEvent.SUPERVISOR_JOB_END, listen_for_job_end)
+        await install_task
+        await event.wait()
+
+    events = [
+        evt.args[0]["data"]["data"]
+        for evt in ha_ws_client.async_send_command.call_args_list
+        if "data" in evt.args[0] and evt.args[0]["data"]["event"] == WSEvent.JOB
+    ]
+    assert events[0]["name"] == "docker_interface_install"
+    assert events[0]["uuid"] == job.uuid
+    assert events[0]["done"] is None
+    assert events[1]["name"] == "docker_interface_install"
+    assert events[1]["uuid"] == job.uuid
+    assert events[1]["done"] is False
+    assert events[-1]["name"] == "docker_interface_install"
+    assert events[-1]["uuid"] == job.uuid
+    assert events[-1]["done"] is True
+
+    def make_sub_log(layer_id: str):
+        return [
+            {
+                "stage": evt["stage"],
+                "progress": evt["progress"],
+                "done": evt["done"],
+                "extra": evt["extra"],
+            }
+            for evt in events
+            if evt["name"] == "Pulling container image layer"
+            and evt["reference"] == layer_id
+            and evt["parent_id"] == job.uuid
+        ]
+
+    layer_1_log = make_sub_log("1e214cd6d7d0")
+    layer_2_log = make_sub_log("1a38e1d5e18d")
+    assert len(layer_1_log) == 20
+    assert len(layer_2_log) == 19
+    assert len(events) == 42
+    assert layer_1_log == [
+        {"stage": "Pulling fs layer", "progress": 0, "done": False, "extra": None},
+        {
+            "stage": "Downloading",
+            "progress": 0.1,
+            "done": False,
+            "extra": {"current": 539462, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 0.6,
+            "done": False,
+            "extra": {"current": 4864838, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 0.9,
+            "done": False,
+            "extra": {"current": 7552896, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 1.2,
+            "done": False,
+            "extra": {"current": 10252544, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 2.9,
+            "done": False,
+            "extra": {"current": 25369792, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 11.9,
+            "done": False,
+            "extra": {"current": 103619904, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 26.1,
+            "done": False,
+            "extra": {"current": 227726144, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 49.6,
+            "done": False,
+            "extra": {"current": 433170048, "total": 436480882},
+        },
+        {
+            "stage": "Verifying Checksum",
+            "progress": 50,
+            "done": False,
+            "extra": {"current": 433170048, "total": 436480882},
+        },
+        {
+            "stage": "Download complete",
+            "progress": 50,
+            "done": False,
+            "extra": {"current": 433170048, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 50.1,
+            "done": False,
+            "extra": {"current": 557056, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 60.3,
+            "done": False,
+            "extra": {"current": 89686016, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 70.0,
+            "done": False,
+            "extra": {"current": 174358528, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 80.0,
+            "done": False,
+            "extra": {"current": 261816320, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 88.4,
+            "done": False,
+            "extra": {"current": 334790656, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 94.0,
+            "done": False,
+            "extra": {"current": 383811584, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 99.9,
+            "done": False,
+            "extra": {"current": 435617792, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 100.0,
+            "done": False,
+            "extra": {"current": 436480882, "total": 436480882},
+        },
+        {
+            "stage": "Pull complete",
+            "progress": 100.0,
+            "done": True,
+            "extra": {"current": 436480882, "total": 436480882},
+        },
+    ]
+
+
 async def test_install_progress_rounding_does_not_cause_misses(
-    coresys: CoreSys,
-    test_docker_interface: DockerInterface,
-    ha_ws_client: AsyncMock,
-    capture_exception: Mock,
+    coresys: CoreSys, test_docker_interface: DockerInterface, ha_ws_client: AsyncMock
 ):
     """Test extremely close progress events do not create rounding issues."""
     coresys.core.set_state(CoreState.RUNNING)
-    # Current numbers chosen to create a rounding issue with original code
-    # Where a progress update came in with a value between the actual previous
-    # value and what it was rounded to. It should not raise an out of order exception
     coresys.docker.docker.api.pull.return_value = [
         {
             "status": "Pulling from home-assistant/odroid-n2-homeassistant",
@@ -491,7 +671,65 @@ async def test_install_progress_rounding_does_not_cause_misses(
         await install_task
         await event.wait()
 
-    capture_exception.assert_not_called()
+    events = [
+        evt.args[0]["data"]["data"]
+        for evt in ha_ws_client.async_send_command.call_args_list
+        if "data" in evt.args[0]
+        and evt.args[0]["data"]["event"] == WSEvent.JOB
+        and evt.args[0]["data"]["data"]["reference"] == "1e214cd6d7d0"
+        and evt.args[0]["data"]["data"]["stage"] in {"Downloading", "Extracting"}
+    ]
+
+    assert events == [
+        {
+            "name": "Pulling container image layer",
+            "stage": "Downloading",
+            "progress": 49.6,
+            "done": False,
+            "extra": {"current": 432700000, "total": 436480882},
+            "reference": "1e214cd6d7d0",
+            "parent_id": job.uuid,
+            "errors": [],
+            "uuid": ANY,
+            "created": ANY,
+        },
+        {
+            "name": "Pulling container image layer",
+            "stage": "Downloading",
+            "progress": 49.6,
+            "done": False,
+            "extra": {"current": 432800000, "total": 436480882},
+            "reference": "1e214cd6d7d0",
+            "parent_id": job.uuid,
+            "errors": [],
+            "uuid": ANY,
+            "created": ANY,
+        },
+        {
+            "name": "Pulling container image layer",
+            "stage": "Extracting",
+            "progress": 99.6,
+            "done": False,
+            "extra": {"current": 432700000, "total": 436480882},
+            "reference": "1e214cd6d7d0",
+            "parent_id": job.uuid,
+            "errors": [],
+            "uuid": ANY,
+            "created": ANY,
+        },
+        {
+            "name": "Pulling container image layer",
+            "stage": "Extracting",
+            "progress": 99.6,
+            "done": False,
+            "extra": {"current": 432800000, "total": 436480882},
+            "reference": "1e214cd6d7d0",
+            "parent_id": job.uuid,
+            "errors": [],
+            "uuid": ANY,
+            "created": ANY,
+        },
+    ]
 
 
 @pytest.mark.parametrize(
@@ -541,15 +779,10 @@ async def test_install_raises_on_pull_error(
 
 
 async def test_install_progress_handles_download_restart(
-    coresys: CoreSys,
-    test_docker_interface: DockerInterface,
-    ha_ws_client: AsyncMock,
-    capture_exception: Mock,
+    coresys: CoreSys, test_docker_interface: DockerInterface, ha_ws_client: AsyncMock
 ):
     """Test install handles docker progress events that include a download restart."""
     coresys.core.set_state(CoreState.RUNNING)
-    # Fixture emulates a download restart as it docker logs it
-    # A log out of order exception should not be raised
     coresys.docker.docker.api.pull.return_value = load_json_fixture(
         "docker_pull_image_log_restart.json"
     )
@@ -577,4 +810,106 @@ async def test_install_progress_handles_download_restart(
         await install_task
         await event.wait()
 
-    capture_exception.assert_not_called()
+    events = [
+        evt.args[0]["data"]["data"]
+        for evt in ha_ws_client.async_send_command.call_args_list
+        if "data" in evt.args[0] and evt.args[0]["data"]["event"] == WSEvent.JOB
+    ]
+
+    def make_sub_log(layer_id: str):
+        return [
+            {
+                "stage": evt["stage"],
+                "progress": evt["progress"],
+                "done": evt["done"],
+                "extra": evt["extra"],
+            }
+            for evt in events
+            if evt["name"] == "Pulling container image layer"
+            and evt["reference"] == layer_id
+            and evt["parent_id"] == job.uuid
+        ]
+
+    layer_1_log = make_sub_log("1e214cd6d7d0")
+    assert len(layer_1_log) == 14
+    assert layer_1_log == [
+        {"stage": "Pulling fs layer", "progress": 0, "done": False, "extra": None},
+        {
+            "stage": "Downloading",
+            "progress": 11.9,
+            "done": False,
+            "extra": {"current": 103619904, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 26.1,
+            "done": False,
+            "extra": {"current": 227726144, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 49.6,
+            "done": False,
+            "extra": {"current": 433170048, "total": 436480882},
+        },
+        {
+            "stage": "Retrying download",
+            "progress": 0,
+            "done": False,
+            "extra": None,
+        },
+        {
+            "stage": "Retrying download",
+            "progress": 0,
+            "done": False,
+            "extra": None,
+        },
+        {
+            "stage": "Downloading",
+            "progress": 11.9,
+            "done": False,
+            "extra": {"current": 103619904, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 26.1,
+            "done": False,
+            "extra": {"current": 227726144, "total": 436480882},
+        },
+        {
+            "stage": "Downloading",
+            "progress": 49.6,
+            "done": False,
+            "extra": {"current": 433170048, "total": 436480882},
+        },
+        {
+            "stage": "Verifying Checksum",
+            "progress": 50,
+            "done": False,
+            "extra": {"current": 433170048, "total": 436480882},
+        },
+        {
+            "stage": "Download complete",
+            "progress": 50,
+            "done": False,
+            "extra": {"current": 433170048, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 80.0,
+            "done": False,
+            "extra": {"current": 261816320, "total": 436480882},
+        },
+        {
+            "stage": "Extracting",
+            "progress": 100.0,
+            "done": False,
+            "extra": {"current": 436480882, "total": 436480882},
+        },
+        {
+            "stage": "Pull complete",
+            "progress": 100.0,
+            "done": True,
+            "extra": {"current": 436480882, "total": 436480882},
+        },
+    ]