refactor progress

Author: Andrei Neagu

services/storage/src/simcore_service_storage/api/_worker_tasks/_data_export.py

@@ -9,7 +9,7 @@
 from ...dsm import get_dsm_provider
 from ...modules.celery.utils import get_celery_worker_client, get_fastapi_app
 from ...simcore_s3_dsm import SimcoreS3DataManager
-from ._tqdm_utils import get_export_progress, set_absolute_progress
+from ._progress_utils import get_tqdm_progress, set_tqdm_absolute_progress
 
 _logger = logging.getLogger(__name__)
 
@@ -29,10 +29,10 @@ async def data_export(
         ),
     )
 
-    with get_export_progress(total=1, description=f"{task.name}") as pbar:
+    with get_tqdm_progress(total=1, description=f"{task.name}") as pbar:
 
         async def _progress_cb(report: ProgressReport) -> None:
-            set_absolute_progress(pbar, current_progress=report.actual_value)
+            set_tqdm_absolute_progress(pbar, report)
             await get_celery_worker_client(task.app).set_task_progress(task, report)
 
         return await dsm.create_s3_export(

services/storage/src/simcore_service_storage/api/_worker_tasks/_tqdm_utils.py renamed to services/storage/src/simcore_service_storage/api/_worker_tasks/_progress_utils.py

@@ -1,5 +1,6 @@
 from typing import Final
 
+from models_library.progress_bar import ProgressReport
 from pydantic import NonNegativeFloat
 from tqdm import tqdm
 
@@ -13,11 +14,11 @@
 }
 
 
-def get_export_progress(total: NonNegativeFloat, *, description: str) -> tqdm:
+def get_tqdm_progress(total: NonNegativeFloat, *, description: str) -> tqdm:
     return tqdm(**TQDM_EXPORT_OPTIONS, total=total, desc=description)
 
 
-def set_absolute_progress(pbar: tqdm, *, current_progress: NonNegativeFloat) -> None:
+def set_tqdm_absolute_progress(pbar: tqdm, report: ProgressReport) -> None:
     """used when the progress does not come in chunk by chunk but as the total current value"""
-    pbar.n = current_progress
+    pbar.n = report.actual_value
     pbar.refresh()