fractal-server 2.0.0a11__py3-none-any.whl → 2.0.0a12__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.0.0a11"
+__VERSION__ = "2.0.0a12"

fractal_server/app/models/__init__.py

@@ -2,5 +2,8 @@
 `models` module
 """
 from .security import *  # noqa: F401, F403
-from .v1 import *  # noqa: F401, F403
-from .v2 import *  # noqa: F401, F403
+from .v1 import Project  # noqa: F401
+from .v2 import ProjectV2  # noqa: F401
+
+# We include the project models to avoid issues with LinkUserProject
+# (sometimes taking place in alembic autogenerate)

fractal_server/app/models/v1/state.py

@@ -9,7 +9,7 @@ from sqlmodel import Field
 from sqlmodel import SQLModel
 
 from ....utils import get_timestamp
-from ...schemas.v1 import _StateBase
+from ...schemas.state import _StateBase
 
 
 class State(_StateBase, SQLModel, table=True):

fractal_server/app/models/v2/workflowtask.py

@@ -2,7 +2,6 @@ from typing import Any
 from typing import Literal
 from typing import Optional
 
-from pydantic import validator
 from sqlalchemy import Column
 from sqlalchemy.types import JSON
 from sqlmodel import Field
@@ -48,41 +47,3 @@ class WorkflowTaskV2(SQLModel, table=True):
     task_legacy: Optional[Task] = Relationship(
         sa_relationship_kwargs=dict(lazy="selectin")
     )
-
-    @validator("args_non_parallel")
-    def validate_args_non_parallel(cls, value):
-        if value is None:
-            return
-        forbidden_args_keys = {
-            "zarr_dir",
-            "zarr_url",
-            "zarr_urls",
-            "init_args",
-        }
-        args_keys = set(value.keys())
-        intersect_keys = forbidden_args_keys.intersection(args_keys)
-        if intersect_keys:
-            raise ValueError(
-                "`args` contains the following forbidden keys: "
-                f"{intersect_keys}"
-            )
-        return value
-
-    @validator("args_parallel")
-    def validate_args_parallel(cls, value):
-        if value is None:
-            return
-        forbidden_args_keys = {
-            "zarr_dir",
-            "zarr_url",
-            "zarr_urls",
-            "init_args",
-        }
-        args_keys = set(value.keys())
-        intersect_keys = forbidden_args_keys.intersection(args_keys)
-        if intersect_keys:
-            raise ValueError(
-                "`args` contains the following forbidden keys: "
-                f"{intersect_keys}"
-            )
-        return value

fractal_server/app/routes/admin/v1.py

@@ -20,12 +20,12 @@ from ....syringe import Inject
 from ....utils import get_timestamp
 from ...db import AsyncSession
 from ...db import get_async_db
-from ...models import ApplyWorkflow
-from ...models import Dataset
-from ...models import JobStatusTypeV1
-from ...models import Project
-from ...models import Workflow
 from ...models.security import UserOAuth as User
+from ...models.v1 import ApplyWorkflow
+from ...models.v1 import Dataset
+from ...models.v1 import JobStatusTypeV1
+from ...models.v1 import Project
+from ...models.v1 import Workflow
 from ...runner.filenames import WORKFLOW_LOG_FILENAME
 from ...schemas.v1 import ApplyWorkflowReadV1
 from ...schemas.v1 import ApplyWorkflowUpdateV1

fractal_server/app/routes/api/v1/_aux_functions.py

@@ -12,13 +12,13 @@ from sqlmodel import select
 from sqlmodel.sql.expression import SelectOfScalar
 
 from ....db import AsyncSession
-from ....models import ApplyWorkflow
-from ....models import Dataset
 from ....models import LinkUserProject
-from ....models import Project
-from ....models import Task
-from ....models import Workflow
-from ....models import WorkflowTask
+from ....models.v1 import ApplyWorkflow
+from ....models.v1 import Dataset
+from ....models.v1 import Project
+from ....models.v1 import Task
+from ....models.v1 import Workflow
+from ....models.v1 import WorkflowTask
 from ....schemas.v1 import JobStatusTypeV1
 from ....security import User
 

fractal_server/app/routes/api/v1/dataset.py

@@ -13,10 +13,10 @@ from sqlmodel import select
 
 from ....db import AsyncSession
 from ....db import get_async_db
-from ....models import ApplyWorkflow
-from ....models import Dataset
-from ....models import Project
-from ....models import Resource
+from ....models.v1 import ApplyWorkflow
+from ....models.v1 import Dataset
+from ....models.v1 import Project
+from ....models.v1 import Resource
 from ....runner.filenames import HISTORY_FILENAME
 from ....schemas.v1 import DatasetCreateV1
 from ....schemas.v1 import DatasetReadV1

fractal_server/app/routes/api/v1/project.py

@@ -18,11 +18,11 @@ from .....logger import set_logger
 from .....syringe import Inject
 from ....db import AsyncSession
 from ....db import get_async_db
-from ....models import ApplyWorkflow
-from ....models import Dataset
 from ....models import LinkUserProject
-from ....models import Project
-from ....models import Workflow
+from ....models.v1 import ApplyWorkflow
+from ....models.v1 import Dataset
+from ....models.v1 import Project
+from ....models.v1 import Workflow
 from ....runner.set_start_and_last_task_index import (
     set_start_and_last_task_index,
 )

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

@@ -11,8 +11,8 @@ from sqlmodel import select
 from .....logger import set_logger
 from ....db import AsyncSession
 from ....db import get_async_db
-from ....models import Task
-from ....models import WorkflowTask
+from ....models.v1 import Task
+from ....models.v1 import WorkflowTask
 from ....models.v2 import TaskV2
 from ....schemas.v1 import TaskCreateV1
 from ....schemas.v1 import TaskReadV1

fractal_server/app/routes/api/v1/task_collection.py

@@ -17,9 +17,9 @@ from .....logger import set_logger
 from .....syringe import Inject
 from ....db import AsyncSession
 from ....db import get_async_db
-from ....models import State
-from ....models import Task
-from ....schemas.v1 import StateRead
+from ....models.v1 import State
+from ....models.v1 import Task
+from ....schemas.state import StateRead
 from ....schemas.v1 import TaskCollectPipV1
 from ....schemas.v1 import TaskCollectStatusV1
 from ....security import current_active_user

fractal_server/app/routes/api/v1/workflow.py

@@ -23,10 +23,10 @@ from .....logger import close_logger
 from .....logger import set_logger
 from ....db import AsyncSession
 from ....db import get_async_db
-from ....models import ApplyWorkflow
-from ....models import Project
-from ....models import Task
-from ....models import Workflow
+from ....models.v1 import ApplyWorkflow
+from ....models.v1 import Project
+from ....models.v1 import Task
+from ....models.v1 import Workflow
 from ....schemas.v1 import WorkflowCreateV1
 from ....schemas.v1 import WorkflowExportV1
 from ....schemas.v1 import WorkflowImportV1

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

@@ -22,7 +22,7 @@ from fastapi import status
 
 from ....db import AsyncSession
 from ....db import get_async_db
-from ....models import Task
+from ....models.v1 import Task
 from ....schemas.v1 import WorkflowTaskCreateV1
 from ....schemas.v1 import WorkflowTaskReadV1
 from ....schemas.v1 import WorkflowTaskUpdateV1

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

@@ -270,6 +270,16 @@ async def import_dataset(
         db=db,
     )
 
+    for image in dataset.images:
+        if not image.zarr_url.startswith(dataset.zarr_dir):
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail=(
+                    f"Cannot import dataset: zarr_url {image.zarr_url} is not "
+                    f"relative to zarr_dir={dataset.zarr_dir}."
+                ),
+            )
+
     # Create new Dataset
     db_dataset = DatasetV2(
         project_id=project_id,

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

@@ -12,7 +12,7 @@ from ....db import AsyncSession
 from ....db import get_async_db
 from ....models.v2 import JobV2
 from ....models.v2 import ProjectV2
-from ....runner.filenames import WORKFLOW_LOG_FILENAME  # FIXME
+from ....runner.filenames import WORKFLOW_LOG_FILENAME
 from ....schemas.v2 import JobReadV2
 from ....schemas.v2 import JobStatusTypeV2
 from ....security import current_active_user

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

@@ -5,11 +5,8 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
-from sqlalchemy.exc import IntegrityError
 from sqlmodel import select
 
-from .....logger import close_logger
-from .....logger import set_logger
 from ....db import AsyncSession
 from ....db import get_async_db
 from ....models.v2 import DatasetV2
@@ -65,20 +62,11 @@ async def create_project(
 
     db_project = ProjectV2(**project.dict())
     db_project.user_list.append(user)
-    try:
-        db.add(db_project)
-        await db.commit()
-        await db.refresh(db_project)
-        await db.close()
-    except IntegrityError as e:
-        await db.rollback()
-        logger = set_logger("create_project")
-        logger.error(str(e))
-        close_logger(logger)
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=str(e),
-        )
+
+    db.add(db_project)
+    await db.commit()
+    await db.refresh(db_project)
+    await db.close()
 
     return db_project
 

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

@@ -17,7 +17,7 @@ from ....db import get_async_db
 from ....models.v2 import JobV2
 from ....runner.set_start_and_last_task_index import (
     set_start_and_last_task_index,
-)  # FIXME V2
+)
 from ....runner.v2 import submit_workflow
 from ....schemas.v2 import JobCreateV2
 from ....schemas.v2 import JobReadV2

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

@@ -17,9 +17,9 @@ from .....logger import set_logger
 from .....syringe import Inject
 from ....db import AsyncSession
 from ....db import get_async_db
-from ....models import CollectionStateV2
+from ....models.v2 import CollectionStateV2
 from ....models.v2 import TaskV2
-from ....schemas import StateRead
+from ....schemas.state import StateRead
 from ....schemas.v2 import TaskCollectPipV2
 from ....schemas.v2 import TaskCollectStatusV2
 from ....security import current_active_user

fractal_server/app/routes/aux/_job.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from zipfile import ZIP_DEFLATED
 from zipfile import ZipFile
 
-from ...models import ApplyWorkflow
+from ...models.v1 import ApplyWorkflow
 from ...runner.filenames import SHUTDOWN_FILENAME
 
 

fractal_server/app/runner/task_files.py

@@ -42,7 +42,7 @@ class TaskFiles:
     workflow_dir: Path
     workflow_dir_user: Path
     task_order: Optional[int] = None
-    component: Optional[str] = None  # FIXME: this is actually for V1 only
+    component: Optional[str] = None
 
     file_prefix: str
     args: Path

fractal_server/app/runner/v1/__init__.py

@@ -26,10 +26,10 @@ from ....logger import set_logger
 from ....syringe import Inject
 from ....utils import get_timestamp
 from ...db import DB
-from ...models import ApplyWorkflow
-from ...models import Dataset
-from ...models import Workflow
-from ...models import WorkflowTask
+from ...models.v1 import ApplyWorkflow
+from ...models.v1 import Dataset
+from ...models.v1 import Workflow
+from ...models.v1 import WorkflowTask
 from ...schemas.v1 import JobStatusTypeV1
 from ..exceptions import JobExecutionError
 from ..exceptions import TaskExecutionError

fractal_server/app/runner/v1/_common.py

@@ -21,8 +21,8 @@ from typing import Optional
 from ....config import get_settings
 from ....logger import get_logger
 from ....syringe import Inject
-from ...models import Task
-from ...models import WorkflowTask
+from ...models.v1 import Task
+from ...models.v1 import WorkflowTask
 from ...schemas.v1 import WorkflowTaskStatusTypeV1
 from ..exceptions import JobExecutionError
 from ..exceptions import TaskExecutionError

fractal_server/app/runner/v1/_local/__init__.py

@@ -23,11 +23,11 @@ from pathlib import Path
 from typing import Any
 from typing import Optional
 
-from ....models import Workflow  # FIXME: this is v1 specific
+from ....models.v1 import Workflow
 from ...async_wrap import async_wrap
 from ...set_start_and_last_task_index import set_start_and_last_task_index
-from .._common import execute_tasks  # FIXME: this is v1 specific
-from ..common import TaskParameters  # FIXME: this is v1 specific
+from .._common import execute_tasks
+from ..common import TaskParameters
 from ._submit_setup import _local_submit_setup
 from .executor import FractalThreadPoolExecutor
 

fractal_server/app/runner/v2/runner.py

@@ -12,6 +12,7 @@ from ....images import SingleImage
 from ....images.tools import filter_image_list
 from ....images.tools import find_image_by_zarr_url
 from ....images.tools import match_filter
+from ..exceptions import JobExecutionError
 from ..filenames import FILTERS_FILENAME
 from ..filenames import HISTORY_FILENAME
 from ..filenames import IMAGES_FILENAME
@@ -20,13 +21,12 @@ from .runner_functions import run_v1_task_parallel
 from .runner_functions import run_v2_task_compound
 from .runner_functions import run_v2_task_non_parallel
 from .runner_functions import run_v2_task_parallel
+from .task_interface import TaskOutput
 from fractal_server.app.models.v2 import DatasetV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
 from fractal_server.app.schemas.v2.dataset import _DatasetHistoryItemV2
 from fractal_server.app.schemas.v2.workflowtask import WorkflowTaskStatusTypeV2
 
-# FIXME: define RESERVED_ARGUMENTS = [", ...]
-
 
 def execute_tasks_v2(
     wf_task_list: list[WorkflowTaskV2],
@@ -52,8 +52,15 @@ def execute_tasks_v2(
     for wftask in wf_task_list:
         task = wftask.task
         task_legacy = wftask.task_legacy
-        task_name = task_legacy.name if wftask.is_legacy_task else task.name
-        logger.debug(f'SUBMIT {wftask.order}-th task (name="{task_name}")')
+        if wftask.is_legacy_task:
+            task_name = task_legacy.name
+            logger.debug(
+                f"SUBMIT {wftask.order}-th task "
+                f'(legacy, name="{task_name}")'
+            )
+        else:
+            task_name = task.name
+            logger.debug(f'SUBMIT {wftask.order}-th task (name="{task_name}")')
 
         # PRE TASK EXECUTION
 
@@ -72,9 +79,11 @@ def execute_tasks_v2(
         if not wftask.is_legacy_task:
             for image in filtered_images:
                 if not match_filter(image, Filters(types=task.input_types)):
-                    raise ValueError(
-                        f"Filtered images include {image}, which does "
-                        f"not comply with {task.input_types=}."
+                    raise JobExecutionError(
+                        "Invalid filtered image list\n"
+                        f"Task input types: {task.input_types=}\n"
+                        f'Image zarr_url: {image["zarr_url"]}\n'
+                        f'Image types: {image["types"]}\n'
                     )
 
         # TASK EXECUTION (V2)
@@ -115,7 +124,7 @@ def execute_tasks_v2(
                     submit_setup_call=submit_setup_call,
                 )
             else:
-                raise ValueError(f"Invalid {task.type=}.")
+                raise ValueError(f"Unexpected error: Invalid {task.type=}.")
         # TASK EXECUTION (V1)
         else:
             current_task_output = run_v1_task_parallel(
@@ -131,21 +140,36 @@ def execute_tasks_v2(
 
         # POST TASK EXECUTION
 
+        # If `current_task_output` includes no images (to be created, edited or
+        # removed), then flag all the input images as modified. See
+        # fractal-server issue #1374.
+        if (
+            current_task_output.image_list_updates == []
+            and current_task_output.image_list_removals == []
+        ):
+            current_task_output = TaskOutput(
+                **current_task_output.dict(exclude={"image_list_updates"}),
+                image_list_updates=[
+                    dict(zarr_url=img["zarr_url"]) for img in filtered_images
+                ],
+            )
+
         # Update image list
         current_task_output.check_zarr_urls_are_unique()
         for image_obj in current_task_output.image_list_updates:
             image = image_obj.dict()
             # Edit existing image
-            if image["zarr_url"] in [
-                _image["zarr_url"] for _image in tmp_images
-            ]:
+            tmp_image_paths = [img["zarr_url"] for img in tmp_images]
+            if image["zarr_url"] in tmp_image_paths:
                 if (
                     image["origin"] is not None
                     and image["origin"] != image["zarr_url"]
                 ):
-                    raise ValueError(
-                        f"Trying to edit an image with {image['zarr_url']=} "
-                        f"and {image['origin']=}."
+                    raise JobExecutionError(
+                        "Cannot edit an image with zarr_url different from "
+                        "origin.\n"
+                        f"zarr_url={image['zarr_url']}\n"
+                        f"origin={image['origin']}"
                     )
                 img_search = find_image_by_zarr_url(
                     images=tmp_images,
@@ -153,6 +177,7 @@ def execute_tasks_v2(
                 )
                 if img_search is None:
                     raise ValueError(
+                        "Unexpected error: "
                         f"Image with zarr_url {image['zarr_url']} not found, "
                         "while updating image list."
                     )
@@ -188,14 +213,19 @@ def execute_tasks_v2(
             else:
                 # Check that image['zarr_url'] is relative to zarr_dir
                 if not image["zarr_url"].startswith(zarr_dir):
-                    raise ValueError(
-                        f"{zarr_dir} is not a parent directory of "
-                        f"{image['zarr_url']}"
+                    raise JobExecutionError(
+                        "Cannot create image if zarr_dir is not a parent "
+                        "directory of zarr_url.\n"
+                        f"zarr_dir: {zarr_dir}\n"
+                        f"zarr_url: {image['zarr_url']}"
                     )
                 # Check that image['zarr_url'] is not equal to zarr_dir
                 if image["zarr_url"] == zarr_dir:
-                    raise ValueError(
-                        "image['zarr_url'] cannot be equal to zarr_dir"
+                    raise JobExecutionError(
+                        "Cannot create image if zarr_url is equal to "
+                        "zarr_dir.\n"
+                        f"zarr_dir: {zarr_dir}\n"
+                        f"zarr_url: {image['zarr_url']}"
                     )
                 # Propagate attributes and types from `origin` (if any)
                 updated_attributes = {}
@@ -236,8 +266,8 @@ def execute_tasks_v2(
                 images=tmp_images, zarr_url=img_zarr_url
             )
             if img_search is None:
-                raise ValueError(
-                    f"Cannot remove missing image with zarr_url {img_zarr_url}"
+                raise JobExecutionError(
+                    f"Cannot remove missing image (zarr_url={img_zarr_url})."
                 )
             else:
                 tmp_images.pop(img_search["index"])
@@ -249,24 +279,31 @@ def execute_tasks_v2(
                 current_task_output.filters.attributes
             )
 
-        # Update filters.types: current + (task_output + task_manifest)
+        # Find manifest ouptut types
         if wftask.is_legacy_task:
             types_from_manifest = {}
         else:
             types_from_manifest = task.output_types
+
+        # Find task-output types
         if current_task_output.filters is not None:
             types_from_task = current_task_output.filters.types
         else:
             types_from_task = {}
+
         # Check that key sets are disjoint
         set_types_from_manifest = set(types_from_manifest.keys())
         set_types_from_task = set(types_from_task.keys())
         if not set_types_from_manifest.isdisjoint(set_types_from_task):
             overlap = set_types_from_manifest.intersection(set_types_from_task)
-            raise ValueError(
-                "Both task and task manifest did set the same"
-                f"output type. Overlapping keys: {overlap}."
+            raise JobExecutionError(
+                "Some type filters are being set twice, "
+                f"for task '{task_name}'.\n"
+                f"Types from task output: {types_from_task}\n"
+                f"Types from task maniest: {types_from_manifest}\n"
+                f"Overlapping keys: {overlap}"
             )
+
         # Update filters.types
         tmp_filters["types"].update(types_from_manifest)
         tmp_filters["types"].update(types_from_task)

fractal_server/app/runner/v2/runner_functions.py

@@ -8,6 +8,9 @@ from typing import Callable
 from typing import Literal
 from typing import Optional
 
+from pydantic import ValidationError
+
+from ..exceptions import JobExecutionError
 from .deduplicate_list import deduplicate_list
 from .merge_outputs import merge_outputs
 from .runner_functions_low_level import run_single_task
@@ -31,6 +34,34 @@ __all__ = [
 MAX_PARALLELIZATION_LIST_SIZE = 20_000
 
 
+def _cast_and_validate_TaskOutput(
+    task_output: dict[str, Any]
+) -> Optional[TaskOutput]:
+    try:
+        validated_task_output = TaskOutput(**task_output)
+        return validated_task_output
+    except ValidationError as e:
+        raise JobExecutionError(
+            "Validation of task output failed.\n"
+            f"Original error: {str(e)}\n"
+            f"Original data: {task_output}."
+        )
+
+
+def _cast_and_validate_InitTaskOutput(
+    init_task_output: dict[str, Any],
+) -> Optional[InitTaskOutput]:
+    try:
+        validated_init_task_output = InitTaskOutput(**init_task_output)
+        return validated_init_task_output
+    except ValidationError as e:
+        raise JobExecutionError(
+            "Validation of init-task output failed.\n"
+            f"Original error: {str(e)}\n"
+            f"Original data: {init_task_output}."
+        )
+
+
 def no_op_submit_setup_call(
     *,
     wftask: WorkflowTaskV2,
@@ -71,7 +102,7 @@ def _get_executor_options(
 
 def _check_parallelization_list_size(my_list):
     if len(my_list) > MAX_PARALLELIZATION_LIST_SIZE:
-        raise ValueError(
+        raise JobExecutionError(
             "Too many parallelization items.\n"
             f"   {len(my_list)}\n"
             f"   {MAX_PARALLELIZATION_LIST_SIZE=}\n"
@@ -126,12 +157,10 @@ def run_v2_task_non_parallel(
         **executor_options,
     )
     output = future.result()
-    # FIXME V2: handle validation errors
     if output is None:
         return TaskOutput()
     else:
-        validated_output = TaskOutput(**output)
-        return validated_output
+        return _cast_and_validate_TaskOutput(output)
 
 
 def run_v2_task_parallel(
@@ -188,9 +217,7 @@ def run_v2_task_parallel(
         if output is None:
             outputs[ind] = TaskOutput()
         else:
-            # FIXME: improve handling of validation errors
-            validated_output = TaskOutput(**output)
-            outputs[ind] = validated_output
+            outputs[ind] = _cast_and_validate_TaskOutput(output)
 
     merged_output = merge_outputs(outputs)
     return merged_output
@@ -245,7 +272,7 @@ def run_v2_task_compound(
     if output is None:
         init_task_output = InitTaskOutput()
     else:
-        init_task_output = InitTaskOutput(**output)
+        init_task_output = _cast_and_validate_InitTaskOutput(output)
     parallelization_list = init_task_output.parallelization_list
     parallelization_list = deduplicate_list(parallelization_list)
 
@@ -285,8 +312,7 @@ def run_v2_task_compound(
         if output is None:
             outputs[ind] = TaskOutput()
         else:
-            # FIXME: improve handling of validation errors
-            validated_output = TaskOutput(**output)
+            validated_output = _cast_and_validate_TaskOutput(output)
             outputs[ind] = validated_output
 
     merged_output = merge_outputs(outputs)

fractal_server/app/runner/v2/runner_functions_low_level.py

@@ -76,19 +76,12 @@ def run_single_task(
         workflow_dir_user = workflow_dir
 
     component = args.pop(_COMPONENT_KEY_, None)
-    if component is None:
-        task_files = get_task_file_paths(
-            workflow_dir=workflow_dir,
-            workflow_dir_user=workflow_dir_user,
-            task_order=wftask.order,
-        )
-    else:
-        task_files = get_task_file_paths(
-            workflow_dir=workflow_dir,
-            workflow_dir_user=workflow_dir_user,
-            task_order=wftask.order,
-            component=component,
-        )
+    task_files = get_task_file_paths(
+        workflow_dir=workflow_dir,
+        workflow_dir_user=workflow_dir_user,
+        task_order=wftask.order,
+        component=component,
+    )
 
     # Write arguments to args.json file
     with task_files.args.open("w") as f:

fractal_server/app/runner/v2/task_interface.py

@@ -29,8 +29,10 @@ class TaskOutput(BaseModel):
                 if zarr_urls.count(zarr_url) > 1
             ]
             msg = (
-                "TaskOutput image-list updates/removals has "
-                "non-unique zarr_urls:"
+                "TaskOutput "
+                f"({len(self.image_list_updates)} image_list_updates and "
+                f"{len(self.image_list_removals)} image_list_removals) "
+                "has non-unique zarr_urls:"
             )
             for duplicate in duplicates:
                 msg = f"{msg}\n{duplicate}"

fractal_server/app/schemas/__init__.py

@@ -1,4 +1 @@
-from .state import *  # noqa: F401, F403
 from .user import *  # noqa: F401, F403
-from .v1 import *  # noqa: F401, F403
-from .v2 import *  # noqa: F401, F403

fractal_server/app/schemas/v1/__init__.py

@@ -1,12 +1,6 @@
 """
 Schemas for API request/response bodies
 """
-from ..state import _StateBase  # noqa: F401
-from ..state import StateRead  # noqa: F401
-from ..user import UserCreate  # noqa: F401
-from ..user import UserRead  # noqa: F401
-from ..user import UserUpdate  # noqa: F401
-from ..user import UserUpdateStrict  # noqa: F401
 from .applyworkflow import ApplyWorkflowCreateV1  # noqa: F401
 from .applyworkflow import ApplyWorkflowReadV1  # noqa: F401
 from .applyworkflow import ApplyWorkflowUpdateV1  # noqa: F401

fractal_server/app/schemas/v2/__init__.py

@@ -1,4 +1,6 @@
 from .dataset import DatasetCreateV2  # noqa F401
+from .dataset import DatasetExportV2  # noqa F401
+from .dataset import DatasetImportV2  # noqa F401
 from .dataset import DatasetReadV2  # noqa F401
 from .dataset import DatasetUpdateV2  # noqa F401
 from .dumps import DatasetDumpV2  # noqa F401

fractal_server/app/schemas/v2/dataset.py

@@ -103,6 +103,11 @@ class DatasetImportV2(BaseModel):
     images: list[SingleImage] = Field(default_factory=[])
     filters: Filters = Field(default_factory=Filters)
 
+    # Validators
+    @validator("zarr_dir")
+    def normalize_zarr_dir(cls, v: str) -> str:
+        return normalize_url(v)
+
 
 class DatasetExportV2(BaseModel):
     """

