fractal-server 2.9.1__tar.gz → 2.10.0a0__tar.gz

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.9.1
+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.10.0a0/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.10.0a0"

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/models/security.py

@@ -76,7 +76,6 @@ class UserOAuth(SQLModel, table=True):
         is_verified:
         slurm_user:
         slurm_accounts:
-        cache_dir:
         username:
         oauth_accounts:
     """

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/models/user_settings.py

@@ -20,7 +20,7 @@ class UserSettings(SQLModel, table=True):
         ssh_tasks_dir: Task-venvs base folder on `ssh_host`.
         ssh_jobs_dir: Jobs base folder on `ssh_host`.
         slurm_user: Local user, to be impersonated via `sudo -u`
-        cache_dir: Folder where `slurm_user` can write.
+        project_dir: Folder where `slurm_user` can write.
     """
 
     __tablename__ = "user_settings"
@@ -35,5 +35,4 @@ class UserSettings(SQLModel, table=True):
     ssh_tasks_dir: Optional[str] = None
     ssh_jobs_dir: Optional[str] = None
     slurm_user: Optional[str] = None
-    cache_dir: Optional[str] = None
     project_dir: Optional[str] = None

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/routes/api/v1/project.py

@@ -448,6 +448,12 @@ async def apply_workflow(
     await db.commit()
     await db.refresh(job)
 
+    cache_dir = (
+        f"{user_settings.project_dir}/.fractal_cache"
+        if user_settings.project_dir is not None
+        else None
+    )
+
     background_tasks.add_task(
         submit_workflow,
         workflow_id=workflow.id,
@@ -456,7 +462,7 @@ async def apply_workflow(
         job_id=job.id,
         worker_init=apply_workflow.worker_init,
         slurm_user=user_settings.slurm_user,
-        user_cache_dir=user_settings.cache_dir,
+        user_cache_dir=cache_dir,
     )
     request.app.state.jobsV1.append(job.id)
     logger.info(

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py

@@ -182,8 +182,8 @@ async def check_no_submitted_job(
     Find submitted jobs which include tasks from a given task group.
 
     Arguments:
-        task_id_list: List of TaskV2 IDs
-        db: Database session
+        task_group_id: ID of the `TaskGroupV2` object.
+        db: Asynchronous database session.
     """
     stm = (
         select(func.count(JobV2.id))

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/routes/api/v2/submit.py

@@ -186,18 +186,22 @@ async def apply_workflow(
         f"_{timestamp_string}"
     )
 
+    cache_dir = (
+        Path(user_settings.project_dir) / ".fractal_cache"
+        if user_settings.project_dir is not None
+        else None
+    )
+
     # Define user-side job directory
     if FRACTAL_RUNNER_BACKEND == "local":
         WORKFLOW_DIR_REMOTE = WORKFLOW_DIR_LOCAL
     elif FRACTAL_RUNNER_BACKEND == "local_experimental":
         WORKFLOW_DIR_REMOTE = WORKFLOW_DIR_LOCAL
     elif FRACTAL_RUNNER_BACKEND == "slurm":
-        WORKFLOW_DIR_REMOTE = (
-            Path(user_settings.cache_dir) / f"{WORKFLOW_DIR_LOCAL.name}"
-        )
+        WORKFLOW_DIR_REMOTE = cache_dir / WORKFLOW_DIR_LOCAL.name
     elif FRACTAL_RUNNER_BACKEND == "slurm_ssh":
         WORKFLOW_DIR_REMOTE = (
-            Path(user_settings.ssh_jobs_dir) / f"{WORKFLOW_DIR_LOCAL.name}"
+            Path(user_settings.ssh_jobs_dir) / WORKFLOW_DIR_LOCAL.name
         )
 
     # Update job folders in the db
@@ -229,7 +233,7 @@ async def apply_workflow(
         user_settings=user_settings,
         worker_init=job.worker_init,
         slurm_user=user_settings.slurm_user,
-        user_cache_dir=user_settings.cache_dir,
+        user_cache_dir=cache_dir.as_posix() if cache_dir else None,
         fractal_ssh=fractal_ssh,
     )
     request.app.state.jobsV2.append(job.id)

{fractal_server-2.9.1 → fractal_server-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-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/routes/api/v2/workflow_import.py

@@ -68,11 +68,8 @@ async def _get_task_by_source(
     Find task with a given source.
 
     Args:
-        task_import: Info on task to be imported.
-        user_id: ID of current user.
-        default_group_id: ID of default user group.
-        task_group_list: Current list of valid task groups.
-        db: Asynchronous db session
+        source: `source` of the task to be imported.
+        task_groups_list: Current list of valid task groups.
 
     Return:
         `id` of the matching task, or `None`.
@@ -172,10 +169,10 @@ async def _get_task_by_taskimport(
 
     Args:
         task_import: Info on task to be imported.
+        task_groups_list: Current list of valid task groups.
         user_id: ID of current user.
         default_group_id: ID of default user group.
-        task_group_list: Current list of valid task groups.
-        db: Asynchronous db session
+        db: Asynchronous database session.
 
     Return:
         `id` of the matching task, or `None`.

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/runner/executors/slurm/_slurm_config.py

@@ -327,7 +327,7 @@ class SlurmConfig(BaseModel, extra=Extra.forbid):
         script.
 
         Arguments:
-            user_cache_dir:
+            remote_export_dir:
                 Base directory for exports defined in
                 `self.user_local_exports`.
         """
@@ -378,7 +378,7 @@ class SlurmConfig(BaseModel, extra=Extra.forbid):
         if self.user_local_exports:
             if remote_export_dir is None:
                 raise ValueError(
-                    f"user_cache_dir=None but {self.user_local_exports=}"
+                    f"remote_export_dir=None but {self.user_local_exports=}"
                 )
             for key, value in self.user_local_exports.items():
                 tmp_value = str(Path(remote_export_dir) / value)

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/runner/executors/slurm/ssh/executor.py

@@ -917,7 +917,7 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
         thread via `fut.set_exception(...)`.
 
         Arguments:
-            jobid: ID of the SLURM job
+            job_ids: IDs of the SLURM jobs to handle.
         """
         # Handle all uncaught exceptions in this broad try/except block
         try:
@@ -1109,8 +1109,9 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
         Fetch a remote folder via tar+sftp+tar
 
         Arguments:
-            job:
-                `SlurmJob` object (needed for its prefixes-related attributes).
+            jobs:
+                List of `SlurmJob` object (needed for their prefix-related
+                attributes).
         """
 
         # Check that the subfolder is unique

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/runner/v1/_common.py

@@ -524,8 +524,7 @@ def execute_tasks(
 
     **Note:** At the end of each task, write current metadata to
     `workflow_dir_local / METADATA_FILENAME`, so that they can be read as part
-    of the [`get_job`
-    endpoint](../../api/v1/job/#fractal_server.app.routes.api.v1.job.get_job).
+    of the `get_job` endpoint.
 
     Arguments:
         executor:

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/runner/v2/_local/__init__.py

@@ -44,10 +44,6 @@ def _process_workflow(
     Internal processing routine
 
     Schedules the workflow using a `FractalThreadPoolExecutor`.
-
-    Cf.
-    [process_workflow][fractal_server.app.runner.v2._local.process_workflow]
-    for the call signature.
     """
 
     with FractalThreadPoolExecutor() as executor:

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/runner/v2/_slurm_ssh/__init__.py

@@ -55,9 +55,6 @@ 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.v2._local.process_workflow]
-
     Returns:
         new_dataset_attributes:
     """
@@ -115,9 +112,6 @@ async def process_workflow(
 ) -> dict:
     """
     Process workflow (SLURM backend public interface)
-
-    Cf.
-    [process_workflow][fractal_server.app.runner.v2._local.process_workflow]
     """
 
     # Set values of first_task_index and last_task_index

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/runner/v2/_slurm_sudo/__init__.py

@@ -51,9 +51,6 @@ 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.v2._local.process_workflow]
-
     Returns:
         new_dataset_attributes:
     """
@@ -106,10 +103,7 @@ async def process_workflow(
     worker_init: Optional[str] = None,
 ) -> dict:
     """
-    Process workflow (SLURM backend public interface)
-
-    Cf.
-    [process_workflow][fractal_server.app.runner.v2._local.process_workflow]
+    Process workflow (SLURM backend public interface).
     """
 
     # Set values of first_task_index and last_task_index

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/schemas/user_settings.py

@@ -31,14 +31,12 @@ class UserSettingsRead(BaseModel):
     ssh_jobs_dir: Optional[str] = None
     slurm_user: Optional[str] = None
     slurm_accounts: list[str]
-    cache_dir: Optional[str] = None
     project_dir: Optional[str] = None
 
 
 class UserSettingsReadStrict(BaseModel):
     slurm_user: Optional[str] = None
     slurm_accounts: list[str]
-    cache_dir: Optional[str] = None
     ssh_username: Optional[str] = None
     project_dir: Optional[str] = None
 
@@ -55,7 +53,6 @@ class UserSettingsUpdate(BaseModel, extra=Extra.forbid):
     ssh_jobs_dir: Optional[str] = None
     slurm_user: Optional[str] = None
     slurm_accounts: Optional[list[StrictStr]] = None
-    cache_dir: Optional[str] = None
     project_dir: Optional[str] = None
 
     _ssh_host = validator("ssh_host", allow_reuse=True)(
@@ -87,13 +84,6 @@ class UserSettingsUpdate(BaseModel, extra=Extra.forbid):
             value[i] = valstr(f"slurm_accounts[{i}]")(item)
         return val_unique_list("slurm_accounts")(value)
 
-    @validator("cache_dir")
-    def cache_dir_validator(cls, value):
-        if value is None:
-            return None
-        validate_cmd(value)
-        return val_absolute_path("cache_dir")(value)
-
     @validator("project_dir")
     def project_dir_validator(cls, value):
         if value is None:
@@ -104,15 +94,7 @@ class UserSettingsUpdate(BaseModel, extra=Extra.forbid):
 
 class UserSettingsUpdateStrict(BaseModel, extra=Extra.forbid):
     slurm_accounts: Optional[list[StrictStr]] = None
-    cache_dir: Optional[str] = None
 
     _slurm_accounts = validator("slurm_accounts", allow_reuse=True)(
         val_unique_list("slurm_accounts")
     )
-
-    @validator("cache_dir")
-    def cache_dir_validator(cls, value):
-        if value is None:
-            return value
-        validate_cmd(value)
-        return val_absolute_path("cache_dir")(value)

{fractal_server-2.9.1 → fractal_server-2.10.0a0}/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-2.9.1 → fractal_server-2.10.0a0}/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-2.9.1 → fractal_server-2.10.0a0}/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-2.9.1 → fractal_server-2.10.0a0}/fractal_server/app/user_settings.py

@@ -32,11 +32,11 @@ class SlurmSudoUserSettings(BaseModel):
 
     Attributes:
         slurm_user: User to be impersonated via `sudo -u`.
-        cache_dir: Folder where `slurm_user` can write.
+        project_dir: Folder where `slurm_user` can write.
         slurm_accounts:
             List of SLURM accounts, to be used upon Fractal job submission.
     """
 
     slurm_user: str
-    cache_dir: str
+    project_dir: str
     slurm_accounts: list[str]