Merge remote-tracking branch 'upstream/master' into pr-osparc-s3-zip-stream-worker-code

Author: Andrei Neagu

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

@@ -1,4 +1,5 @@
 import logging
+import ssl
 
 from celery import Celery  # type: ignore[import-untyped]
 from settings_library.celery import CelerySettings
@@ -16,12 +17,14 @@ def create_app(celery_settings: CelerySettings) -> Celery:
             RedisDatabase.CELERY_TASKS,
         ),
     )
+    app.conf.broker_connection_retry_on_startup = True
+    # NOTE: disable SSL cert validation (https://github.com/ITISFoundation/osparc-simcore/pull/7407)
+    app.conf.redis_backend_use_ssl = {"ssl_cert_reqs": ssl.CERT_NONE}
     app.conf.result_expires = celery_settings.CELERY_RESULT_EXPIRES
     app.conf.result_extended = True  # original args are included in the results
     app.conf.result_serializer = "json"
     app.conf.task_send_sent_event = True
     app.conf.task_track_started = True
     app.conf.worker_send_task_events = True  # enable tasks monitoring
-    app.conf.broker_connection_retry_on_startup = True
 
     return app

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

@@ -50,24 +50,23 @@ 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
-        )
+    explicitly_trashed_project_deleted = asyncio.Event()
 
     fire_and_forget_task(
-        _empty_trash(),
+        _service.safe_empty_trash(
+            request.app,
+            product_name=product_name,
+            user_id=user_id,
+            on_explicitly_trashed_projects_deleted=explicitly_trashed_project_deleted,
+        ),
         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; otherwise,
-    # when the front-end requests the trash item list,
+    # 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()
+    await explicitly_trashed_project_deleted.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,
+    on_explicitly_trashed_projects_deleted: asyncio.Event | None = None
 ):
+    # Delete explicitly trashed projects & notify
     await _empty_explicitly_trashed_projects(app, product_name, user_id)
+    if on_explicitly_trashed_projects_deleted:
+        on_explicitly_trashed_projects_deleted.set()
 
+    # Delete explicitly trashed folders (and all implicitly trashed sub-folders and projects)
     await _empty_explicitly_trashed_folders_and_content(app, product_name, user_id)