fractal_server/app/schemas/v2/workflowtask.py

@@ -12,12 +12,14 @@ from .._validators import valdictkeys
 from .._validators import valint
 from ..v1.task import TaskExportV1
 from ..v1.task import TaskImportV1
-from ..v1.task import TaskReadV1
 from .task import TaskExportV2
 from .task import TaskImportV2
+from .task import TaskLegacyReadV2
 from .task import TaskReadV2
 from fractal_server.images import Filters
 
+RESERVED_ARGUMENTS = {"zarr_dir", "zarr_url", "zarr_urls", "init_args"}
+
 
 class WorkflowTaskStatusTypeV2(str, Enum):
     """
@@ -56,14 +58,36 @@ class WorkflowTaskCreateV2(BaseModel, extra=Extra.forbid):
     _meta_parallel = validator("meta_parallel", allow_reuse=True)(
         valdictkeys("meta_parallel")
     )
-    _args_non_parallel = validator("args_non_parallel", allow_reuse=True)(
-        valdictkeys("args_non_parallel")
-    )
-    _args_parallel = validator("args_parallel", allow_reuse=True)(
-        valdictkeys("args_parallel")
-    )
     _order = validator("order", allow_reuse=True)(valint("order", min_val=0))
 
+    @validator("args_non_parallel")
+    def validate_args_non_parallel(cls, value):
+        if value is None:
+            return
+        valdictkeys("args_non_parallel")(value)
+        args_keys = set(value.keys())
+        intersect_keys = RESERVED_ARGUMENTS.intersection(args_keys)
+        if intersect_keys:
+            raise ValueError(
+                "`args` contains the following forbidden keys: "
+                f"{intersect_keys}"
+            )
+        return value
+
+    @validator("args_parallel")
+    def validate_args_parallel(cls, value):
+        if value is None:
+            return
+        valdictkeys("args_parallel")(value)
+        args_keys = set(value.keys())
+        intersect_keys = RESERVED_ARGUMENTS.intersection(args_keys)
+        if intersect_keys:
+            raise ValueError(
+                "`args` contains the following forbidden keys: "
+                f"{intersect_keys}"
+            )
+        return value
+
     @root_validator
     def validate_legacy_task(cls, values):
         if values["is_legacy_task"] and (
@@ -96,7 +120,7 @@ class WorkflowTaskReadV2(BaseModel):
     task_id: Optional[int]
     task: Optional[TaskReadV2]
     task_legacy_id: Optional[int]
-    task_legacy: Optional[TaskReadV1]
+    task_legacy: Optional[TaskLegacyReadV2]
 
 
 class WorkflowTaskUpdateV2(BaseModel):
@@ -114,12 +138,34 @@ class WorkflowTaskUpdateV2(BaseModel):
     _meta_parallel = validator("meta_parallel", allow_reuse=True)(
         valdictkeys("meta_parallel")
     )
-    _args_non_parallel = validator("args_non_parallel", allow_reuse=True)(
-        valdictkeys("args_non_parallel")
-    )
-    _args_parallel = validator("args_parallel", allow_reuse=True)(
-        valdictkeys("args_parallel")
-    )
+
+    @validator("args_non_parallel")
+    def validate_args_non_parallel(cls, value):
+        if value is None:
+            return
+        valdictkeys("args_non_parallel")(value)
+        args_keys = set(value.keys())
+        intersect_keys = RESERVED_ARGUMENTS.intersection(args_keys)
+        if intersect_keys:
+            raise ValueError(
+                "`args` contains the following forbidden keys: "
+                f"{intersect_keys}"
+            )
+        return value
+
+    @validator("args_parallel")
+    def validate_args_parallel(cls, value):
+        if value is None:
+            return
+        valdictkeys("args_parallel")(value)
+        args_keys = set(value.keys())
+        intersect_keys = RESERVED_ARGUMENTS.intersection(args_keys)
+        if intersect_keys:
+            raise ValueError(
+                "`args` contains the following forbidden keys: "
+                f"{intersect_keys}"
+            )
+        return value
 
 
 class WorkflowTaskImportV2(BaseModel):

fractal_server/images/tools.py

@@ -33,7 +33,6 @@ def find_image_by_zarr_url(
     return dict(image=copy(images[ind]), index=ind)
 
 
-# FIXME: what is filters
 def match_filter(image: dict[str, Any], filters: Filters) -> bool:
     """
     Find whether an image matches a filter set.

