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

fractal_server/__init__.py

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

fractal_server/app/routes/admin/v2.py

@@ -12,6 +12,7 @@ from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
 from fastapi.responses import StreamingResponse
+from pydantic import BaseModel
 from sqlmodel import select
 
 from ....config import get_settings
@@ -279,13 +280,17 @@ async def download_job_logs(
     )
 
 
+class TaskCompatibility(BaseModel):
+    is_v2_compatible: bool
+
+
 @router_admin_v2.patch(
     "/task-v1/{task_id}/",
     status_code=status.HTTP_200_OK,
 )
 async def flag_task_v1_as_v2_compatible(
     task_id: int,
-    is_v2_compatible: bool,
+    compatibility: TaskCompatibility,
     user: User = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
@@ -297,7 +302,7 @@ async def flag_task_v1_as_v2_compatible(
             detail=f"Task {task_id} not found",
         )
 
-    task.is_v2_compatible = is_v2_compatible
+    task.is_v2_compatible = compatibility.is_v2_compatible
     await db.commit()
     await db.close()
 

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

@@ -140,6 +140,16 @@ async def collect_tasks_pip(
                     f"Original error: {e}"
                 ),
             )
+        except ValidationError as e:
+            await db.close()
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail=(
+                    "Cannot collect package. Possible reason: an old version "
+                    "of the same package has already been collected. "
+                    f"Original error: {e}"
+                ),
+            )
         task_collect_status.info = "Already installed"
         state = State(data=task_collect_status.sanitised_dict())
         response.status_code == status.HTTP_200_OK

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

@@ -10,6 +10,7 @@ from .project import router as project_router_v2
 from .submit import router as submit_job_router_v2
 from .task import router as task_router_v2
 from .task_collection import router as task_collection_router_v2
+from .task_legacy import router as task_legacy_router_v2
 from .workflow import router as workflow_router_v2
 from .workflowtask import router as workflowtask_router_v2
 
@@ -19,10 +20,13 @@ router_api_v2.include_router(dataset_router_v2, tags=["V2 Dataset"])
 router_api_v2.include_router(job_router_v2, tags=["V2 Job"])
 router_api_v2.include_router(images_routes_v2, tags=["V2 Images"])
 router_api_v2.include_router(project_router_v2, tags=["V2 Project"])
-router_api_v2.include_router(submit_job_router_v2, tags=["V2 Submit Job"])
-router_api_v2.include_router(task_router_v2, prefix="/task", tags=["V2 Task"])
+router_api_v2.include_router(submit_job_router_v2, tags=["V2 Job"])
 router_api_v2.include_router(
     task_collection_router_v2, prefix="/task", tags=["V2 Task Collection"]
 )
+router_api_v2.include_router(task_router_v2, prefix="/task", tags=["V2 Task"])
+router_api_v2.include_router(
+    task_legacy_router_v2, prefix="/task-legacy", tags=["V2 Task Legacy"]
+)
 router_api_v2.include_router(workflow_router_v2, tags=["V2 Workflow"])
 router_api_v2.include_router(workflowtask_router_v2, tags=["V2 WorkflowTask"])

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

