fractal-server 2.14.0a0__tar.gz → 2.14.0a1__tar.gz

{fractal_server-2.14.0a0 → fractal_server-2.14.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.14.0a0
+Version: 2.14.0a1
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.14.0a1/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.14.0a1"

{fractal_server-2.14.0a0 → fractal_server-2.14.0a1}/fractal_server/app/routes/api/v2/project.py

@@ -5,6 +5,7 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
+from sqlmodel import delete
 from sqlmodel import select
 
 from .....logger import reset_logger_handlers
@@ -12,6 +13,8 @@ from .....logger import set_logger
 from ....db import AsyncSession
 from ....db import get_async_db
 from ....models.v2 import DatasetV2
+from ....models.v2 import HistoryItemV2
+from ....models.v2 import ImageStatus
 from ....models.v2 import JobV2
 from ....models.v2 import LinkUserProjectV2
 from ....models.v2 import ProjectV2
@@ -161,6 +164,22 @@ async def delete_project(
         for job in jobs:
             logger.info(f"Setting Job[{job.id}].workflow_id to None.")
             job.workflow_id = None
+        # Cascade operations: set foreign-keys to null for history items
+        # which are in relationship with the current workflow
+        wft_ids = [wft.id for wft in wf.task_list]
+        stm = select(HistoryItemV2).where(
+            HistoryItemV2.workflowtask_id.in_(wft_ids)
+        )
+        res = await db.execute(stm)
+        history_items = res.scalars().all()
+        for history_item in history_items:
+            history_item.workflowtask_id = None
+        # Cascade operations: delete all image status which are in relationship
+        # with the current workflow
+        stm = delete(ImageStatus).where(
+            ImageStatus.workflowtask_id.in_(wft_ids)
+        )
+        await db.execute(stm)
         # Delete workflow
         logger.info(f"Adding Workflow[{wf.id}] to deletion.")
         await db.delete(wf)
@@ -180,6 +199,12 @@ async def delete_project(
         for job in jobs:
             logger.info(f"Setting Job[{job.id}].dataset_id to None.")
             job.dataset_id = None
+        # Cascade operations: delete history items and image statuses which are
+        # in relationship with the current dataset
+        stm = delete(HistoryItemV2).where(HistoryItemV2.dataset_id == ds.id)
+        await db.execute(stm)
+        stm = delete(ImageStatus).where(ImageStatus.dataset_id == ds.id)
+        await db.execute(stm)
         # Delete dataset
         logger.info(f"Adding Dataset[{ds.id}] to deletion.")
         await db.delete(ds)

{fractal_server-2.14.0a0 → fractal_server-2.14.0a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.14.0a0"
+version = "2.14.0a1"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -95,7 +95,7 @@ filterwarnings = [
 markers = ["container"]
 
 [tool.bumpver]
-current_version = "2.14.0a0"
+current_version = "2.14.0a1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.14.0a0/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.14.0a0"