fractal-server 2.11.0a4__py3-none-any.whl → 2.11.0a6__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.11.0a4"
+__VERSION__ = "2.11.0a6"

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

@@ -22,6 +22,7 @@ from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
+from fractal_server.images.tools import merge_type_filters
 from fractal_server.logger import set_logger
 
 logger = set_logger(__name__)
@@ -351,3 +352,23 @@ async def _add_warnings_to_workflow_tasks(
             wftask_data["warning"] = "Current user has no access to this task."
         wftask_list_with_warnings.append(wftask_data)
     return wftask_list_with_warnings
+
+
+def _check_type_filters_compatibility(
+    *,
+    task_input_types: dict[str, bool],
+    wftask_type_filters: dict[str, bool],
+) -> None:
+    """
+    Wrap `merge_type_filters` and raise `HTTPException` if needed.
+    """
+    try:
+        merge_type_filters(
+            task_input_types=task_input_types,
+            wftask_type_filters=wftask_type_filters,
+        )
+    except ValueError as e:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=f"Incompatible type filters.\nOriginal error: {str(e)}",
+        )

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

@@ -207,7 +207,7 @@ async def query_dataset_images(
         if page > last_page:
             page = last_page
         offset = (page - 1) * page_size
-        images = images[offset : offset + page_size]  # noqa E203
+        images = images[offset : offset + page_size]
 
     return ImagePage(
         total_count=total_count,

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

@@ -28,6 +28,7 @@ from ...aux.validate_user_settings import validate_user_settings
 from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import clean_app_job_list_v2
+from ._aux_functions_tasks import _check_type_filters_compatibility
 from fractal_server.app.models import TaskGroupV2
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.api.v2._aux_functions_tasks import (
@@ -108,15 +109,17 @@ async def apply_workflow(
 
     # Check that tasks have read-access and are `active`
     used_task_group_ids = set()
-    for wftask in workflow.task_list[
-        first_task_index : last_task_index + 1  # noqa: E203
-    ]:
+    for wftask in workflow.task_list[first_task_index : last_task_index + 1]:
         task = await _get_task_read_access(
             user_id=user.id,
             task_id=wftask.task_id,
             require_active=True,
             db=db,
         )
+        _check_type_filters_compatibility(
+            task_input_types=task.input_types,
+            wftask_type_filters=wftask.type_filters,
+        )
         used_task_group_ids.add(task.taskgroupv2_id)
 
     # Validate user settings

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

@@ -19,6 +19,7 @@ from ._aux_functions import _check_workflow_exists
 from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _workflow_insert_task
 from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
+from ._aux_functions_tasks import _check_type_filters_compatibility
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
@@ -325,6 +326,13 @@ async def import_workflow(
         list_wf_tasks.append(new_wf_task)
         list_task_ids.append(task_id)
 
+    for wftask, task_id in zip(list_wf_tasks, list_task_ids):
+        task = await db.get(TaskV2, task_id)
+        _check_type_filters_compatibility(
+            task_input_types=task.input_types,
+            wftask_type_filters=wftask.type_filters,
+        )
+
     # Create new Workflow
     db_workflow = WorkflowV2(
         project_id=project_id,

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

@@ -12,6 +12,7 @@ from ....db import get_async_db
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import _get_workflow_task_check_owner
 from ._aux_functions import _workflow_insert_task
+from ._aux_functions_tasks import _check_type_filters_compatibility
 from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import WorkflowTaskV2
@@ -47,24 +48,29 @@ async def replace_workflowtask(
         db=db,
     )
 
-    task = await _get_task_read_access(
+    new_task = await _get_task_read_access(
         task_id=task_id, user_id=user.id, db=db, require_active=True
     )
 
-    if task.type != old_workflow_task.task.type:
+    if new_task.type != old_workflow_task.task.type:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail=(
                 f"Cannot replace a Task '{old_workflow_task.task.type}' with a"
-                f"  Task '{task.type}'."
+                f"  Task '{new_task.type}'."
             ),
         )
 
+    _check_type_filters_compatibility(
+        task_input_types=new_task.input_types,
+        wftask_type_filters=old_workflow_task.type_filters,
+    )
+
     _args_non_parallel = old_workflow_task.args_non_parallel
     _args_parallel = old_workflow_task.args_parallel
     if replace is not None:
         if replace.args_non_parallel is not None:
-            if task.type == "parallel":
+            if new_task.type == "parallel":
                 raise HTTPException(
                     status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                     detail=(
@@ -76,7 +82,7 @@ async def replace_workflowtask(
                 _args_non_parallel = replace.args_non_parallel
 
         if replace.args_parallel is not None:
-            if task.type == "non_parallel":
+            if new_task.type == "non_parallel":
                 raise HTTPException(
                     status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                     detail=(
@@ -92,22 +98,24 @@ async def replace_workflowtask(
     if (
         old_workflow_task.meta_non_parallel
         != old_workflow_task.task.meta_non_parallel
-    ) and (old_workflow_task.task.meta_non_parallel == task.meta_non_parallel):
+    ) and (
+        old_workflow_task.task.meta_non_parallel == new_task.meta_non_parallel
+    ):
         _meta_non_parallel = old_workflow_task.meta_non_parallel
     else:
-        _meta_non_parallel = task.meta_non_parallel
+        _meta_non_parallel = new_task.meta_non_parallel
     # Same for `meta_parallel`
     if (
         old_workflow_task.meta_parallel != old_workflow_task.task.meta_parallel
-    ) and (old_workflow_task.task.meta_parallel == task.meta_parallel):
+    ) and (old_workflow_task.task.meta_parallel == new_task.meta_parallel):
         _meta_parallel = old_workflow_task.meta_parallel
     else:
-        _meta_parallel = task.meta_parallel
+        _meta_parallel = new_task.meta_parallel
 
     new_workflow_task = WorkflowTaskV2(
-        task_id=task.id,
-        task_type=task.type,
-        task=task,
+        task_id=new_task.id,
+        task_type=new_task.type,
+        task=new_task,
         # old-task values
         type_filters=old_workflow_task.type_filters,
         # possibly new values
@@ -134,7 +142,7 @@ async def create_workflowtask(
     project_id: int,
     workflow_id: int,
     task_id: int,
-    new_task: WorkflowTaskCreateV2,
+    wftask: WorkflowTaskCreateV2,
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowTaskReadV2]:
@@ -152,8 +160,8 @@ async def create_workflowtask(
 
     if task.type == "parallel":
         if (
-            new_task.meta_non_parallel is not None
-            or new_task.args_non_parallel is not None
+            wftask.meta_non_parallel is not None
+            or wftask.args_non_parallel is not None
         ):
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -165,8 +173,8 @@ async def create_workflowtask(
             )
     elif task.type == "non_parallel":
         if (
-            new_task.meta_parallel is not None
-            or new_task.args_parallel is not None
+            wftask.meta_parallel is not None
+            or wftask.args_parallel is not None
         ):
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -176,20 +184,26 @@ async def create_workflowtask(
                     "is `non_parallel`."
                 ),
             )
-    workflow_task = await _workflow_insert_task(
+
+    _check_type_filters_compatibility(
+        task_input_types=task.input_types,
+        wftask_type_filters=wftask.type_filters,
+    )
+
+    wftask_db = await _workflow_insert_task(
         workflow_id=workflow.id,
         task_id=task_id,
-        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,
-        type_filters=new_task.type_filters,
+        meta_non_parallel=wftask.meta_non_parallel,
+        meta_parallel=wftask.meta_parallel,
+        args_non_parallel=wftask.args_non_parallel,
+        args_parallel=wftask.args_parallel,
+        type_filters=wftask.type_filters,
         db=db,
     )
 
     await db.close()
 
-    return workflow_task
+    return wftask_db
 
 
 @router.get(
@@ -236,6 +250,11 @@ async def update_workflowtask(
         user_id=user.id,
         db=db,
     )
+    if workflow_task_update.type_filters is not None:
+        _check_type_filters_compatibility(
+            task_input_types=db_wf_task.task.input_types,
+            wftask_type_filters=workflow_task_update.type_filters,
+        )
 
     if db_wf_task.task_type == "parallel" and (
         workflow_task_update.args_non_parallel is not None

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

@@ -966,8 +966,8 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
                 # Retrieve job and future objects
                 job = jobs[ind_job]
                 future = futures[ind_job]
-                remaining_job_ids = job_ids[ind_job + 1 :]  # noqa: E203
-                remaining_futures = futures[ind_job + 1 :]  # noqa: E203
+                remaining_job_ids = job_ids[ind_job + 1 :]
+                remaining_futures = futures[ind_job + 1 :]
 
                 outputs = []
 

fractal_server/app/schemas/_filter_validators.py

@@ -22,14 +22,10 @@ def validate_attribute_filters(
 
     attribute_filters = valdict_keys("attribute_filters")(attribute_filters)
     for key, values in attribute_filters.items():
-        if values is None:
-            # values=None corresponds to not applying any filter for
-            # attribute `key`
-            pass
-        elif values == []:
-            # WARNING: in this case, no image can match with the current
-            # filter. In the future we may deprecate this possibility.
-            pass
+        if values == []:
+            raise ValueError(
+                f"attribute_filters[{key}] cannot be an empty list."
+            )
         else:
             # values is a non-empty list, and its items must all be of the
             # same scalar non-None type

fractal_server/data_migrations/2_11_0.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Union
 
 from sqlalchemy.orm.attributes import flag_modified
 from sqlmodel import select
@@ -7,23 +8,52 @@ from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import DatasetV2
 from fractal_server.app.models import JobV2
 from fractal_server.app.models import WorkflowTaskV2
+from fractal_server.app.schemas.v2 import DatasetReadV2
+from fractal_server.app.schemas.v2 import JobReadV2
+from fractal_server.app.schemas.v2 import ProjectReadV2
+from fractal_server.app.schemas.v2 import TaskReadV2
+from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
 
 logger = logging.getLogger("fix_db")
 logger.setLevel(logging.INFO)
 
 
-def fix_db():
+def dict_values_to_list(
+    input_dict: dict[str, Union[int, float, bool, str, None]],
+    identifier: str,
+) -> dict[str, list[Union[int, float, bool, str]]]:
+    for k, v in input_dict.items():
+        if not isinstance(v, (int, float, bool, str, type(None))):
+            error_msg = (
+                f"Attribute '{k}' from '{identifier}' "
+                f"has invalid type '{type(v)}'."
+            )
+            logger.error(error_msg)
+            raise RuntimeError(error_msg)
+        elif v is None:
+            logger.warning(
+                f"Attribute '{k}' from '{identifier}' is None and it "
+                "will be removed."
+            )
+        else:
+            input_dict[k] = [v]
+    return input_dict
+
 
+def fix_db():
     logger.info("START execution of fix_db function")
 
     with next(get_sync_db()) as db:
-
         # DatasetV2.filters
         # DatasetV2.history[].workflowtask.input_filters
         stm = select(DatasetV2).order_by(DatasetV2.id)
         datasets = db.execute(stm).scalars().all()
         for ds in datasets:
-            ds.attribute_filters = ds.filters["attributes"]
+            logger.info(f"DatasetV2[{ds.id}] START")
+            ds.attribute_filters = dict_values_to_list(
+                ds.filters["attributes"],
+                f"Dataset[{ds.id}].filters.attributes",
+            )
             ds.type_filters = ds.filters["types"]
             ds.filters = None
             for i, h in enumerate(ds.history):
@@ -31,37 +61,54 @@ def fix_db():
                     "workflowtask"
                 ]["input_filters"]["types"]
             flag_modified(ds, "history")
+            DatasetReadV2(
+                **ds.model_dump(),
+                project=ProjectReadV2(**ds.project.model_dump()),
+            )
             db.add(ds)
-            logger.info(f"Fixed filters in DatasetV2[{ds.id}]")
+            logger.info(f"DatasetV2[{ds.id}] END - fixed filters")
+
+        logger.info("------ switch from dataset to workflowtasks ------")
 
         # WorkflowTaskV2.input_filters
         stm = select(WorkflowTaskV2).order_by(WorkflowTaskV2.id)
         wftasks = db.execute(stm).scalars().all()
         for wft in wftasks:
+            logger.info(f"WorkflowTaskV2[{wft.id}] START")
             wft.type_filters = wft.input_filters["types"]
             if wft.input_filters["attributes"]:
                 logger.warning(
-                    f"Removing WorkflowTaskV2[{wft.id}].input_filters"
-                    f"['attributes'] = {wft.input_filters['attributes']}"
+                    "Removing input_filters['attributes']. "
+                    f"(previous value: {wft.input_filters['attributes']})"
                 )
             wft.input_filters = None
             flag_modified(wft, "input_filters")
+            WorkflowTaskReadV2(
+                **wft.model_dump(),
+                task=TaskReadV2(**wft.task.model_dump()),
+            )
             db.add(wft)
-            logger.info(f"Fixed filters in WorkflowTaskV2[{wft.id}]")
+            logger.info(f"WorkflowTaskV2[{wft.id}] END - fixed filters")
+
+        logger.info("------ switch from workflowtasks to jobs ------")
 
         # JOBS V2
         stm = select(JobV2).order_by(JobV2.id)
         jobs = db.execute(stm).scalars().all()
         for job in jobs:
+            logger.info(f"JobV2[{job.id}] START")
             job.dataset_dump["type_filters"] = job.dataset_dump["filters"][
                 "types"
             ]
-            job.dataset_dump["attribute_filters"] = job.dataset_dump[
-                "filters"
-            ]["attributes"]
+            job.dataset_dump["attribute_filters"] = dict_values_to_list(
+                job.dataset_dump["filters"]["attributes"],
+                f"JobV2[{job.id}].dataset_dump.filters.attributes",
+            )
             job.dataset_dump.pop("filters")
             flag_modified(job, "dataset_dump")
-            logger.info(f"Fixed filters in JobV2[{job.id}].datasetdump")
+            JobReadV2(**job.model_dump())
+            db.add(job)
+            logger.info(f"JobV2[{job.id}] END - fixed filters")
 
         db.commit()
         logger.info("Changes committed.")

fractal_server/images/models.py

@@ -9,7 +9,7 @@ from pydantic import validator
 from fractal_server.app.schemas._validators import valdict_keys
 from fractal_server.urls import normalize_url
 
-AttributeFiltersType = dict[str, Optional[list[Any]]]
+AttributeFiltersType = dict[str, list[Any]]
 
 
 class _SingleImageBase(BaseModel):

fractal_server/images/tools.py

@@ -57,8 +57,6 @@ def match_filter(
 
     # Verify match with attributes (only for not-None filters)
     for key, values in attribute_filters.items():
-        if values is None:
-            continue
         if image["attributes"].get(key) not in values:
             return False
 

fractal_server/logger.py

@@ -109,7 +109,10 @@ def set_logger(
             if isinstance(handler, logging.FileHandler)
         ]
         if len(current_file_handlers) > 1:
-            logger.warning(f"Logger {logger_name} has multiple file handlers.")
+            logger.warning(
+                f"Logger {logger_name} has multiple file handlers: "
+                f"{current_file_handlers}"
+            )
 
     return logger
 

fractal_server/tasks/v2/local/collect.py

@@ -33,8 +33,6 @@ from fractal_server.tasks.v2.utils_templates import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def collect_local(
     *,
@@ -59,6 +57,8 @@ def collect_local(
         wheel_file:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

fractal_server/tasks/v2/local/deactivate.py

@@ -21,8 +21,6 @@ from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def deactivate_local(
     *,
@@ -40,6 +38,8 @@ def deactivate_local(
         task_group_activity_id:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

fractal_server/tasks/v2/local/reactivate.py

@@ -23,9 +23,6 @@ from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
 
-LOGGER_NAME = __name__
-
-
 def reactivate_local(
     *,
     task_group_activity_id: int,
@@ -42,6 +39,8 @@ def reactivate_local(
         task_group_activity_id:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

fractal_server/tasks/v2/ssh/collect.py

@@ -30,8 +30,6 @@ from fractal_server.tasks.v2.utils_templates import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def collect_ssh(
     *,
@@ -62,6 +60,8 @@ def collect_ssh(
         wheel_file:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     # Work within a temporary folder, where also logs will be placed
     with TemporaryDirectory() as tmpdir:
         LOGGER_NAME = "task_collection_ssh"

fractal_server/tasks/v2/ssh/deactivate.py

@@ -22,8 +22,6 @@ from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def deactivate_ssh(
     *,
@@ -47,6 +45,8 @@ def deactivate_ssh(
             `user_settings.ssh_tasks_dir`.
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

fractal_server/tasks/v2/ssh/reactivate.py

@@ -22,8 +22,6 @@ from fractal_server.tasks.v2.utils_python_interpreter import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def reactivate_ssh(
     *,
@@ -47,6 +45,8 @@ def reactivate_ssh(
             `user_settings.ssh_tasks_dir`.
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

{fractal_server-2.11.0a4.dist-info → fractal_server-2.11.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.11.0a4
+Version: 2.11.0a6
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.11.0a4.dist-info → fractal_server-2.11.0a6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=DZWnRj7O86D5FPeOgamWSQFlyHVz7jh1SwTyyBfs6GQ,25
+fractal_server/__init__.py,sha256=aC0yx2HX8xIU9XVrkikksq9g-IXOskfofOk8lZZtKNc,25
 fractal_server/__main__.py,sha256=D2YTmSowmXNyvqOjW_HeItCZT2UliWlySl_owicaZg0,8026
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,21 +45,21 @@ fractal_server/app/routes/api/v1/workflowtask.py,sha256=OYYConwJbmNULDw5I3T-UbSJ
 fractal_server/app/routes/api/v2/__init__.py,sha256=w4c9WzagaVV5d4TWBX5buu5ENk8jf3YftMQYmhavz9Q,2172
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=NJ6_1biN_hhIEK1w8Vj6XhLmdkQ5kMVd_MX5JC_nHLU,11524
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=c8eqPXdMhc3nIixX50B1Ka5n7LgbOZm2JbEs7lICQ04,6767
-fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=PuapLtvSk9yhBAsKNEp1w2oagOMr0YZTo247-CU3hdM,11008
+fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=uhNSs-jcS7ndIUFKiOC1yrDiViw3uvKEXi9UL04BMks,11642
 fractal_server/app/routes/api/v2/dataset.py,sha256=Y6uZz--YSEGgnPYu05rZ9sr1Ug08bNl2v1h3VeApBe8,9441
-fractal_server/app/routes/api/v2/images.py,sha256=EI2Gu4vNVepXDBRjQLtU2Il3ciQSY9fpEyIsGEm8UVU,8845
+fractal_server/app/routes/api/v2/images.py,sha256=0qkItqPrAvWEaK3YHUmCCrKrO_tQuzAPf4Te0q8mON8,8832
 fractal_server/app/routes/api/v2/job.py,sha256=Bga2Kz1OjvDIdxZObWaaXVhNIhC_5JKhKRjEH2_ayEE,5157
 fractal_server/app/routes/api/v2/project.py,sha256=eWYFJ7F2ZYQcpi-_n-rhPF-Q4gJhzYBsVGYFhHZZXAE,6653
 fractal_server/app/routes/api/v2/status.py,sha256=_cDZW-ESYw6zpf-lLFFqko5bLpKhqKrCM6yv1OfqxN4,6300
-fractal_server/app/routes/api/v2/submit.py,sha256=Vxvqgu9nh0UCAXEYGEl_XvEfudCrvl_H2nmZwvsFzTo,8429
+fractal_server/app/routes/api/v2/submit.py,sha256=UMPhWwk4FqZmYtVEu6WLPkSr6a2R4wwgPPeVrx0zRME,8622
 fractal_server/app/routes/api/v2/task.py,sha256=K0ik33t7vL8BAK5S7fqyJDNdRK4stGqb_73bSa8tvPE,7159
 fractal_server/app/routes/api/v2/task_collection.py,sha256=9p8w9UnN6RFszC1ohy9Uo3I4HIMVdfD8fYGWuQqzxMU,12682
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=cctW61-C2QYF2KXluS15lLhZJS_kt30Ca6UGLFO32z0,6207
 fractal_server/app/routes/api/v2/task_group.py,sha256=4o2N0z7jK7VUVlJZMM4GveCCc4JKxYJx9-PMmsYIlJQ,8256
 fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=3o9bCC8ubMwffQPPaxQZy-CjH9IB2RkIReIecI6L2_w,9300
 fractal_server/app/routes/api/v2/workflow.py,sha256=vjCNRzMHaAB4YWbAEWGlELHXDN4GjtE26IkIiB15RGM,8682
-fractal_server/app/routes/api/v2/workflow_import.py,sha256=-7Er3FWGF_1xI2qHFO9gfLVQAok5bojd7mbzQxa9Ofw,10858
-fractal_server/app/routes/api/v2/workflowtask.py,sha256=NueHDKbrPWxP4Jo2hpBvuU_XBCccAyoeZOBNybF74zg,10709
+fractal_server/app/routes/api/v2/workflow_import.py,sha256=DHoHZvxndJQav6l_p5JJW9c9pSRlMEm7bv62h0M5evI,11187
+fractal_server/app/routes/api/v2/workflowtask.py,sha256=coYBy-21CbJNIkpmwC84BtPTw3r4DYBrBwaFWiM0dJA,11335
 fractal_server/app/routes/auth/__init__.py,sha256=fao6CS0WiAjHDTvBzgBVV_bSXFpEAeDBF6Z6q7rRkPc,1658
 fractal_server/app/routes/auth/_aux_auth.py,sha256=ifkNocTYatBSMYGwiR14qohmvR9SfMldceiEj6uJBrU,4783
 fractal_server/app/routes/auth/current_user.py,sha256=I3aVY5etWAJ_SH6t65Mj5TjvB2X8sAGuu1KG7FxLyPU,5883
@@ -86,7 +86,7 @@ fractal_server/app/runner/executors/slurm/remote.py,sha256=wLziIsGdSMiO-jIXM8x77
 fractal_server/app/runner/executors/slurm/ssh/__init__.py,sha256=Cjn1rYvljddi96tAwS-qqGkNfOcfPzjChdaEZEObCcM,65
 fractal_server/app/runner/executors/slurm/ssh/_executor_wait_thread.py,sha256=bKo5Ja0IGxJWpPWyh9dN0AG-PwzTDZzD5LyaEHB3YU4,3742
 fractal_server/app/runner/executors/slurm/ssh/_slurm_job.py,sha256=rwlqZzoGo4SAb4nSlFjsQJdaCgfM1J6YGcjb8yYxlqc,4506
-fractal_server/app/runner/executors/slurm/ssh/executor.py,sha256=U2-tNE_5ECHFIoXjEvBlaSXKaIf-1IXZlDs0c34mab8,54110
+fractal_server/app/runner/executors/slurm/ssh/executor.py,sha256=gtjXKTY0cP3h5AtTXRZChtFOP-tbJTBmvxs_6VnEWao,54082
 fractal_server/app/runner/executors/slurm/sudo/__init__.py,sha256=Cjn1rYvljddi96tAwS-qqGkNfOcfPzjChdaEZEObCcM,65
 fractal_server/app/runner/executors/slurm/sudo/_check_jobs_status.py,sha256=wAgwpVcr6JIslKHOuS0FhRa_6T1KCManyRJqA-fifzw,1909
 fractal_server/app/runner/executors/slurm/sudo/_executor_wait_thread.py,sha256=uRRyVHQtK9McHCB6OsjYfDnQsu2E8At9K_UYb_pe2pg,4682
@@ -134,7 +134,7 @@ fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=1fWvQ6YZUUnDhO
 fractal_server/app/runner/v2/task_interface.py,sha256=d6HPwPzrytUMVjExTU6fuCEwtvvWGRaSje0iXcRD45w,1728
 fractal_server/app/runner/versions.py,sha256=dSaPRWqmFPHjg20kTCHmi_dmGNcCETflDtDLronNanU,852
 fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMoqWc3orFyI,135
-fractal_server/app/schemas/_filter_validators.py,sha256=WcfQ3ARc-2pj2oQFB4lWA0X5wtoOPGzpD4hJq4BblXs,1727
+fractal_server/app/schemas/_filter_validators.py,sha256=0wJuZzMa-hJsMCEMxtBalW3lSk1Qey25uSVmS7GVcPM,1534
 fractal_server/app/schemas/_validators.py,sha256=3dotVxUHWKAmUO3aeoluYDLRKrw1OS-NxcZ4Fg_HOYk,3560
 fractal_server/app/schemas/user.py,sha256=icjox9gK_invW44Nh_L4CvqfRa92qghyQhmevyg09nQ,2243
 fractal_server/app/schemas/user_group.py,sha256=t30Kd07PY43G_AqFDb8vjdInTeLeU9WvFZDx8fVLPSI,1750
@@ -165,14 +165,14 @@ fractal_server/app/security/__init__.py,sha256=qn6idYgl-p5HWea0gTVnz4JnkoxGEkmQj
 fractal_server/app/security/signup_email.py,sha256=DrL51UdTSrgjleynMD5CRZwTSOpPrZ96fasRV0fvxDE,1165
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
 fractal_server/config.py,sha256=9rAzw7OO6ZeHEz-I8NJHuGoHf4xCHxfFLyRNZQD9ytY,27019
-fractal_server/data_migrations/2_11_0.py,sha256=glS3BkhumrA6SpHiE_QFBgA7Bm2cbDCUlQyY3BjEub8,2464
+fractal_server/data_migrations/2_11_0.py,sha256=hkOZsvTWi30TqpSsAWuPyL4XxEJlqLwAv02PkVIk4Rw,4337
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
 fractal_server/images/__init__.py,sha256=-_wjoKtSX02P1KjDxDP_EXKvmbONTRmbf7iGVTsyBpM,154
-fractal_server/images/models.py,sha256=fAecChXhs4utRX4123Lgz5e_b_H0YtHrvNHCenR7tOs,3359
-fractal_server/images/tools.py,sha256=iqFx_pp46OoHsHjXxX6GrkXJPPfTo_c1WYvRur0olaE,3455
-fractal_server/logger.py,sha256=zwg_AjIHkNP0ruciXjm5lI5UFP3n6tMHullsM9lDjz4,5039
+fractal_server/images/models.py,sha256=t4zcUFmWxhAzGgy7kkxs9Ctq8SAhVs0v910UcXcHIUw,3349
+fractal_server/images/tools.py,sha256=4kfPAFJJnvg7fM-cL0JMx97Dc1Npva_0ghitEji3JUU,3407
+fractal_server/logger.py,sha256=5Z3rfsFwl8UysVljTOaaIvt8Pyp6CVH492ez3jE8WAw,5113
 fractal_server/main.py,sha256=gStLT9Du5QMpc9SyvRvtKU21EKwp-dG4HL3zGHzE06A,4908
 fractal_server/migrations/env.py,sha256=9t_OeKVlhM8WRcukmTrLbWNup-imiBGP_9xNgwCbtpI,2730
 fractal_server/migrations/naming_convention.py,sha256=htbKrVdetx3pklowb_9Cdo5RqeF0fJ740DNecY5de_M,265
@@ -219,14 +219,14 @@ fractal_server/tasks/v1/utils.py,sha256=HYFyNAyZofmf--mVgdwGC5TJpGShIWIDaS01yRr4
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/tasks/v2/local/__init__.py,sha256=9RVItnS7OyLsJOuJjWMCicaky4ASUPQEYD4SzDs0hOE,141
 fractal_server/tasks/v2/local/_utils.py,sha256=EvhmVwYjqaNyDCUMEsTWYOUXLgEwR1xr6bu32apCEI8,2491
-fractal_server/tasks/v2/local/collect.py,sha256=JuMplfREqrPvVEGlT5kJhcmZXC_iYlwvNlkgFrCaCC0,12107
-fractal_server/tasks/v2/local/deactivate.py,sha256=SOFtOaR5yYm3IkbOw48TrQgzEpONQ9647KvyD_zImr8,9899
-fractal_server/tasks/v2/local/reactivate.py,sha256=MeUZHx8IKrfTEf-pXlfYms8I4o-26co3jdNgSNAvw60,6053
+fractal_server/tasks/v2/local/collect.py,sha256=Mr4BzscBY8zBRCzWq8ozTjFYy1-VFPXrMCBF7vd9Ods,12143
+fractal_server/tasks/v2/local/deactivate.py,sha256=uAV-tBgfKiN4chkfk6dYCZfF67POwhNizyxuCk_WJK8,9935
+fractal_server/tasks/v2/local/reactivate.py,sha256=DwtOZrSk6jhUHEmAiMcstK3YzqPQ12pfgxmUNdrSgfk,6088
 fractal_server/tasks/v2/ssh/__init__.py,sha256=aSQbVi6Ummt9QzcSLWNmSqYjfdxrn9ROmqgH6bDpI7k,135
 fractal_server/tasks/v2/ssh/_utils.py,sha256=LjaEYVUJDChilu3YuhxuGWYRNnVJ_zqNE9SDHdRTIHY,2824
-fractal_server/tasks/v2/ssh/collect.py,sha256=2XXEPpl4LS22A75v_k4Bd46k46tmnLNZfceHyPi3kXo,13457
-fractal_server/tasks/v2/ssh/deactivate.py,sha256=D8rfnC46davmDKZCipPdWZHDD4TIZ-4nr9vxZSV2aC0,11261
-fractal_server/tasks/v2/ssh/reactivate.py,sha256=cmdT2P1J0FwS1NYYRrhxHsSRyUZ5uu78hS3fDrSVbKo,7837
+fractal_server/tasks/v2/ssh/collect.py,sha256=yLVcilvU7uMH8woc__qG_3a0wyT2mNTCuq9I93HVKNM,13493
+fractal_server/tasks/v2/ssh/deactivate.py,sha256=bFlcpZpGiTZcwG845YiLEIIYpiG7vslcSp6_NkXtHGw,11297
+fractal_server/tasks/v2/ssh/reactivate.py,sha256=RoXM5HpIc0rVz4-8UCr3uWv-9zA8bobGSTNJamYsMOo,7873
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
 fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=Gpk2io8u9YaflFUlQu2NgkDQw5AA4m4AOVG1sB4yrHQ,1822
 fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V4aI-FnX9ZvVNxgpSOBFc,168
@@ -241,8 +241,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=07TZpJ0Mh_A4lXVXrrH2o1VLFFGwxe
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.11.0a4.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.11.0a4.dist-info/METADATA,sha256=Y_VNqSmaDdR4YhuzzFtSRAbS4nPicovQyWytyGfKB18,4564
-fractal_server-2.11.0a4.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.11.0a4.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.11.0a4.dist-info/RECORD,,
+fractal_server-2.11.0a6.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.11.0a6.dist-info/METADATA,sha256=jtJXV-kHK3rf-ha0pEYyhIzwCRKox9fHBQ38M1xti38,4564
+fractal_server-2.11.0a6.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+fractal_server-2.11.0a6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.11.0a6.dist-info/RECORD,,