fractal-server 2.0.0a6__py3-none-any.whl → 2.0.0a9__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.0.0a6"
+__VERSION__ = "2.0.0a9"

fractal_server/app/models/v2/workflow.py

@@ -33,11 +33,3 @@ class WorkflowV2(SQLModel, table=True):
         default_factory=get_timestamp,
         sa_column=Column(DateTime(timezone=True), nullable=False),
     )
-
-    @property
-    def input_types(self):
-        return self.task_list[0].task.input_types
-
-    @property
-    def output_types(self):
-        return self.task_list[-1].task.output_types

fractal_server/app/models/v2/workflowtask.py

@@ -51,14 +51,13 @@ class WorkflowTaskV2(SQLModel, table=True):
 
     @validator("args_non_parallel")
     def validate_args_non_parallel(cls, value):
-        """
-        FIXME V2 this requires an update
-        """
         if value is None:
             return
         forbidden_args_keys = {
-            "metadata",
-            "component",
+            "zarr_dir",
+            "zarr_url",
+            "zarr_urls",
+            "init_args",
         }
         args_keys = set(value.keys())
         intersect_keys = forbidden_args_keys.intersection(args_keys)
@@ -71,14 +70,13 @@ class WorkflowTaskV2(SQLModel, table=True):
 
     @validator("args_parallel")
     def validate_args_parallel(cls, value):
-        """
-        FIXME V2 this requires an update
-        """
         if value is None:
             return
         forbidden_args_keys = {
-            "metadata",
-            "component",
+            "zarr_dir",
+            "zarr_url",
+            "zarr_urls",
+            "init_args",
         }
         args_keys = set(value.keys())
         intersect_keys = forbidden_args_keys.intersection(args_keys)

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

@@ -17,6 +17,8 @@ from ....models.v2 import ProjectV2
 from ....schemas.v2 import DatasetCreateV2
 from ....schemas.v2 import DatasetReadV2
 from ....schemas.v2 import DatasetUpdateV2
+from ....schemas.v2.dataset import DatasetExportV2
+from ....schemas.v2.dataset import DatasetImportV2
 from ....schemas.v2.dataset import DatasetStatusReadV2
 from ....schemas.v2.dataset import WorkflowTaskStatusTypeV2
 from ....security import current_active_user
@@ -134,6 +136,15 @@ async def update_dataset(
     )
     db_dataset = output["dataset"]
 
+    if (dataset_update.zarr_dir is not None) and (len(db_dataset.images) != 0):
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=(
+                "Cannot modify `zarr_dir` because the dataset has a non-empty "
+                "image list."
+            ),
+        )
+
     for key, value in dataset_update.dict(exclude_unset=True).items():
         setattr(db_dataset, key, value)
 