fractal_server/tasks/v1/background_operations.py

@@ -15,8 +15,8 @@ from ..utils import slugify_task_name
 from ._TaskCollectPip import _TaskCollectPip
 from fractal_server.app.db import DBSyncSession
 from fractal_server.app.db import get_sync_db
-from fractal_server.app.models import State
-from fractal_server.app.models import Task
+from fractal_server.app.models.v1 import State
+from fractal_server.app.models.v1 import Task
 from fractal_server.app.schemas.v1 import TaskCollectStatusV1
 from fractal_server.app.schemas.v1 import TaskCreateV1
 from fractal_server.app.schemas.v1 import TaskReadV1

{fractal_server-2.0.0a11.dist-info → fractal_server-2.0.0a12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.0.0a11
+Version: 2.0.0a12
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.0.0a11.dist-info → fractal_server-2.0.0a12.dist-info}/RECORD

@@ -1,16 +1,16 @@
-fractal_server/__init__.py,sha256=3s9YLGOYqSP6sC_lM9jIIhYieV3lgQqBsJSBVyRU0ZU,25
+fractal_server/__init__.py,sha256=n09kNau5UUJa9hzn0KtsMdH-0FpJzIry0v93FUKYRLg,25
 fractal_server/__main__.py,sha256=CocbzZooX1UtGqPi55GcHGNxnrJXFg5tUU5b3wyFCyo,4958
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/db/__init__.py,sha256=WZEVfdJAX7ZyBM1ngfEGeqWWcjK_NygtCbawpmbwGpU,4042
-fractal_server/app/models/__init__.py,sha256=fwlIQsf-OLF2pPVQBxo43W0hD0gYIVmnCzPp9ekDo4g,144
+fractal_server/app/models/__init__.py,sha256=FRRDJkx7LgPaUqSp8IV7qevu_VE2dt0-fQtQruHFaVo,267
 fractal_server/app/models/linkuserproject.py,sha256=eQaourbGRshvlMVlKzLYJKHEjfsW1CbWws9yW4eHXhA,567
 fractal_server/app/models/security.py,sha256=UG9wCVA5GRSyHrYEFhH8lIF1hXykxsr9LSi8_dFToMY,3378
 fractal_server/app/models/v1/__init__.py,sha256=qUlUGnWFaIm3aBXfUuLdhcW9f_s1VzAEuypr31zvHGo,458
 fractal_server/app/models/v1/dataset.py,sha256=99GDgt7njx8yYQApkImqp_7bHA5HH3ElvbR6Oyj9kVI,2017
 fractal_server/app/models/v1/job.py,sha256=QLGXcWdVRHaUHQNDapYYlLpEfw4K7QyD8TmcwhrWw2o,3304
 fractal_server/app/models/v1/project.py,sha256=sDmAFLOBK5o4dLrwsIN681JcT5J1rzoUNTV9QVqwnA8,859