@@ -39,7 +39,6 @@ async def _get_project_check_owner(
         project_id:
         user_id:
         db:
-        version:
 
     Returns:
         The project object
@@ -382,8 +381,8 @@ async def _get_task_check_owner(
 def _get_submitted_jobs_statement() -> SelectOfScalar:
     """
     Returns:
-        A sqlmodel statement that selects all `ApplyWorkflow`s with
-        `ApplyWorkflow.status` equal to `submitted`.
+        A sqlmodel statement that selects all `Job`s with
+        `Job.status` equal to `submitted`.
     """
     stm = select(JobV2).where(JobV2.status == JobStatusTypeV1.SUBMITTED)
     return stm
@@ -406,11 +405,16 @@ async def _workflow_insert_task(
     Insert a new WorkflowTask into Workflow.task_list
 
     Args:
-        task_id: TBD
-        args: TBD
-        meta: TBD
-        order: TBD
-        db: TBD
+        workflow_id:
+        task_id:
+        is_legacy_task:
+        order:
+        meta_parallel:
+        meta_non_parallel:
+        args_non_parallel:
+        args_parallel:
+        input_filters:
+        db:
     """
     db_workflow = await db.get(WorkflowV2, workflow_id)
     if db_workflow is None:

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

@@ -148,7 +148,7 @@ async def apply_workflow(
         if len(user.slurm_accounts) > 0:
             job_create.slurm_account = user.slurm_accounts[0]
 
-    # Add new ApplyWorkflow object to DB
+    # Add new Job object to DB
     job = JobV2(
         project_id=project_id,
         dataset_id=dataset_id,
@@ -192,9 +192,8 @@ async def apply_workflow(
         raise HTTPException(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=(
-                f"The endpoint 'POST /api/v2/project/{project_id}/workflow/"
-                f"{workflow_id}/apply/' "
-                "was called several times within an interval of less "
+                f"The endpoint 'POST /api/v2/project/{project_id}/job/submit/'"
+                " was called several times within an interval of less "
                 f"than {settings.FRACTAL_API_SUBMIT_RATE_LIMIT} seconds, using"
                 " the same foreign keys. If it was intentional, please wait "
                 "and try again."

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

@@ -137,7 +137,17 @@ async def collect_tasks_pip(
                 detail=(
                     "Cannot collect package. Possible reason: another "
                     "collection of the same package is in progress. "
-                    f"Original error: {e}"
+                    f"Original FileNotFoundError: {e}"
+                ),
+            )
+        except ValidationError as e:
+            await db.close()
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail=(
+                    "Cannot collect package. Possible reason: an old version "
+                    "of the same package has already been collected. "
+                    f"Original ValidationError: {e}"
                 ),
             )
         task_collect_status.info = "Already installed"

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

@@ -0,0 +1,59 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from fastapi import HTTPException
+from fastapi import status
+from sqlmodel import select
+
+from .....logger import set_logger
+from ....db import AsyncSession
+from ....db import get_async_db
+from ....models.v1 import Task as TaskV1
+from ....schemas.v2 import TaskLegacyReadV2
+from ....security import current_active_user
+from ....security import User
+
+router = APIRouter()
+
+logger = set_logger(__name__)
+
+
+@router.get("/", response_model=list[TaskLegacyReadV2])
+async def get_list_task_legacy(
+    args_schema: bool = True,
+    only_v2_compatible: bool = False,
+    user: User = Depends(current_active_user),
+    db: AsyncSession = Depends(get_async_db),
+) -> list[TaskLegacyReadV2]:
+    """
+    Get list of available legacy tasks
+    """
+    stm = select(TaskV1)
+    if only_v2_compatible:
+        stm = stm.where(TaskV1.is_v2_compatible)
+    res = await db.execute(stm)
+    task_list = res.scalars().all()
+    await db.close()
+    if args_schema is False:
+        for task in task_list:
+            setattr(task, "args_schema", None)
+
+    return task_list
+
+
+@router.get("/{task_id}/", response_model=TaskLegacyReadV2)
+async def get_task_legacy(
+    task_id: int,
+    user: User = Depends(current_active_user),
+    db: AsyncSession = Depends(get_async_db),
+) -> TaskLegacyReadV2:
+    """
+    Get info on a specific legacy task
+    """
+    task = await db.get(TaskV1, task_id)
+    await db.close()
+    if not task:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"TaskV1[{task_id}] not found",
+        )
+    return task

fractal_server/app/runner/executors/slurm/executor.py

@@ -417,8 +417,6 @@ class FractalSlurmExecutor(SlurmExecutor):
                 A `TaskFiles` object; if `None`, use
                 `self.get_default_task_files()`.
 
-        Returns:
-            An iterator of results.
         """
 
         def _result_or_cancel(fut):

fractal_server/app/runner/v1/_common.py

@@ -207,7 +207,7 @@ def call_single_task(
         with task_files.metadiff.open("r") as f_metadiff:
             diff_metadata = json.load(f_metadiff)
     except FileNotFoundError as e:
-        logger.error(
+        logger.warning(
             f"Skip collection of updated metadata. Original error: {str(e)}"
         )
         diff_metadata = {}

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

@@ -49,7 +49,8 @@ def _process_workflow(
 
     Schedules the workflow using a `FractalThreadPoolExecutor`.
 
-    Cf. [process_workflow][fractal_server.app.runner._local.process_workflow]
+    Cf.
+    [process_workflow][fractal_server.app.runner.v1._local.process_workflow]
     for the call signature.
     """
 

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

@@ -66,7 +66,8 @@ def _process_workflow(
     workflow working dir and user to impersonate. It then schedules the
     workflow tasks and returns the output dataset metadata.
 
-    Cf. [process_workflow][fractal_server.app.runner._local.process_workflow]
+    Cf.
+    [process_workflow][fractal_server.app.runner.v1._local.process_workflow]
 
     Returns:
         output_dataset_metadata: Metadata of the output dataset
@@ -132,7 +133,8 @@ async def process_workflow(
     """
     Process workflow (SLURM backend public interface)
 
-    Cf. [process_workflow][fractal_server.app.runner._local.process_workflow]
+    Cf.
+    [process_workflow][fractal_server.app.runner.v1._local.process_workflow]
     """
 
     # Set values of first_task_index and last_task_index

fractal_server/app/runner/v1/_slurm/_submit_setup.py

@@ -12,7 +12,7 @@
 """
 Submodule to define _slurm_submit_setup, which is also the reference
 implementation of `submit_setup_call` in
-[fractal_server.app.runner._common][]).
+[fractal_server.app.runner.v1._common][]).
 """
 from pathlib import Path
 
@@ -38,7 +38,7 @@ def _slurm_submit_setup(
 
     For now, this is the reference implementation for the argument
     `submit_setup_call` of
-    [fractal_server.app.runner._common.execute_tasks][].
+    [fractal_server.app.runner.v1._common.execute_tasks][].
 
     Arguments:
         wftask:

fractal_server/app/runner/v2/__init__.py

@@ -248,7 +248,7 @@ async def submit_workflow(
             job,
             dataset,
             workflow,
-            logger,
+            logger_name=logger_name,
             failed_wftask=failed_wftask,
         )
         latest_filters = assemble_filters_failed_job(job)
@@ -283,7 +283,7 @@ async def submit_workflow(
             job,
             dataset,
             workflow,
-            logger,
+            logger_name=logger_name,
         )
         latest_filters = assemble_filters_failed_job(job)
         if latest_filters is not None:
@@ -313,7 +313,7 @@ async def submit_workflow(
             job,
             dataset,
             workflow,
-            logger,
+            logger_name=logger_name,
         )
         latest_filters = assemble_filters_failed_job(job)
         if latest_filters is not None:

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

@@ -45,7 +45,8 @@ def _process_workflow(
 
     Schedules the workflow using a `FractalThreadPoolExecutor`.
 
-    Cf. [process_workflow][fractal_server.app.runner._local.process_workflow]
+    Cf.
+    [process_workflow][fractal_server.app.runner.v2._local.process_workflow]
     for the call signature.
     """
 
@@ -91,21 +92,21 @@ async def process_workflow(
     Args:
         workflow:
             The workflow to be run
-        input_paths:
-            The paths to the input files to pass to the first task of the
-            workflow
-        output_path:
-            The destination path for the last task of the workflow
-        input_metadata:
-            Initial metadata, passed to the first task
-        logger_name:
-            Name of the logger to log information on the run to
+        dataset:
+            Initial dataset.
         workflow_dir:
             Working directory for this run.
         workflow_dir_user:
             Working directory for this run, on the user side. This argument is
             present for compatibility with the standard backend interface, but
             for the `local` backend it cannot be different from `workflow_dir`.
+        first_task_index:
+            Positional index of the first task to execute; if `None`, start
+            from `0`.
+        last_task_index:
+            Positional index of the last task to execute; if `None`, proceed
+            until the last task.
+        logger_name: Logger name
         slurm_user:
             Username to impersonate to run the workflow. This argument is
             present for compatibility with the standard backend interface, but
@@ -123,12 +124,6 @@ async def process_workflow(
             to the backend executor. This argument is present for compatibility
             with the standard backend interface, but is ignored in the `local`
             backend.
-        first_task_index:
-            Positional index of the first task to execute; if `None`, start
-            from `0`.
-        last_task_index:
-            Positional index of the last task to execute; if `None`, proceed
-            until the last task.
 
     Raises:
         TaskExecutionError: wrapper for errors raised during tasks' execution

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

@@ -56,7 +56,8 @@ def _process_workflow(
     workflow working dir and user to impersonate. It then schedules the
     workflow tasks and returns the new dataset attributes
 
-    Cf. [process_workflow][fractal_server.app.runner._local.process_workflow]
+    Cf.
+    [process_workflow][fractal_server.app.runner.v2._local.process_workflow]
 
     Returns:
         new_dataset_attributes:
@@ -112,7 +113,8 @@ async def process_workflow(
     """
     Process workflow (SLURM backend public interface)
 
-    Cf. [process_workflow][fractal_server.app.runner._local.process_workflow]
+    Cf.
+    [process_workflow][fractal_server.app.runner.v2._local.process_workflow]
     """
 
     # Set values of first_task_index and last_task_index

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

@@ -11,8 +11,7 @@
 # Zurich.
 """
 Submodule to define _slurm_submit_setup, which is also the reference
-implementation of `submit_setup_call` in
-[fractal_server.app.runner._common][]).
+implementation of `submit_setup_call`.
 """
 from pathlib import Path
 from typing import Literal
@@ -40,7 +39,7 @@ def _slurm_submit_setup(
 
     For now, this is the reference implementation for the argument
     `submit_setup_call` of
-    [fractal_server.app.runner._common.execute_tasks][].
+    [fractal_server.app.runner.v2.runner][].
 
     Arguments:
         wftask:

fractal_server/app/runner/v2/deduplicate_list.py

@@ -1,9 +1,10 @@
 from typing import TypeVar
 
 from ....images import SingleImage
+from ....images import SingleImageTaskOutput
 from .task_interface import InitArgsModel
 
-T = TypeVar("T", SingleImage, InitArgsModel)
+T = TypeVar("T", SingleImage, SingleImageTaskOutput, InitArgsModel)
 
 
 def deduplicate_list(

fractal_server/app/runner/v2/handle_failed_job.py

@@ -32,7 +32,7 @@ def assemble_history_failed_job(
     job: JobV2,
     dataset: DatasetV2,
     workflow: WorkflowV2,
-    logger: logging.Logger,
+    logger_name: Optional[str] = None,
     failed_wftask: Optional[WorkflowTaskV2] = None,
 ) -> list[dict[str, Any]]:
     """
@@ -40,12 +40,12 @@ def assemble_history_failed_job(
 
     Args:
         job:
-            The failed `ApplyWorkflow` object.
-        output_dataset:
-            The `dataset` associated to `job`.
+            The failed `JobV2` object.
+        dataset:
+            The `DatasetV2` object associated to `job`.
         workflow:
-            The `workflow` associated to `job`.
-        logger: A logger instance.
+            The `WorkflowV2` object associated to `job`.
+        logger_name: A logger name.
         failed_wftask:
             If set, append it to `history` during step 3; if `None`, infer
             it by comparing the job task list and the one in
@@ -53,9 +53,11 @@ def assemble_history_failed_job(
 
     Returns:
         The new value of `history`, to be merged into
-        `output_dataset.meta`.
+        `dataset.meta`.
     """
 
+    logger = logging.getLogger(logger_name)
+
     # The final value of the history attribute should include up to three
     # parts, coming from: the database, the temporary file, the failed-task
     # information.

fractal_server/app/runner/v2/runner.py

@@ -157,6 +157,20 @@ def execute_tasks_v2(
                 updated_types.update(image["types"])
                 updated_types.update(task.output_types)
 
+                # Unset attributes with None value
+                updated_attributes = {
+                    key: value
+                    for key, value in updated_attributes.items()
+                    if value is not None
+                }
+
+                # Validate new image
+                SingleImage(
+                    zarr_url=image["zarr_url"],
+                    types=updated_types,
+                    attributes=updated_attributes,
+                )
+
                 # Update image in the dataset image list
                 tmp_images[original_index]["attributes"] = updated_attributes
                 tmp_images[original_index]["types"] = updated_types
@@ -182,6 +196,11 @@ def execute_tasks_v2(
                         updated_types = copy(original_img["types"])
                 # Update image attributes/types with task output and manifest
                 updated_attributes.update(image["attributes"])
+                updated_attributes = {
+                    key: value
+                    for key, value in updated_attributes.items()
+                    if value is not None
+                }
                 updated_types.update(image["types"])
                 updated_types.update(task.output_types)
                 new_image = dict(

fractal_server/app/runner/v2/task_interface.py

@@ -3,7 +3,7 @@ from typing import Any
 from pydantic import BaseModel
 from pydantic import Field
 
-from ....images import SingleImage
+from ....images import SingleImageTaskOutput
 from fractal_server.images import Filters
 
 
@@ -11,7 +11,9 @@ class TaskOutput(BaseModel):
     class Config:
         extra = "forbid"
 
-    image_list_updates: list[SingleImage] = Field(default_factory=list)
+    image_list_updates: list[SingleImageTaskOutput] = Field(
+        default_factory=list
+    )
     image_list_removals: list[str] = Field(default_factory=list)
     filters: Filters = Field(default_factory=Filters)
 

fractal_server/app/schemas/_validators.py

@@ -1,6 +1,7 @@
 import os
 from datetime import datetime
 from datetime import timezone
+from typing import Any
 
 
 def valstr(attribute: str, accept_none: bool = False):
@@ -27,6 +28,27 @@ def valstr(attribute: str, accept_none: bool = False):
     return val
 
 
+def valdictkeys(attribute: str):
+    def val(d: dict[str, Any]):
+        """
+        Apply valstr to every key of the dictionary, and fail if there are
+        identical keys.
+        """
+        if d is not None:
+            old_keys = list(d.keys())
+            new_keys = [valstr(f"{attribute}[{key}]")(key) for key in old_keys]
+            if len(new_keys) != len(set(new_keys)):
+                raise ValueError(
+                    f"Dictionary contains multiple identical keys: {d}."
+                )
+            for old_key, new_key in zip(old_keys, new_keys):
+                if new_key != old_key:
+                    d[new_key] = d.pop(old_key)
+        return d
+
+    return val
+
+
 def valint(attribute: str, min_val: int = 1):
     """
     Check that an integer attribute (e.g. if it is meant to be the ID of a

fractal_server/app/schemas/v2/__init__.py

@@ -17,6 +17,7 @@ from .project import ProjectUpdateV2  # noqa F401
 from .task import TaskCreateV2  # noqa F401
 from .task import TaskExportV2  # noqa F401
 from .task import TaskImportV2  # noqa F401
+from .task import TaskLegacyReadV2  # noqa F401
 from .task import TaskReadV2  # noqa F401
 from .task import TaskUpdateV2  # noqa F401
 from .task_collection import TaskCollectPipV2  # noqa F401

fractal_server/app/schemas/v2/dumps.py

@@ -5,7 +5,7 @@ Dump models differ from their Read counterpart in that:
 * They may only include a subset of the Read attributes.
 
 These models are used in at least two situations:
-1. In the "*_dump" attributes of ApplyWorkflow models;
+1. In the "*_dump" attributes of Job models;
 2. In the `_DatasetHistoryItem.workflowtask` model, to trim its size.
 """
 from typing import Optional

fractal_server/app/schemas/v2/task.py

@@ -9,7 +9,9 @@ from pydantic import HttpUrl
 from pydantic import root_validator
 from pydantic import validator
 
+from .._validators import valdictkeys
 from .._validators import valstr
+from ..v1.task import TaskReadV1
 
 
 class TaskCreateV2(BaseModel, extra=Extra.forbid):
@@ -20,8 +22,8 @@ class TaskCreateV2(BaseModel, extra=Extra.forbid):
     command_parallel: Optional[str]
     source: str
 
-    meta_parallel: Optional[dict[str, Any]]
     meta_non_parallel: Optional[dict[str, Any]]
+    meta_parallel: Optional[dict[str, Any]]
     version: Optional[str]
     args_schema_non_parallel: Optional[dict[str, Any]]
     args_schema_parallel: Optional[dict[str, Any]]
@@ -53,9 +55,28 @@ class TaskCreateV2(BaseModel, extra=Extra.forbid):
     )
     _source = validator("source", allow_reuse=True)(valstr("source"))
     _version = validator("version", allow_reuse=True)(valstr("version"))
+
+    _meta_non_parallel = validator("meta_non_parallel", allow_reuse=True)(
+        valdictkeys("meta_non_parallel")
+    )
+    _meta_parallel = validator("meta_parallel", allow_reuse=True)(
+        valdictkeys("meta_parallel")
+    )
+    _args_schema_non_parallel = validator(
+        "args_schema_non_parallel", allow_reuse=True
+    )(valdictkeys("args_schema_non_parallel"))
+    _args_schema_parallel = validator(
+        "args_schema_parallel", allow_reuse=True
+    )(valdictkeys("args_schema_parallel"))
     _args_schema_version = validator("args_schema_version", allow_reuse=True)(
         valstr("args_schema_version")
     )
+    _input_types = validator("input_types", allow_reuse=True)(
+        valdictkeys("input_types")
+    )
+    _output_types = validator("output_types", allow_reuse=True)(
+        valdictkeys("output_types")
+    )
 
 
 class TaskReadV2(BaseModel):
@@ -80,6 +101,10 @@ class TaskReadV2(BaseModel):
     output_types: dict[str, bool]
 
 
+class TaskLegacyReadV2(TaskReadV1):
+    is_v2_compatible: bool
+
+
 class TaskUpdateV2(BaseModel):
 
     name: Optional[str]
@@ -106,6 +131,12 @@ class TaskUpdateV2(BaseModel):
     _command_non_parallel = validator(
         "command_non_parallel", allow_reuse=True
     )(valstr("command_non_parallel"))
+    _input_types = validator("input_types", allow_reuse=True)(
+        valdictkeys("input_types")
+    )
+    _output_types = validator("output_types", allow_reuse=True)(
+        valdictkeys("output_types")
+    )
 
 
 class TaskImportV2(BaseModel):

fractal_server/app/schemas/v2/task_collection.py

@@ -6,6 +6,7 @@ from pydantic import BaseModel
 from pydantic import Field
 from pydantic import validator
 
+from .._validators import valdictkeys
 from .._validators import valstr
 from .task import TaskReadV2
 
@@ -43,6 +44,9 @@ class TaskCollectPipV2(BaseModel):
     python_version: Optional[str] = None
     pinned_package_versions: Optional[dict[str, str]] = None
 
+    _pinned_package_versions = validator(
+        "pinned_package_versions", allow_reuse=True
+    )(valdictkeys("pinned_package_versions"))
     _package_extras = validator("package_extras", allow_reuse=True)(
         valstr("package_extras")
     )

fractal_server/app/schemas/v2/workflowtask.py

@@ -8,6 +8,7 @@ from pydantic import Field
 from pydantic import root_validator
 from pydantic import validator
 
+from .._validators import valdictkeys
 from .._validators import valint
 from ..v1.task import TaskExportV1
 from ..v1.task import TaskImportV1
@@ -49,7 +50,18 @@ class WorkflowTaskCreateV2(BaseModel, extra=Extra.forbid):
     is_legacy_task: bool = False
 
     # Validators
-
+    _meta_non_parallel = validator("meta_non_parallel", allow_reuse=True)(
+        valdictkeys("meta_non_parallel")
+    )
+    _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))
 
     @root_validator
@@ -96,14 +108,18 @@ class WorkflowTaskUpdateV2(BaseModel):
     input_filters: Optional[Filters]
 
     # Validators
-
-    @validator("meta_parallel", "meta_non_parallel")
-    def check_no_parallelisation_level(cls, m):
-        if "parallelization_level" in m:
-            raise ValueError(
-                "Overriding task parallelization level currently not allowed"
-            )
-        return m
+    _meta_non_parallel = validator("meta_non_parallel", allow_reuse=True)(
+        valdictkeys("meta_non_parallel")
+    )
+    _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")
+    )
 
 
 class WorkflowTaskImportV2(BaseModel):
@@ -119,6 +135,19 @@ class WorkflowTaskImportV2(BaseModel):
     task: Optional[TaskImportV2] = None
     task_legacy: Optional[TaskImportV1] = None
 
+    _meta_non_parallel = validator("meta_non_parallel", allow_reuse=True)(
+        valdictkeys("meta_non_parallel")
+    )
+    _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")
+    )
+
 
 class WorkflowTaskExportV2(BaseModel):
 

fractal_server/images/__init__.py

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

fractal_server/images/models.py

@@ -6,8 +6,19 @@ from pydantic import BaseModel
 from pydantic import Field
 from pydantic import validator
 
+from fractal_server.app.schemas._validators import valdictkeys
 
-class SingleImage(BaseModel):
+
+class SingleImageBase(BaseModel):
+    """
+    Base for SingleImage and SingleImageTaskOutput.
+
+    Attributes:
+        zarr_url:
+        origin:
+        attributes:
+        types:
+    """
 
     zarr_url: str
     origin: Optional[str] = None
@@ -15,6 +26,37 @@ class SingleImage(BaseModel):
     attributes: dict[str, Any] = Field(default_factory=dict)
     types: dict[str, bool] = Field(default_factory=dict)
 
+    # Validators
+    _attributes = validator("attributes", allow_reuse=True)(
+        valdictkeys("attributes")
+    )
+    _types = validator("types", allow_reuse=True)(valdictkeys("types"))
+
+
+class SingleImageTaskOutput(SingleImageBase):
+    """
+    `SingleImageBase`, with scalar `attributes` values (`None` included).
+    """
+
+    @validator("attributes")
+    def validate_attributes(
+        cls, v: dict[str, Any]
+    ) -> dict[str, Union[int, float, str, bool, None]]:
+        for key, value in v.items():
+            if not isinstance(value, (int, float, str, bool, type(None))):
+                raise ValueError(
+                    f"SingleImageTaskOutput.attributes[{key}] must be a "
+                    "scalar (int, float, str or bool). "
+                    f"Given {value} ({type(value)})"
+                )
+        return v
+
+
+class SingleImage(SingleImageBase):
+    """
+    `SingleImageBase`, with scalar `attributes` values (`None` excluded).
+    """
+
     @validator("attributes")
     def validate_attributes(
         cls, v: dict[str, Any]
@@ -36,6 +78,11 @@ class Filters(BaseModel):
         extra = "forbid"
 
     # Validators
+    _attributes = validator("attributes", allow_reuse=True)(
+        valdictkeys("attributes")
+    )
+    _types = validator("types", allow_reuse=True)(valdictkeys("types"))
+
     @validator("attributes")
     def validate_attributes(
         cls, v: dict[str, Any]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.0.0a3
+Version: 2.0.0a5
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause
@@ -16,21 +16,21 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: gunicorn
 Provides-Extra: postgres
 Requires-Dist: aiosqlite (>=0.19.0,<0.20.0)
-Requires-Dist: alembic (>=1.9.1,<2.0.0)
+Requires-Dist: alembic (>=1.13.1,<2.0.0)
 Requires-Dist: asyncpg (>=0.29.0,<0.30.0) ; extra == "postgres"
 Requires-Dist: bcrypt (==4.0.1)
-Requires-Dist: cloudpickle (>=2.2.1,<2.3.0)
+Requires-Dist: cloudpickle (>=3.0.0,<3.1.0)
 Requires-Dist: clusterfutures (>=0.5,<0.6)
-Requires-Dist: fastapi (>=0.109.0,<0.110.0)
+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: packaging (>=23.2,<24.0)
 Requires-Dist: psycopg2 (>=2.9.5,<3.0.0) ; extra == "postgres"
 Requires-Dist: pydantic (>=1.10.8,<2)
-Requires-Dist: python-dotenv (>=0.21.0,<0.22.0)
+Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)
-Requires-Dist: sqlmodel (>=0.0.14,<0.0.15)
-Requires-Dist: uvicorn (>=0.27.0,<0.28.0)
+Requires-Dist: sqlmodel (>=0.0.16,<0.0.17)
+Requires-Dist: uvicorn (>=0.29.0,<0.30.0)
 Project-URL: Changelog, https://github.com/fractal-analytics-platform/fractal-server/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server
 Project-URL: Repository, https://github.com/fractal-analytics-platform/fractal-server

{fractal_server-2.0.0a3.dist-info → fractal_server-2.0.0a5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=HWERJ6DN1N5nAIka5TF2b6cTQfjSmZGWOqkcnNTIxWs,24
+fractal_server/__init__.py,sha256=oMW8PG9hYE8hZFrzx7V0lWEhIDsTi7x10oIzOXR7EYc,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
@@ -21,8 +21,9 @@ fractal_server/app/models/v2/task.py,sha256=9ZPhug3VWyeqgT8wQ9_8ZXQ2crSiiicRipxr
 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/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/v2.py,sha256=RswcZ2DxRr_OPo3JJSLDFG4j2Ac6z1g5H-uiBiWXF2w,9706
+fractal_server/app/routes/admin/v2.py,sha256=c2hk8lB9ilXvFDJ6AHv7aPd_nyaXyobH0S7CaaDqFMI,9826
 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
@@ -30,18 +31,19 @@ fractal_server/app/routes/api/v1/dataset.py,sha256=7z57FGBTCyz_G6Ivr1PeGIXGyd15f
 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=LtOakYF30XiKo4ei7i09WSZ7u4D9pPJhhQBxHaSLr9M,8457
+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/v2/__init__.py,sha256=wCd4eBUnZlP43uoFDKtrFMZBwDQz6pX8owGs3pdtixk,1217
-fractal_server/app/routes/api/v2/_aux_functions.py,sha256=reX1N0_jP1P86FVxkAuuDFrl0zBQRT8ozS-BuCeLv4Q,14218
+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/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=I8asPxY3KUogLbeDi0uPNbVLQBunOwMHCp1fbTYmdyg,7219
+fractal_server/app/routes/api/v2/submit.py,sha256=egu5jE93sU7sRu3x_4Rp9t3uUJFATK4dwj4Pl3iJPN0,7171
 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/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/auth.py,sha256=Xv80iqdyfY3lyicYs2Y8B6zEDEnyUu_H6_6psYtv3R4,4885
@@ -49,50 +51,51 @@ fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 fractal_server/app/routes/aux/_job.py,sha256=5gKgvArAruSkMQuPN34Vvzi89WJbwWPsx0oDAa_iXu4,1248
 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
 fractal_server/app/runner/async_wrap.py,sha256=_O6f8jftKYXG_DozkmlrDBhoiK9QhE9MablOyECq2_M,829
 fractal_server/app/runner/components.py,sha256=ZF8ct_Ky5k8IAcrmpYOZ-bc6OBgdELEighYVqFDEbZg,119
 fractal_server/app/runner/exceptions.py,sha256=_qZ_t8O4umAdJ1ikockiF5rDJuxnEskrGrLjZcnQl7A,4159
+fractal_server/app/runner/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm/__init__.py,sha256=Cjn1rYvljddi96tAwS-qqGkNfOcfPzjChdaEZEObCcM,65
 fractal_server/app/runner/executors/slurm/_batching.py,sha256=1P6CgrAOCK9u_EvNFTumcQ-PcZMpocCaSAyNr0YB1js,8841
 fractal_server/app/runner/executors/slurm/_check_jobs_status.py,sha256=8d29a7DQ2xoWxoFQCnFfTpHER-qBX8mEatl4Dw5HU_o,1908
 fractal_server/app/runner/executors/slurm/_executor_wait_thread.py,sha256=J3tjAx33nBgW4eHAXDte7hDs7Oe9FLEZaElEt8inrbg,4421
 fractal_server/app/runner/executors/slurm/_slurm_config.py,sha256=rF37XDImX1QoWx37MC5hSM9AuY_KfHU5gaWwN4vl4Zk,15552
 fractal_server/app/runner/executors/slurm/_subprocess_run_as_user.py,sha256=8CCtxWCuB5UDst3C_WJxBU77xwPrpDyq7iMCZMnodXU,5123
-fractal_server/app/runner/executors/slurm/executor.py,sha256=iqp73KdTPCnVtMA-FeEGXxtnYuzz-UB_7UnhNYWqIaU,44504
+fractal_server/app/runner/executors/slurm/executor.py,sha256=O9h6ZPAKM95BUJrZkHCdFJZrw2zR2XmxeB5fCoGp97w,44451
 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=hlSh-lUWbDCWP2k4isswoU9hh7huoT2Zy7cEwjXwnzk,21238
-fractal_server/app/runner/v1/_local/__init__.py,sha256=CMKYo01skbGKCc2UHp7HDe4-uu7EKS50a6tSllwCxNk,6919
+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/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
-fractal_server/app/runner/v1/_slurm/__init__.py,sha256=ohvDMhzOOzk1Qe1W3wY1MGxCQGRKmCleQV45EO1rVZc,10839
-fractal_server/app/runner/v1/_slurm/_submit_setup.py,sha256=UoPzhxN86FeIRXJlWouulBKoguNFaOv2j_s3-9MwXCs,2732
+fractal_server/app/runner/v1/_slurm/__init__.py,sha256=KN98RO8E3EG4MLNFa--D3DilRHjUyHrVicC6pHtu5L0,10853
+fractal_server/app/runner/v1/_slurm/_submit_setup.py,sha256=llTgSOCnCVMvm7Q0SoVpLZshorAOZZUDz927ij0LZEA,2738
 fractal_server/app/runner/v1/_slurm/get_slurm_config.py,sha256=6TLWQon8hSicsD7c3yXK4P9xeId0s_H3HOOeMUVGVss,5977
 fractal_server/app/runner/v1/common.py,sha256=_L-vjLnWato80VdlB_BFN4G8P4jSM07u-5cnl1T3S34,3294
 fractal_server/app/runner/v1/handle_failed_job.py,sha256=bHzScC_aIlU3q-bQxGW6rfWV4xbZ2tho_sktjsAs1no,4684
-fractal_server/app/runner/v2/__init__.py,sha256=xHSI2eoalyEtjDcFIFJdYMZywOM0b9Tj-lkL40H77u0,12431
-fractal_server/app/runner/v2/_local/__init__.py,sha256=wTXCiNRG6WkWPw79tvguOCOVvMcXt5vnVwUCrPspVss,6163
+fractal_server/app/runner/v2/__init__.py,sha256=RwIOSLCChMZWHix5QuUNRPtRwgf1UmFDk3YufRCTOoc,12482
+fractal_server/app/runner/v2/_local/__init__.py,sha256=Q1s-DwXleUq6w1ZNv6tlh3tZv6cyBqxB_hMvZlqVYaM,5881
 fractal_server/app/runner/v2/_local/_local_config.py,sha256=lR0Js-l63mQUzN9hK0HkfdLsrTf-W6GHvPvbPC64amY,3630
 fractal_server/app/runner/v2/_local/_submit_setup.py,sha256=deagsLSy6A3ZHKaSDcQqrdvbQVM3i4kgyTcbVc0tC5U,1614
 fractal_server/app/runner/v2/_local/executor.py,sha256=QrJlD77G6q4WohoJQO7XXbvi2RlCUsNvMnPDEZIoAqA,3620
-fractal_server/app/runner/v2/_slurm/__init__.py,sha256=CJgbawVty4gvBitIjcl2JgfE4FCnDHWCJJfNF4YjH8s,4395
-fractal_server/app/runner/v2/_slurm/_submit_setup.py,sha256=3zK_GYN5ou_HFLP9N2--Nf-XUULqSWMRk1MIr2tL9-A,2847
+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/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/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/merge_outputs.py,sha256=IHuHqbKmk97K35BFvTrKVBs60z3e_--OzXTnsvmA02c,1281
-fractal_server/app/runner/v2/runner.py,sha256=hLLGE6wD8nVSFWui0LlNTqn63WYYCPFeRvIAn4sBLlU,11119
+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=3M0xDaARCVCD3yX2-N6YaFsYwZwsPpCKqAFMp0YqRDA,1376
+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/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
+fractal_server/app/schemas/_validators.py,sha256=Pdff5plJJmoUTf_nZpMA24tZlFJb84EdRSnLwRZDxfE,3264
 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
@@ -104,21 +107,21 @@ 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=U3WXzQ1o26dSq3jR8n0rA-Zsq6uIpoN3oCKPOABytvA,1704
+fractal_server/app/schemas/v2/__init__.py,sha256=zlCYrplCWwnCL9-BYsExRMfVzhBy21IMBfdHPMgJZYk,1752
 fractal_server/app/schemas/v2/dataset.py,sha256=ThUwme1uVhamZhlvlN0873bTDTbhTaoFanQBlgp0F5k,1839
-fractal_server/app/schemas/v2/dumps.py,sha256=bEhfJrxBon1NzqS3bha16pj-59qPY_VWk_vOjsXsvAo,2047
+fractal_server/app/schemas/v2/dumps.py,sha256=CPJ5hS5z6S0sPJ5frAMe7yFvF5Yv76c07jiddqQpRyU,2037
 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=Okm9n4KqUUs8oxFo6yIV3Y_4mJznLeKCI2ccjY0X8Vo,814
-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/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=KnzsuTQZ8S1wwoRDY3poWTnO3GbogFTLqCoBJNYzIFU,1831
-fractal_server/app/schemas/v2/workflowtask.py,sha256=Cg9h2RlkMGISeHXNtW0X_SUJFO0azLBX3_NNrm5WDOQ,3903
+fractal_server/app/schemas/v2/workflowtask.py,sha256=vRyPca8smu6fzwd9gO1eOd3qdPLJ-Zq2AAAbSLCou3I,5051
 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=Aj_U-IGjVFSbubMxo7pwlwa5IuHyn_HdtBiEEvddCss,1540
+fractal_server/images/__init__.py,sha256=KWLVMlWqTY85qq1VUpzaJi5Sl2VOYWEn0vIEiD-QZ5k,144
+fractal_server/images/models.py,sha256=hgDQf1-SsMJw504GFUufVETedPPEweCQxUhA2uDfdao,2904
 fractal_server/images/tools.py,sha256=Q7jM60r_jq5bttrt1b4bU29n717RSUMMPbAbAkzWjgw,2234
 fractal_server/logger.py,sha256=95duXY8eSxf1HWg0CVn8SUGNzgJw9ZR0FlapDDF6WAY,3924
 fractal_server/main.py,sha256=7CpwPfCsHxBAo5fWuXPCsYOFCpbBI0F7Z0jsgCQdou8,3001
@@ -147,14 +150,16 @@ fractal_server/tasks/__init__.py,sha256=kadmVUoIghl8s190_Tt-8f-WBqMi8u8oU4Pvw39N
 fractal_server/tasks/endpoint_operations.py,sha256=D1WSJd8dIfIumKezon1NYX5a0QNPqqlbj9uRq-ur9CQ,5379
 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/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
 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.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,,
+fractal_server-2.0.0a5.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.0.0a5.dist-info/METADATA,sha256=xM14fc51eG07eC21M_JzXJeENmKObX-mn4ASQ6GkV7I,4204
+fractal_server-2.0.0a5.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+fractal_server-2.0.0a5.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.0.0a5.dist-info/RECORD,,

fractal_server/app/schemas/json_schemas/manifest.json

@@ -1,81 +0,0 @@
-{
-  "title": "ManifestV1",
-  "description": "Manifest schema version 1.\n\nAttributes:\n    task_list:",
-  "type": "object",
-  "properties": {
-    "manifest_version": {
-      "title": "Manifest Version",
-      "type": "string"
-    },
-    "task_list": {
-      "title": "Task List",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/TaskManifestV1"
-      }
-    },
-    "has_args_schemas": {
-      "title": "Has Args Schemas",
-      "default": false,
-      "type": "boolean"
-    },
-    "args_schema_version": {
-      "title": "Args Schema Version",
-      "type": "string"
-    }
-  },
-  "required": [
-    "manifest_version",
-    "task_list"
-  ],
-  "definitions": {
-    "TaskManifestV1": {
-      "title": "TaskManifestV1",
-      "description": "Task manifest schema version 1.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "title": "Name",
-          "type": "string"
-        },
-        "executable": {
-          "title": "Executable",
-          "type": "string"
-        },
-        "input_type": {
-          "title": "Input Type",
-          "type": "string"
-        },
-        "output_type": {
-          "title": "Output Type",
-          "type": "string"
-        },
-        "meta": {
-          "title": "Meta",
-          "type": "object"
-        },
-        "args_schema": {
-          "title": "Args Schema",
-          "type": "object"
-        },
-        "docs_info": {
-          "title": "Docs Info",
-          "type": "string"
-        },
-        "docs_link": {
-          "title": "Docs Link",
-          "minLength": 1,
-          "maxLength": 2083,
-          "format": "uri",
-          "type": "string"
-        }
-      },
-      "required": [
-        "name",
-        "executable",
-        "input_type",
-        "output_type"
-      ]
-    }
-  }
-}