use ProgressReport

Author: bisgaard-itis

packages/models-library/src/models_library/api_schemas_rpc_async_jobs/async_jobs.py

@@ -3,15 +3,16 @@
 from uuid import UUID
 
 from pydantic import BaseModel, model_validator
-from servicelib.progress_bar import ProgressBarData
 from typing_extensions import Self
 
+from ..progress_bar import ProgressReport
+
 AsyncJobId: TypeAlias = UUID
 
 
 class AsyncJobStatus(BaseModel):
     job_id: AsyncJobId
-    progress: ProgressBarData
+    progress: ProgressReport
     done: bool
     started: datetime
     stopped: datetime | None

packages/models-library/src/models_library/api_schemas_webserver/storage.py

@@ -9,9 +9,9 @@
     AsyncJobId,
     AsyncJobResult,
     AsyncJobStatus,
-    ProgressBarData,
 )
 from ..api_schemas_storage.data_export_async_jobs import DataExportTaskStartInput
+from ..progress_bar import ProgressReport
 from ..projects_nodes_io import LocationID
 from ..users import UserID
 
@@ -39,7 +39,7 @@ def from_async_job_rpc_get(
 
 class StorageAsyncJobStatus(BaseModel):
     job_id: AsyncJobId
-    progress: ProgressBarData
+    progress: ProgressReport
     done: bool
     started: datetime
     stopped: datetime | None

services/storage/src/simcore_service_storage/api/rpc/_async_jobs.py

@@ -11,6 +11,7 @@
     ResultError,
     StatusError,
 )
+from models_library.progress_bar import ProgressReport
 from servicelib.rabbitmq import RPCRouter
 
 router = RPCRouter()
@@ -25,9 +26,10 @@ async def abort(app: FastAPI, job_id: AsyncJobId) -> AsyncJobAbort:
 @router.expose(reraise_if_error_type=(StatusError,))
 async def get_status(app: FastAPI, job_id: AsyncJobId) -> AsyncJobStatus:
     assert app  # nosec
+    progress_report = ProgressReport(actual_value=0.5, total=1.0, attempt=1)
     return AsyncJobStatus(
         job_id=job_id,
-        progress=0.5,
+        progress=progress_report,
         done=False,
         started=datetime.now(),
         stopped=None,