fractal-server 2.14.13__py3-none-any.whl → 2.14.15__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.13"
+__VERSION__ = "2.14.15"

fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py

@@ -137,7 +137,7 @@ async def remove_duplicate_task_groups(
     db: AsyncSession,
 ) -> list[TaskGroupV2]:
     """
-    Extract a single task group for each `version`.
+    Extract an item for each `version` from a *sorted* task-group list.
 
     Args:
         task_groups: A list of task groups with identical `pkg_name`

fractal_server/app/routes/api/v2/pre_submission_checks.py

@@ -4,7 +4,6 @@ from fastapi import status
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel
 from pydantic import Field
-from sqlmodel import select
 
 from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_workflow_task_check_owner
@@ -12,10 +11,11 @@ from .images import ImageQuery
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.models.v2 import HistoryImageCache
-from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.routes.auth import current_active_user
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
+from fractal_server.app.schemas.v2 import TaskType
+from fractal_server.images.status_tools import enrich_images_async
+from fractal_server.images.status_tools import IMAGE_STATUS_KEY
 from fractal_server.images.tools import aggregate_types
 from fractal_server.images.tools import filter_image_list
 from fractal_server.types import AttributeFilters
@@ -30,6 +30,7 @@ router = APIRouter()
 async def verify_unique_types(
     project_id: int,
     dataset_id: int,
+    workflowtask_id: int,
     query: ImageQuery | None = None,
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
@@ -44,8 +45,17 @@ async def verify_unique_types(
     if query is None:
         filtered_images = dataset.images
     else:
+        if IMAGE_STATUS_KEY in query.attribute_filters.keys():
+            images = await enrich_images_async(
+                dataset_id=dataset_id,
+                workflowtask_id=workflowtask_id,
+                images=dataset.images,
+                db=db,
+            )
+        else:
+            images = dataset.images
         filtered_images = filter_image_list(
-            images=dataset.images,
+            images=images,
             attribute_filters=query.attribute_filters,
             type_filters=query.type_filters,
         )
@@ -77,7 +87,7 @@ class NonProcessedImagesPayload(BaseModel):
     "/project/{project_id}/dataset/{dataset_id}/images/non-processed/",
     status_code=status.HTTP_200_OK,
 )
-async def check_workflowtask(
+async def check_non_processed_images(
     project_id: int,
     dataset_id: int,
     workflow_id: int,
@@ -105,8 +115,8 @@ async def check_workflowtask(
         # Skip check if previous task has non-trivial `output_types`
         return JSONResponse(status_code=200, content=[])
     elif previous_wft.task.type in [
-        "converter_compound",
-        "converter_non_parallel",
+        TaskType.CONVERTER_COMPOUND,
+        TaskType.CONVERTER_NON_PARALLEL,
     ]:
         # Skip check if previous task is converter
         return JSONResponse(status_code=200, content=[])
@@ -124,19 +134,16 @@ async def check_workflowtask(
         attribute_filters=filters.attribute_filters,
     )
 
-    filtered_zarr_urls = [image["zarr_url"] for image in filtered_images]
-
-    res = await db.execute(
-        select(HistoryImageCache.zarr_url)
-        .join(HistoryUnit)
-        .where(HistoryImageCache.zarr_url.in_(filtered_zarr_urls))
-        .where(HistoryImageCache.dataset_id == dataset_id)
-        .where(HistoryImageCache.workflowtask_id == previous_wft.id)
-        .where(HistoryImageCache.latest_history_unit_id == HistoryUnit.id)
-        .where(HistoryUnit.status == HistoryUnitStatus.DONE)
+    filtered_images_with_status = await enrich_images_async(
+        dataset_id=dataset_id,
+        workflowtask_id=previous_wft.id,
+        images=filtered_images,
+        db=db,
     )
-    done_zarr_urls = res.scalars().all()
-
-    missing_zarr_urls = list(set(filtered_zarr_urls) - set(done_zarr_urls))
+    missing_zarr_urls = [
+        img["zarr_url"]
+        for img in filtered_images_with_status
+        if img["attributes"][IMAGE_STATUS_KEY] != HistoryUnitStatus.DONE
+    ]
 
     return JSONResponse(status_code=200, content=missing_zarr_urls)

fractal_server/app/routes/api/v2/task.py

@@ -25,6 +25,7 @@ from fractal_server.app.routes.auth import current_active_verified_user
 from fractal_server.app.schemas.v2 import TaskCreateV2
 from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
 from fractal_server.app.schemas.v2 import TaskReadV2
+from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2 import TaskUpdateV2
 from fractal_server.logger import set_logger
 
@@ -109,12 +110,12 @@ async def patch_task(
     update = task_update.model_dump(exclude_unset=True)
 
     # Forbid changes that set a previously unset command
-    if db_task.type == "non_parallel" and "command_parallel" in update:
+    if db_task.type == TaskType.NON_PARALLEL and "command_parallel" in update:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail="Cannot set an unset `command_parallel`.",
         )
-    if db_task.type == "parallel" and "command_non_parallel" in update:
+    if db_task.type == TaskType.PARALLEL and "command_non_parallel" in update:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail="Cannot set an unset `command_non_parallel`.",
@@ -151,7 +152,7 @@ async def create_task(
         db=db,
     )
 
-    if task.type == "parallel" and (
+    if task.type == TaskType.PARALLEL and (
         task.args_schema_non_parallel is not None
         or task.meta_non_parallel is not None
     ):
@@ -162,7 +163,7 @@ async def create_task(
                 "`TaskV2.args_schema_non_parallel` if TaskV2 is parallel"
             ),
         )
-    elif task.type == "non_parallel" and (
+    elif task.type == TaskType.NON_PARALLEL and (
         task.args_schema_parallel is not None or task.meta_parallel is not None
     ):
         raise HTTPException(

fractal_server/app/routes/api/v2/task_group.py

@@ -163,17 +163,17 @@ async def get_task_group_list(
     grouped_result = [
         (
             pkg_name,
-            sorted(
-                (
-                    await remove_duplicate_task_groups(
-                        task_groups=list(groups),
-                        user_id=user.id,
-                        default_group_id=default_group_id,
-                        db=db,
-                    )
-                ),
-                key=_version_sort_key,
-                reverse=True,
+            (
+                await remove_duplicate_task_groups(
+                    task_groups=sorted(
+                        list(groups),
+                        key=_version_sort_key,
+                        reverse=True,
+                    ),
+                    user_id=user.id,
+                    default_group_id=default_group_id,
+                    db=db,
+                )
             ),
         )
         for pkg_name, groups in itertools.groupby(

fractal_server/app/routes/api/v2/task_version_update.py

@@ -24,21 +24,23 @@ from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
 from fractal_server.app.schemas.v2 import WorkflowTaskReplaceV2
 
-
 router = APIRouter()
 
 
 VALID_TYPE_UPDATES = {
-    ("non_parallel", "converter_non_parallel"),
-    ("compound", "converter_compound"),
-    ("converter_non_parallel", "converter_non_parallel"),
-    ("converter_compound", "converter_compound"),
-    ("non_parallel", "non_parallel"),
-    ("compound", "compound"),
-    ("parallel", "parallel"),
+    # Transform into converter
+    (TaskType.NON_PARALLEL, TaskType.CONVERTER_NON_PARALLEL),
+    (TaskType.COMPOUND, TaskType.CONVERTER_COMPOUND),
+    # Keep the same
+    (TaskType.CONVERTER_NON_PARALLEL, TaskType.CONVERTER_NON_PARALLEL),
+    (TaskType.CONVERTER_COMPOUND, TaskType.CONVERTER_COMPOUND),
+    (TaskType.NON_PARALLEL, TaskType.NON_PARALLEL),
+    (TaskType.COMPOUND, TaskType.COMPOUND),
+    (TaskType.PARALLEL, TaskType.PARALLEL),
 }
 
 
@@ -208,12 +210,18 @@ async def replace_workflowtask(
             ),
         )
 
-    if replace.args_non_parallel is not None and new_task.type == "parallel":
+    if (
+        replace.args_non_parallel is not None
+        and new_task.type == TaskType.PARALLEL
+    ):
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail="Cannot set 'args_non_parallel' for parallel task.",
         )
-    if replace.args_parallel is not None and new_task.type == "non_parallel":
+    if (
+        replace.args_parallel is not None
+        and new_task.type == TaskType.NON_PARALLEL
+    ):
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail="Cannot set 'args_parallel' for non-parallel task.",

fractal_server/app/routes/api/v2/workflowtask.py

@@ -15,6 +15,7 @@ from ._aux_functions_tasks import _check_type_filters_compatibility
 from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2 import WorkflowTaskCreateV2
 from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
 from fractal_server.app.schemas.v2 import WorkflowTaskUpdateV2
@@ -47,7 +48,7 @@ async def create_workflowtask(
         task_id=task_id, user_id=user.id, db=db, require_active=True
     )
 
-    if task.type == "parallel":
+    if task.type == TaskType.PARALLEL:
         if (
             wftask.meta_non_parallel is not None
             or wftask.args_non_parallel is not None
@@ -60,7 +61,7 @@ async def create_workflowtask(
                     "is `parallel`."
                 ),
             )
-    elif task.type == "non_parallel":
+    elif task.type == TaskType.NON_PARALLEL:
         if (
             wftask.meta_parallel is not None
             or wftask.args_parallel is not None
@@ -143,7 +144,7 @@ async def update_workflowtask(
             wftask_type_filters=workflow_task_update.type_filters,
         )
 
-    if db_wf_task.task_type == "parallel" and (
+    if db_wf_task.task_type == TaskType.PARALLEL and (
         workflow_task_update.args_non_parallel is not None
         or workflow_task_update.meta_non_parallel is not None
     ):
@@ -156,8 +157,8 @@ async def update_workflowtask(
             ),
         )
     elif db_wf_task.task_type in [
-        "non_parallel",
-        "converter_non_parallel",
+        TaskType.NON_PARALLEL,
+        TaskType.CONVERTER_NON_PARALLEL,
     ] and (
         workflow_task_update.args_parallel is not None
         or workflow_task_update.meta_parallel is not None

fractal_server/app/runner/executors/base_runner.py

@@ -1,19 +1,34 @@
+from enum import StrEnum
 from typing import Any
 
 from fractal_server.app.runner.task_files import TaskFiles
-from fractal_server.app.schemas.v2.task import TaskTypeType
+from fractal_server.app.schemas.v2.task import TaskType
 from fractal_server.logger import set_logger
 
-TASK_TYPES_SUBMIT: list[TaskTypeType] = [
-    "compound",
-    "converter_compound",
-    "non_parallel",
-    "converter_non_parallel",
+
+class SubmitTaskType(StrEnum):
+    COMPOUND = TaskType.COMPOUND
+    NON_PARALLEL = TaskType.NON_PARALLEL
+    CONVERTER_NON_PARALLEL = TaskType.CONVERTER_NON_PARALLEL
+    CONVERTER_COMPOUND = TaskType.CONVERTER_COMPOUND
+
+
+class MultisubmitTaskType(StrEnum):
+    PARALLEL = TaskType.PARALLEL
+    COMPOUND = TaskType.COMPOUND
+    CONVERTER_COMPOUND = TaskType.CONVERTER_COMPOUND
+
+
+TASK_TYPES_SUBMIT: list[TaskType] = [
+    TaskType.COMPOUND,
+    TaskType.CONVERTER_COMPOUND,
+    TaskType.NON_PARALLEL,
+    TaskType.CONVERTER_NON_PARALLEL,
 ]
-TASK_TYPES_MULTISUBMIT: list[TaskTypeType] = [
-    "compound",
-    "converter_compound",
-    "parallel",
+TASK_TYPES_MULTISUBMIT: list[TaskType] = [
+    TaskType.COMPOUND,
+    TaskType.CONVERTER_COMPOUND,
+    TaskType.PARALLEL,
 ]
 
 logger = set_logger(__name__)
@@ -32,7 +47,7 @@ class BaseRunner:
         task_name: str,
         parameters: dict[str, Any],
         history_unit_id: int,
-        task_type: TaskTypeType,
+        task_type: TaskType,
         task_files: TaskFiles,
         config: Any,
         user_id: int,
@@ -64,7 +79,7 @@ class BaseRunner:
         list_parameters: list[dict[str, Any]],
         history_unit_ids: list[int],
         list_task_files: list[TaskFiles],
-        task_type: TaskTypeType,
+        task_type: TaskType,
         config: Any,
         user_id: int,
     ) -> tuple[dict[int, Any], dict[int, BaseException]]:
@@ -90,7 +105,7 @@ class BaseRunner:
     def validate_submit_parameters(
         self,
         parameters: dict[str, Any],
-        task_type: TaskTypeType,
+        task_type: TaskType,
     ) -> None:
         """
         Validate parameters for `submit` method
