revert interfaces

Author: Andrei Neagu

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

@@ -33,7 +33,10 @@ async def data_export(
 
         async def _progress_cb(report: ProgressReport) -> None:
             set_tqdm_absolute_progress(pbar, report)
-            await get_celery_worker(task.app).set_task_progress(task, task_id, report)
+            assert task.name  # nosec
+            await get_celery_worker(task.app).set_task_progress(
+                task.name, task_id, report
+            )
 
         async with ProgressBarData(
             num_steps=1, description="data export", progress_report_cb=_progress_cb

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

@@ -22,7 +22,7 @@ async def _task_progress_cb(
 ) -> None:
     worker = get_celery_worker(task.app)
     assert task.name  # nosec
-    await worker.set_task_progress(task=task, task_id=task_id, report=report)
+    await worker.set_task_progress(task.name, task_id, report)
 
 
 async def deep_copy_files_from_project(

services/storage/src/simcore_service_storage/modules/celery/worker.py

@@ -1,6 +1,6 @@
 import logging
 
-from celery import Celery, Task  # type: ignore[import-untyped]
+from celery import Celery  # type: ignore[import-untyped]
 from common_library.async_tools import make_async
 from models_library.progress_bar import ProgressReport
 from servicelib.logging_utils import log_context
@@ -16,11 +16,8 @@ def __init__(self, celery_app: Celery) -> None:
 
     @make_async()
     def set_task_progress(
-        self, task: Task, task_id: TaskID, report: ProgressReport
+        self, task_name: str, task_id: TaskID, report: ProgressReport
     ) -> None:
-        assert task.name  # nosec
-        task_name = task.name
-
         with log_context(
             _logger,
             logging.DEBUG,

services/storage/tests/unit/test_modules_celery.py

@@ -46,7 +46,9 @@ def celery_client(
     return get_celery_client(initialized_app)
 
 
-async def _async_archive(celery_app: Celery, task: Task, files: list[str]) -> str:
+async def _async_archive(
+    celery_app: Celery, task_name: str, task_id: str, files: list[str]
+) -> str:
     worker_client = get_celery_worker(celery_app)
 
     def sleep_for(seconds: float) -> None:
@@ -55,7 +57,7 @@ def sleep_for(seconds: float) -> None:
     for n, file in enumerate(files, start=1):
         with log_context(_logger, logging.INFO, msg=f"Processing file {file}"):
             await worker_client.set_task_progress(
-                task, task.id, ProgressReport(actual_value=n / len(files) * 10)
+                task_name, task_id, ProgressReport(actual_value=n / len(files) * 10)
             )
             await asyncio.get_event_loop().run_in_executor(None, sleep_for, 1)
 
@@ -66,7 +68,7 @@ def sync_archive(task: Task, files: list[str]) -> str:
     assert task.name
     _logger.info("Calling async_archive")
     return asyncio.run_coroutine_threadsafe(
-        _async_archive(task.app, task, files),
+        _async_archive(task.app, task.name, task.request.id, files),
         get_event_loop(get_fastapi_app(task.app)),
     ).result()