fractal-server 2.16.3__py3-none-any.whl → 2.16.4__py3-none-any.whl

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

@@ -60,7 +60,7 @@ async def collect_task_custom(
     if settings.FRACTAL_RUNNER_BACKEND == "slurm_ssh":
         if task_collect.package_root is None:
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail="Cannot infer 'package_root' with 'slurm_ssh' backend.",
             )
     else:
@@ -68,7 +68,7 @@ async def collect_task_custom(
             task_collect.python_interpreter, os.X_OK
         ) or not os.access(task_collect.python_interpreter, os.R_OK):
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     f"{task_collect.python_interpreter=} "
                     "is not accessible to the Fractal user "
@@ -77,13 +77,13 @@ async def collect_task_custom(
             )
         if not Path(task_collect.python_interpreter).is_file():
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=f"{task_collect.python_interpreter=} is not a file.",
             )
         if task_collect.package_root is not None:
             if not os.access(task_collect.package_root, os.R_OK):
                 raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                     detail=(
                         f"{task_collect.package_root=} "
                         "is not accessible to the Fractal user."
@@ -91,7 +91,7 @@ async def collect_task_custom(
                 )
             if not Path(task_collect.package_root).is_dir():
                 raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                     detail=f"{task_collect.package_root=} is not a directory.",
                 )
 
@@ -125,7 +125,7 @@ async def collect_task_custom(
             or ("\n" in res.stdout.strip("\n"))
         ):
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     "Cannot determine 'package_root'.\n"
                     f"Original output: {res.stdout}\n"

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

@@ -54,13 +54,13 @@ logger = set_logger(__name__)
 def validate_pkgname_and_version(filename: str) -> tuple[str, str]:
     if not filename.endswith(".tar.gz"):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"{filename=} does not end with '.tar.gz'.",
         )
     filename_splitted = filename.split("-")
     if len(filename_splitted) != 2:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Invalid filename: '{filename}' must contain a single `-` "
                 "character, separating the package name from the version "
@@ -93,7 +93,7 @@ async def collect_task_pixi(
     # Check if Pixi is available
     if settings.pixi is None:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Pixi task collection is not available.",
         )
     # Check if provided Pixi version is available. Use default if not provided
