waits until explit projects deleted

Author: pcrespov

services/web/server/src/simcore_service_webserver/trash/_rest.py

@@ -1,7 +1,10 @@
+import asyncio
 import logging
 
 from aiohttp import web
 from servicelib.aiohttp import status
+from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
+from servicelib.utils import fire_and_forget_task
 
 from .._meta import API_VTAG as VTAG
 from ..exception_handling import (
@@ -47,12 +50,23 @@ async def empty_trash(request: web.Request):
     user_id = get_user_id(request)
     product_name = products_web.get_product_name(request)
 
-    # NOTE: This handler waits for all deletions to complete before returning.
-    # We chose this over hiding the project, as that approach is both costlier to implement
-    # and duplicates the deletion logic. In the worst case, if deletion is too slow,
-    # the frontend can disconnect sand retry the request.
-    await _service.safe_empty_trash(
-        request.app, product_name=product_name, user_id=user_id
+    is_fired = asyncio.Event()
+
+    fire_and_forget_task(
+        _service.safe_empty_trash(
+            request.app,
+            product_name=product_name,
+            user_id=user_id,
+            notify_explicit_projects_deleted=is_fired,
+        ),
+        task_suffix_name="rest.empty_trash",
+        fire_and_forget_tasks_collection=request.app[APP_FIRE_AND_FORGET_TASKS_KEY],
     )
 
+    # NOTE: Ensures `fire_and_forget_task` is triggered and deletes explicit projects;
+    # otherwise, when the front-end requests the trash item list,
+    # it may still display items, misleading the user into
+    # thinking the `empty trash` operation failed.
+    await is_fired.wait()
+
     return web.json_response(status=status.HTTP_204_NO_CONTENT)

services/web/server/src/simcore_service_webserver/trash/_service.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 from datetime import timedelta
 from typing import Final
@@ -100,10 +101,18 @@ async def _empty_explicitly_trashed_folders_and_content(
 
 
 async def safe_empty_trash(
-    app: web.Application, *, product_name: ProductName, user_id: UserID
+    app: web.Application,
+    *,
+    product_name: ProductName,
+    user_id: UserID,
+    notify_explicit_projects_deleted: asyncio.Event | None = None
 ):
     await _empty_explicitly_trashed_projects(app, product_name, user_id)
 
+    # Notify the caller if an event is provided
+    if notify_explicit_projects_deleted:
+        notify_explicit_projects_deleted.set()
+
     await _empty_explicitly_trashed_folders_and_content(app, product_name, user_id)