@sanderegg review: stop before trashing

Author: pcrespov

packages/models-library/tests/test_rest_filters.py

@@ -12,7 +12,7 @@ class CustomFilter(Filters):
 
 
 class CustomFilterStrict(CustomFilter):
-    class Config:
+    class Config(CustomFilter.Config):
         extra = Extra.forbid
 
 

packages/service-library/src/servicelib/project_lock.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+from ast import TypeAlias
 from asyncio.log import logger
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
@@ -21,7 +22,7 @@
 PROJECT_LOCK_TIMEOUT: Final[datetime.timedelta] = datetime.timedelta(seconds=10)
 ProjectLock = Lock
 
-ProjectLockError = redis.exceptions.LockError
+ProjectLockError: TypeAlias = redis.exceptions.LockError
 
 
 async def _auto_extend_project_lock(project_lock: Lock) -> None:

services/web/server/src/simcore_service_webserver/projects/_trash_api.py

@@ -7,8 +7,12 @@
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.users import UserID
+from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
+from simcore_service_webserver.director_v2.exceptions import DirectorServiceError
 
+from ..director_v2 import api as director_v2_api
 from . import projects_api
+from .exceptions import ProjectLockError, StopProjectBeforeTrashError
 from .models import ProjectPatchExtended
 from .settings import get_plugin_settings
 
@@ -18,7 +22,7 @@
 async def empty_trash(app: web.Application, product_name: ProductName, user_id: UserID):
     # filter trashed=True and set them to False
     _logger.debug(
-        "CODE PLACEHOLDER: all projects marked of trashed of %s in %s are deleted",
+        "CODE PLACEHOLDER: all projects marked as trashed of %s in %s are deleted",
         f"{user_id=}",
         f"{product_name=}",
     )
@@ -38,16 +42,37 @@ async def prune_all_trashes(app: web.Application) -> list[str]:
     return []
 
 
-async def update_project(
+async def trash_project(
     app: web.Application,
     *,
     product_name: ProductName,
     user_id: UserID,
     project_id: ProjectID,
     trashed: bool,
 ):
-    # FIXME: can you trash something that is running?
+    if trashed:
+        # stop first
+        try:
+            await projects_api.remove_project_dynamic_services(
+                user_id=user_id,
+                project_uuid=f"{project_id}",
+                app=app,
+                simcore_user_agent=UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
+                notify_users=False,
+            )
 
+            await director_v2_api.delete_pipeline(
+                app, user_id=user_id, project_id=project_id
+            )
+        except (DirectorServiceError, ProjectLockError) as exc:
+            raise StopProjectBeforeTrashError(
+                project_uuid=project_id,
+                user_id=user_id,
+                product_name=product_name,
+                from_err=exc,
+            ) from exc
+
+    # mark as trash
     await projects_api.patch_project(
         app,
         user_id=user_id,

services/web/server/src/simcore_service_webserver/projects/_trash_handlers.py

@@ -39,7 +39,7 @@ async def trash_project(request: web.Request):
     product_name = get_product_name(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
-    await _trash_api.update_project(
+    await _trash_api.trash_project(
         request.app,
         product_name=product_name,
         user_id=user_id,
@@ -58,7 +58,7 @@ async def untrash_project(request: web.Request):
     product_name = get_product_name(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
-    await _trash_api.update_project(
+    await _trash_api.trash_project(
         request.app,
         product_name=product_name,
         user_id=user_id,

services/web/server/src/simcore_service_webserver/projects/exceptions.py

@@ -78,6 +78,14 @@ def __init__(self, *, project_uuid, reason, **ctx):
         self.reason = reason
 
 
+class ProjectTrashError(BaseProjectError):
+    ...
+
+
+class StopProjectBeforeTrashError(ProjectTrashError):
+    msg_template = "Failed to  services in '{project_uuid}' before trashing"
+
+
 class NodeNotFoundError(BaseProjectError):
     msg_template = "Node '{node_uuid}' not found in project '{project_uuid}'"