@@ -102,7 +102,7 @@ async def collect_task_pixi(
     else:
         if pixi_version not in settings.pixi.versions:
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     f"Pixi version {pixi_version} is not available. Available "
                     f"versions: {list(settings.pixi.versions.keys())}"
@@ -165,7 +165,7 @@ async def collect_task_pixi(
     if settings.FRACTAL_RUNNER_BACKEND != "slurm_ssh":
         if Path(task_group_path).exists():
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=f"{task_group_path} already exists.",
             )
 

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

@@ -72,7 +72,7 @@ async def deactivate_task_group(
     # Check that task-group is active
     if not task_group.active:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot deactivate a task group with {task_group.active=}."
             ),
@@ -185,7 +185,7 @@ async def reactivate_task_group(
     # Check that task-group is not active
     if task_group.active:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot reactivate a task group with {task_group.active=}."
             ),
@@ -222,7 +222,7 @@ async def reactivate_task_group(
 
     if task_group.env_info is None:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot reactivate a task group with "
                 f"{task_group.env_info=}."

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

@@ -201,7 +201,7 @@ async def replace_workflowtask(
         new_type=new_task.type,
     ):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot change task type from "
                 f"{workflow_task.task_type} to {new_task.type}."
@@ -213,7 +213,7 @@ async def replace_workflowtask(
         and new_task.type == TaskType.PARALLEL
     ):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Cannot set 'args_non_parallel' for parallel task.",
         )
     if (
@@ -221,7 +221,7 @@ async def replace_workflowtask(
         and new_task.type == TaskType.NON_PARALLEL
     ):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Cannot set 'args_parallel' for non-parallel task.",
         )
     _check_type_filters_compatibility(

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

@@ -151,7 +151,7 @@ async def update_workflow(
                 workflow_id=workflow_id, db=db
             ):
                 raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                     detail=(
                         "Cannot re-order WorkflowTasks while a Job is running "
                         "for this Workflow."
@@ -166,7 +166,7 @@ async def update_workflow(
                 current_workflowtask_ids
             ):
                 raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                     detail=(
                         "`reordered_workflowtask_ids` must be a permutation of"
                         f" {current_workflowtask_ids} (given {value})"
@@ -225,7 +225,7 @@ async def delete_workflow(
     if jobs:
         string_ids = str([job.id for job in jobs])[1:-1]
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot delete workflow {workflow.id} because it "
                 f"is linked to active job(s) {string_ids}."
@@ -320,7 +320,7 @@ async def get_workflow_type_filters(
     num_tasks = len(workflow.task_list)
     if num_tasks == 0:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Workflow has no tasks.",
         )
 

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

@@ -248,7 +248,7 @@ async def import_workflow(
             )
         if task_id is None:
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=f"Could not find a task matching with {wf_task.task}.",
             )
         new_wf_task = WorkflowTaskCreateV2(

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

@@ -55,7 +55,7 @@ async def create_workflowtask(
             or wftask.args_non_parallel is not None
         ):
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     "Cannot set `WorkflowTaskV2.meta_non_parallel` or "
                     "`WorkflowTask.args_non_parallel` if the associated Task "
@@ -68,7 +68,7 @@ async def create_workflowtask(
             or wftask.args_parallel is not None
         ):
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     "Cannot set `WorkflowTaskV2.meta_parallel` or "
                     "`WorkflowTask.args_parallel` if the associated Task "
@@ -150,7 +150,7 @@ async def update_workflowtask(
         or workflow_task_update.meta_non_parallel is not None
     ):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot patch `WorkflowTaskV2.args_non_parallel` or "
                 "`WorkflowTask.meta_non_parallel` if the associated Task is "
@@ -165,7 +165,7 @@ async def update_workflowtask(
         or workflow_task_update.meta_parallel is not None
     ):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot patch `WorkflowTaskV2.args_parallel` or "
                 "`WorkflowTask.meta_parallel` if the associated Task is "
@@ -191,7 +191,7 @@ async def update_workflowtask(
             setattr(db_wf_task, key, value)
         else:
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=f"patch_workflow_task endpoint cannot set {key=}",
             )
 
@@ -227,7 +227,7 @@ async def delete_workflowtask(
 
     if await _workflow_has_submitted_job(workflow_id=workflow_id, db=db):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot delete a WorkflowTask while a Job is running for this "
                 "Workflow."

fractal_server/app/routes/auth/group.py

@@ -144,7 +144,7 @@ async def delete_single_group(
 
     if group.name == FRACTAL_DEFAULT_GROUP_NAME:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot delete default UserGroup "
                 f"'{FRACTAL_DEFAULT_GROUP_NAME}'."
@@ -223,7 +223,7 @@ async def remove_user_from_group(
     default_user_group_id = await _get_default_usergroup_id(db=db)
     if default_user_group_id == group_id:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot remove user from '{FRACTAL_DEFAULT_GROUP_NAME}' "
                 "group.",

fractal_server/app/routes/auth/users.py

@@ -157,7 +157,7 @@ async def set_user_groups(
     default_group_id = await _get_default_usergroup_id(db=db)
     if default_group_id not in target_group_ids:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot remove user from "
                 f"'{FRACTAL_DEFAULT_GROUP_NAME}' group.",

fractal_server/app/routes/aux/_job.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
 from ...models.v2 import JobV2
-from ...runner.filenames import SHUTDOWN_FILENAME
+from fractal_server.runner.filenames import SHUTDOWN_FILENAME
 
 
 def _write_shutdown_file(*, job: JobV2):

fractal_server/app/routes/aux/_runner.py

@@ -15,7 +15,7 @@ def _backend_supports_shutdown(backend: str) -> bool:
 def _check_shutdown_is_supported():
     """
     Raises:
-        HTTPException(status_code=HTTP_422_UNPROCESSABLE_ENTITY):
+        HTTPException(status_code=HTTP_422_UNPROCESSABLE_CONTENT):
             If FRACTAL_RUNNER_BACKEND is the thread-based 'local' backend.
     """
     settings = Inject(get_settings)
@@ -23,7 +23,7 @@ def _check_shutdown_is_supported():
 
     if not _backend_supports_shutdown(backend):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Stopping a job execution is not implemented for "
                 f"FRACTAL_RUNNER_BACKEND={backend}."

fractal_server/app/routes/aux/validate_user_settings.py

@@ -24,7 +24,7 @@ def verify_user_has_settings(user: UserOAuth) -> None:
     """
     if user.user_settings_id is None:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Error: user '{user.email}' has no settings.",
         )
 
@@ -66,7 +66,7 @@ async def validate_user_settings(
         )
         logger.warning(error_msg)
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=error_msg,
         )
 

fractal_server/config.py

@@ -806,7 +806,7 @@ class Settings(BaseSettings):
 
         info = f"FRACTAL_RUNNER_BACKEND={self.FRACTAL_RUNNER_BACKEND}"
         if self.FRACTAL_RUNNER_BACKEND == "slurm":
-            from fractal_server.app.runner.executors.slurm_common._slurm_config import (  # noqa: E501
+            from fractal_server.runner.executors.slurm_common._slurm_config import (  # noqa: E501
                 load_slurm_config_file,
             )
 
@@ -840,7 +840,7 @@ class Settings(BaseSettings):
                     "Pixi config must include SLURM_CONFIG."
                 )
 
-            from fractal_server.app.runner.executors.slurm_common._slurm_config import (  # noqa: E501
+            from fractal_server.runner.executors.slurm_common._slurm_config import (  # noqa: E501
                 load_slurm_config_file,
             )
 

fractal_server/main.py

@@ -21,12 +21,12 @@ from contextlib import asynccontextmanager
 from fastapi import FastAPI
 
 from .app.routes.aux._runner import _backend_supports_shutdown
-from .app.runner.shutdown import cleanup_after_shutdown
 from .config import get_settings
 from .logger import config_uvicorn_loggers
 from .logger import get_logger
 from .logger import reset_logger_handlers
 from .logger import set_logger
+from .runner.shutdown import cleanup_after_shutdown
 from .syringe import Inject
 from fractal_server import __VERSION__
 

fractal_server/{app/runner → runner}/executors/base_runner.py

@@ -1,9 +1,9 @@
 from enum import StrEnum
 from typing import Any
 
-from fractal_server.app.runner.task_files import TaskFiles
 from fractal_server.app.schemas.v2.task import TaskType
 from fractal_server.logger import set_logger
+from fractal_server.runner.task_files import TaskFiles
 
 
 class SubmitTaskType(StrEnum):

fractal_server/{app/runner → runner}/executors/call_command_wrapper.py

@@ -3,7 +3,7 @@ import shlex
 import shutil
 import subprocess  # nosec
 
-from fractal_server.app.runner.exceptions import TaskExecutionError
+from fractal_server.runner.exceptions import TaskExecutionError
 from fractal_server.string_tools import validate_cmd
 
 

fractal_server/{app/runner → runner}/executors/local/runner.py

@@ -7,18 +7,18 @@ from typing import Any
 from ..call_command_wrapper import call_command_wrapper
 from .get_local_config import LocalBackendConfig
 from fractal_server.app.db import get_sync_db
-from fractal_server.app.runner.exceptions import TaskExecutionError
-from fractal_server.app.runner.executors.base_runner import BaseRunner
-from fractal_server.app.runner.executors.base_runner import MultisubmitTaskType
-from fractal_server.app.runner.executors.base_runner import SubmitTaskType
-from fractal_server.app.runner.task_files import TaskFiles
-from fractal_server.app.runner.v2.db_tools import (
-    bulk_update_status_of_history_unit,
-)
-from fractal_server.app.runner.v2.db_tools import update_status_of_history_unit
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.logger import set_logger
+from fractal_server.runner.exceptions import TaskExecutionError
+from fractal_server.runner.executors.base_runner import BaseRunner
+from fractal_server.runner.executors.base_runner import MultisubmitTaskType
+from fractal_server.runner.executors.base_runner import SubmitTaskType
+from fractal_server.runner.task_files import TaskFiles
+from fractal_server.runner.v2.db_tools import (
+    bulk_update_status_of_history_unit,
+)
+from fractal_server.runner.v2.db_tools import update_status_of_history_unit
 
 logger = set_logger(__name__)
 

fractal_server/{app/runner → runner}/executors/slurm_common/_slurm_config.py

@@ -212,7 +212,7 @@ class SlurmConfig(BaseModel):
     `SlurmConfig` attributes (e.g. `mem_per_task_MB`), which are not meant to
     be part of the `FRACTAL_SLURM_CONFIG_FILE` JSON file (details on the
     expected file content are defined in
-    [`SlurmConfigFile`](#fractal_server.app.runner._slurm._slurm_config.SlurmConfigFile)).
+    [`SlurmConfigFile`](#fractal_server.runner._slurm._slurm_config.SlurmConfigFile)).
 
     Part of the attributes map directly to some of the SLURM attributes (see
     https://slurm.schedmd.com/sbatch.html), e.g. `partition`. Other attributes

fractal_server/{app/runner → runner}/executors/slurm_common/base_slurm_runner.py

@@ -16,21 +16,21 @@ from ._job_states import STATES_FINISHED
 from fractal_server import __VERSION__
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models.v2 import AccountingRecordSlurm
-from fractal_server.app.runner.exceptions import JobExecutionError
-from fractal_server.app.runner.exceptions import TaskExecutionError
-from fractal_server.app.runner.executors.base_runner import BaseRunner
-from fractal_server.app.runner.executors.base_runner import MultisubmitTaskType
-from fractal_server.app.runner.executors.base_runner import SubmitTaskType
-from fractal_server.app.runner.filenames import SHUTDOWN_FILENAME
-from fractal_server.app.runner.task_files import TaskFiles
-from fractal_server.app.runner.v2.db_tools import (
-    bulk_update_status_of_history_unit,
-)
-from fractal_server.app.runner.v2.db_tools import update_status_of_history_unit
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
+from fractal_server.runner.exceptions import JobExecutionError
+from fractal_server.runner.exceptions import TaskExecutionError
+from fractal_server.runner.executors.base_runner import BaseRunner
+from fractal_server.runner.executors.base_runner import MultisubmitTaskType
+from fractal_server.runner.executors.base_runner import SubmitTaskType
+from fractal_server.runner.filenames import SHUTDOWN_FILENAME
+from fractal_server.runner.task_files import TaskFiles
+from fractal_server.runner.v2.db_tools import (
+    bulk_update_status_of_history_unit,
+)
+from fractal_server.runner.v2.db_tools import update_status_of_history_unit
 from fractal_server.syringe import Inject
 
 SHUTDOWN_ERROR_MESSAGE = "Failed due to job-execution shutdown."
@@ -326,7 +326,7 @@ class BaseSlurmRunner(BaseRunner):
             output_file = task.output_file_remote
             cmdlines.append(
                 f"{self.python_worker_interpreter}"
-                " -m fractal_server.app.runner."
+                " -m fractal_server.runner."
                 "executors.slurm_common.remote "
                 f"--input-file {input_file} "
                 f"--output-file {output_file}"
@@ -1008,7 +1008,7 @@ class BaseSlurmRunner(BaseRunner):
         # Fetch remote fractal-server version
         cmd = (
             f"{self.python_worker_interpreter} "
-            "-m fractal_server.app.runner.versions"
+            "-m fractal_server.runner.versions"
         )
         stdout = self._run_remote_cmd(cmd)
         remote_version = json.loads(stdout.strip("\n"))["fractal_server"]

fractal_server/{app/runner → runner}/executors/slurm_common/slurm_job_task_models.py

@@ -4,7 +4,7 @@ from typing import Any
 from pydantic import BaseModel
 from pydantic import ConfigDict
 
-from fractal_server.app.runner.task_files import TaskFiles
+from fractal_server.runner.task_files import TaskFiles
 
 
 class SlurmTask(BaseModel):

fractal_server/{app/runner → runner}/executors/slurm_sudo/runner.py

@@ -10,9 +10,9 @@ from ..slurm_common.base_slurm_runner import BaseSlurmRunner
 from ..slurm_common.slurm_job_task_models import SlurmJob
 from ._subprocess_run_as_user import _mkdir_as_user
 from ._subprocess_run_as_user import _run_command_as_user
-from fractal_server.app.runner.exceptions import JobExecutionError
 from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
+from fractal_server.runner.exceptions import JobExecutionError
 from fractal_server.syringe import Inject
 
 logger = set_logger(__name__)

fractal_server/{app/runner → runner}/task_files.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 from pydantic import BaseModel
 
-from fractal_server.app.runner.components import _index_to_component
+from fractal_server.runner.components import _index_to_component
 from fractal_server.string_tools import sanitize_string
 
 SUBMIT_PREFIX = "non_par"

fractal_server/{app/runner → runner}/v2/_local.py

@@ -1,11 +1,11 @@
 from pathlib import Path
 
-from ...models.v2 import DatasetV2
-from ...models.v2 import WorkflowV2
 from ..executors.local.get_local_config import get_local_backend_config
 from ..executors.local.runner import LocalRunner
 from ..set_start_and_last_task_index import set_start_and_last_task_index
 from .runner import execute_tasks_v2
+from fractal_server.app.models.v2 import DatasetV2
+from fractal_server.app.models.v2 import WorkflowV2
 from fractal_server.types import AttributeFilters
 
 

fractal_server/{app/runner → runner}/v2/_slurm_ssh.py

@@ -17,13 +17,13 @@ This backend runs fractal workflows in a SLURM cluster.
 """
 from pathlib import Path
 
-from ....ssh._fabric import FractalSSH
-from ...models.v2 import DatasetV2
-from ...models.v2 import WorkflowV2
+from ...ssh._fabric import FractalSSH
 from ..executors.slurm_common.get_slurm_config import get_slurm_config
 from ..executors.slurm_ssh.runner import SlurmSSHRunner
 from ..set_start_and_last_task_index import set_start_and_last_task_index
 from .runner import execute_tasks_v2
+from fractal_server.app.models.v2 import DatasetV2
+from fractal_server.app.models.v2 import WorkflowV2
 from fractal_server.logger import set_logger
 from fractal_server.types import AttributeFilters
 

fractal_server/{app/runner → runner}/v2/_slurm_sudo.py

@@ -17,12 +17,12 @@ This backend runs fractal workflows in a SLURM cluster.
 """
 from pathlib import Path
 
-from ...models.v2 import DatasetV2
-from ...models.v2 import WorkflowV2
 from ..executors.slurm_common.get_slurm_config import get_slurm_config
 from ..executors.slurm_sudo.runner import SudoSlurmRunner
 from ..set_start_and_last_task_index import set_start_and_last_task_index
 from .runner import execute_tasks_v2
+from fractal_server.app.models.v2 import DatasetV2
+from fractal_server.app.models.v2 import WorkflowV2
 from fractal_server.types import AttributeFilters
 
 

fractal_server/{app/runner → runner}/v2/deduplicate_list.py

@@ -1,8 +1,8 @@
 from typing import TypeVar
 
-from ....images import SingleImage
-from ....images import SingleImageTaskOutput
 from .task_interface import InitArgsModel
+from fractal_server.images import SingleImage
+from fractal_server.images import SingleImageTaskOutput
 
 T = TypeVar("T", SingleImage, SingleImageTaskOutput, InitArgsModel)
 

fractal_server/{app/runner → runner}/v2/merge_outputs.py

@@ -1,5 +1,5 @@
-from fractal_server.app.runner.v2.deduplicate_list import deduplicate_list
-from fractal_server.app.runner.v2.task_interface import TaskOutput
+from fractal_server.runner.v2.deduplicate_list import deduplicate_list
+from fractal_server.runner.v2.task_interface import TaskOutput
 
 
 def merge_outputs(task_outputs: list[TaskOutput]) -> TaskOutput:

fractal_server/{app/runner → runner}/v2/runner.py

@@ -24,9 +24,6 @@ from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
-from fractal_server.app.runner.exceptions import JobExecutionError
-from fractal_server.app.runner.executors.base_runner import BaseRunner
-from fractal_server.app.runner.v2.db_tools import update_status_of_history_run
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskDumpV2
 from fractal_server.app.schemas.v2 import TaskGroupDumpV2
@@ -38,6 +35,9 @@ from fractal_server.images.tools import filter_image_list
 from fractal_server.images.tools import find_image_by_zarr_url
 from fractal_server.images.tools import merge_type_filters
 from fractal_server.logger import get_logger
+from fractal_server.runner.exceptions import JobExecutionError
+from fractal_server.runner.executors.base_runner import BaseRunner
+from fractal_server.runner.v2.db_tools import update_status_of_history_run
 from fractal_server.types import AttributeFilters
 
 

fractal_server/{app/runner → runner}/v2/runner_functions.py

@@ -16,24 +16,24 @@ from fractal_server.app.db import get_sync_db
 from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
-from fractal_server.app.runner.executors.base_runner import BaseRunner
-from fractal_server.app.runner.task_files import enrich_task_files_multisubmit
-from fractal_server.app.runner.task_files import SUBMIT_PREFIX
-from fractal_server.app.runner.task_files import TaskFiles
-from fractal_server.app.runner.v2.db_tools import (
+from fractal_server.app.schemas.v2 import HistoryUnitStatus
+from fractal_server.app.schemas.v2 import TaskType
+from fractal_server.exceptions import UnreachableBranchError
+from fractal_server.logger import set_logger
+from fractal_server.runner.executors.base_runner import BaseRunner
+from fractal_server.runner.task_files import enrich_task_files_multisubmit
+from fractal_server.runner.task_files import SUBMIT_PREFIX
+from fractal_server.runner.task_files import TaskFiles
+from fractal_server.runner.v2.db_tools import (
     bulk_update_status_of_history_unit,
 )
-from fractal_server.app.runner.v2.db_tools import bulk_upsert_image_cache_fast
-from fractal_server.app.runner.v2.task_interface import (
+from fractal_server.runner.v2.db_tools import bulk_upsert_image_cache_fast
+from fractal_server.runner.v2.task_interface import (
     _cast_and_validate_InitTaskOutput,
 )
-from fractal_server.app.runner.v2.task_interface import (
+from fractal_server.runner.v2.task_interface import (
     _cast_and_validate_TaskOutput,
 )
-from fractal_server.app.schemas.v2 import HistoryUnitStatus
-from fractal_server.app.schemas.v2 import TaskType
-from fractal_server.exceptions import UnreachableBranchError
-from fractal_server.logger import set_logger
 
 __all__ = [
     "run_v2_task_parallel",