-fractal_server/app/models/v1/state.py,sha256=W5XxCR9BlHXo5abCvzblkvufqpGZtM5-G11ixzMUOp4,1092
+fractal_server/app/models/v1/state.py,sha256=ew7xw3iPzBwUnPlzmsOEMiPbPEMsJn_TyZ5cK93jBRQ,1095
 fractal_server/app/models/v1/task.py,sha256=3xZqNeFYUqslh8ddMSXF2nO4nIiOD8T5Ij37wY20kss,2782
 fractal_server/app/models/v1/workflow.py,sha256=dnY5eMaOe3oZv8arn00RNX9qVkBtTLG-vYdWXcQuyo4,3950
 fractal_server/app/models/v2/__init__.py,sha256=uLzdInqATSwi0bS_V4vKB-TqFrOFaXuxCAbU73c0f24,473
@@ -20,37 +20,37 @@ fractal_server/app/models/v2/job.py,sha256=ypJmN-qspkKBGhBG7Mt-HypSQqcQ2EmB4Bzzb
 fractal_server/app/models/v2/project.py,sha256=CqDEKzdVxmFDMee6DnVOyX7WGmdn-dQSLSekzw_OLUc,817
 fractal_server/app/models/v2/task.py,sha256=9ZPhug3VWyeqgT8wQ9_8ZXQ2crSiiicRipxrxTslOso,3257
 fractal_server/app/models/v2/workflow.py,sha256=YBgFGCziUgU0aJ5EM3Svu9W2c46AewZO9VBlFCHiSps,1069