@@ -306,3 +317,67 @@ async def get_workflowtask_status(
 
     response_body = DatasetStatusReadV2(status=workflow_tasks_status_dict)
     return response_body
+
+
+# /api/v2/project/{project_id}/dataset/{dataset_id}/export/
+
+
+@router.get(
+    "/project/{project_id}/dataset/{dataset_id}/export/",
+    response_model=DatasetExportV2,
+)
+async def export_dataset(
+    project_id: int,
+    dataset_id: int,
+    user: User = Depends(current_active_user),
+    db: AsyncSession = Depends(get_async_db),
+) -> Optional[DatasetExportV2]:
+    """
+    Export an existing dataset
+    """
+    dict_dataset_project = await _get_dataset_check_owner(
+        project_id=project_id,
+        dataset_id=dataset_id,
+        user_id=user.id,
+        db=db,
+    )
+    await db.close()
+
+    dataset = dict_dataset_project["dataset"]
+
+    return dataset
+
+
+@router.post(
+    "/project/{project_id}/dataset/import/",
+    response_model=DatasetReadV2,
+    status_code=status.HTTP_201_CREATED,
+)
+async def import_dataset(
+    project_id: int,
+    dataset: DatasetImportV2,
+    user: User = Depends(current_active_user),
+    db: AsyncSession = Depends(get_async_db),
+) -> Optional[DatasetReadV2]:
+    """
+    Import an existing dataset into a project
+    """
+
+    # Preliminary checks
+    await _get_project_check_owner(
+        project_id=project_id,
+        user_id=user.id,
+        db=db,
+    )
+
+    # Create new Dataset
+    db_dataset = DatasetV2(
+        project_id=project_id,
+        **dataset.dict(exclude_none=True),
+    )
+    db.add(db_dataset)
+    await db.commit()
+    await db.refresh(db_dataset)
+    await db.close()
+
+    return db_dataset

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

@@ -17,6 +17,8 @@ from fractal_server.app.security import current_active_user
 from fractal_server.app.security import User
 from fractal_server.images import Filters
 from fractal_server.images import SingleImage
+from fractal_server.images import SingleImageUpdate
+from fractal_server.images.tools import find_image_by_zarr_url
 from fractal_server.images.tools import match_filter
 
 router = APIRouter()
@@ -56,6 +58,23 @@ async def post_new_image(
     )
     dataset = output["dataset"]
 
+    if not new_image.zarr_url.startswith(dataset.zarr_dir):
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=(
+                "Cannot create image with zarr_url which is not relative to "
+                f"{dataset.zarr_dir}."
+            ),
+        )
+    elif new_image.zarr_url == dataset.zarr_dir:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=(
+                "`SingleImage.zarr_url` cannot be equal to `Dataset.zarr_dir`:"
+                f" {dataset.zarr_dir}"
+            ),
+        )
+
     if new_image.zarr_url in dataset.image_zarr_urls:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -213,3 +232,48 @@ async def delete_dataset_images(
     await db.commit()
 
     return Response(status_code=status.HTTP_204_NO_CONTENT)
+
+
+@router.patch(
+    "/project/{project_id}/dataset/{dataset_id}/images/",
+    response_model=SingleImage,
+    status_code=status.HTTP_200_OK,
+)
+async def patch_dataset_image(
+    project_id: int,
+    dataset_id: int,
+    image_update: SingleImageUpdate,
+    user: User = Depends(current_active_user),
+    db: AsyncSession = Depends(get_async_db),
+):
+    output = await _get_dataset_check_owner(
+        project_id=project_id,
+        dataset_id=dataset_id,
+        user_id=user.id,
+        db=db,
+    )
+    db_dataset = output["dataset"]
+
+    ret = find_image_by_zarr_url(
+        images=db_dataset.images, zarr_url=image_update.zarr_url
+    )
+    if ret is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=(
+                f"No image with zarr_url '{image_update.zarr_url}' in "
+                f"DatasetV2 {dataset_id}."
+            ),
+        )
+    index = ret["index"]
+
+    for key, value in image_update.dict(
+        exclude_none=True, exclude={"zarr_url"}
+    ).items():
+        db_dataset.images[index][key] = value
+
+    flag_modified(db_dataset, "images")
+
+    await db.commit()
+    await db.close()
+    return db_dataset.images[index]

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

