fixes coro

Author: pcrespov

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

@@ -52,12 +52,10 @@ async def _is_project_running(
     project_id: ProjectID,
 ) -> bool:
     return bool(
-        # computational
         await director_v2_api.is_pipeline_running(
             app, user_id=user_id, project_id=project_id
         )
     ) or bool(
-        # dynamic
         await director_v2_api.list_dynamic_services(
             app, user_id=user_id, project_id=f"{project_id}"
         )
@@ -87,26 +85,28 @@ async def trash_project(
     )
 
     if force_stop_first:
-        # NOTE: schedules stop-project
-
-        stop_project_task = asyncio.gather(
-            director_v2_api.stop_pipeline(app, user_id=user_id, project_id=project_id),
-            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,
-            ),
-        )
+
+        async def _schedule():
+            await asyncio.gather(
+                director_v2_api.stop_pipeline(
+                    app, user_id=user_id, project_id=project_id
+                ),
+                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,
+                ),
+            )
 
         fire_and_forget_task(
-            stop_project_task,
-            task_suffix_name=f"trash_project_stop_project_{user_id=}_{project_id=}",
+            _schedule(),
+            task_suffix_name=f"trash_project_force_stop_first_{user_id=}_{project_id=}",
             fire_and_forget_tasks_collection=app[APP_FIRE_AND_FORGET_TASKS_KEY],
         )
 
-    elif _is_project_running(app, user_id=user_id, project_id=project_id):
+    elif await _is_project_running(app, user_id=user_id, project_id=project_id):
         raise ProjectRunningConflictError(
             project_uuid=project_id,
             user_id=user_id,

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

@@ -41,7 +41,7 @@ class HttpErrorInfo(NamedTuple):
 _TO_HTTP_ERROR_MAP: dict[type[Exception], HttpErrorInfo] = {
     ProjectRunningConflictError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        "Current study is in use and cannot be trashed [{project_uuid}]. Please stop all services first and try again",
+        "Current study is in use and cannot be trashed [project_id={project_uuid}]. Please stop all services first and try again",
     ),
     ProjectStoppingError: HttpErrorInfo(
         status.HTTP_503_SERVICE_UNAVAILABLE,

services/web/server/tests/unit/with_dbs/03/test_trash.py

@@ -39,30 +39,37 @@ def mocked_catalog(
 @pytest.mark.acceptance_test(
     "For https://github.com/ITISFoundation/osparc-simcore/pull/6579"
 )
-@pytest.mark.parametrize("is_trash_service_running", [False, True])
+@pytest.mark.parametrize("force", [False, True])
+@pytest.mark.parametrize("is_project_running", [False, True])
 async def test_trash_projects(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     mocked_catalog: None,
     director_v2_service_mock: aioresponses,
     mocker: MockerFixture,
-    is_trash_service_running: bool,
+    force: bool,
+    is_project_running: bool,
 ):
     assert client.app
 
     # this test should have no errors stopping services
-    mocker.patch(
+    mock_remove_dynamic_services = mocker.patch(
         "simcore_service_webserver.projects._trash_api.projects_api.remove_project_dynamic_services",
         autospec=True,
     )
-    mocker.patch(
-        "simcore_service_webserver.projects._trash_api.director_v2_api.delete_pipeline",
+    mock_stop_pipeline = mocker.patch(
+        "simcore_service_webserver.projects._trash_api.director_v2_api.stop_pipeline",
         autospec=True,
     )
     mocker.patch(
         "simcore_service_webserver.projects._trash_api.director_v2_api.is_pipeline_running",
-        return_value=is_trash_service_running,
+        return_value=is_project_running,
+        autospec=True,
+    )
+    mocker.patch(
+        "simcore_service_webserver.projects._trash_api.director_v2_api.list_dynamic_services",
+        return_value=[mocker.MagicMock()] if is_project_running else [],
         autospec=True,
     )
 
@@ -91,15 +98,17 @@ async def test_trash_projects(
 
     # TRASH
     trashing_at = arrow.utcnow().datetime
-    resp = await client.post(f"/v0/projects/{project_uuid}:trash")
+    resp = await client.post(
+        f"/v0/projects/{project_uuid}:trash", params={"force": f"{force}"}
+    )
     _, error = await assert_status(
         resp,
         status.HTTP_409_CONFLICT
-        if is_trash_service_running
+        if (is_project_running and not force)
         else status.HTTP_204_NO_CONTENT,
     )
 
-    could_not_trash = is_trash_service_running
+    could_not_trash = is_project_running and not force
 
     if could_not_trash:
         assert error["status"] == status.HTTP_409_CONFLICT
@@ -140,3 +149,7 @@ async def test_trash_projects(
 
         assert got.uuid == project_uuid
         assert got.trashed_at is None
+
+    if is_project_running and force:
+        mock_remove_dynamic_services.assert_any_await()
+        mock_stop_pipeline.assert_any_await()