-fractal_server/app/models/v2/workflowtask.py,sha256=kEm2k1LI0KK9vlTH7DL1NddaEUpIvMkFi42vahwDpd8,2695
+fractal_server/app/models/v2/workflowtask.py,sha256=3jEkObsSnlI05Pur_dSsXYdJxRqPL60Z7tK5-EJLOks,1532
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/routes/admin/v1.py,sha256=uY6H1znlAlrM9e1MG2EThTqwciCl87Twew34JM5W6IU,13981
+fractal_server/app/routes/admin/v1.py,sha256=uMupmRkicaoWazX8qSX5fgh00O3MbuSfim8QayP6NkE,13996
 fractal_server/app/routes/admin/v2.py,sha256=T8-bGAL25on-ntZx_Msz9j5jq6NGhkjVl1jp3eRJUbw,9830
 fractal_server/app/routes/api/__init__.py,sha256=EVyZrEq3I_1643QGTPCC5lgCp4xH_auYbrFfogTm4pc,315
 fractal_server/app/routes/api/v1/__init__.py,sha256=Y2HQdG197J0a7DyQEE2jn53IfxD0EHGhzK1I2JZuEck,958
-fractal_server/app/routes/api/v1/_aux_functions.py,sha256=eC5exnGj9jnJqx0ccecoNaipxDeK2ZsR1ev0syH5x-Y,11955
-fractal_server/app/routes/api/v1/dataset.py,sha256=7z57FGBTCyz_G6Ivr1PeGIXGyd15fs4iLD2aJUxnslA,16911
+fractal_server/app/routes/api/v1/_aux_functions.py,sha256=KoSefKiBXximu0df4fJ3l9bKsGaLO8rb3z6xhD8PWj4,11973
+fractal_server/app/routes/api/v1/dataset.py,sha256=HRE-8vPmVkeXf7WFYkI19mDtbY-iJZeJ7PmMiV0LMgY,16923
 fractal_server/app/routes/api/v1/job.py,sha256=NwXyhvvzdPDor0ts8Im__9-I0P1H943s4NXIRgaz7PM,5436
