fractal-server 2.9.2__py3-none-any.whl → 2.10.0a0__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.9.2"
+__VERSION__ = "2.10.0a0"

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

@@ -1,13 +1,19 @@
+import json
 from pathlib import Path
 from typing import Optional
 
 from fastapi import APIRouter
 from fastapi import BackgroundTasks
 from fastapi import Depends
+from fastapi import File
+from fastapi import Form
 from fastapi import HTTPException
 from fastapi import Request
 from fastapi import Response
 from fastapi import status
+from fastapi import UploadFile
+from pydantic import BaseModel
+from pydantic import root_validator
 from pydantic import ValidationError
 from sqlmodel import select
 
@@ -22,6 +28,7 @@ from ....schemas.v2 import TaskCollectPipV2
 from ....schemas.v2 import TaskGroupActivityStatusV2
 from ....schemas.v2 import TaskGroupActivityV2Read
 from ....schemas.v2 import TaskGroupCreateV2Strict
+from ....schemas.v2 import WheelFile
 from ...aux.validate_user_settings import validate_user_settings
 from ._aux_functions_task_lifecycle import get_package_version_from_pypi
 from ._aux_functions_tasks import _get_valid_user_group_id
@@ -44,20 +51,99 @@ from fractal_server.tasks.v2.utils_python_interpreter import (
     get_python_interpreter_v2,
 )
 
+
 router = APIRouter()
 
 logger = set_logger(__name__)
 
 
