fractal-server 2.0.0a1__py3-none-any.whl → 2.0.0a3__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.0.0a1"
+__VERSION__ = "2.0.0a3"

fractal_server/app/models/v2/dataset.py

@@ -51,5 +51,5 @@ class DatasetV2(SQLModel, table=True):
     )
 
     @property
-    def image_paths(self) -> list[str]:
-        return [image["path"] for image in self.images]
+    def image_zarr_urls(self) -> list[str]:
+        return [image["zarr_url"] for image in self.images]

fractal_server/app/routes/admin/v2.py

@@ -27,6 +27,7 @@ from ...models.v2 import ProjectV2
 from ...runner.filenames import WORKFLOW_LOG_FILENAME
 from ...schemas.v2 import JobReadV2
 from ...schemas.v2 import JobUpdateV2
+from ...schemas.v2 import ProjectReadV2
 from ...security import current_active_superuser
 from ..aux._job import _write_shutdown_file
 from ..aux._job import _zip_folder_to_byte_stream
@@ -52,6 +53,35 @@ def _convert_to_db_timestamp(dt: datetime) -> datetime:
     return _dt
 
 
+@router_admin_v2.get("/project/", response_model=list[ProjectReadV2])
+async def view_project(
+    id: Optional[int] = None,
+    user_id: Optional[int] = None,
+    user: User = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> list[ProjectReadV2]:
+    """
+    Query `ProjectV2` table.
+
+    Args:
+        id: If not `None`, select a given `project.id`.
+        user_id: If not `None`, select a given `project.user_id`.
+    """
+
+    stm = select(ProjectV2)
+
+    if id is not None:
+        stm = stm.where(ProjectV2.id == id)
+    if user_id is not None:
+        stm = stm.where(ProjectV2.user_list.any(User.id == user_id))
+
+    res = await db.execute(stm)
+    project_list = res.scalars().all()
+    await db.close()
+
+    return project_list
+
+
 @router_admin_v2.get("/job/", response_model=list[JobReadV2])
 async def view_job(
     id: Optional[int] = None,

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

@@ -8,6 +8,7 @@ from typing import Union
 
 from fastapi import HTTPException
 from fastapi import status
+from sqlalchemy.orm.attributes import flag_modified
 from sqlmodel import select
 from sqlmodel.sql.expression import SelectOfScalar
 
@@ -488,9 +489,9 @@ async def _workflow_insert_task(
         meta_non_parallel=final_meta_non_parallel,
         **input_filters_kwarg,
     )
-    db.add(wf_task)
     db_workflow.task_list.insert(order, wf_task)
     db_workflow.task_list.reorder()  # type: ignore
+    flag_modified(db_workflow, "task_list")
     await db.commit()
     await db.refresh(wf_task)
 

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

@@ -186,7 +186,6 @@ async def delete_dataset(
     jobs = res.scalars().all()
     for job in jobs:
         job.dataset_id = None
-    await db.commit()
 
     # Delete dataset
     await db.delete(dataset)

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

@@ -35,7 +35,7 @@ class ImagePage(BaseModel):
 
 
 class ImageQuery(BaseModel):
-    path: Optional[str]
+    zarr_url: Optional[str]
     filters: Filters = Field(default_factory=Filters)
 
 
@@ -56,11 +56,11 @@ async def post_new_image(
     )
     dataset = output["dataset"]
 
-    if new_image.path in dataset.image_paths:
+    if new_image.zarr_url in dataset.image_zarr_urls:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail=(
-                f"Image with path '{new_image.path}' "
+                f"Image with zarr_url '{new_image.zarr_url}' "
                 f"already in DatasetV2 {dataset_id}",
             ),
         )
@@ -121,9 +121,13 @@ async def query_dataset_images(
 
     if query is not None:
 
-        if query.path is not None:
+        if query.zarr_url is not None:
             image = next(
-                (image for image in images if image["path"] == query.path),
+                (
+                    image
+                    for image in images
+                    if image["zarr_url"] == query.zarr_url
+                ),
                 None,
             )
             if image is None:
@@ -180,7 +184,7 @@ async def query_dataset_images(
 async def delete_dataset_images(
     project_id: int,
     dataset_id: int,
-    path: str,
+    zarr_url: str,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
@@ -191,12 +195,16 @@ async def delete_dataset_images(
     dataset = output["dataset"]
 
     image_to_remove = next(
-        (image for image in dataset.images if image["path"] == path), None
+        (image for image in dataset.images if image["zarr_url"] == zarr_url),
+        None,
     )
     if image_to_remove is None:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
-            detail=f"No image with path '{path}' in DatasetV2 {dataset_id}.",
+            detail=(
+                f"No image with zarr_url '{zarr_url}' in "
+                f"DatasetV2 {dataset_id}."
+            ),
         )
 
     dataset.images.remove(image_to_remove)

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

@@ -169,7 +169,6 @@ async def delete_project(
             job.workflow_id = None
         # Delete workflow
         await db.delete(wf)
-    await db.commit()
 
     # Dataset
     stm = select(DatasetV2).where(DatasetV2.project_id == project_id)
@@ -185,7 +184,6 @@ async def delete_project(
             job.dataset_id = None
         # Delete dataset
         await db.delete(ds)
-    await db.commit()
 
     # Job
     stm = select(JobV2).where(JobV2.project_id == project_id)
@@ -194,8 +192,6 @@ async def delete_project(
     for job in jobs:
         job.project_id = None
 
-    await db.commit()
-
     await db.delete(project)
     await db.commit()
 

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

@@ -16,7 +16,6 @@ from ....models.v2 import JobV2
 from ....models.v2 import ProjectV2
 from ....models.v2 import TaskV2
 from ....models.v2 import WorkflowV2
-from ....schemas.v1 import WorkflowTaskCreateV1
 from ....schemas.v2 import WorkflowCreateV2
 from ....schemas.v2 import WorkflowExportV2
 from ....schemas.v2 import WorkflowImportV2
@@ -213,7 +212,6 @@ async def delete_workflow(
     jobs = res.scalars().all()
     for job in jobs:
         job.workflow_id = None
-    await db.commit()
 
     # Delete workflow
     await db.delete(workflow)
@@ -341,40 +339,25 @@ async def import_workflow(
     await db.refresh(db_workflow)
 
     # Insert tasks
-    async with db:  # FIXME why?
-
-        for wf_task in workflow.task_list:
-            if wf_task.is_legacy_task is True:
-                # Identify task_id
-                source = wf_task.task_legacy.source
-                task_id = source_to_id_legacy[source]
-                # Prepare new_wf_task
-                new_wf_task = WorkflowTaskCreateV1(
-                    **wf_task.dict(exclude_none=True)
-                )
-                # Insert task
-                await _workflow_insert_task(
-                    **new_wf_task.dict(),
-                    is_legacy_task=True,
-                    workflow_id=db_workflow.id,
-                    task_id=task_id,
-                    db=db,
-                )
-            else:
-                # Identify task_id
-                source = wf_task.task.source
-                task_id = source_to_id[source]
-                # Prepare new_wf_task
-                new_wf_task = WorkflowTaskCreateV2(
-                    **wf_task.dict(exclude_none=True)
-                )
-                # Insert task
-                await _workflow_insert_task(
-                    **new_wf_task.dict(),
-                    workflow_id=db_workflow.id,
-                    task_id=task_id,
-                    db=db,
-                )
+
+    for wf_task in workflow.task_list:
+        if wf_task.is_legacy_task is True:
+            source = wf_task.task_legacy.source
+            task_id = source_to_id_legacy[source]
+        else:
+            source = wf_task.task.source
+            task_id = source_to_id[source]
+
+        new_wf_task = WorkflowTaskCreateV2(
+            **wf_task.dict(exclude_none=True, exclude={"task", "task_legacy"})
+        )
+        # Insert task
+        await _workflow_insert_task(
+            **new_wf_task.dict(),
+            workflow_id=db_workflow.id,
+            task_id=task_id,
+            db=db,
+        )
 
     await db.close()
     return db_workflow

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

@@ -91,19 +91,18 @@ async def create_workflowtask(
                 ),
             )
 
-    async with db:
-        workflow_task = await _workflow_insert_task(
-            workflow_id=workflow.id,
-            is_legacy_task=new_task.is_legacy_task,
-            task_id=task_id,
-            order=new_task.order,
-            meta_non_parallel=new_task.meta_non_parallel,
-            meta_parallel=new_task.meta_parallel,
-            args_non_parallel=new_task.args_non_parallel,
-            args_parallel=new_task.args_parallel,
-            input_filters=new_task.input_filters,
-            db=db,
-        )
+    workflow_task = await _workflow_insert_task(
+        workflow_id=workflow.id,
+        is_legacy_task=new_task.is_legacy_task,
+        task_id=task_id,
+        order=new_task.order,
+        meta_non_parallel=new_task.meta_non_parallel,
+        meta_parallel=new_task.meta_parallel,
+        args_non_parallel=new_task.args_non_parallel,
+        args_parallel=new_task.args_parallel,
+        input_filters=new_task.input_filters,
+        db=db,
+    )
 
     await db.close()
 
@@ -212,17 +211,8 @@ async def update_workflowtask(
             if not actual_args:
                 actual_args = None
             setattr(db_wf_task, key, actual_args)
-        elif key == "meta_parallel":
-            current_meta_parallel = deepcopy(db_wf_task.meta_parallel) or {}
-            current_meta_parallel.update(value)
-            setattr(db_wf_task, key, current_meta_parallel)
-        elif key == "meta_non_parallel":
-            current_meta_non_parallel = (
-                deepcopy(db_wf_task.meta_non_parallel) or {}
-            )
-            current_meta_non_parallel.update(value)
-            setattr(db_wf_task, key, current_meta_non_parallel)
-        # FIXME handle `input_filters`
+        elif key in ["meta_parallel", "meta_non_parallel", "input_filters"]:
+            setattr(db_wf_task, key, value)
         else:
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,

fractal_server/app/runner/v2/runner.py

@@ -9,7 +9,7 @@ from typing import Optional
 from ....images import Filters
 from ....images import SingleImage
 from ....images.tools import filter_image_list
-from ....images.tools import find_image_by_path
+from ....images.tools import find_image_by_zarr_url
 from ....images.tools import match_filter
 from ..filenames import FILTERS_FILENAME
 from ..filenames import HISTORY_FILENAME
@@ -66,7 +66,7 @@ def execute_tasks_v2(
         for image in filtered_images:
             if not match_filter(image, Filters(types=task.input_types)):
                 raise ValueError(
-                    f"Filtered images include {image.dict()}, which does "
+                    f"Filtered images include {image}, which does "
                     f"not comply with {task.input_types=}."
                 )
 
@@ -123,30 +123,32 @@ def execute_tasks_v2(
         # POST TASK EXECUTION
 
         # Update image list
-        current_task_output.check_paths_are_unique()
+        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["path"] in [_image["path"] for _image in tmp_images]:
+            if image["zarr_url"] in [
+                _image["zarr_url"] for _image in tmp_images
+            ]:
                 if (
                     image["origin"] is not None
-                    and image["origin"] != image["path"]
+                    and image["origin"] != image["zarr_url"]
                 ):
                     raise ValueError(
-                        f"Trying to edit an image with {image['path']=} "
+                        f"Trying to edit an image with {image['zarr_url']=} "
                         f"and {image['origin']=}."
                     )
-                image_search = find_image_by_path(
+                img_search = find_image_by_zarr_url(
                     images=tmp_images,
-                    path=image["path"],
+                    zarr_url=image["zarr_url"],
                 )
-                if image_search is None:
+                if img_search is None:
                     raise ValueError(
-                        f"Image with path {image['path']} not found, while "
-                        "updating image list."
+                        f"Image with zarr_url {image['zarr_url']} not found, "
+                        "while updating image list."
                     )
-                original_img = image_search["image"]
-                original_index = image_search["index"]
+                original_img = img_search["image"]
+                original_index = img_search["index"]
                 updated_attributes = copy(original_img["attributes"])
                 updated_types = copy(original_img["types"])
 
@@ -160,22 +162,22 @@ def execute_tasks_v2(
                 tmp_images[original_index]["types"] = updated_types
             # Add new image
             else:
-                # Check that image['path'] is relative to zarr_dir
-                if not image["path"].startswith(zarr_dir):
+                # 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['path']}"
+                        f"{image['zarr_url']}"
                     )
                 # Propagate attributes and types from `origin` (if any)
                 updated_attributes = {}
                 updated_types = {}
                 if image["origin"] is not None:
-                    image_search = find_image_by_path(
+                    img_search = find_image_by_zarr_url(
                         images=tmp_images,
-                        path=image["origin"],
+                        zarr_url=image["origin"],
                     )
-                    if image_search is not None:
-                        original_img = image_search["image"]
+                    if img_search is not None:
+                        original_img = img_search["image"]
                         updated_attributes = copy(original_img["attributes"])
                         updated_types = copy(original_img["types"])
                 # Update image attributes/types with task output and manifest
@@ -183,7 +185,7 @@ def execute_tasks_v2(
                 updated_types.update(image["types"])
                 updated_types.update(task.output_types)
                 new_image = dict(
-                    path=image["path"],
+                    zarr_url=image["zarr_url"],
                     origin=image["origin"],
                     attributes=updated_attributes,
                     types=updated_types,
@@ -194,16 +196,16 @@ def execute_tasks_v2(
                 tmp_images.append(new_image)
 
         # Remove images from tmp_images
-        for image_path in current_task_output.image_list_removals:
-            image_search = find_image_by_path(
-                images=tmp_images, path=image_path
+        for img_zarr_url in current_task_output.image_list_removals:
+            img_search = find_image_by_zarr_url(
+                images=tmp_images, zarr_url=img_zarr_url
             )
-            if image_search is None:
+            if img_search is None:
                 raise ValueError(
-                    f"Cannot remove missing image with path {image_path=}"
+                    f"Cannot remove missing image with zarr_url {img_zarr_url}"
                 )
             else:
-                tmp_images.pop(image_search["index"])
+                tmp_images.pop(img_search["index"])
 
         # Update filters.attributes:
         # current + (task_output: not really, in current examples..)

fractal_server/app/runner/v2/runner_functions.py

@@ -110,7 +110,7 @@ def run_v2_task_non_parallel(
     )
 
     function_kwargs = dict(
-        paths=[image["path"] for image in images],
+        zarr_urls=[image["zarr_url"] for image in images],
         zarr_dir=zarr_dir,
         **(wftask.args_non_parallel or {}),
     )
@@ -160,7 +160,7 @@ def run_v2_task_parallel(
     for ind, image in enumerate(images):
         list_function_kwargs.append(
             dict(
-                path=image["path"],
+                zarr_url=image["zarr_url"],
                 **(wftask.args_parallel or {}),
             ),
         )
@@ -223,7 +223,7 @@ def run_v2_task_compound(
 
     # 3/A: non-parallel init task
     function_kwargs = dict(
-        paths=[image["path"] for image in images],
+        zarr_urls=[image["zarr_url"] for image in images],
         zarr_dir=zarr_dir,
         **(wftask.args_non_parallel or {}),
     )
@@ -253,7 +253,7 @@ def run_v2_task_compound(
     for ind, parallelization_item in enumerate(parallelization_list):
         list_function_kwargs.append(
             dict(
-                path=parallelization_item.path,
+                zarr_url=parallelization_item.zarr_url,
                 init_args=parallelization_item.init_args,
                 **(wftask.args_parallel or {}),
             ),
@@ -314,7 +314,7 @@ def run_v1_task_parallel(
         list_function_kwargs.append(
             convert_v2_args_into_v1(
                 dict(
-                    path=image["path"],
+                    zarr_url=image["zarr_url"],
                     **(wftask.args_parallel or {}),
                 )
             ),

fractal_server/app/runner/v2/task_interface.py

@@ -15,13 +15,18 @@ class TaskOutput(BaseModel):
     image_list_removals: list[str] = Field(default_factory=list)
     filters: Filters = Field(default_factory=Filters)
 
-    def check_paths_are_unique(self) -> None:
-        paths = [img.path for img in self.image_list_updates]
-        paths.extend(self.image_list_removals)
-        if len(paths) != len(set(paths)):
-            duplicates = [path for path in set(paths) if paths.count(path) > 1]
+    def check_zarr_urls_are_unique(self) -> None:
+        zarr_urls = [img.zarr_url for img in self.image_list_updates]
+        zarr_urls.extend(self.image_list_removals)
+        if len(zarr_urls) != len(set(zarr_urls)):
+            duplicates = [
+                zarr_url
+                for zarr_url in set(zarr_urls)
+                if zarr_urls.count(zarr_url) > 1
+            ]
             msg = (
-                "TaskOutput image-list updates/removals has non-unique paths:"
+                "TaskOutput image-list updates/removals has "
+                "non-unique zarr_urls:"
             )
             for duplicate in duplicates:
                 msg = f"{msg}\n{duplicate}"
@@ -32,7 +37,7 @@ class InitArgsModel(BaseModel):
     class Config:
         extra = "forbid"
 
-    path: str
+    zarr_url: str
     init_args: dict[str, Any] = Field(default_factory=dict)
 
 

fractal_server/app/runner/v2/v1_compat.py

@@ -7,11 +7,11 @@ def convert_v2_args_into_v1(kwargs_v2: dict[str, Any]) -> dict[str, Any]:
 
     kwargs_v1 = deepcopy(kwargs_v2)
 
-    path = kwargs_v2.pop("path")
-    input_path = Path(path).parents[3].as_posix()
-    component = path.replace(input_path, "").lstrip("/")
+    zarr_url = kwargs_v1.pop("zarr_url")
+    input_path = Path(zarr_url).parents[3].as_posix()
+    component = zarr_url.replace(input_path, "").lstrip("/")
 
-    kwargs_v1 = dict(
+    kwargs_v1.update(
         input_paths=[input_path],
         output_path=input_path,
         metadata={},

fractal_server/app/schemas/v2/workflowtask.py

@@ -5,6 +5,7 @@ from typing import Optional
 from pydantic import BaseModel
 from pydantic import Extra
 from pydantic import Field
+from pydantic import root_validator
 from pydantic import validator
 
 from .._validators import valint
@@ -38,8 +39,8 @@ class WorkflowTaskStatusTypeV2(str, Enum):
 
 class WorkflowTaskCreateV2(BaseModel, extra=Extra.forbid):
 
-    meta_parallel: Optional[dict[str, Any]]
     meta_non_parallel: Optional[dict[str, Any]]
+    meta_parallel: Optional[dict[str, Any]]
     args_non_parallel: Optional[dict[str, Any]]
     args_parallel: Optional[dict[str, Any]]
     order: Optional[int]
@@ -50,7 +51,18 @@ class WorkflowTaskCreateV2(BaseModel, extra=Extra.forbid):
     # Validators
 
     _order = validator("order", allow_reuse=True)(valint("order", min_val=0))
-    # FIXME validate: if `is_legacy_task`, `args_non_parallel` must be None
+
+    @root_validator
+    def validate_legacy_task(cls, values):
+        if values["is_legacy_task"] and (
+            values.get("meta_non_parallel") is not None
+            or values.get("args_non_parallel") is not None
+        ):
+            raise ValueError(
+                "If Task is legacy, 'args_non_parallel' and 'meta_non_parallel"
+                "must be None"
+            )
+        return values
 
 
 class WorkflowTaskReadV2(BaseModel):
@@ -59,8 +71,8 @@ class WorkflowTaskReadV2(BaseModel):
 
     workflow_id: int
     order: Optional[int]
-    meta_parallel: Optional[dict[str, Any]]
     meta_non_parallel: Optional[dict[str, Any]]
+    meta_parallel: Optional[dict[str, Any]]
 
     args_non_parallel: Optional[dict[str, Any]]
     args_parallel: Optional[dict[str, Any]]
@@ -77,8 +89,8 @@ class WorkflowTaskReadV2(BaseModel):
 
 class WorkflowTaskUpdateV2(BaseModel):
 
-    meta_parallel: Optional[dict[str, Any]]
     meta_non_parallel: Optional[dict[str, Any]]
+    meta_parallel: Optional[dict[str, Any]]
     args_non_parallel: Optional[dict[str, Any]]
     args_parallel: Optional[dict[str, Any]]
     input_filters: Optional[Filters]
@@ -96,9 +108,10 @@ class WorkflowTaskUpdateV2(BaseModel):
 
 class WorkflowTaskImportV2(BaseModel):
 
-    meta_parallel: Optional[dict[str, Any]] = None
     meta_non_parallel: Optional[dict[str, Any]] = None
-    args: Optional[dict[str, Any]] = None  # FIXME
+    meta_parallel: Optional[dict[str, Any]] = None
+    args_non_parallel: Optional[dict[str, Any]] = None
+    args_parallel: Optional[dict[str, Any]] = None
 
     input_filters: Optional[Filters] = None
 
@@ -109,9 +122,10 @@ class WorkflowTaskImportV2(BaseModel):
 
 class WorkflowTaskExportV2(BaseModel):
 
-    meta_parallel: Optional[dict[str, Any]] = None
     meta_non_parallel: Optional[dict[str, Any]] = None
-    args: Optional[dict[str, Any]] = None  # FIXME
+    meta_parallel: Optional[dict[str, Any]] = None
+    args_non_parallel: Optional[dict[str, Any]] = None
+    args_parallel: Optional[dict[str, Any]] = None
     input_filters: Filters = Field(default_factory=Filters)
 
     is_legacy_task: bool = False

fractal_server/images/models.py

@@ -9,7 +9,7 @@ from pydantic import validator
 
 class SingleImage(BaseModel):
 
-    path: str
+    zarr_url: str
     origin: Optional[str] = None
 
     attributes: dict[str, Any] = Field(default_factory=dict)

fractal_server/images/tools.py

@@ -10,24 +10,24 @@ from fractal_server.images import Filters
 ImageSearch = dict[Literal["image", "index"], Union[int, dict[str, Any]]]
 
 
-def find_image_by_path(
+def find_image_by_zarr_url(
     *,
     images: list[dict[str, Any]],
-    path: str,
+    zarr_url: str,
 ) -> Optional[ImageSearch]:
     """
-    Return a copy of the image with a given path, and its positional index.
+    Return a copy of the image with a given zarr_url, and its positional index.
 
     Arguments:
         images: List of images.
-        path: Path that the returned image must have.
+        zarr_url: Path that the returned image must have.
 
     Returns:
-        The first image from `images` which has path equal to `path`.
+        The first image from `images` which has zarr_url equal to `zarr_url`.
     """
-    image_paths = [img["path"] for img in images]
+    image_urls = [img["zarr_url"] for img in images]
     try:
-        ind = image_paths.index(path)
+        ind = image_urls.index(zarr_url)
     except ValueError:
         return None
     return dict(image=copy(images[ind]), index=ind)

{fractal_server-2.0.0a1.dist-info → fractal_server-2.0.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.0.0a1
+Version: 2.0.0a3
 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.0a1.dist-info → fractal_server-2.0.0a3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=nTWdIbpub_qGvHveAOSoZcQPCAXn60jq4tWgPbd3jQk,24
+fractal_server/__init__.py,sha256=HWERJ6DN1N5nAIka5TF2b6cTQfjSmZGWOqkcnNTIxWs,24
 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
@@ -14,7 +14,7 @@ fractal_server/app/models/v1/project.py,sha256=sDmAFLOBK5o4dLrwsIN681JcT5J1rzoUN
 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=2T_ZXpP9n5IktoX3bkQUKUKzGAN5tJiR1LKWOtOCclM,400
-fractal_server/app/models/v2/dataset.py,sha256=3G0PO9tY3FTOlEj4we06V3QbWGfvggXpq00xQKNp8EA,1475
+fractal_server/app/models/v2/dataset.py,sha256=rTDSNeB7jCNa9QwgRPK_vB5a8oM1EhO7KKuV63EIMjE,1483
 fractal_server/app/models/v2/job.py,sha256=PCJf0_NYIc5boXL6e6P72BvYJGydCZOGKnW2DT4Sw9g,1535
 fractal_server/app/models/v2/project.py,sha256=VJvkQexFSS150KxDQxOWBAZYDlV3Ve4l3h2oabzE-tM,845
 fractal_server/app/models/v2/task.py,sha256=9ZPhug3VWyeqgT8wQ9_8ZXQ2crSiiicRipxrxTslOso,3257
@@ -22,7 +22,7 @@ fractal_server/app/models/v2/workflow.py,sha256=4pSTeZC78OQbgHHC5S0ge6pK1AP6ak7Q
 fractal_server/app/models/v2/workflowtask.py,sha256=f2a85MSAyBAdC7oG6SR8mViMNqlomQWaIB08n3ZhT-0,2727
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/admin/v1.py,sha256=uY6H1znlAlrM9e1MG2EThTqwciCl87Twew34JM5W6IU,13981
-fractal_server/app/routes/admin/v2.py,sha256=TFG6oshQXY5QlW_SIxVlQw5rSJm0tqDEnijmHE2ea-4,8891
+fractal_server/app/routes/admin/v2.py,sha256=RswcZ2DxRr_OPo3JJSLDFG4j2Ac6z1g5H-uiBiWXF2w,9706
 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
@@ -34,16 +34,16 @@ fractal_server/app/routes/api/v1/task_collection.py,sha256=LtOakYF30XiKo4ei7i09W
 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/v2/__init__.py,sha256=wCd4eBUnZlP43uoFDKtrFMZBwDQz6pX8owGs3pdtixk,1217
-fractal_server/app/routes/api/v2/_aux_functions.py,sha256=AA_DHK5OfLs9AEm_uWlf3O6zV0_A4j23dp1PDBbxsyc,14142
-fractal_server/app/routes/api/v2/dataset.py,sha256=Djq-4IwAKehgBRvSCtQba4ctgKu5P113HyL7Nat7JHM,9702
-fractal_server/app/routes/api/v2/images.py,sha256=5voGxRbx5qTnrRbnku-Q6neE1KcW8unOaaLuOFNFGyA,5765
+fractal_server/app/routes/api/v2/_aux_functions.py,sha256=reX1N0_jP1P86FVxkAuuDFrl0zBQRT8ozS-BuCeLv4Q,14218
+fractal_server/app/routes/api/v2/dataset.py,sha256=qQi9jfT9YLu6DrRCPh280J3MoFWs9yMiejkCNaauCyQ,9680
+fractal_server/app/routes/api/v2/images.py,sha256=b1NM9Y0ocuRYRec-3UcVAizB0vFkmzPEHfObaoCnIMY,5956
 fractal_server/app/routes/api/v2/job.py,sha256=9mXaKCX_N3FXM0GIxdE49nWl_hJZ8CBLBIaMMhaCKOM,5334
-fractal_server/app/routes/api/v2/project.py,sha256=YYche5eKdQu-Wnd2ob_zwxz-cVz3x3-zC-pFS0GWD6M,6091
+fractal_server/app/routes/api/v2/project.py,sha256=i9a19HAqE36N92G60ZYgObIP9nv-hR7Jt5nd9Dkhz1g,6024
 fractal_server/app/routes/api/v2/submit.py,sha256=I8asPxY3KUogLbeDi0uPNbVLQBunOwMHCp1fbTYmdyg,7219
 fractal_server/app/routes/api/v2/task.py,sha256=gJ0LruSk-Q1iMw8ZOX8C0wrZ4S4DGlQTr_5SdJJud0Q,7130
 fractal_server/app/routes/api/v2/task_collection.py,sha256=kxSOOSsTFq2w1SeDwMeX6mSDPYbH5Uds18xpdLU5kTo,8466
-fractal_server/app/routes/api/v2/workflow.py,sha256=MPfwyrksZ4tA5eh1ZULoKT7L2P8w_M-rgmcyaUNvQTE,12580
-fractal_server/app/routes/api/v2/workflowtask.py,sha256=8Ibu71nSJg-v5d5hJVOz9YRGomj7dVOaiIhQK50_O6s,8895
+fractal_server/app/routes/api/v2/workflow.py,sha256=sw-1phO_rrmDAcWX9Zqb9M8SfrWF78-02AuLB1-D1PU,11845
+fractal_server/app/routes/api/v2/workflowtask.py,sha256=L4hYpb-ihKNfPxM5AnZqPhCdiojI9Eq5TR0wf-0vP_s,8414
 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
@@ -85,11 +85,11 @@ fractal_server/app/runner/v2/_slurm/get_slurm_config.py,sha256=sqP-hs58TPt849rx1
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=UShgbFy8d8elUE5sa1_jLDqQWip4Bi21VDhcFFM0fpU,571
 fractal_server/app/runner/v2/handle_failed_job.py,sha256=t4MjRH_7OhDMqZHP5UeZJ9_RlIJVj-F5VYtl34JBXO8,5149
 fractal_server/app/runner/v2/merge_outputs.py,sha256=IHuHqbKmk97K35BFvTrKVBs60z3e_--OzXTnsvmA02c,1281
-fractal_server/app/runner/v2/runner.py,sha256=wvfaaVnqzap0AJwihBFntLBEprh1gV88l3wQVSAPPo8,11027
-fractal_server/app/runner/v2/runner_functions.py,sha256=pHGBbah0UlmN7fukmorU-AZq4WW8Aj8oSWxJwr8Woh4,10047
+fractal_server/app/runner/v2/runner.py,sha256=hLLGE6wD8nVSFWui0LlNTqn63WYYCPFeRvIAn4sBLlU,11119
+fractal_server/app/runner/v2/runner_functions.py,sha256=LfO1-FJF70_Qh78NQTCHJWyzyr011wvvtnzB6nTj5ZM,10087
 fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=Pp3hsj1i1t4ExDMcUBkQ27yEi7kjlvymY6q6eDiC8DM,3845
-fractal_server/app/runner/v2/task_interface.py,sha256=QwoTQnsBzzPzfsK6LIy-FfKRU_vItlrlJG0ViYN3D64,1243
-fractal_server/app/runner/v2/v1_compat.py,sha256=dR_ukOppfc1XmInvOyKiVLdh15OSEK7ZX1l_DxYI8Sg,495
+fractal_server/app/runner/v2/task_interface.py,sha256=3M0xDaARCVCD3yX2-N6YaFsYwZwsPpCKqAFMp0YqRDA,1376
+fractal_server/app/runner/v2/v1_compat.py,sha256=6UijuRYbB2ry2mM073u1fW4CSTeelB11lmoj_TOGtm4,511
 fractal_server/app/schemas/__init__.py,sha256=VL55f3CTFngXHYkOsFaLBEEkEEewEWI5ODlcGTI7cqA,157
 fractal_server/app/schemas/_validators.py,sha256=s9a6AX4-3Vfoy1Y_HMQA3lXm4FLdmnODYUD4lfsJr6w,2549
 fractal_server/app/schemas/json_schemas/manifest.json,sha256=yXYKHbYXPYSkSXMTLfTpfCUGBtmQuPTk1xuSXscdba4,1787
@@ -113,13 +113,13 @@ fractal_server/app/schemas/v2/project.py,sha256=Okm9n4KqUUs8oxFo6yIV3Y_4mJznLeKC
 fractal_server/app/schemas/v2/task.py,sha256=vZPIsqBVM9RJDkk81EvJQQhQa-LNSh5YGdP-KM9AKgs,3607
 fractal_server/app/schemas/v2/task_collection.py,sha256=Jk-r3f2RIHRAXbej9xnz_WsPrIrod1P_FIWK1iEVkes,2993
 fractal_server/app/schemas/v2/workflow.py,sha256=KnzsuTQZ8S1wwoRDY3poWTnO3GbogFTLqCoBJNYzIFU,1831
-fractal_server/app/schemas/v2/workflowtask.py,sha256=ZGtsQyefk5Z52vWrTudF0OAJ2_LTbmfY7dE1nO2v0EU,3424
+fractal_server/app/schemas/v2/workflowtask.py,sha256=Cg9h2RlkMGISeHXNtW0X_SUJFO0azLBX3_NNrm5WDOQ,3903
 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=JnTf7TflCdTbhcMHi12s3CJhEtuAXNulwauUU1wDpp0,88
-fractal_server/images/models.py,sha256=FId-e_lQNqp6rMoj2C4yO-fF0mCpjl5n-NJwum5TWns,1536
-fractal_server/images/tools.py,sha256=e4sajbw9OF1JSje_UiTX6xOe-Cnx8tkQxLLcl0x3Rts,2204
+fractal_server/images/models.py,sha256=Aj_U-IGjVFSbubMxo7pwlwa5IuHyn_HdtBiEEvddCss,1540
+fractal_server/images/tools.py,sha256=Q7jM60r_jq5bttrt1b4bU29n717RSUMMPbAbAkzWjgw,2234
 fractal_server/logger.py,sha256=95duXY8eSxf1HWg0CVn8SUGNzgJw9ZR0FlapDDF6WAY,3924
 fractal_server/main.py,sha256=7CpwPfCsHxBAo5fWuXPCsYOFCpbBI0F7Z0jsgCQdou8,3001
 fractal_server/migrations/README,sha256=4rQvyDfqodGhpJw74VYijRmgFP49ji5chyEemWGHsuw,59
@@ -153,8 +153,8 @@ fractal_server/tasks/v2/_TaskCollectPip.py,sha256=QeCqXDgOnMjk3diVlC5bgGEywyQjYF
 fractal_server/tasks/v2/background_operations.py,sha256=zr6j3uoWmCeW2EA9auxWNZ0sG3SHgSxUVTC1OpQXE3Y,12803
 fractal_server/tasks/v2/get_collection_data.py,sha256=Qhf2T_aaqAfqu9_KpUSlXsS7EJoZQbEPEreHHa2jco8,502
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server-2.0.0a1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.0.0a1.dist-info/METADATA,sha256=BQTLOQphWBZRtiU6OQSrVF3esVMqyLQkkju3mDMM19U,4205
-fractal_server-2.0.0a1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-fractal_server-2.0.0a1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.0.0a1.dist-info/RECORD,,
+fractal_server-2.0.0a3.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.0.0a3.dist-info/METADATA,sha256=5eETQf0NY1w6uZqbwgmgaLfqUzKyP74Y9vTI9VwUgOY,4205
+fractal_server-2.0.0a3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+fractal_server-2.0.0a3.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.0.0a3.dist-info/RECORD,,