-fractal_server/app/routes/api/v1/project.py,sha256=keqA0gYM48lyFP8zJgZ6cv34V6Js8DD-gbzE316H46k,15765
-fractal_server/app/routes/api/v1/task.py,sha256=4zUXMtq5M95XjaZs1t9oibYHiDIwxpM-3sTAxN95aRk,6123
-fractal_server/app/routes/api/v1/task_collection.py,sha256=_cY3pPRGchdWPuJ1XudMZMVJ0IC0_XVH0XwLTiAbRGg,8873
-fractal_server/app/routes/api/v1/workflow.py,sha256=ZObifWTPi100oRQ1wEER8Sgsr3Neo8QVdCCFQnWMNZ0,10930
-fractal_server/app/routes/api/v1/workflowtask.py,sha256=ox-DIIqYV4K35hCu86eGa2SHnR5IQml-I00UHEwnmHQ,5579
+fractal_server/app/routes/api/v1/project.py,sha256=4wlxcc-bR45bns6Yy0WyjA9Qv9eiMscATLZKjVhSd1k,15777
+fractal_server/app/routes/api/v1/task.py,sha256=udbKnenzc-Q10elYCVB9JmOPWATraa9tZi0AaByvWo0,6129
+fractal_server/app/routes/api/v1/task_collection.py,sha256=mFaYyCWtCPRqvs3j6zx_zaiDXn31Uzoa7UHZS-Lu_L0,8882
+fractal_server/app/routes/api/v1/workflow.py,sha256=7r9IoIevg_rvYCrerMOsIsUabSOQatxdPCfLdkP0dRs,10942
+fractal_server/app/routes/api/v1/workflowtask.py,sha256=qcHQlzlSFf_k8gtId-mA3tnyzgSR7i1m7pvR4R86blE,5582
 fractal_server/app/routes/api/v2/__init__.py,sha256=UNgODxoEXfQpQDjvsnMvHaUWbZOrcHhEXNisLcU-0tE,1487
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=IL1JKVqRcGfqiVbptDzpMKqi9QTYDYCCcsqIG0x0Nl8,14301
-fractal_server/app/routes/api/v2/dataset.py,sha256=0JGRnK1DRQKgVA3FDhK8VdoRglLYFxgkMQOaoWI-tiQ,7853
+fractal_server/app/routes/api/v2/dataset.py,sha256=_HjKNP9XsMGoqyubGdF2ZyeW7vXC3VdK_0_TaUxgIF0,8248
 fractal_server/app/routes/api/v2/images.py,sha256=4r_HblPWyuKSZSJZfn8mbDaLv1ncwZU0gWdKneZcNG4,7894
-fractal_server/app/routes/api/v2/job.py,sha256=9mXaKCX_N3FXM0GIxdE49nWl_hJZ8CBLBIaMMhaCKOM,5334
-fractal_server/app/routes/api/v2/project.py,sha256=i9a19HAqE36N92G60ZYgObIP9nv-hR7Jt5nd9Dkhz1g,6024
+fractal_server/app/routes/api/v2/job.py,sha256=BtaxErBDbLwjY2zgGD1I6eRpsffoMonifcS1CMEXmLU,5325
+fractal_server/app/routes/api/v2/project.py,sha256=qyvizYZ4aUFgF3tGdfp4z8AwWgfo19N_KbFEljfUaC8,5594
 fractal_server/app/routes/api/v2/status.py,sha256=3bqQejJ3TnIMan5wK6jr9sv4ypsQr9WWU8xqlvTgDCE,5739
-fractal_server/app/routes/api/v2/submit.py,sha256=iszII5CvWDEjGPTphBgH9FVS1pNb5m11Xc8xozGgjgI,6901
+fractal_server/app/routes/api/v2/submit.py,sha256=lbPTZKemoRjypcpExi-Yz9fIiPdv9OIjFeUu9yuILA4,6889
 fractal_server/app/routes/api/v2/task.py,sha256=gJ0LruSk-Q1iMw8ZOX8C0wrZ4S4DGlQTr_5SdJJud0Q,7130