@@ -200,9 +200,15 @@ async def update_workflowtask(
             setattr(db_wf_task, key, actual_args)
         elif key == "args_non_parallel":
             # Get default arguments via a Task property method
-            default_args = deepcopy(
-                db_wf_task.task.default_args_non_parallel_from_args_schema
-            )
+            if db_wf_task.is_legacy_task:
+                # This is only needed so that we don't have to modify the rest
+                # of this block, but legacy task cannot take any non-parallel
+                # args (see checks above).
+                default_args = {}
+            else:
+                default_args = deepcopy(
+                    db_wf_task.task.default_args_non_parallel_from_args_schema
+                )
             # Override default_args with args value items
             actual_args = default_args.copy()
             if value is not None:

fractal_server/app/runner/v2/_slurm/get_slurm_config.py

@@ -125,7 +125,10 @@ def get_slurm_config(
         slurm_dict["mem_per_task_MB"] = mem_per_task_MB
 
     # Job name
-    job_name = wftask.task.name.replace(" ", "_")
+    if wftask.is_legacy_task:
+        job_name = wftask.task_legacy.name.replace(" ", "_")
+    else:
+        job_name = wftask.task.name.replace(" ", "_")
     slurm_dict["job_name"] = job_name
 
     # Optional SLURM arguments and extra lines

fractal_server/app/runner/v2/handle_failed_job.py

@@ -96,8 +96,15 @@ def assemble_history_failed_job(
 
     # Part 3/B: Append failed task to history
     if failed_wftask is not None:
-        failed_wftask_dump = failed_wftask.model_dump(exclude={"task"})
-        failed_wftask_dump["task"] = failed_wftask.task.model_dump()
+        failed_wftask_dump = failed_wftask.model_dump(
+            exclude={"task", "task_legacy"}
+        )
+        if failed_wftask.is_legacy_task:
+            failed_wftask_dump[
+                "task_legacy"
+            ] = failed_wftask.task_legacy.model_dump()
+        else:
+            failed_wftask_dump["task"] = failed_wftask.task.model_dump()
         new_history_item = dict(
             workflowtask=failed_wftask_dump,
             status=WorkflowTaskStatusTypeV2.FAILED,

fractal_server/app/runner/v2/runner.py

@@ -1,4 +1,5 @@
 import json
+import logging
 from concurrent.futures import ThreadPoolExecutor
 from copy import copy
 from copy import deepcopy
@@ -37,6 +38,8 @@ def execute_tasks_v2(
     submit_setup_call: Callable = no_op_submit_setup_call,
 ) -> DatasetV2:
 
+    logger = logging.getLogger(logger_name)
+
     if not workflow_dir.exists():  # FIXME: this should have already happened
         workflow_dir.mkdir()
 
@@ -48,6 +51,9 @@ 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}")')
 
         # PRE TASK EXECUTION
 
@@ -63,12 +69,13 @@ def execute_tasks_v2(
             filters=Filters(**pre_filters),
         )
         # Verify that filtered images comply with task input_types
-        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=}."
-                )
+        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=}."
+                    )
 
         # TASK EXECUTION (V2)
         if not wftask.is_legacy_task:
