continue

Author: giancarloromeo

services/storage/docker/boot.sh

@@ -59,9 +59,10 @@ else
   if [ "${STORAGE_WORKER_MODE}" = "true" ]; then
     exec celery \
       --app=simcore_service_storage.modules.celery.worker_main:app \
-      worker \
+      worker --pool=threads \
       --loglevel="${SERVER_LOG_LEVEL}" \
-      --hostname="${HOSTNAME}"
+      --hostname="${HOSTNAME}" \
+      --concurrency="${CELERY_CONCURRENCY}"
   else
     exec uvicorn simcore_service_storage.main:app \
       --host 0.0.0.0 \

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

@@ -10,7 +10,7 @@
 from pydantic import ValidationError
 from servicelib.logging_utils import log_context
 
-from .models import TaskContext, TaskID, TaskStatus, TaskUUID
+from .models import TaskContext, TaskID, TaskState, TaskStatus, TaskUUID
 
 _logger = logging.getLogger(__name__)
 
@@ -77,13 +77,20 @@ def get_result(self, task_context: TaskContext, task_uuid: TaskUUID) -> Any:
 
     def _get_progress_report(
         self, task_context: TaskContext, task_uuid: TaskUUID
-    ) -> ProgressReport | None:
+    ) -> ProgressReport:
         task_id = _build_task_id(task_context, task_uuid)
         result = self._celery_app.AsyncResult(task_id).result
-        if result:
+        state = self._celery_app.AsyncResult(task_id).state
+        if result and state == TaskState.RUNNING.value:
             with contextlib.suppress(ValidationError):
                 return ProgressReport.model_validate(result)
-        return None
+        if state in (
+            TaskState.ABORTED.value,
+            TaskState.FAILURE.value,
+            TaskState.SUCCESS.value,
+        ):
+            return ProgressReport(actual_value=100.0)
+        return ProgressReport(actual_value=0.0)
 
     @make_async()
     def get_task_status(

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

@@ -12,8 +12,7 @@
 
 class TaskState(StrEnum):
     PENDING = auto()
-    STARTED = auto()
-    PROGRESS = auto()
+    RUNNING = auto()
     SUCCESS = auto()
     FAILURE = auto()
     ABORTED = auto()
@@ -22,4 +21,4 @@ class TaskState(StrEnum):
 class TaskStatus(BaseModel):
     task_uuid: TaskUUID
     task_state: TaskState
-    progress_report: ProgressReport | None = None
+    progress_report: ProgressReport