-fractal_server/app/routes/api/v2/task_collection.py,sha256=O5eg40P-TwYy6azGh0DpyN6Rya9FfhRHQDf4qpYIGEE,8952
+fractal_server/app/routes/api/v2/task_collection.py,sha256=wHkPkQKnvXEzidywuJqLe8QB_xjlHUqzPgsitXydNkU,8961
 fractal_server/app/routes/api/v2/task_legacy.py,sha256=P_VJv9v0yzFUBuS-DQHhMVSOe20ecGJJcFBqiiFciOM,1628
 fractal_server/app/routes/api/v2/workflow.py,sha256=sw-1phO_rrmDAcWX9Zqb9M8SfrWF78-02AuLB1-D1PU,11845
 fractal_server/app/routes/api/v2/workflowtask.py,sha256=l4eTD5IIun5cOdYzsxh3ajmnOISaSccYA_mVf15Cjtw,8802
 fractal_server/app/routes/auth.py,sha256=Xv80iqdyfY3lyicYs2Y8B6zEDEnyUu_H6_6psYtv3R4,4885
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/routes/aux/_job.py,sha256=5gKgvArAruSkMQuPN34Vvzi89WJbwWPsx0oDAa_iXu4,1248
+fractal_server/app/routes/aux/_job.py,sha256=7OP3B_FqYJUQ8hVn-7G8oYEEaZrM4hxLF9FoSyjudTo,1251
 fractal_server/app/routes/aux/_runner.py,sha256=psW6fsoo_VrAHrD5UQPbqFYikCp0m16VRymC-U1yUTk,675
 fractal_server/app/runner/.gitignore,sha256=ytzN_oyHWXrGU7iFAtoHSTUbM6Rn6kG0Zkddg0xZk6s,16
 fractal_server/app/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -68,10 +68,10 @@ fractal_server/app/runner/executors/slurm/executor.py,sha256=O9h6ZPAKM95BUJrZkHC
 fractal_server/app/runner/executors/slurm/remote.py,sha256=wLziIsGdSMiO-jIXM8x77JRK82g_2hx0iBKTiMghuIo,5852
 fractal_server/app/runner/filenames.py,sha256=9lwu3yB4C67yiijYw8XIKaLFn3mJUt6_TCyVFM_aZUQ,206
 fractal_server/app/runner/set_start_and_last_task_index.py,sha256=-q4zVybAj8ek2XlbENKlfOAJ39hT_zoJoZkqzDqiAMY,1254
-fractal_server/app/runner/task_files.py,sha256=c5mggMy7BIK_yBUvbimFgvKFZPKKDu6RRfWepwinBVk,3219
-fractal_server/app/runner/v1/__init__.py,sha256=meqMG2UejFa_1hm5xlsmkDxsM7Y_hqftsexuteQXOrE,13608
-fractal_server/app/runner/v1/_common.py,sha256=fIt8BVW7u6ReZbHgQ5kV2kDtWoHMQNjPoeuWP5YfWQk,21240
-fractal_server/app/runner/v1/_local/__init__.py,sha256=8PjeyPLvj6KHdZ3HyzWZCdlrubgedA1hZLXGAsLNOKI,6926
+fractal_server/app/runner/task_files.py,sha256=b5aRDi35QemBQnHT_AU6L_IPJJU_k_f5sJn-JXzkzy0,3180
+fractal_server/app/runner/v1/__init__.py,sha256=Uqf9smd4G9JCunXOsJ0U_DJyhYvl8TwItY3TbDLBLMc,13620
+fractal_server/app/runner/v1/_common.py,sha256=2-NScI-7qCIw14Od90so1onw-psIt8x1kx6EXq489Vk,21246
+fractal_server/app/runner/v1/_local/__init__.py,sha256=ZcWftuGRLmN8-S6QZXm6FhNehsxwmwZRhuRv-a7zA6s,6839
 fractal_server/app/runner/v1/_local/_local_config.py,sha256=hM7SPxR07luXPcXdrWXRpEB2uOyjSSRUdqW3QBKJn9c,3147
 fractal_server/app/runner/v1/_local/_submit_setup.py,sha256=kvNPT7ey2mEamORzPMMVThbFHtzZcSr-0A9tYw9uVDA,1493
 fractal_server/app/runner/v1/_local/executor.py,sha256=QrJlD77G6q4WohoJQO7XXbvi2RlCUsNvMnPDEZIoAqA,3620
@@ -91,16 +91,16 @@ fractal_server/app/runner/v2/_slurm/get_slurm_config.py,sha256=I_lOS75iGYyJ74-gN
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=-imwO7OB7ATADEnqVbTElUwoY0YIJCTf_SbWJNN9OZg,639
 fractal_server/app/runner/v2/handle_failed_job.py,sha256=M1r3dnrbUMo_AI2qjaVuGhieMAyLh5gcvB10YOBpjvI,5415
 fractal_server/app/runner/v2/merge_outputs.py,sha256=IHuHqbKmk97K35BFvTrKVBs60z3e_--OzXTnsvmA02c,1281
-fractal_server/app/runner/v2/runner.py,sha256=K6bmWbQRSZwbO6ZI2Bp7wNxYdkHcXxhWwBObMxJ0iSU,12599
-fractal_server/app/runner/v2/runner_functions.py,sha256=qVGG9KlH8ObX4Y0kr0q6qE8OpWFwf4RnOHhgPRRdj5M,10293
-fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=djNKD1y_EE0Q9Jkzh1QdKpjM66JVsLQgX2_zJT0xQlA,3947
-fractal_server/app/runner/v2/task_interface.py,sha256=TZLVJs6CNFo2lFhr-lsDxe585cEhRv48eA490LS9aqc,1746
+fractal_server/app/runner/v2/runner.py,sha256=pZDRYXibPs6lYz8hg-F7KbibR_cl0sjCa5s9yaFE_-s,14160
+fractal_server/app/runner/v2/runner_functions.py,sha256=jwLfIL1gdmL-KqSKb-5CDG-g7rQYZdywn24bJ92R2qI,11067
+fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=nPxmoSTIAQRwEf8iwfCdwTq4Eo3eDAHcgGn3GejPgqk,3710
+fractal_server/app/runner/v2/task_interface.py,sha256=myS-kT0DsJ8xIJZBVEzgD8g54VbiwL6i7Im3e1zcVHQ,1866
 fractal_server/app/runner/v2/v1_compat.py,sha256=t0ficzAHUFaaeI56nqTb4YEKxfARF7L9Y6ijtJCwjP8,912
-fractal_server/app/schemas/__init__.py,sha256=VL55f3CTFngXHYkOsFaLBEEkEEewEWI5ODlcGTI7cqA,157
+fractal_server/app/schemas/__init__.py,sha256=jiIf54owztXupv3PO6Ilh0qcrkh2RUzKq4bcEFqEfc4,40
 fractal_server/app/schemas/_validators.py,sha256=1dTOYr1IZykrxuQSV2-zuEMZbKe_nGwrfS7iUrsh-sE,3461
 fractal_server/app/schemas/state.py,sha256=t4XM04aqxeluh8MfvD7LfEc-8-dOmUVluZHhLsfxxkc,692
 fractal_server/app/schemas/user.py,sha256=rE8WgBz-ceVUs0Sz2ZwcjUrSTZTnS0ys5SBtD2XD9r8,3113
-fractal_server/app/schemas/v1/__init__.py,sha256=gZLfkANl4YtZ7aV3PFoUj5w0m1-riQv9iRomJhZRLZo,2078
+fractal_server/app/schemas/v1/__init__.py,sha256=terWiFLKJ0QU-y3PG3hXNYdpxGTffZTlwrwJ8LfQ3FM,1809
 fractal_server/app/schemas/v1/applyworkflow.py,sha256=uuIh7fHlHEL4yLqL-dePI6-nfCsqgBYATmht7w_KITw,4302
 fractal_server/app/schemas/v1/dataset.py,sha256=n71lNUO3JLy2K3IM9BZM2Fk1EnKQOTU7pm2s2rJ1FGY,3444
 fractal_server/app/schemas/v1/dumps.py,sha256=67VXnyLh_0Ufo7rPM2jZ9P9rk0CnYcVAkilx_cLX6sg,1274