@@ -77,7 +84,7 @@ def execute_tasks_v2(
                     images=filtered_images,
                     zarr_dir=zarr_dir,
                     wftask=wftask,
-                    task=wftask.task,
+                    task=task,
                     workflow_dir=workflow_dir,
                     workflow_dir_user=workflow_dir_user,
                     executor=executor,
@@ -88,7 +95,7 @@ def execute_tasks_v2(
                 current_task_output = run_v2_task_parallel(
                     images=filtered_images,
                     wftask=wftask,
-                    task=wftask.task,
+                    task=task,
                     workflow_dir=workflow_dir,
                     workflow_dir_user=workflow_dir_user,
                     executor=executor,
@@ -100,7 +107,7 @@ def execute_tasks_v2(
                     images=filtered_images,
                     zarr_dir=zarr_dir,
                     wftask=wftask,
-                    task=wftask.task,
+                    task=task,
                     workflow_dir=workflow_dir,
                     workflow_dir_user=workflow_dir_user,
                     executor=executor,
@@ -114,9 +121,11 @@ def execute_tasks_v2(
             current_task_output = run_v1_task_parallel(
                 images=filtered_images,
                 wftask=wftask,
-                task_legacy=wftask.task_legacy,
+                task_legacy=task_legacy,
                 executor=executor,
                 logger_name=logger_name,
+                workflow_dir=workflow_dir,
+                workflow_dir_user=workflow_dir_user,
                 submit_setup_call=submit_setup_call,
             )
 
@@ -155,7 +164,8 @@ def execute_tasks_v2(
                 # Update image attributes/types with task output and manifest
                 updated_attributes.update(image["attributes"])
                 updated_types.update(image["types"])
-                updated_types.update(task.output_types)
+                if not wftask.is_legacy_task:
+                    updated_types.update(task.output_types)
 
                 # Unset attributes with None value
                 updated_attributes = {
@@ -182,6 +192,11 @@ def execute_tasks_v2(
                         f"{zarr_dir} is not a parent directory of "
                         f"{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"
+                    )
                 # Propagate attributes and types from `origin` (if any)
                 updated_attributes = {}
                 updated_types = {}
@@ -202,7 +217,8 @@ def execute_tasks_v2(
                     if value is not None
                 }
                 updated_types.update(image["types"])
-                updated_types.update(task.output_types)
+                if not wftask.is_legacy_task:
+                    updated_types.update(task.output_types)
                 new_image = dict(
                     zarr_url=image["zarr_url"],
                     origin=image["origin"],
@@ -277,6 +293,8 @@ def execute_tasks_v2(
         with open(workflow_dir / IMAGES_FILENAME, "w") as f:
             json.dump(tmp_images, f, indent=2)
 
+        logger.debug(f'END    {wftask.order}-th task (name="{task_name}")')
+
     # NOTE: tmp_history only contains the newly-added history items (to be
     # appended to the original history), while tmp_filters and tmp_images
     # represent the new attributes (to replace the original ones)

fractal_server/app/runner/v2/runner_functions.py

@@ -313,10 +313,11 @@ def run_v1_task_parallel(
     for ind, image in enumerate(images):
         list_function_kwargs.append(
             convert_v2_args_into_v1(
-                dict(
+                kwargs_v2=dict(
                     zarr_url=image["zarr_url"],
                     **(wftask.args_parallel or {}),
-                )
+                ),
+                parallelization_level=task_legacy.parallelization_level,
             ),
         )
         list_function_kwargs[-1][_COMPONENT_KEY_] = _index_to_component(ind)

fractal_server/app/runner/v2/runner_functions_low_level.py

@@ -116,7 +116,10 @@ def run_single_task(
     except TaskExecutionError as e:
         e.workflow_task_order = wftask.order
         e.workflow_task_id = wftask.id
-        e.task_name = wftask.task.name
+        if wftask.is_legacy_task:
+            e.task_name = wftask.task_legacy.name
+        else:
+            e.task_name = wftask.task.name
         raise e
 
     try:

fractal_server/app/runner/v2/task_interface.py

@@ -2,9 +2,11 @@ from typing import Any
 
 from pydantic import BaseModel
 from pydantic import Field
+from pydantic import validator
 
 from ....images import SingleImageTaskOutput
 from fractal_server.images import Filters
+from fractal_server.urls import normalize_url
 
 
 class TaskOutput(BaseModel):
@@ -34,6 +36,10 @@ class TaskOutput(BaseModel):
                 msg = f"{msg}\n{duplicate}"
             raise ValueError(msg)
 
+    @validator("image_list_removals")
+    def normalize_paths(cls, v: list[str]) -> list[str]:
+        return [normalize_url(zarr_url) for zarr_url in v]
+
 
 class InitArgsModel(BaseModel):
     class Config:
@@ -42,6 +48,10 @@ class InitArgsModel(BaseModel):
     zarr_url: str
     init_args: dict[str, Any] = Field(default_factory=dict)
 
+    @validator("zarr_url")
+    def normalize_path(cls, v: str) -> str:
+        return normalize_url(v)
+
 
 class InitTaskOutput(BaseModel):
     class Config:

fractal_server/app/runner/v2/v1_compat.py

@@ -3,13 +3,23 @@ from pathlib import Path
 from typing import Any
 
 
-def convert_v2_args_into_v1(kwargs_v2: dict[str, Any]) -> dict[str, Any]:
-
+def convert_v2_args_into_v1(
+    kwargs_v2: dict[str, Any],
+    parallelization_level: str = "image",
+) -> dict[str, Any]:
     kwargs_v1 = deepcopy(kwargs_v2)
 
     zarr_url = kwargs_v1.pop("zarr_url")
     input_path = Path(zarr_url).parents[3].as_posix()
-    component = zarr_url.replace(input_path, "").lstrip("/")
+    image_component = zarr_url.replace(input_path, "").lstrip("/")
+    if parallelization_level == "image":
+        component = image_component
+    elif parallelization_level == "well":
+        component = str(Path(image_component).parent)
+    elif parallelization_level == "plate":
+        component = str(Path(image_component).parents[2])
+    else:
+        raise ValueError(f"Invalid {parallelization_level=}.")
 
     kwargs_v1.update(
         input_paths=[input_path],

fractal_server/app/schemas/_validators.py

@@ -2,6 +2,7 @@ import os
 from datetime import datetime
 from datetime import timezone
 from typing import Any
+from typing import Optional
 
 
 def valstr(attribute: str, accept_none: bool = False):
@@ -12,7 +13,7 @@ def valstr(attribute: str, accept_none: bool = False):
     If `accept_none`, the validator also accepts `None`.
     """
 
-    def val(string: str):
+    def val(string: Optional[str]) -> Optional[str]:
         if string is None:
             if accept_none:
                 return string
@@ -29,7 +30,7 @@ def valstr(attribute: str, accept_none: bool = False):
 
 
 def valdictkeys(attribute: str):
-    def val(d: dict[str, Any]):
+    def val(d: Optional[dict[str, Any]]) -> Optional[dict[str, Any]]:
         """
         Apply valstr to every key of the dictionary, and fail if there are
         identical keys.
@@ -55,7 +56,7 @@ def valint(attribute: str, min_val: int = 1):
     database entry) is greater or equal to min_val.
     """
 
-    def val(integer: int):
+    def val(integer: Optional[int]) -> Optional[int]:
         if integer is None:
             raise ValueError(f"Integer attribute '{attribute}' cannot be None")
         if integer < min_val:
@@ -73,7 +74,7 @@ def val_absolute_path(attribute: str):
     Check that a string attribute is an absolute path
     """
 
-    def val(string: str):
+    def val(string: Optional[str]) -> str:
         if string is None:
             raise ValueError(f"String attribute '{attribute}' cannot be None")
         s = string.strip()
@@ -90,7 +91,7 @@ def val_absolute_path(attribute: str):
 
 
 def val_unique_list(attribute: str):
-    def val(must_be_unique: list):
+    def val(must_be_unique: Optional[list]) -> Optional[list]:
         if must_be_unique is not None:
             if len(set(must_be_unique)) != len(must_be_unique):
                 raise ValueError(f"`{attribute}` list has repetitions")
@@ -100,7 +101,7 @@ def val_unique_list(attribute: str):
 
 
 def valutc(attribute: str):
-    def val(timestamp: datetime):
+    def val(timestamp: Optional[datetime]) -> Optional[datetime]:
         """
         Replacing `tzinfo` with `timezone.utc` is just required by SQLite data.
         If using Postgres, this function leaves the datetime exactly as it is.

fractal_server/app/schemas/v2/dataset.py

@@ -12,6 +12,8 @@ from .dumps import WorkflowTaskDumpV2
 from .project import ProjectReadV2
 from .workflowtask import WorkflowTaskStatusTypeV2
 from fractal_server.images import Filters
+from fractal_server.images import SingleImage
+from fractal_server.urls import normalize_url
 
 
 class _DatasetHistoryItemV2(BaseModel):
@@ -50,6 +52,10 @@ class DatasetCreateV2(BaseModel, extra=Extra.forbid):
     filters: Filters = Field(default_factory=Filters)
 
     # Validators
+    @validator("zarr_dir")
+    def normalize_zarr_dir(cls, v: str) -> str:
+        return normalize_url(v)
+
     _name = validator("name", allow_reuse=True)(valstr("name"))
 
 
@@ -83,4 +89,47 @@ class DatasetUpdateV2(BaseModel):
     filters: Optional[Filters]
 
     # Validators
+    @validator("zarr_dir")
+    def normalize_zarr_dir(cls, v: Optional[str]) -> Optional[str]:
+        if v is not None:
+            return normalize_url(v)
+        return v
+
     _name = validator("name", allow_reuse=True)(valstr("name"))
+
+
+class DatasetImportV2(BaseModel):
+    """
+    Class for `Dataset` import.
+
+    Attributes:
+        name:
+        zarr_dir:
+        images:
+        filters:
+    """
+
+    class Config:
+        extra = "forbid"
+
+    name: str
+    zarr_dir: str
+    images: list[SingleImage] = Field(default_factory=[])
+    filters: Filters = Field(default_factory=Filters)
+
+
+class DatasetExportV2(BaseModel):
+    """
+    Class for `Dataset` export.
+
+    Attributes:
+        name:
+        zarr_dir:
+        images:
+        filters:
+    """
+
+    name: str
+    zarr_dir: str
+    images: list[SingleImage]
+    filters: Filters

fractal_server/app/schemas/v2/dumps.py

@@ -45,6 +45,8 @@ class WorkflowTaskDumpV2(BaseModel):
     workflow_id: int
     order: Optional[int]
 
+    is_legacy_task: bool
+
     input_filters: Filters
 
     task_id: Optional[int]

fractal_server/images/__init__.py

@@ -1,3 +1,4 @@
 from .models import Filters  # noqa: F401
 from .models import SingleImage  # noqa: F401
 from .models import SingleImageTaskOutput  # noqa: F401
+from .models import SingleImageUpdate  # noqa: F401

fractal_server/images/models.py

@@ -7,6 +7,7 @@ from pydantic import Field
 from pydantic import validator
 
 from fractal_server.app.schemas._validators import valdictkeys
+from fractal_server.urls import normalize_url
 
 
 class SingleImageBase(BaseModel):
@@ -32,6 +33,15 @@ class SingleImageBase(BaseModel):
     )
     _types = validator("types", allow_reuse=True)(valdictkeys("types"))
 
+    @validator("zarr_url")
+    def normalize_zarr_url(cls, v: str) -> str:
+        return normalize_url(v)
+
+    @validator("origin")
+    def normalize_orig(cls, v: Optional[str]) -> Optional[str]:
+        if v is not None:
+            return normalize_url(v)
+
 
 class SingleImageTaskOutput(SingleImageBase):
     """
@@ -70,6 +80,35 @@ class SingleImage(SingleImageBase):
         return v
 
 
+class SingleImageUpdate(BaseModel):
+    zarr_url: str
+    attributes: Optional[dict[str, Any]]
+    types: Optional[dict[str, bool]]
+
+    @validator("zarr_url")
+    def normalize_zarr_url(cls, v: str) -> str:
+        return normalize_url(v)
+
+    @validator("attributes")
+    def validate_attributes(
+        cls, v: dict[str, Any]
+    ) -> dict[str, Union[int, float, str, bool]]:
+        if v is not None:
+            # validate keys
+            valdictkeys("attributes")(v)
+            # validate values
+            for key, value in v.items():
+                if not isinstance(value, (int, float, str, bool)):
+                    raise ValueError(
+                        f"SingleImageUpdate.attributes[{key}] must be a scalar"
+                        " (int, float, str or bool). "
+                        f"Given {value} ({type(value)})"
+                    )
+        return v
+
+    _types = validator("types", allow_reuse=True)(valdictkeys("types"))
+
+
 class Filters(BaseModel):
     attributes: dict[str, Any] = Field(default_factory=dict)
     types: dict[str, bool] = Field(default_factory=dict)

fractal_server/urls.py

@@ -0,0 +1,13 @@
+from os.path import normpath
+
+
+def normalize_url(url: str) -> str:
+    if url.startswith("/"):
+        return normpath(url)
+    elif url.startswith("s3"):
+        # It would be better to have a NotImplementedError
+        # but Pydantic Validation + FastAPI require
+        # ValueError, TypeError or AssertionError
+        raise ValueError("S3 handling not implemented yet")
+    else:
+        raise ValueError("URLs must begin with '/' or 's3'.")

{fractal_server-2.0.0a6.dist-info → fractal_server-2.0.0a9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.0.0a6
+Version: 2.0.0a9
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause
@@ -23,7 +23,7 @@ Requires-Dist: cloudpickle (>=3.0.0,<3.1.0)
 Requires-Dist: clusterfutures (>=0.5,<0.6)
 Requires-Dist: fastapi (>=0.110.0,<0.111.0)
 Requires-Dist: fastapi-users[oauth] (>=12.1.0,<13.0.0)
-Requires-Dist: gunicorn (>=21.2.0,<22.0.0) ; extra == "gunicorn"
+Requires-Dist: gunicorn (>=21.2,<23.0) ; extra == "gunicorn"
 Requires-Dist: packaging (>=23.2,<24.0)
 Requires-Dist: psycopg2 (>=2.9.5,<3.0.0) ; extra == "postgres"
 Requires-Dist: pydantic (>=1.10.8,<2)

{fractal_server-2.0.0a6.dist-info → fractal_server-2.0.0a9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=5qWDQ_nyhHlAAd6zm7X6HCZpyfGaVJKhBA0qSF2KZfA,24
+fractal_server/__init__.py,sha256=igx3UAg7e-LuCe083CY3r_FQooF1tJV_FTJy9JRvzEo,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
@@ -18,8 +18,8 @@ fractal_server/app/models/v2/dataset.py,sha256=-7sxHEw4IIAvF_uSan7tA3o8hvoakBkQ0
 fractal_server/app/models/v2/job.py,sha256=PCJf0_NYIc5boXL6e6P72BvYJGydCZOGKnW2DT4Sw9g,1535
 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=4pSTeZC78OQbgHHC5S0ge6pK1AP6ak7Qew_0ZNM9xuw,1256
-fractal_server/app/models/v2/workflowtask.py,sha256=f2a85MSAyBAdC7oG6SR8mViMNqlomQWaIB08n3ZhT-0,2727
+fractal_server/app/models/v2/workflow.py,sha256=YBgFGCziUgU0aJ5EM3Svu9W2c46AewZO9VBlFCHiSps,1069
+fractal_server/app/models/v2/workflowtask.py,sha256=kEm2k1LI0KK9vlTH7DL1NddaEUpIvMkFi42vahwDpd8,2695
 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
@@ -36,8 +36,8 @@ fractal_server/app/routes/api/v1/workflow.py,sha256=ZObifWTPi100oRQ1wEER8Sgsr3Ne
 fractal_server/app/routes/api/v1/workflowtask.py,sha256=ox-DIIqYV4K35hCu86eGa2SHnR5IQml-I00UHEwnmHQ,5579
 fractal_server/app/routes/api/v2/__init__.py,sha256=x56HcY1uBNCgq4BRVj-0j6bAj6OsTN97RNDqY8NefJ8,1373
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=TCHf3aM-KQxaNJen10CGX1Da5IIra00xRF39FUTU698,14301
-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/dataset.py,sha256=mgz8746jOhXDdKkNY7dDN3bM0QgXFBMk1VUFqnxU-B0,11573
+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/submit.py,sha256=iszII5CvWDEjGPTphBgH9FVS1pNb5m11Xc8xozGgjgI,6901
@@ -45,7 +45,7 @@ fractal_server/app/routes/api/v2/task.py,sha256=gJ0LruSk-Q1iMw8ZOX8C0wrZ4S4DGlQT
 fractal_server/app/routes/api/v2/task_collection.py,sha256=iw74UF8qdQa9pJf0DvSjihng6ri2k2HtW2UhMS_a8Zc,8904
 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=L4hYpb-ihKNfPxM5AnZqPhCdiojI9Eq5TR0wf-0vP_s,8414
+fractal_server/app/routes/api/v2/workflowtask.py,sha256=I1nrIV5J_DW1IeBq0q9VmUeBDo7P6x7qYO_Ocls2Pno,8720
 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,17 +85,17 @@ fractal_server/app/runner/v2/_local/_submit_setup.py,sha256=deagsLSy6A3ZHKaSDcQq
 fractal_server/app/runner/v2/_local/executor.py,sha256=QrJlD77G6q4WohoJQO7XXbvi2RlCUsNvMnPDEZIoAqA,3620
 fractal_server/app/runner/v2/_slurm/__init__.py,sha256=srxn5-KdQxqD8cWJmOJlSoctbXYlyCMM249xWGY9bhI,4409
 fractal_server/app/runner/v2/_slurm/_submit_setup.py,sha256=tsZHQdVy3VxENMdsBzHltrVWzugBppq0cFrHtaVzoUA,2793
-fractal_server/app/runner/v2/_slurm/get_slurm_config.py,sha256=sqP-hs58TPt849rx10VRFKWX_DgLDPQcKZJcE0zKBXs,6621
+fractal_server/app/runner/v2/_slurm/get_slurm_config.py,sha256=I_lOS75iGYyJ74-gNwwcPadvZ9vI9HYe04WMln5GJ5Q,6726
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=-imwO7OB7ATADEnqVbTElUwoY0YIJCTf_SbWJNN9OZg,639
-fractal_server/app/runner/v2/handle_failed_job.py,sha256=fipRJT5Y8UY0US4bXUX-4ORTAQ1AetZcCAOVCjDO3_c,5202
+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=rBRehRDduGU0TUOkgQN6WbIGhDWZ6GOat4bv7IVB8cA,11784
-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=NJZUMHtEs5C3bFdXX42Kv1GMzQ7xPW2v5ZRxGNANOec,1410
-fractal_server/app/runner/v2/v1_compat.py,sha256=6UijuRYbB2ry2mM073u1fW4CSTeelB11lmoj_TOGtm4,511
+fractal_server/app/runner/v2/runner.py,sha256=K6bmWbQRSZwbO6ZI2Bp7wNxYdkHcXxhWwBObMxJ0iSU,12599
+fractal_server/app/runner/v2/runner_functions.py,sha256=kN_xuaAg4qeRNIXijo30F1WSOo3zbjz5JCuS87EQf4g,10171
+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/v1_compat.py,sha256=t0ficzAHUFaaeI56nqTb4YEKxfARF7L9Y6ijtJCwjP8,912
 fractal_server/app/schemas/__init__.py,sha256=VL55f3CTFngXHYkOsFaLBEEkEEewEWI5ODlcGTI7cqA,157
-fractal_server/app/schemas/_validators.py,sha256=Pdff5plJJmoUTf_nZpMA24tZlFJb84EdRSnLwRZDxfE,3264
+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
@@ -108,8 +108,8 @@ fractal_server/app/schemas/v1/task.py,sha256=7BxOZ_qoRQ8n3YbQpDvB7VMcxB5fSYQmR5R
 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=VSAB8np2TdZf_a2NJKkpBVJFDSs0IYpLan5RDzu6g3E,1757
-fractal_server/app/schemas/v2/dumps.py,sha256=Xen0OPf1Ax9i_7ItrAPvCk1OCNcUsnhlLRiyny89aLM,1997
+fractal_server/app/schemas/v2/dataset.py,sha256=_nnpGqaD7HJNC125jAyPn05iavy5uy4jxEMDB40TXCA,2737
+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
 fractal_server/app/schemas/v2/project.py,sha256=u7S4B-bote1oGjzAGiZ-DuQIyeRAGqJsI71Tc1EtYE0,736
@@ -120,8 +120,8 @@ fractal_server/app/schemas/v2/workflowtask.py,sha256=vRyPca8smu6fzwd9gO1eOd3qdPL
 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=KWLVMlWqTY85qq1VUpzaJi5Sl2VOYWEn0vIEiD-QZ5k,144
-fractal_server/images/models.py,sha256=hgDQf1-SsMJw504GFUufVETedPPEweCQxUhA2uDfdao,2904
+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/logger.py,sha256=95duXY8eSxf1HWg0CVn8SUGNzgJw9ZR0FlapDDF6WAY,3924
 fractal_server/main.py,sha256=7CpwPfCsHxBAo5fWuXPCsYOFCpbBI0F7Z0jsgCQdou8,3001
@@ -157,9 +157,10 @@ fractal_server/tasks/v2/_TaskCollectPip.py,sha256=QeCqXDgOnMjk3diVlC5bgGEywyQjYF
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server-2.0.0a6.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.0.0a6.dist-info/METADATA,sha256=VzuxOIkkB0Uv-MzjnyEf9Xu3xhQzJQUNCYROj_tVrwM,4204
-fractal_server-2.0.0a6.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-fractal_server-2.0.0a6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.0.0a6.dist-info/RECORD,,
+fractal_server-2.0.0a9.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.0.0a9.dist-info/METADATA,sha256=P8NzTlZ9SHoftxPyngm08c824qK_b9sdIXvfrxt_e5Y,4200
+fractal_server-2.0.0a9.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+fractal_server-2.0.0a9.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.0.0a9.dist-info/RECORD,,