@@ -104,12 +119,18 @@ class BaseRunner:
             raise ValueError(f"Invalid {task_type=} for `submit`.")
         if not isinstance(parameters, dict):
             raise ValueError("`parameters` must be a dictionary.")
-        if task_type in ["non_parallel", "compound"]:
+        if task_type in [
+            TaskType.NON_PARALLEL,
+            TaskType.COMPOUND,
+        ]:
             if "zarr_urls" not in parameters.keys():
                 raise ValueError(
                     f"No 'zarr_urls' key in in {list(parameters.keys())}"
                 )
-        elif task_type in ["converter_non_parallel", "converter_compound"]:
+        elif task_type in [
+            TaskType.CONVERTER_NON_PARALLEL,
+            TaskType.CONVERTER_COMPOUND,
+        ]:
             if "zarr_urls" in parameters.keys():
                 raise ValueError(
                     f"Forbidden 'zarr_urls' key in {list(parameters.keys())}"
@@ -119,7 +140,7 @@ class BaseRunner:
     def validate_multisubmit_parameters(
         self,
         *,
-        task_type: TaskTypeType,
+        task_type: TaskType,
         list_parameters: list[dict[str, Any]],
         list_task_files: list[TaskFiles],
         history_unit_ids: list[int],
@@ -163,7 +184,7 @@ class BaseRunner:
                 raise ValueError(
                     f"No 'zarr_url' key in in {list(single_kwargs.keys())}"
                 )
-        if task_type == "parallel":
+        if task_type == TaskType.PARALLEL:
             zarr_urls = [kwargs["zarr_url"] for kwargs in list_parameters]
             if len(zarr_urls) != len(set(zarr_urls)):
                 raise ValueError("Non-unique zarr_urls")

fractal_server/app/runner/executors/local/runner.py

@@ -3,19 +3,21 @@ from concurrent.futures import Future
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from typing import Any
-from typing import Literal
 
 from ..call_command_wrapper import call_command_wrapper
 from .get_local_config import LocalBackendConfig
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.runner.exceptions import TaskExecutionError
 from fractal_server.app.runner.executors.base_runner import BaseRunner
+from fractal_server.app.runner.executors.base_runner import MultisubmitTaskType
+from fractal_server.app.runner.executors.base_runner import SubmitTaskType
 from fractal_server.app.runner.task_files import TaskFiles
 from fractal_server.app.runner.v2.db_tools import (
     bulk_update_status_of_history_unit,
 )
 from fractal_server.app.runner.v2.db_tools import update_status_of_history_unit
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
+from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.logger import set_logger
 
 logger = set_logger(__name__)
@@ -87,12 +89,7 @@ class LocalRunner(BaseRunner):
         history_unit_id: int,
         task_files: TaskFiles,
         config: LocalBackendConfig,
-        task_type: Literal[
-            "non_parallel",
-            "converter_non_parallel",
-            "compound",
-            "converter_compound",
-        ],
+        task_type: SubmitTaskType,
         user_id: int,
     ) -> tuple[Any, Exception]:
         logger.debug("[submit] START")
@@ -129,7 +126,10 @@ class LocalRunner(BaseRunner):
             try:
                 result = future.result()
                 logger.debug("[submit] END with result")
-                if task_type not in ["compound", "converter_compound"]:
+                if task_type not in [
+                    TaskType.COMPOUND,
+                    TaskType.CONVERTER_COMPOUND,
+                ]:
                     update_status_of_history_unit(
                         history_unit_id=history_unit_id,
                         status=HistoryUnitStatus.DONE,
@@ -154,7 +154,7 @@ class LocalRunner(BaseRunner):
         list_parameters: list[dict],
         history_unit_ids: list[int],
         list_task_files: list[TaskFiles],
-        task_type: Literal["parallel", "compound", "converter_compound"],
+        task_type: MultisubmitTaskType,
         config: LocalBackendConfig,
         user_id: int,
     ) -> tuple[dict[int, Any], dict[int, BaseException]]:
@@ -197,7 +197,7 @@ class LocalRunner(BaseRunner):
             exceptions = {
                 ind: exception for ind in range(len(list_parameters))
             }
-            if task_type == "parallel":
+            if task_type == TaskType.PARALLEL:
                 with next(get_sync_db()) as db:
                     bulk_update_status_of_history_unit(
                         history_unit_ids=history_unit_ids,
@@ -233,7 +233,7 @@ class LocalRunner(BaseRunner):
                         positional_index
                     ]
                     exceptions[positional_index] = TaskExecutionError(str(e))
-                    if task_type == "parallel":
+                    if task_type == TaskType.PARALLEL:
                         with next(get_sync_db()) as db:
                             update_status_of_history_unit(
                                 history_unit_id=current_history_unit_id,
@@ -252,14 +252,14 @@ class LocalRunner(BaseRunner):
                 with next(get_sync_db()) as db:
                     for positional_index, fut in finished_futures:
                         active_futures.pop(positional_index)
-                        if task_type == "parallel":
+                        if task_type == TaskType.PARALLEL:
                             current_history_unit_id = history_unit_ids[
                                 positional_index
                             ]
 
                         try:
                             results[positional_index] = fut.result()
-                            if task_type == "parallel":
+                            if task_type == TaskType.PARALLEL:
                                 update_status_of_history_unit(
                                     history_unit_id=current_history_unit_id,
                                     status=HistoryUnitStatus.DONE,
@@ -275,7 +275,7 @@ class LocalRunner(BaseRunner):
                             exceptions[positional_index] = TaskExecutionError(
                                 str(e)
                             )
-                            if task_type == "parallel":
+                            if task_type == TaskType.PARALLEL:
                                 update_status_of_history_unit(
                                     history_unit_id=current_history_unit_id,
                                     status=HistoryUnitStatus.FAILED,

fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py

@@ -19,6 +19,8 @@ from fractal_server.app.models.v2 import AccountingRecordSlurm
 from fractal_server.app.runner.exceptions import JobExecutionError
 from fractal_server.app.runner.exceptions import TaskExecutionError
 from fractal_server.app.runner.executors.base_runner import BaseRunner
+from fractal_server.app.runner.executors.base_runner import MultisubmitTaskType
+from fractal_server.app.runner.executors.base_runner import SubmitTaskType
 from fractal_server.app.runner.filenames import SHUTDOWN_FILENAME
 from fractal_server.app.runner.task_files import TaskFiles
 from fractal_server.app.runner.v2.db_tools import (
@@ -26,6 +28,7 @@ from fractal_server.app.runner.v2.db_tools import (
 )
 from fractal_server.app.runner.v2.db_tools import update_status_of_history_unit
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
+from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
 from fractal_server.syringe import Inject
@@ -501,12 +504,7 @@ class BaseSlurmRunner(BaseRunner):
         history_unit_id: int,
         task_files: TaskFiles,
         config: SlurmConfig,
-        task_type: Literal[
-            "non_parallel",
-            "converter_non_parallel",
-            "compound",
-            "converter_compound",
-        ],
+        task_type: SubmitTaskType,
         user_id: int,
     ) -> tuple[Any, Exception]:
         logger.debug("[submit] START")
@@ -604,8 +602,8 @@ class BaseSlurmRunner(BaseRunner):
                             )
                         else:
                             if task_type not in [
-                                "compound",
-                                "converter_compound",
+                                TaskType.COMPOUND,
+                                TaskType.CONVERTER_COMPOUND,
                             ]:
                                 update_status_of_history_unit(
                                     history_unit_id=history_unit_id,
@@ -641,7 +639,7 @@ class BaseSlurmRunner(BaseRunner):
         list_parameters: list[dict],
         history_unit_ids: list[int],
         list_task_files: list[TaskFiles],
-        task_type: Literal["parallel", "compound", "converter_compound"],
+        task_type: MultisubmitTaskType,
         config: SlurmConfig,
         user_id: int,
     ) -> tuple[dict[int, Any], dict[int, BaseException]]:
@@ -654,7 +652,7 @@ class BaseSlurmRunner(BaseRunner):
         logger.debug(f"[multisubmit] START, {len(list_parameters)=}")
         try:
             if self.is_shutdown():
-                if task_type == "parallel":
+                if task_type == TaskType.PARALLEL:
                     with next(get_sync_db()) as db:
                         bulk_update_status_of_history_unit(
                             history_unit_ids=history_unit_ids,
@@ -680,7 +678,7 @@ class BaseSlurmRunner(BaseRunner):
             workdir_remote = list_task_files[0].wftask_subfolder_remote
 
             # Create local&remote task subfolders
-            if task_type == "parallel":
+            if task_type == TaskType.PARALLEL:
                 self._mkdir_local_folder(workdir_local.as_posix())
                 self._mkdir_remote_folder(folder=workdir_remote.as_posix())
 
@@ -758,7 +756,7 @@ class BaseSlurmRunner(BaseRunner):
                 f" Original error {str(e)}"
             )
             self.scancel_jobs()
-            if task_type == "parallel":
+            if task_type == TaskType.PARALLEL:
                 with next(get_sync_db()) as db:
                     bulk_update_status_of_history_unit(
                         history_unit_ids=history_unit_ids,
@@ -824,7 +822,7 @@ class BaseSlurmRunner(BaseRunner):
                         # `result is None` is not relevant for this purpose.
                         if exception is not None:
                             exceptions[task.index] = exception
-                            if task_type == "parallel":
+                            if task_type == TaskType.PARALLEL:
                                 update_status_of_history_unit(
                                     history_unit_id=history_unit_ids[
                                         task.index
@@ -834,7 +832,7 @@ class BaseSlurmRunner(BaseRunner):
                                 )
                         else:
                             results[task.index] = result
-                            if task_type == "parallel":
+                            if task_type == TaskType.PARALLEL:
                                 update_status_of_history_unit(
                                     history_unit_id=history_unit_ids[
                                         task.index

fractal_server/app/runner/v2/runner.py

@@ -10,10 +10,6 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlmodel import delete
 from sqlmodel import update
 
-from ....images import SingleImage
-from ....images.tools import filter_image_list
-from ....images.tools import find_image_by_zarr_url
-from ..exceptions import JobExecutionError
 from .merge_outputs import merge_outputs
 from .runner_functions import run_v2_task_compound
 from .runner_functions import run_v2_task_non_parallel
@@ -28,13 +24,18 @@ from fractal_server.app.models.v2 import HistoryRun
 from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
+from fractal_server.app.runner.exceptions import JobExecutionError
 from fractal_server.app.runner.executors.base_runner import BaseRunner
 from fractal_server.app.runner.v2.db_tools import update_status_of_history_run
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskDumpV2
 from fractal_server.app.schemas.v2 import TaskGroupDumpV2
+from fractal_server.app.schemas.v2 import TaskType
+from fractal_server.images import SingleImage
 from fractal_server.images.status_tools import enrich_images_sync
 from fractal_server.images.status_tools import IMAGE_STATUS_KEY
+from fractal_server.images.tools import filter_image_list
+from fractal_server.images.tools import find_image_by_zarr_url
 from fractal_server.images.tools import merge_type_filters
 from fractal_server.types import AttributeFilters
 
@@ -131,7 +132,11 @@ def execute_tasks_v2(
         # PRE TASK EXECUTION
 
         # Filter images by types and attributes (in two steps)
-        if wftask.task_type in ["compound", "parallel", "non_parallel"]:
+        if wftask.task_type in [
+            TaskType.COMPOUND,
+            TaskType.PARALLEL,
+            TaskType.NON_PARALLEL,
+        ]:
             # Non-converter task
             type_filters = copy(current_dataset_type_filters)
             type_filters_patch = merge_type_filters(
@@ -190,7 +195,10 @@ def execute_tasks_v2(
 
         # TASK EXECUTION (V2)
         try:
-            if task.type in ["non_parallel", "converter_non_parallel"]:
+            if task.type in [
+                TaskType.NON_PARALLEL,
+                TaskType.CONVERTER_NON_PARALLEL,
+            ]:
                 outcomes_dict, num_tasks = run_v2_task_non_parallel(
                     images=filtered_images,
                     zarr_dir=zarr_dir,
@@ -205,7 +213,7 @@ def execute_tasks_v2(
                     user_id=user_id,
                     task_type=task.type,
                 )
-            elif task.type == "parallel":
+            elif task.type == TaskType.PARALLEL:
                 outcomes_dict, num_tasks = run_v2_task_parallel(
                     images=filtered_images,
                     wftask=wftask,
@@ -218,7 +226,10 @@ def execute_tasks_v2(
                     dataset_id=dataset.id,
                     user_id=user_id,
                 )
-            elif task.type in ["compound", "converter_compound"]:
+            elif task.type in [
+                TaskType.COMPOUND,
+                TaskType.CONVERTER_COMPOUND,
+            ]:
                 outcomes_dict, num_tasks = run_v2_task_compound(
                     images=filtered_images,
                     zarr_dir=zarr_dir,

fractal_server/app/runner/v2/runner_functions.py

@@ -31,6 +31,7 @@ from fractal_server.app.runner.v2.task_interface import (
     _cast_and_validate_TaskOutput,
 )
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
+from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.logger import set_logger
 
 __all__ = [
@@ -135,14 +136,17 @@ def run_v2_task_non_parallel(
     ],
     dataset_id: int,
     history_run_id: int,
-    task_type: Literal["non_parallel", "converter_non_parallel"],
+    task_type: Literal[TaskType.NON_PARALLEL, TaskType.CONVERTER_NON_PARALLEL],
     user_id: int,
 ) -> tuple[dict[int, SubmissionOutcome], int]:
     """
     This runs server-side (see `executor` argument)
     """
 
-    if task_type not in ["non_parallel", "converter_non_parallel"]:
+    if task_type not in [
+        TaskType.NON_PARALLEL,
+        TaskType.CONVERTER_NON_PARALLEL,
+    ]:
         raise ValueError(
             f"Invalid {task_type=} for `run_v2_task_non_parallel`."
         )
@@ -166,14 +170,14 @@ def run_v2_task_non_parallel(
         "zarr_dir": zarr_dir,
         **(wftask.args_non_parallel or {}),
     }
-    if task_type == "non_parallel":
+    if task_type == TaskType.NON_PARALLEL:
         function_kwargs["zarr_urls"] = [img["zarr_url"] for img in images]
 
     # Database History operations
     with next(get_sync_db()) as db:
-        if task_type == "non_parallel":
+        if task_type == TaskType.NON_PARALLEL:
             zarr_urls = function_kwargs["zarr_urls"]
-        elif task_type == "converter_non_parallel":
+        elif task_type == TaskType.CONVERTER_NON_PARALLEL:
             zarr_urls = []
 
         history_unit = HistoryUnit(
@@ -388,7 +392,7 @@ def run_v2_task_compound(
     ],
     dataset_id: int,
     history_run_id: int,
-    task_type: Literal["compound", "converter_compound"],
+    task_type: Literal[TaskType.COMPOUND, TaskType.CONVERTER_COMPOUND],
     user_id: int,
 ) -> tuple[dict[int, SubmissionOutcome], int]:
     # Get TaskFiles object
@@ -410,10 +414,10 @@ def run_v2_task_compound(
         "zarr_dir": zarr_dir,
         **(wftask.args_non_parallel or {}),
     }
-    if task_type == "compound":
+    if task_type == TaskType.COMPOUND:
         function_kwargs["zarr_urls"] = [img["zarr_url"] for img in images]
         input_image_zarr_urls = function_kwargs["zarr_urls"]
-    elif task_type == "converter_compound":
+    elif task_type == TaskType.CONVERTER_COMPOUND:
         input_image_zarr_urls = []
 
     # Create database History entries

fractal_server/app/schemas/v2/__init__.py

@@ -31,6 +31,7 @@ from .task import TaskExportV2  # noqa F401
 from .task import TaskImportV2  # noqa F401
 from .task import TaskImportV2Legacy  # noqa F401
 from .task import TaskReadV2  # noqa F401
+from .task import TaskType  # noqa F401
 from .task import TaskUpdateV2  # noqa F401
 from .task_collection import TaskCollectCustomV2  # noqa F401
 from .task_collection import TaskCollectPipV2  # noqa F401

fractal_server/app/schemas/v2/dumps.py

@@ -11,7 +11,7 @@ from pydantic import BaseModel
 from pydantic import ConfigDict
 from pydantic import Field
 
-from .task import TaskTypeType
+from .task import TaskType
 from .task_group import TaskGroupV2OriginEnum
 
 
@@ -25,7 +25,7 @@ class ProjectDumpV2(BaseModel):
 class TaskDumpV2(BaseModel):
     id: int
     name: str
-    type: TaskTypeType
+    type: TaskType
 
     command_non_parallel: str | None = None
     command_parallel: str | None = None

fractal_server/app/schemas/v2/manifest.py

@@ -4,6 +4,7 @@ from pydantic import BaseModel
 from pydantic import Field
 from pydantic import model_validator
 
+from .task import TaskType
 from fractal_server.types import DictStrAny
 from fractal_server.types import HttpUrlStr
 from fractal_server.types import NonEmptyStr
@@ -55,15 +56,7 @@ class TaskManifestV2(BaseModel):
     modality: str | None = None
     tags: list[str] = Field(default_factory=list)
 
-    type: None | (
-        Literal[
-            "compound",
-            "converter_compound",
-            "non_parallel",
-            "converter_non_parallel",
-            "parallel",
-        ]
-    ) = None
+    type: None | TaskType = None
 
     @model_validator(mode="after")
     def validate_executable_args_meta(self):

fractal_server/app/schemas/v2/task.py

@@ -1,5 +1,5 @@
+from enum import StrEnum
 from typing import Any
-from typing import Literal
 
 from pydantic import BaseModel
 from pydantic import ConfigDict
@@ -14,18 +14,22 @@ from fractal_server.types import ListUniqueNonEmptyString
 from fractal_server.types import NonEmptyStr
 from fractal_server.types import TypeFilters
 
-TaskTypeType = Literal[
-    "compound",
-    "converter_compound",
-    "non_parallel",
-    "converter_non_parallel",
-    "parallel",
-]
-
 
 logger = set_logger(__name__)
 
 
+class TaskType(StrEnum):
+    """
+    Define the available task types.
+    """
+
+    COMPOUND = "compound"
+    CONVERTER_COMPOUND = "converter_compound"
+    NON_PARALLEL = "non_parallel"
+    CONVERTER_NON_PARALLEL = "converter_non_parallel"
+    PARALLEL = "parallel"
+
+
 class TaskCreateV2(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
@@ -51,7 +55,7 @@ class TaskCreateV2(BaseModel):
     tags: ListUniqueNonEmptyString = Field(default_factory=list)
     authors: NonEmptyStr | None = None
 
-    type: TaskTypeType | None = None
+    type: TaskType | None = None
 
     @model_validator(mode="after")
     def validate_commands(self):
@@ -78,11 +82,11 @@ class TaskCreateV2(BaseModel):
                 "Please move to `fractal-task-tools`."
             )
             if self.command_non_parallel is None:
-                self.type = "parallel"
+                self.type = TaskType.PARALLEL
             elif self.command_parallel is None:
-                self.type = "non_parallel"
+                self.type = TaskType.NON_PARALLEL
             else:
-                self.type = "compound"
+                self.type = TaskType.COMPOUND
 
         return self
 
@@ -90,7 +94,7 @@ class TaskCreateV2(BaseModel):
 class TaskReadV2(BaseModel):
     id: int
     name: str
-    type: TaskTypeType
+    type: TaskType
     source: str | None = None
     version: str | None = None
 

fractal_server/app/schemas/v2/workflowtask.py

@@ -9,7 +9,7 @@ from .task import TaskExportV2
 from .task import TaskImportV2
 from .task import TaskImportV2Legacy
 from .task import TaskReadV2
-from .task import TaskTypeType
+from .task import TaskType
 from fractal_server.types import DictStrAny
 from fractal_server.types import TypeFilters
 from fractal_server.types import WorkflowTaskArgument
@@ -45,7 +45,7 @@ class WorkflowTaskReadV2(BaseModel):
 
     type_filters: dict[str, bool]
 
-    task_type: TaskTypeType
+    task_type: TaskType
     task_id: int
     task: TaskReadV2
 

fractal_server/utils.py

@@ -13,12 +13,10 @@
 This module provides general purpose utilities that are not specific to any
 subsystem.
 """
-import asyncio
 import shlex
 import subprocess  # nosec
 from datetime import datetime
 from datetime import timezone
-from pathlib import Path
 
 from .logger import get_logger
 from .string_tools import validate_cmd
@@ -31,53 +29,6 @@ def get_timestamp() -> datetime:
     return datetime.now(tz=timezone.utc)
 
 
-async def execute_command_async(
-    *,
-    command: str,
-    cwd: Path | None = None,
-    logger_name: str | None = None,
-) -> str:
-    """
-    Execute arbitrary command
-
-    If the command returns a return code different from zero, a RuntimeError
-    containing the stderr is raised.
-
-    Args:
-        cwd:
-            The working directory for the command execution.
-        command:
-            The command to execute.
-
-    Returns:
-        stdout:
-            The stdout from the command execution.
-
-    Raises:
-        RuntimeError: if the process exited with non-zero status. The error
-            string is set to the `stderr` of the process.
-    """
-    command_split = shlex.split(command)
-    cmd, *args = command_split
-
-    logger = get_logger(logger_name)
-    cwd_kwarg = dict() if cwd is None else dict(cwd=cwd)
-    proc = await asyncio.create_subprocess_exec(
-        cmd,
-        *args,
-        stdout=asyncio.subprocess.PIPE,
-        stderr=asyncio.subprocess.PIPE,
-        **cwd_kwarg,
-    )
-    stdout, stderr = await proc.communicate()
-    logger.debug(f"Subprocess call to: {command}")
-    logger.debug(stdout.decode("utf-8"))
-    logger.debug(stderr.decode("utf-8"))
-    if proc.returncode != 0:
-        raise RuntimeError(stderr.decode("utf-8"))
-    return stdout.decode("utf-8")
-
-
 def execute_command_sync(
     *,
     command: str,

{fractal_server-2.14.13.dist-info → fractal_server-2.14.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.14.13
+Version: 2.14.15
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin

{fractal_server-2.14.13.dist-info → fractal_server-2.14.15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=6bdBE5bJoA01yAEh1heVK-Ta-FFnpeeh531ZgEO8YXY,24
+fractal_server/__init__.py,sha256=1lO5LXhx8fwsKnWQVdnMtEvVmWkDE9cZ0L2RpkoG0O8,24
 fractal_server/__main__.py,sha256=rkM8xjY1KeS3l63irB8yCrlVobR-73uDapC4wvrIlxI,6957
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,24 +35,24 @@ fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=Z23xwvBaVEEQ5B
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=GpKfw9yj01LmOAuNMTOreU1PFkCKpjK5oCt7_wp35-A,6741
 fractal_server/app/routes/api/v2/_aux_functions_task_version_update.py,sha256=WLDOYCnb6fnS5avKflyx6yN24Vo1n5kJk5ZyiKbzb8Y,1175
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=MFYnyNPBACSHXTDLXe6cSennnpmlpajN84iivOOMW7Y,11599
-fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=2sK7-bZzcl3-2mkx62tw0MPxeUYVDch30DSWgdhouHI,4615
+fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=8x1_q9FyCzItnPmdSdLQuwUTy4B9xCsXscp97_lJcpM,4635
 fractal_server/app/routes/api/v2/dataset.py,sha256=6u4MFqJ3YZ0Zq6Xx8CRMrTPKW55ZaR63Uno21DqFr4Q,8889
 fractal_server/app/routes/api/v2/history.py,sha256=BEmf_ENF5HNMy8yXrxRdo4280rWuRUa1Jw4u8R9-LQQ,15477
 fractal_server/app/routes/api/v2/images.py,sha256=TS1ltUhP0_SaViupdHrSh3MLDi5OVk-lOhE1VCVyZj0,7869
 fractal_server/app/routes/api/v2/job.py,sha256=8xRTwh_OCHmK9IfI_zUASa2ozewR0qu0zVBl_a4IvHw,6467
-fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=MmjvSQ0pNAWEw5BavR16zIZ4h13py302AmToaz8Vvco,4768
+fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=122MlfYwBBIw39bo9b3xuhvzBG20olPvjCzudAxX8H4,4909
 fractal_server/app/routes/api/v2/project.py,sha256=ldMEyjtwGpX2teu85sCNWaubDFlw-En8U1SA7G1VaIw,4567
 fractal_server/app/routes/api/v2/status_legacy.py,sha256=ZckHeBy8y21cyQ_OLY-VmkapzMhd3g9ae-qg-r4-uVo,6317
 fractal_server/app/routes/api/v2/submit.py,sha256=_BDkWtFdo8-p7kZ0Oxaidei04MfuBeaEsWtwJaKZQ_Y,8781
-fractal_server/app/routes/api/v2/task.py,sha256=cUFrCxFOLGlRV7UCbUMHs4Xy4tIc3pqwG8gEqVP5GcU,6939
+fractal_server/app/routes/api/v2/task.py,sha256=ptS47XtxnHzk9bPNZV24Wfroo5sP19RE0-LsfX0ZvOc,7018
 fractal_server/app/routes/api/v2/task_collection.py,sha256=FGMhTnU88Umd8nMdriUYPtpTtAHcRBRrZIYyOesFhrU,12577
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=EfGpv6W7xDyuYYp6E7XAcXLJiLNAImUHFqMDLgfh-4s,6730
-fractal_server/app/routes/api/v2/task_group.py,sha256=Xfsj5Wy0NOIkbeYsdqyFke4mkaeq0riJeTrGCHbt-eM,9059
+fractal_server/app/routes/api/v2/task_group.py,sha256=M96VoKcLqOpZlY0RWnsHza8jN0dzAWK9lxw87Om3Fbw,9063
 fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=C2U2V76YbbqDWmErJ98MH9C2C26Lve2p_35FZ1dNmXg,9095
-fractal_server/app/routes/api/v2/task_version_update.py,sha256=h2c6aTLXj0_ZyBuHVsD5-ZTNMGEUpS96qZ4Ot1jlb74,7974
+fractal_server/app/routes/api/v2/task_version_update.py,sha256=o8W_C0I84X0u8gAMnCvi8ChiVAKrb5WzUBuJLSuujCA,8235
 fractal_server/app/routes/api/v2/workflow.py,sha256=gwMtpfUY_JiTv5_R_q1I9WNkp6nTqEVtYx8jWNJRxcU,10227
 fractal_server/app/routes/api/v2/workflow_import.py,sha256=kOGDaCj0jCGK1WSYGbnUjtUg2U1YxUY9UMH-2ilqJg4,9027
-fractal_server/app/routes/api/v2/workflowtask.py,sha256=vVqEoJa3lrMl2CU94WoxFaqO3U0QImPgvrkkUNdqDOU,7462
+fractal_server/app/routes/api/v2/workflowtask.py,sha256=KQU9rSQNhc6TRFdUYM09zty8Bu150sKvcLGz_tX4Fgo,7548
 fractal_server/app/routes/auth/__init__.py,sha256=fao6CS0WiAjHDTvBzgBVV_bSXFpEAeDBF6Z6q7rRkPc,1658
 fractal_server/app/routes/auth/_aux_auth.py,sha256=UZgauY0V6mSqjte_sYI1cBl2h8bcbLaeWzgpl1jdJlk,4883
 fractal_server/app/routes/auth/current_user.py,sha256=EjkwMxUA0l6FLbDJdertHGnuOoSS-HEysmm6l5FkAlY,5903
@@ -71,16 +71,16 @@ fractal_server/app/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 fractal_server/app/runner/components.py,sha256=-Ii5l8d_V6f5DFOd-Zsr8VYmOsyqw0Hox9fEFQiuqxY,66
 fractal_server/app/runner/exceptions.py,sha256=tJxs7WCQ86kjezunFm4o_VAiUAyD70l3GiH6ht0waWA,3958
 fractal_server/app/runner/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/runner/executors/base_runner.py,sha256=z86UVlxL22MdpCx1RCNcw1i04-cxvG8r9aVS2Asde0A,5448
+fractal_server/app/runner/executors/base_runner.py,sha256=7ujN6gN92X9sWAlDwkc07G3FA4Z_Zwew_uBYh2qv0uI,5978
 fractal_server/app/runner/executors/call_command_wrapper.py,sha256=1BHl-zbXoX2oGUWGAFprVZMmg5QjutPH0-VZJSIC0II,1419
 fractal_server/app/runner/executors/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/local/get_local_config.py,sha256=KBYOkcuwpSYl-ZIAwPBxpn59QSyFF8eJ-fLKVIhwwzA,3594
-fractal_server/app/runner/executors/local/runner.py,sha256=25sqaz6p2Fj1AZLF22odUwP892DDTSfCzU6X7wZcR_Q,10716
+fractal_server/app/runner/executors/local/runner.py,sha256=DZK_oVxjIewyo7tjB7HvTds0nDHxIbpLJ4ABn4Mly8w,10841
 fractal_server/app/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_common/_batching.py,sha256=gbHZIxt90GjUwhB9_UInwVqpX-KdxRQMDeXzUagdL3U,8816
 fractal_server/app/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
 fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=Zv2l_6X1EfSHGRqcBMj2dbai_kP8hfuMfh-WoIUj0tY,15646
-fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=-xGJb_wc_99o-JweRr1f-ho8hSczNTWdj00jCfE1KPc,35533
+fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=2F2zgg3DJKAJ5LecFAzMSGLFmsMiM4lMk4Kh9It35F4,35626
 fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=VJNryceLzF5_fx9_lS1nGq85EW8rOQ0KrgtMATcfdQc,7271
 fractal_server/app/runner/executors/slurm_common/remote.py,sha256=xWnI6WktHR_7cxUme72ztIeBb4osnbZNu6J2azWn9K8,3765
 fractal_server/app/runner/executors/slurm_common/slurm_job_task_models.py,sha256=K4SdJOKsUWzDlnkb8Ug_UmTx6nBMsTqn9_oKqwE4XDI,3520
@@ -102,8 +102,8 @@ fractal_server/app/runner/v2/_slurm_sudo.py,sha256=Gvsh4tUlc1_3KdF3B7zEqs-YIntC_
 fractal_server/app/runner/v2/db_tools.py,sha256=du5dKhMMFMErQXbGIgu9JvO_vtMensodyPsyDeqz1yQ,3324
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=IVTE4abBU1bUprFTkxrTfYKnvkNTanWQ-KWh_etiT08,645
 fractal_server/app/runner/v2/merge_outputs.py,sha256=D1L4Taieq9i71SPQyNc1kMokgHh-sV_MqF3bv7QMDBc,907
-fractal_server/app/runner/v2/runner.py,sha256=_vmFdJCqNZVK9sQa7MoAIemkRX-hakLm5RLCBz8QxDg,18667
-fractal_server/app/runner/v2/runner_functions.py,sha256=Q9AVIR2NEBfRpfqW1wtQTTQfks_R1TnwRFBRro2fvjQ,18837
+fractal_server/app/runner/v2/runner.py,sha256=vi5AAHl-MZwq0FMMCfdgzXv4DB8cCDWsAqvTdpaXh9Q,18972
+fractal_server/app/runner/v2/runner_functions.py,sha256=aEwEDzI2l-QvgfJSj-M2LGvqA89nOiJYIFVryKEq_3M,18988
 fractal_server/app/runner/v2/submit_workflow.py,sha256=AMnXdozwIGlXD55ch0_SNAG-ntKBO-QRhkbInrvsShU,13140
 fractal_server/app/runner/v2/task_interface.py,sha256=V2TWBK6tbhycyMrJvFaoJ9IpuKlrLrvmjJbfNMsBBXo,2527
 fractal_server/app/runner/versions.py,sha256=4BW-8Et8RVgILgpFoUJLWkEnZz53pv8hv_2ucG480ns,398
@@ -111,20 +111,20 @@ fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMo
 fractal_server/app/schemas/user.py,sha256=t9nbyYjGCSOsxm9K97PDG3-9o27CsaFfhWb_L5nrjqA,1910
 fractal_server/app/schemas/user_group.py,sha256=x3-kqbo0q2wTP7QI0iZ7PU_9Dr957UYrFMKqS7BXLhE,1425
 fractal_server/app/schemas/user_settings.py,sha256=NpdC0Me0fgwwdfJuTSlFLCnLUjiWWzrJlPn_UPLjXnw,1862
-fractal_server/app/schemas/v2/__init__.py,sha256=ft9gFmLLClNbWE8pwmG81fuLl1hlfdSsb8TvLoX3Sqk,3047
+fractal_server/app/schemas/v2/__init__.py,sha256=-uKDjFn1esNs7WlhrugvBRl34ABXyo7h1Gm0V5KWk9U,3087
 fractal_server/app/schemas/v2/accounting.py,sha256=Wylt7uWTiDIFlHJOh4XEtYitk2FjFlmnodDrJDxcr0E,397
 fractal_server/app/schemas/v2/dataset.py,sha256=NKCjBwGBC7mPiSlXktZAcleJsvlLY6KfNKw7Wx4Zfqk,1728
-fractal_server/app/schemas/v2/dumps.py,sha256=o4RiWoSmQ8UPoWxgKoeORykGNIdczeNmm-ng-dBRD7k,2216
+fractal_server/app/schemas/v2/dumps.py,sha256=xZcUBN3cKADzR37z0X3kjIwizdhPpDHBC_RX1rXxJ5U,2208
 fractal_server/app/schemas/v2/history.py,sha256=pZiMKfh6nMWbTp5MUtrnGySPKbeRFf5tM1VLFaTgGcw,1784
 fractal_server/app/schemas/v2/job.py,sha256=fPay7dLSr-skKRdVRoZig8rf_sZwUdVdHZaJ4XM8vMI,3288
-fractal_server/app/schemas/v2/manifest.py,sha256=sZhj99iDgjE2MWXeTxnXSb6pFdKwRnFpCVQzcnpoTrI,6821
+fractal_server/app/schemas/v2/manifest.py,sha256=QUpXMDB8WkB1F4UK-yYmm3O8bXoHwDGURnqwn6ayO_I,6674
 fractal_server/app/schemas/v2/project.py,sha256=l96-3bCfB3knhITaLj1WSyBgbzP_k8CdtvgX_5jO_fU,657
 fractal_server/app/schemas/v2/status_legacy.py,sha256=eQT1zGxbkzSwd0EqclsOdZ60n1x6J3DB1CZ3m4LYyxc,955
-fractal_server/app/schemas/v2/task.py,sha256=b-eRyVKva6NjhCd0FgnFQXntlRN7gtcJdTA5q5A8yOQ,4221
+fractal_server/app/schemas/v2/task.py,sha256=IJv8loB4kx9FBkaIHoiMsswQyq02FxvyAnHK1u074fU,4364
 fractal_server/app/schemas/v2/task_collection.py,sha256=MyFBr5xltYk8bRSDGEpfHw4eD_LU4287UFSNDP2WPjI,4144
 fractal_server/app/schemas/v2/task_group.py,sha256=R6u6CB2V62gn28Q_K8AbMHs9rWfyYTd-SPt3J4oNTU0,3172
 fractal_server/app/schemas/v2/workflow.py,sha256=JtjxbDO52bmY06WUMACUKpFSdJysO4DBv7wezsvODRQ,1775
-fractal_server/app/schemas/v2/workflowtask.py,sha256=uXAXjj2TrHOOnFm6CODCGA5kJEs0oaJHE9MjuQSqjsU,3647
+fractal_server/app/schemas/v2/workflowtask.py,sha256=6eweAMyziwaoMT-7R1fVJYunIeZKzT0-7fAVgPO_FEc,3639
 fractal_server/app/security/__init__.py,sha256=oJ8RVglpOvWPQY4RokiE2YA72Nqo42dZEjywWTt8xr8,14032
 fractal_server/app/security/signup_email.py,sha256=Xd6QYxcdmg0PHpDwmUE8XQmPcOj3Xjy5oROcIMhmltM,1472
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
@@ -214,10 +214,10 @@ fractal_server/types/validators/_common_validators.py,sha256=MpxyaP2kwgbyCTOaVRj
 fractal_server/types/validators/_filter_validators.py,sha256=_s2dG9aCkiNWyX3ZLLuYlAgNKlQVm-ORdF-HpnyhX10,830
 fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL7NgV8d56XbcD6gG5PVFUPMHjDm5Q-d7cXhVLdFAGU,387
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
-fractal_server/utils.py,sha256=FCY6HUsRnnbsWkT2kwQ2izijiHuCrCD3Kh50G0QudxE,3531
+fractal_server/utils.py,sha256=Vn35lApt1T1J8nc09sAVqd10Cy0sa3dLipcljI-hkuk,2185
 fractal_server/zip_tools.py,sha256=tqz_8f-vQ9OBRW-4OQfO6xxY-YInHTyHmZxU7U4PqZo,4885
-fractal_server-2.14.13.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.13.dist-info/METADATA,sha256=-h8oCvhvIAs4Sp0G5zxavNQkpS6NkBsM8XHHmCT47EE,4244
-fractal_server-2.14.13.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.13.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.13.dist-info/RECORD,,
+fractal_server-2.14.15.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.15.dist-info/METADATA,sha256=Sz4teXD8HvAhlbNjhwBKfOiswHcP47lMAIMnHK6puVU,4244
+fractal_server-2.14.15.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.15.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.15.dist-info/RECORD,,