waits

Author: pcrespov

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

@@ -1,10 +1,7 @@
-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 (
@@ -50,24 +47,12 @@ async def empty_trash(request: web.Request):
     user_id = get_user_id(request)
     product_name = products_web.get_product_name(request)
 
-    is_fired = asyncio.Event()
-
-    async def _empty_trash():
-        is_fired.set()
-        await _service.safe_empty_trash(
-            request.app, product_name=product_name, user_id=user_id
-        )
-
-    fire_and_forget_task(
-        _empty_trash(),
-        task_suffix_name="rest.empty_trash",
-        fire_and_forget_tasks_collection=request.app[APP_FIRE_AND_FORGET_TASKS_KEY],
+    # 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
     )
 
-    # NOTE: Ensures `fire_and_forget_task` is triggered; 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)