@@ -109,8 +109,8 @@ fractal_server/app/schemas/v1/project.py,sha256=TO2TjI4m9FO-A9IB9lUCld7E4Ld0k4Ma
 fractal_server/app/schemas/v1/task.py,sha256=7BxOZ_qoRQ8n3YbQpDvB7VMcxB5fSYQmR5RLIWhuJ5U,3704
 fractal_server/app/schemas/v1/task_collection.py,sha256=uvq9bcMaGD_qHsh7YtcpoSAkVAbw12eY4DocIO3MKOg,3057
 fractal_server/app/schemas/v1/workflow.py,sha256=tuOs5E5Q_ozA8if7YPZ07cQjzqB_QMkBS4u92qo4Ro0,4618
-fractal_server/app/schemas/v2/__init__.py,sha256=zlCYrplCWwnCL9-BYsExRMfVzhBy21IMBfdHPMgJZYk,1752
-fractal_server/app/schemas/v2/dataset.py,sha256=MGv0bdzEIQFNy8ARqiDn_neC1mJJTMXFzbb9M5l4xxg,2474
+fractal_server/app/schemas/v2/__init__.py,sha256=IssDWR6q_mgNkaAxfhSnEZZLZRZIqOsr9SM7RvN1IsY,1852
+fractal_server/app/schemas/v2/dataset.py,sha256=dLT52tV4dSf2HrFNak4vdQEn8PT_04IUrGnd2z-AXIU,2599
 fractal_server/app/schemas/v2/dumps.py,sha256=IpIT_2KxJd7qTgW2NllDknGeP7vBAJDfyz1I5p3TytU,2023
 fractal_server/app/schemas/v2/job.py,sha256=zfF9K3v4jWUJ7M482ta2CkqUJ4tVT4XfVt60p9IRhP0,3250
 fractal_server/app/schemas/v2/manifest.py,sha256=N37IWohcfO3_y2l8rVM0h_1nZq7m4Izxk9iL1vtwBJw,6243
@@ -119,13 +119,13 @@ fractal_server/app/schemas/v2/status.py,sha256=SQaUpQkjFq5c5k5J4rOjNhuQaDOEg8lks
 fractal_server/app/schemas/v2/task.py,sha256=7IfxiZkaVqlARy7WYE_H8m7j_IEcuQaZORUrs6b5YuY,4672
 fractal_server/app/schemas/v2/task_collection.py,sha256=sY29NQfJrbjiidmVkVjSIH-20wIsmh7G1QOdr05KoDQ,3171
 fractal_server/app/schemas/v2/workflow.py,sha256=Zzx3e-qgkH8le0FUmAx9UrV5PWd7bj14PPXUh_zgZXM,1827
-fractal_server/app/schemas/v2/workflowtask.py,sha256=vRyPca8smu6fzwd9gO1eOd3qdPLJ-Zq2AAAbSLCou3I,5051
+fractal_server/app/schemas/v2/workflowtask.py,sha256=atVuVN4aXsVEOmSd-vyg-8_8OnPmqx-gT75rXcn_AlQ,6552
 fractal_server/app/security/__init__.py,sha256=wxosoHc3mJYPCdPMyWnRD8w_2OgnKYp2aDkdmwrZh5k,11203
 fractal_server/config.py,sha256=CA8ASObADaME5chDiBXawAJZ3MvjTRpCKP0jvdYtSh8,15080
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/images/__init__.py,sha256=xO6jTLE4EZKO6cTDdJsBmK9cdeh9hFTaSbSuWgQg7y4,196
 fractal_server/images/models.py,sha256=9ipU5h4N6ogBChoB-2vHoqtL0TXOHCv6kRR-fER3mkM,4167
-fractal_server/images/tools.py,sha256=Q7jM60r_jq5bttrt1b4bU29n717RSUMMPbAbAkzWjgw,2234
+fractal_server/images/tools.py,sha256=gxeniYy4Z-cp_ToK2LHPJUTVVUUrdpogYdcBUvBuLiY,2209
 fractal_server/logger.py,sha256=95duXY8eSxf1HWg0CVn8SUGNzgJw9ZR0FlapDDF6WAY,3924
 fractal_server/main.py,sha256=7CpwPfCsHxBAo5fWuXPCsYOFCpbBI0F7Z0jsgCQdou8,3001
 fractal_server/migrations/README,sha256=4rQvyDfqodGhpJw74VYijRmgFP49ji5chyEemWGHsuw,59
@@ -154,7 +154,7 @@ fractal_server/tasks/endpoint_operations.py,sha256=D1WSJd8dIfIumKezon1NYX5a0QNPq
 fractal_server/tasks/utils.py,sha256=R1_SKfXTwveT7CJJOrvkwi0vNpr9MBIiNh7qv8EK3Wc,3278
 fractal_server/tasks/v1/_TaskCollectPip.py,sha256=16Gn8lVYHBuwNLBHdcdx0X8s9QXXsbfPwSzcCcM6fRg,3775
 fractal_server/tasks/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/tasks/v1/background_operations.py,sha256=T5L-ghgGEJIGcGoZB_r0cjH96UkEfAPkhr2ciTSaQlQ,11725
+fractal_server/tasks/v1/background_operations.py,sha256=I-D4SaG56UMkoH7dNy5CzbEsAjySCPc7gQc-U14phKk,11731
 fractal_server/tasks/v1/get_collection_data.py,sha256=bi9tuApLgoKZNMIG1kR4GoKI9S6Y040gFfNQapw4ikM,502
 fractal_server/tasks/v2/_TaskCollectPip.py,sha256=QeCqXDgOnMjk3diVlC5bgGEywyQjYFm5637Rke49vJY,3775
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -162,8 +162,8 @@ fractal_server/tasks/v2/background_operations.py,sha256=fUukEA-zFjUDhxgI3oO_Bvy7
 fractal_server/tasks/v2/get_collection_data.py,sha256=Qhf2T_aaqAfqu9_KpUSlXsS7EJoZQbEPEreHHa2jco8,502
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server-2.0.0a11.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.0.0a11.dist-info/METADATA,sha256=vFS5XczcfUY_lJ0uxHE2LAm_9pwDShIGzl_jjC6Cwdo,4201
-fractal_server-2.0.0a11.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-fractal_server-2.0.0a11.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.0.0a11.dist-info/RECORD,,
+fractal_server-2.0.0a12.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.0.0a12.dist-info/METADATA,sha256=vBB1xO15zGGC1KMJRwj7xmVLHS0pF0BLTjVUusilAns,4201
+fractal_server-2.0.0a12.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+fractal_server-2.0.0a12.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.0.0a12.dist-info/RECORD,,