+class CollectionRequestData(BaseModel):
+    """
+    Validate form data _and_ wheel file.
+    """
+
+    task_collect: TaskCollectPipV2
+    file: Optional[UploadFile] = None
+    origin: TaskGroupV2OriginEnum
+
+    @root_validator(pre=True)
+    def validate_data(cls, values):
+        file = values.get("file")
+        package = values.get("task_collect").package
+        package_version = values.get("task_collect").package_version
+
+        if file is None:
+            if package is None:
+                raise ValueError(
+                    "When no `file` is provided, `package` is required."
+                )
+            values["origin"] = TaskGroupV2OriginEnum.PYPI
+        else:
+            if package is not None:
+                raise ValueError(
+                    "Cannot set `package` when `file` is provided "
+                    f"(given package='{package}')."
+                )
+            if package_version is not None:
+                raise ValueError(
+                    "Cannot set `package_version` when `file` is "
+                    f"provided (given package_version='{package_version}')."
+                )
+            values["origin"] = TaskGroupV2OriginEnum.WHEELFILE
+        return values
+
+
+def parse_request_data(
+    package: Optional[str] = Form(None),
+    package_version: Optional[str] = Form(None),
+    package_extras: Optional[str] = Form(None),
+    python_version: Optional[str] = Form(None),
+    pinned_package_versions: Optional[str] = Form(None),
+    file: Optional[UploadFile] = File(None),
+) -> CollectionRequestData:
+    """
+    Expand the parsing/validation of `parse_form_data`, based on `file`.
+    """
+
+    try:
+        # Convert dict_pinned_pkg from a JSON string into a Python dictionary
+        dict_pinned_pkg = (
+            json.loads(pinned_package_versions)
+            if pinned_package_versions
+            else None
+        )
+        # Validate and coerce form data
+        task_collect_pip = TaskCollectPipV2(
+            package=package,
+            package_version=package_version,
+            package_extras=package_extras,
+            python_version=python_version,
+            pinned_package_versions=dict_pinned_pkg,
+        )
+
+        data = CollectionRequestData(
+            task_collect=task_collect_pip,
+            file=file,
+        )
+
+    except (ValidationError, json.JSONDecodeError) as e:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=f"Invalid request-body\n{str(e)}",
+        )
+
+    return data
+
+
 @router.post(
     "/collect/pip/",
     response_model=TaskGroupActivityV2Read,
 )
 async def collect_tasks_pip(
-    task_collect: TaskCollectPipV2,
-    background_tasks: BackgroundTasks,
-    response: Response,
     request: Request,
+    response: Response,
+    background_tasks: BackgroundTasks,
+    request_data: CollectionRequestData = Depends(parse_request_data),
     private: bool = False,
     user_group_id: Optional[int] = None,
     user: UserOAuth = Depends(current_active_verified_user),
@@ -66,12 +152,17 @@ async def collect_tasks_pip(
     """
     Task-collection endpoint
     """
-
     # Get settings
     settings = Inject(get_settings)
 
+    # Get some validated request data
+    task_collect = request_data.task_collect
+
     # Initialize task-group attributes
-    task_group_attrs = dict(user_id=user.id)
+    task_group_attrs = dict(
+        user_id=user.id,
+        origin=request_data.origin,
+    )
 
     # Set/check python version
     if task_collect.python_version is None:
@@ -103,12 +194,19 @@ async def collect_tasks_pip(
             "pinned_package_versions"
         ] = task_collect.pinned_package_versions
 
+    # Initialize wheel_file_content as None
+    wheel_file = None
+
     # Set pkg_name, version, origin and wheel_path
-    if task_collect.package.endswith(".whl"):
+    if request_data.origin == TaskGroupV2OriginEnum.WHEELFILE:
         try:
-            task_group_attrs["wheel_path"] = task_collect.package
-            wheel_filename = Path(task_group_attrs["wheel_path"]).name
+            wheel_filename = request_data.file.filename
             wheel_info = _parse_wheel_filename(wheel_filename)
+            wheel_file_content = await request_data.file.read()
+            wheel_file = WheelFile(
+                filename=wheel_filename,
+                contents=wheel_file_content,
+            )
         except ValueError as e:
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -121,11 +219,9 @@ async def collect_tasks_pip(
             wheel_info["distribution"]
         )
         task_group_attrs["version"] = wheel_info["version"]
-        task_group_attrs["origin"] = TaskGroupV2OriginEnum.WHEELFILE
-    else:
+    elif request_data.origin == TaskGroupV2OriginEnum.PYPI:
         pkg_name = task_collect.package
         task_group_attrs["pkg_name"] = normalize_package_name(pkg_name)
-        task_group_attrs["origin"] = TaskGroupV2OriginEnum.PYPI
         latest_version = await get_package_version_from_pypi(
             task_collect.package,
             task_collect.package_version,
@@ -202,7 +298,6 @@ async def collect_tasks_pip(
     # On-disk checks
 
     if settings.FRACTAL_RUNNER_BACKEND != "slurm_ssh":
-
         # Verify that folder does not exist (for local collection)
         if Path(task_group_path).exists():
             raise HTTPException(
@@ -210,15 +305,6 @@ async def collect_tasks_pip(
                 detail=f"{task_group_path} already exists.",
             )
 
-        # Verify that wheel file exists
-        wheel_path = task_group_attrs.get("wheel_path", None)
-        if wheel_path is not None:
-            if not Path(wheel_path).exists():
-                raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                    detail=f"No such file: {wheel_path}.",
-                )
-
     # Create TaskGroupV2 object
     task_group = TaskGroupV2(**task_group_attrs)
     db.add(task_group)
@@ -259,14 +345,17 @@ async def collect_tasks_pip(
             task_group_activity_id=task_group_activity.id,
             fractal_ssh=fractal_ssh,
             tasks_base_dir=user_settings.ssh_tasks_dir,
+            wheel_file=wheel_file,
         )
 
     else:
         # Local task collection
+
         background_tasks.add_task(
             collect_local,
             task_group_id=task_group.id,
             task_group_activity_id=task_group_activity.id,
+            wheel_file=wheel_file,
         )
     logger.debug(
         "Task-collection endpoint: start background collection "

fractal_server/app/schemas/v2/__init__.py

@@ -25,6 +25,7 @@ from .task import TaskReadV2  # noqa F401
 from .task import TaskUpdateV2  # noqa F401
 from .task_collection import TaskCollectCustomV2  # noqa F401
 from .task_collection import TaskCollectPipV2  # noqa F401
+from .task_collection import WheelFile  # noqa F401
 from .task_group import TaskGroupActivityActionV2  # noqa F401
 from .task_group import TaskGroupActivityStatusV2  # noqa F401
 from .task_group import TaskGroupActivityV2Read  # noqa F401

fractal_server/app/schemas/v2/task_collection.py

@@ -12,6 +12,15 @@ from fractal_server.app.schemas.v2 import ManifestV2
 from fractal_server.string_tools import validate_cmd
 
 
+class WheelFile(BaseModel):
+    """
+    Model for data sent from the endpoint to the background task.
+    """
+
+    filename: str
+    contents: bytes
+
+
 class TaskCollectPipV2(BaseModel, extra=Extra.forbid):
     """
     TaskCollectPipV2 class
@@ -22,14 +31,11 @@ class TaskCollectPipV2(BaseModel, extra=Extra.forbid):
 
     Two cases are supported:
 
-        1. `package` is the path of a local wheel file;
-        2. `package` is the name of a package that can be installed via `pip`.
-
+        1. `package` is the name of a package that can be installed via `pip`.
+        1. `package=None`, and a wheel file is uploaded within the API request.
 
     Attributes:
-        package:
-            The name of a `pip`-installable package, or the path to a local
-            wheel file.
+        package: The name of a `pip`-installable package, or `None`.
         package_version: Version of the package
         package_extras: Package extras to include in the `pip install` command
         python_version: Python version to install and run the package tasks
@@ -39,12 +45,28 @@ class TaskCollectPipV2(BaseModel, extra=Extra.forbid):
 
     """
 
-    package: str
+    package: Optional[str] = None
     package_version: Optional[str] = None
     package_extras: Optional[str] = None
     python_version: Optional[Literal["3.9", "3.10", "3.11", "3.12"]] = None
     pinned_package_versions: Optional[dict[str, str]] = None
 
+    @validator("package")
+    def package_validator(cls, value: Optional[str]) -> Optional[str]:
+        if value is None:
+            return value
+        value = valstr("package")(value)
+        validate_cmd(value, attribute_name="package")
+        return value
+
+    @validator("package_version")
+    def package_version_validator(cls, value: Optional[str]) -> Optional[str]:
+        if value is None:
+            return value
+        value = valstr("package_version")(value)
+        validate_cmd(value, attribute_name="package_version")
+        return value
+
     @validator("pinned_package_versions")
     def pinned_package_versions_validator(cls, value):
         if value is None:
@@ -65,36 +87,10 @@ class TaskCollectPipV2(BaseModel, extra=Extra.forbid):
             validate_cmd(version)
         return value
 
-    @validator("package")
-    def package_validator(cls, value):
-        value = valstr("package")(value)
-        if "/" in value or value.endswith(".whl"):
-            if not value.endswith(".whl"):
-                raise ValueError(
-                    "Local-package path must be a wheel file "
-                    f"(given {value})."
-                )
-            if not Path(value).is_absolute():
-                raise ValueError(
-                    f"Local-package path must be absolute: (given {value})."
-                )
-        validate_cmd(value, attribute_name="package")
-        return value
-
-    @validator("package_version")
-    def package_version_validator(
-        cls, v: Optional[str], values
-    ) -> Optional[str]:
-        v = valstr("package_version")(v)
-        if values["package"].endswith(".whl"):
-            raise ValueError(
-                "Cannot provide package version when package is a wheel file."
-            )
-        validate_cmd(v, attribute_name="package_version")
-        return v
-
     @validator("package_extras")
     def package_extras_validator(cls, value: Optional[str]) -> Optional[str]:
+        if value is None:
+            return value
         value = valstr("package_extras")(value)
         validate_cmd(value, attribute_name="package_extras")
         return value

fractal_server/app/schemas/v2/task_group.py

@@ -5,7 +5,6 @@ from typing import Optional
 from pydantic import BaseModel
 from pydantic import Extra
 from pydantic import Field
-from pydantic import root_validator
 from pydantic import validator
 
 from .._validators import val_absolute_path
@@ -77,21 +76,6 @@ class TaskGroupCreateV2Strict(TaskGroupCreateV2):
     version: str
     python_version: str
 
-    @root_validator
-    def check_wheel_file(cls, values):
-        origin = values.get("origin")
-        wheel_path = values.get("wheel_path")
-        bad_condition_1 = (
-            origin == TaskGroupV2OriginEnum.WHEELFILE and wheel_path is None
-        )
-        bad_condition_2 = (
-            origin != TaskGroupV2OriginEnum.WHEELFILE
-            and wheel_path is not None
-        )
-        if bad_condition_1 or bad_condition_2:
-            raise ValueError(f"Cannot have {origin=} and {wheel_path=}.")
-        return values
-
 
 class TaskGroupReadV2(BaseModel):
     id: int

fractal_server/tasks/v2/local/collect.py

@@ -4,6 +4,7 @@ import shutil
 import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
+from typing import Optional
 
 from ..utils_database import create_db_tasks_and_update_task_group
 from ._utils import _customize_and_run_template
@@ -12,8 +13,8 @@ from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
+from fractal_server.app.schemas.v2 import WheelFile
 from fractal_server.app.schemas.v2.manifest import ManifestV2
-from fractal_server.logger import get_logger
 from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import get_log_path
 from fractal_server.tasks.v2.local._utils import check_task_files_exist
@@ -35,30 +36,19 @@ from fractal_server.utils import get_timestamp
 LOGGER_NAME = __name__
 
 
-def _copy_wheel_file_local(task_group: TaskGroupV2) -> str:
-    logger = get_logger(LOGGER_NAME)
-    source = task_group.wheel_path
-    dest = (
-        Path(task_group.path) / Path(task_group.wheel_path).name
-    ).as_posix()
-    logger.debug(f"[_copy_wheel_file] START {source=} {dest=}")
-    shutil.copy(task_group.wheel_path, task_group.path)
-    logger.debug(f"[_copy_wheel_file] END {source=} {dest=}")
-    return dest
-
-
 def collect_local(
     *,
     task_group_activity_id: int,
     task_group_id: int,
+    wheel_file: Optional[WheelFile] = None,
 ) -> None:
     """
     Collect a task package.
 
-    This function is run as a background task, therefore exceptions must be
+    This function runs as a background task, therefore exceptions must be
     handled.
 
-    NOTE: by making this function sync, it runs within a thread - due to
+    NOTE:  since this function is sync, it runs within a thread - due to
     starlette/fastapi handling of background tasks (see
     https://github.com/encode/starlette/blob/master/starlette/background.py).
 
@@ -66,6 +56,7 @@ def collect_local(
     Arguments:
         task_group_id:
         task_group_activity_id:
+        wheel_file:
     """
 
     with TemporaryDirectory() as tmpdir:
@@ -76,7 +67,6 @@ def collect_local(
         )
 
         with next(get_sync_db()) as db:
-
             # Get main objects from db
             activity = db.get(TaskGroupActivityV2, task_group_activity_id)
             task_group = db.get(TaskGroupV2, task_group_id)
@@ -109,17 +99,22 @@ def collect_local(
                 return
 
             try:
-
                 # Create task_group.path folder
                 Path(task_group.path).mkdir(parents=True)
                 logger.debug(f"Created {task_group.path}")
 
-                # Copy wheel file into task group path
-                if task_group.wheel_path:
-                    new_wheel_path = _copy_wheel_file_local(
-                        task_group=task_group
+                # Write wheel file and set task_group.wheel_path
+                if wheel_file is not None:
+
+                    wheel_path = (
+                        Path(task_group.path) / wheel_file.filename
+                    ).as_posix()
+                    logger.debug(
+                        f"Write wheel-file contents into {wheel_path}"
                     )
-                    task_group.wheel_path = new_wheel_path
+                    with open(wheel_path, "wb") as f:
+                        f.write(wheel_file.contents)
+                    task_group.wheel_path = wheel_path
                     task_group = add_commit_refresh(obj=task_group, db=db)
 
                 # Prepare replacements for templates

fractal_server/tasks/v2/ssh/collect.py

@@ -2,6 +2,7 @@ import logging
 import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
+from typing import Optional
 
 from ..utils_background import _prepare_tasks_metadata
 from ..utils_background import fail_and_cleanup
@@ -11,10 +12,10 @@ from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
+from fractal_server.app.schemas.v2 import WheelFile
 from fractal_server.app.schemas.v2.manifest import ManifestV2
 from fractal_server.logger import set_logger
 from fractal_server.ssh._fabric import FractalSSH
-from fractal_server.tasks.v2.ssh._utils import _copy_wheel_file_ssh
 from fractal_server.tasks.v2.ssh._utils import _customize_and_run_template
 from fractal_server.tasks.v2.utils_background import add_commit_refresh
 from fractal_server.tasks.v2.utils_background import get_current_log
@@ -38,14 +39,15 @@ def collect_ssh(
     task_group_activity_id: int,
     fractal_ssh: FractalSSH,
     tasks_base_dir: str,
+    wheel_file: Optional[WheelFile] = None,
 ) -> None:
     """
     Collect a task package over SSH
 
-    This function is run as a background task, therefore exceptions must be
+    This function runs as a background task, therefore exceptions must be
     handled.
 
-    NOTE: by making this function sync, it runs within a thread - due to
+    NOTE: since this function is sync, it runs within a thread - due to
     starlette/fastapi handling of background tasks (see
     https://github.com/encode/starlette/blob/master/starlette/background.py).
 
@@ -57,6 +59,7 @@ def collect_ssh(
         tasks_base_dir:
             Only used as a `safe_root` in `remove_dir`, and typically set to
             `user_settings.ssh_tasks_dir`.
+        wheel_file:
     """
 
     # Work within a temporary folder, where also logs will be placed
@@ -116,27 +119,36 @@ def collect_ssh(
                 return
 
             try:
-                script_dir_remote = (
-                    Path(task_group.path) / SCRIPTS_SUBFOLDER
-                ).as_posix()
                 # Create remote `task_group.path` and `script_dir_remote`
                 # folders (note that because of `parents=True` we  are in
                 # the `no error if existing, make parent directories as
                 # needed` scenario for `mkdir`)
+                script_dir_remote = (
+                    Path(task_group.path) / SCRIPTS_SUBFOLDER
+                ).as_posix()
                 fractal_ssh.mkdir(folder=task_group.path, parents=True)
                 fractal_ssh.mkdir(folder=script_dir_remote, parents=True)
 
-                # Copy wheel file into task group path
-                if task_group.wheel_path:
-                    new_wheel_path = _copy_wheel_file_ssh(
-                        task_group=task_group,
-                        fractal_ssh=fractal_ssh,
-                        logger_name=LOGGER_NAME,
+                # Write wheel file locally and send it to remote path,
+                # and set task_group.wheel_path
+                if wheel_file is not None:
+                    wheel_filename = wheel_file.filename
+                    wheel_path = (
+                        Path(task_group.path) / wheel_filename
+                    ).as_posix()
+                    tmp_wheel_path = (Path(tmpdir) / wheel_filename).as_posix()
+                    logger.debug(
+                        f"Write wheel-file contents into {tmp_wheel_path}"
                     )
-                    task_group.wheel_path = new_wheel_path
+                    with open(tmp_wheel_path, "wb") as f:
+                        f.write(wheel_file.contents)
+                    fractal_ssh.send_file(
+                        local=tmp_wheel_path,
+                        remote=wheel_path,
+                    )
+                    task_group.wheel_path = wheel_path
                     task_group = add_commit_refresh(obj=task_group, db=db)
 
-                # Prepare replacements for templates
                 replacements = get_collection_replacements(
                     task_group=task_group,
                     python_bin=get_python_interpreter_v2(
@@ -173,7 +185,6 @@ def collect_ssh(
                 )
                 activity.log = get_current_log(log_file_path)
                 activity = add_commit_refresh(obj=activity, db=db)
-
                 # Run script 2
                 stdout = _customize_and_run_template(
                     template_filename="2_pip_install.sh",

{fractal_server-2.9.2.dist-info → fractal_server-2.10.0a0.dist-info}/METADATA

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

{fractal_server-2.9.2.dist-info → fractal_server-2.10.0a0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=NSsP8CCnskjO7TQm83nfwPJv47-cRQJECiDBsOXPNyU,22
+fractal_server/__init__.py,sha256=Qb19IXoi0fWBhP9l0Xx5EOFNybthKtzgo46qgF8V_s0,25
 fractal_server/__main__.py,sha256=dEkCfzLLQrIlxsGC-HBfoR-RBMWnJDgNrxYTyzmE9c0,6146
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,7 +53,7 @@ fractal_server/app/routes/api/v2/project.py,sha256=eWYFJ7F2ZYQcpi-_n-rhPF-Q4gJhz
 fractal_server/app/routes/api/v2/status.py,sha256=6N9DSZ4iFqbZImorWfEAPoyoFUgEruo4Hweqo0x0xXU,6435
 fractal_server/app/routes/api/v2/submit.py,sha256=cQwt0oK8xjHMGA_bQrw4Um8jd_aCvgmWfoqSQDh12hQ,8246
 fractal_server/app/routes/api/v2/task.py,sha256=K0ik33t7vL8BAK5S7fqyJDNdRK4stGqb_73bSa8tvPE,7159
-fractal_server/app/routes/api/v2/task_collection.py,sha256=TIr1IPO15TX6CZIQ_LPc0zFtTltuleDISAdMVaVQxfw,9633
+fractal_server/app/routes/api/v2/task_collection.py,sha256=snX_E3OSBsgjbVwQMgKvV7pLmfNGD0OyqgAsxSGtB5E,12359
 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
@@ -149,7 +149,7 @@ fractal_server/app/schemas/v1/state.py,sha256=tBXzp_qW2TNNNPBo-AWEaffEU-1GkMBtUo
 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=oRKamLSuAgrTcv3gMMxGcotDloLL2c3NNgPA39UEmmM,4467
-fractal_server/app/schemas/v2/__init__.py,sha256=jAmAxPulME4hFnQJXMTxwoMZsDjZp9jjb-m__OByiXo,2505
+fractal_server/app/schemas/v2/__init__.py,sha256=ILWYZu_PfVVuZ8-qMRAuRuzBhne6nhS6sUzsigLcl-E,2557
 fractal_server/app/schemas/v2/dataset.py,sha256=zRlcO0wDZahTW1PINdVEuARZ7GZUuEqqop7UdE3-5do,2470
 fractal_server/app/schemas/v2/dumps.py,sha256=s6dg-pHZFui6t2Ktm0SMxjKDN-v-ZqBHz9iTsBQF3eU,1712
 fractal_server/app/schemas/v2/job.py,sha256=42V-bFfMvysRplwTKGsL_WshAVsWSM6yjFqypxwrY3k,3020
@@ -157,8 +157,8 @@ fractal_server/app/schemas/v2/manifest.py,sha256=Uqtd7DbyOkf9bxBOKkU7Sv7nToBIFGU
 fractal_server/app/schemas/v2/project.py,sha256=ABv9LSLVCq1QYthEhBvZOTn_4DFEC-7cH28tFGFdM7I,589
 fractal_server/app/schemas/v2/status.py,sha256=SQaUpQkjFq5c5k5J4rOjNhuQaDOEg8lksPhkKmPU5VU,332
 fractal_server/app/schemas/v2/task.py,sha256=FFAbYwDlqowB8gVMdjFVPVHvAM0T89PYLixUth49xfQ,6870
-fractal_server/app/schemas/v2/task_collection.py,sha256=yHpCRxoj6tKqCiQfUjaTj8SfCn1ChD_P6okfEOzyUDE,6518
-fractal_server/app/schemas/v2/task_group.py,sha256=fSjdLbClrpmrPj5hFZMu9DoJW4Y33EnbOh0HjMBsGVc,3784
+fractal_server/app/schemas/v2/task_collection.py,sha256=9c_yyFcVBXdAZpQQniy1bROhYnQT7G1BflOpMY1joPE,6250
+fractal_server/app/schemas/v2/task_group.py,sha256=EPQ1WHjIA8WDrpsTfvfRESjwUVzu6jKiaKZx45b36N4,3215
 fractal_server/app/schemas/v2/workflow.py,sha256=-KWvXnbHBFA3pj5n7mfSyLKJQSqkJmoziIEe7mpLl3M,1875
 fractal_server/app/schemas/v2/workflowtask.py,sha256=vDdMktYbHeYBgB5OuWSv6wRPRXWqvetkeqQ7IC5YtfA,5751
 fractal_server/app/security/__init__.py,sha256=MlWVrLFPj9M2Gug-k8yATM-Cw066RugVU4KK6kMRbnQ,13019
@@ -218,12 +218,12 @@ 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=BbXSgxExPUxFxcmBs3ejwWzRae-sQgfbk3zZkAQg77Y,12190
+fractal_server/tasks/v2/local/collect.py,sha256=JuMplfREqrPvVEGlT5kJhcmZXC_iYlwvNlkgFrCaCC0,12107
 fractal_server/tasks/v2/local/deactivate.py,sha256=XR1nvJY3mKCRqwPwV79rVaQmtb3J83KdmJKjTOHD-cU,9250
 fractal_server/tasks/v2/local/reactivate.py,sha256=R3rArAzUpMGf6xa3dGVwwXHW9WVDi5ia28AFisZsqNc,6112
 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=FkTfyhdwAp4qa4W_dqjT0CmuDMFuCBSOYjg_y1Kq2Bs,12939
+fractal_server/tasks/v2/ssh/collect.py,sha256=2XXEPpl4LS22A75v_k4Bd46k46tmnLNZfceHyPi3kXo,13457
 fractal_server/tasks/v2/ssh/deactivate.py,sha256=Ffk_UuQSBUBNBCiviuKNhEUGyZPQa4_erJKFdwgMcE8,10616
 fractal_server/tasks/v2/ssh/reactivate.py,sha256=jdO8iyzavzSVPcOpIZrYSEkGPYTvz5XJ5h_5-nz9yzA,7896
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
@@ -240,8 +240,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=MS8zu24qimJSktZaHruPxkwIl81ZoU
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=utvmBx8K9I8hRWFquxna2pBaOqe0JifDL_NVPmihEJI,3525
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.9.2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.9.2.dist-info/METADATA,sha256=SS4_FSV8br7rCqs9Bho2_pFmB_Tvg_4Mpp-Au4weqf8,4543
-fractal_server-2.9.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fractal_server-2.9.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.9.2.dist-info/RECORD,,
+fractal_server-2.10.0a0.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.10.0a0.dist-info/METADATA,sha256=G-j04Q-B4uv3h77NOrY7lh-IEVFO_7AzmV3Lp3zqw8w,4546
+fractal_server-2.10.0a0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.10.0a0.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.10.0a0.dist-info/RECORD,,