fractal-server 2.14.13__tar.gz → 2.14.14__tar.gz

{fractal_server-2.14.13 → fractal_server-2.14.14}/PKG-INFO

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

fractal_server-2.14.14/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.14.14"

{fractal_server-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/fractal_server/app/routes/api/v2/pre_submission_checks.py

@@ -16,6 +16,7 @@ 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.tools import aggregate_types
 from fractal_server.images.tools import filter_image_list
 from fractal_server.types import AttributeFilters
@@ -105,8 +106,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=[])

{fractal_server-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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-2.14.13 → fractal_server-2.14.14}/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