conneting with trash.service

Author: pcrespov

services/web/server/src/simcore_service_webserver/folders/folders_trash_service.py

@@ -1,6 +1,11 @@
-from ._trash_service import delete_trashed_folder, list_explicitly_trashed_folders
+from ._trash_service import (
+    batch_delete_trashed_folders_as_admin,
+    delete_trashed_folder,
+    list_explicitly_trashed_folders,
+)
 
 __all__: tuple[str, ...] = (
+    "batch_delete_trashed_folders_as_admin",
     "delete_trashed_folder",
     "list_explicitly_trashed_folders",
 )

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_trash.py

@@ -28,7 +28,7 @@
     before_sleep=before_sleep_log(_logger, logging.WARNING),
 )
 async def _run_task(app: web.Application):
-    if deleted := await trash_service.delete_expired_trash(app):
+    if deleted := await trash_service.delete_expired_trash_as_admin(app):
         for name in deleted:
             _logger.info("Trash item %s expired and was deleted", f"{name}")
     else:

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

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from datetime import timedelta
 from typing import Final
@@ -107,19 +106,34 @@ async def empty_trash_safe(
     await _empty_explicitly_trashed_folders_and_content(app, product_name, user_id)
 
 
-async def delete_expired_trash(app: web.Application) -> list[str]:
-    """Deletes expired items in the trash"""
+async def delete_expired_trash_as_admin(app: web.Application) -> list[str]:
     settings = get_plugin_settings(app)
 
     # app-wide
     retention = timedelta(days=settings.TRASH_RETENTION_DAYS)
-    expiration_dt = arrow.now().datetime - retention
+    delete_until = arrow.now().datetime - retention
 
-    _logger.debug(
+    with log_context(
+        _logger,
+        logging.DEBUG,
         "CODE PLACEHOLDER: **ALL** items marked as trashed during %s days are deleted (those marked before %s)",
         retention,
-        expiration_dt,
-    )
-    await asyncio.sleep(5)
+        delete_until,
+    ):
+        try:
+            await folders_trash_service.batch_delete_trashed_folders_as_admin(
+                app, trashed_before=delete_until, product_name="TODO", fail_fast=False
+            )
+        except Exception as exc:  # pylint: disable=broad-exception-caught
+            _logger.warning(
+                **create_troubleshotting_log_kwargs(
+                    "Error deleting a trashed folders (and content) that were expired.",
+                    error=exc,
+                    error_context={
+                        "delete_until": delete_until,
+                        "retention": retention,
+                    },
+                )
+            )
 
     return []

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

@@ -1,4 +1,4 @@
-from ._service import delete_expired_trash
+from ._service import delete_expired_trash_as_admin
 
-__all__: tuple[str, ...] = ("delete_expired_trash",)
+__all__: tuple[str, ...] = ("delete_expired_trash_as_admin",)
 # nopycln: file

services/web/server/tests/unit/with_dbs/03/trash/test_trash_service.py

@@ -110,7 +110,7 @@ async def test_trash_service__delete_expired_trash(
     assert ProjectGet.model_validate(data).trashed_by == logged_user["primary_gid"]
 
     # UNDER TEST: Run delete_expired_trash
-    await trash_service.delete_expired_trash(client.app)
+    await trash_service.delete_expired_trash_as_admin(client.app)
 
     # ASSERT: logged_user tries to get the project and expects 404
     resp = await client.get(f"/v0/projects/{user_project_id}")