fractal-server 2.17.1a1__py3-none-any.whl → 2.18.0__py3-none-any.whl

fractal_server/runner/executors/slurm_ssh/runner.py

@@ -1,23 +1,32 @@
 import time
 from pathlib import Path
 
-from ..slurm_common.base_slurm_runner import BaseSlurmRunner
-from ..slurm_common.slurm_job_task_models import SlurmJob
-from .run_subprocess import run_subprocess
-from .tar_commands import get_tar_compression_cmd
-from .tar_commands import get_tar_extraction_cmd
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
 from fractal_server.logger import set_logger
 from fractal_server.runner.config import JobRunnerConfigSLURM
+from fractal_server.runner.executors.slurm_common.base_slurm_runner import (
+    BaseSlurmRunner,
+)
+from fractal_server.runner.executors.slurm_common.slurm_job_task_models import (
+    SlurmJob,
+)
 from fractal_server.ssh._fabric import FractalSSH
 from fractal_server.ssh._fabric import FractalSSHCommandError
 from fractal_server.ssh._fabric import FractalSSHTimeoutError
 
+from .run_subprocess import run_subprocess
+from .tar_commands import get_tar_compression_cmd
+from .tar_commands import get_tar_extraction_cmd
+
 logger = set_logger(__name__)
 
 
 class SlurmSSHRunner(BaseSlurmRunner):
+    """
+    Runner implementation for a computational `slurm_ssh` resource.
+    """
+
     fractal_ssh: FractalSSH
 
     def __init__(
@@ -39,9 +48,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         different SLURM jobs/tasks.
         """
         self.fractal_ssh = fractal_ssh
-        self.shared_config = JobRunnerConfigSLURM(
-            **resource.jobs_runner_config
-        )
+        self.shared_config = JobRunnerConfigSLURM(**resource.jobs_runner_config)
         logger.warning(self.fractal_ssh)
 
         # Check SSH connection and try to recover from a closed-socket error
@@ -80,9 +87,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
             return None
 
         t_0 = time.perf_counter()
-        logger.debug(
-            f"[_fetch_artifacts] START ({len(finished_slurm_jobs)=})."
-        )
+        logger.debug(f"[_fetch_artifacts] START ({len(finished_slurm_jobs)=}).")
 
         # Extract `workdir_remote` and `workdir_local`
         self.validate_slurm_jobs_workdirs(finished_slurm_jobs)

fractal_server/runner/executors/slurm_ssh/tar_commands.py

@@ -1,6 +1,7 @@
 """
 Prepare tar commands for task-subfolder compression/extraction.
 """
+
 from pathlib import Path
 
 

fractal_server/runner/executors/slurm_sudo/_subprocess_run_as_user.py

@@ -15,6 +15,7 @@ This module provides a set of tools similar to `subprocess.run`, `glob.glob` or
 `os.path.exists`, but extended so that they can be executed on behalf of
 another user. Note that this requires appropriate sudo permissions.
 """
+
 import shlex
 import subprocess  # nosec
 

fractal_server/runner/executors/slurm_sudo/runner.py

@@ -5,15 +5,20 @@ import subprocess  # nosec
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 
-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.models import Profile
 from fractal_server.app.models import Resource
 from fractal_server.logger import set_logger
 from fractal_server.runner.config import JobRunnerConfigSLURM
 from fractal_server.runner.exceptions import JobExecutionError
+from fractal_server.runner.executors.slurm_common.base_slurm_runner import (
+    BaseSlurmRunner,
+)
+from fractal_server.runner.executors.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
 
 logger = set_logger(__name__)
 
@@ -40,7 +45,11 @@ def _subprocess_run_or_raise(
         raise JobExecutionError(info=error_msg)
 
 
-class SudoSlurmRunner(BaseSlurmRunner):
+class SlurmSudoRunner(BaseSlurmRunner):
+    """
+    Runner implementation for a computational `slurm_sudo` resource.
+    """
+
     slurm_user: str
     slurm_account: str | None = None
 
@@ -63,9 +72,7 @@ class SudoSlurmRunner(BaseSlurmRunner):
         """
 
         self.slurm_user = profile.username
-        self.shared_config = JobRunnerConfigSLURM(
-            **resource.jobs_runner_config
-        )
+        self.shared_config = JobRunnerConfigSLURM(**resource.jobs_runner_config)
 
         super().__init__(
             slurm_runner_type="sudo",
@@ -90,9 +97,7 @@ class SudoSlurmRunner(BaseSlurmRunner):
         """
         Fetch artifacts for a single SLURM jobs.
         """
-        logger.debug(
-            f"[_fetch_artifacts_single_job] {job.slurm_job_id=} START"
-        )
+        logger.debug(f"[_fetch_artifacts_single_job] {job.slurm_job_id=} START")
         source_target_list = [
             (job.slurm_stdout_remote, job.slurm_stdout_local),
             (job.slurm_stderr_remote, job.slurm_stderr_local),

fractal_server/runner/task_files.py

@@ -86,9 +86,7 @@ class TaskFiles(BaseModel):
     @property
     def log_file_remote_path(self) -> Path:
         self._check_component()
-        return (
-            self.wftask_subfolder_remote / f"{self.prefix_component}-log.txt"
-        )
+        return self.wftask_subfolder_remote / f"{self.prefix_component}-log.txt"
 
     @property
     def log_file_remote(self) -> str:
@@ -141,8 +139,16 @@ def enrich_task_files_multisubmit(
 ) -> list[TaskFiles]:
     """
     Expand `TaskFiles` objects with `component` and `prefix`.
+
+    Args:
+        tot_tasks: Total number of images to process.
+        batch_size: Batch size, where `0` means `batch_size=tot_tasks`.
+        base_task_files: Original `TaskFiles` object to be enriched.
     """
 
+    # Replace `batch_size=0` with `batch_size=tot_tasks`
+    batch_size = batch_size or tot_tasks
+
     new_list_task_files: list[TaskFiles] = []
     for absolute_index in range(tot_tasks):
         ind_batch = absolute_index // batch_size

fractal_server/runner/v2/_local.py

@@ -1,16 +1,21 @@
 from pathlib import Path
 
-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 Profile
 from fractal_server.app.models.v2 import Resource
 from fractal_server.app.models.v2 import WorkflowV2
+from fractal_server.runner.executors.local.get_local_config import (
+    get_local_backend_config,
+)
+from fractal_server.runner.executors.local.runner import LocalRunner
+from fractal_server.runner.set_start_and_last_task_index import (
+    set_start_and_last_task_index,
+)
 from fractal_server.ssh._fabric import FractalSSH
 from fractal_server.types import AttributeFilters
 
+from .runner import execute_tasks
+
 
 def process_workflow(
     *,
@@ -54,7 +59,7 @@ def process_workflow(
         resource: Computational resource for running this job.
         profile: Computational profile for running this job.
         user_cache_dir:
-            User-writeable folder (typically a subfolder of `project_dir`).
+            User-writeable folder (typically a subfolder of `project_dirs`).
             Only relevant for `slurm_sudo` and `slurm_ssh` backends.
         fractal_ssh:
             `FractalSSH` object, only relevant for the `slurm_ssh` backend.
@@ -85,7 +90,7 @@ def process_workflow(
         resource=resource,
         profile=profile,
     ) as runner:
-        execute_tasks_v2(
+        execute_tasks(
             wf_task_list=workflow.task_list[
                 first_task_index : (last_task_index + 1)
             ],
@@ -99,4 +104,5 @@ def process_workflow(
             job_attribute_filters=job_attribute_filters,
             job_type_filters=job_type_filters,
             user_id=user_id,
+            resource_id=resource.id,
         )

fractal_server/runner/v2/_slurm_ssh.py

@@ -15,20 +15,26 @@ Slurm Backend
 
 This backend runs fractal workflows in a SLURM cluster.
 """
+
 from pathlib import Path
 
-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 Profile
 from fractal_server.app.models.v2 import Resource
 from fractal_server.app.models.v2 import WorkflowV2
 from fractal_server.logger import set_logger
+from fractal_server.runner.executors.slurm_common.get_slurm_config import (
+    get_slurm_config,
+)
+from fractal_server.runner.executors.slurm_ssh.runner import SlurmSSHRunner
+from fractal_server.runner.set_start_and_last_task_index import (
+    set_start_and_last_task_index,
+)
+from fractal_server.ssh._fabric import FractalSSH
 from fractal_server.types import AttributeFilters
 
+from .runner import execute_tasks
+
 logger = set_logger(__name__)
 
 
@@ -74,7 +80,7 @@ def process_workflow(
         resource: Computational resource for running this job.
         profile: Computational profile for running this job.
         user_cache_dir:
-            User-writeable folder (typically a subfolder of `project_dir`).
+            User-writeable folder (typically a subfolder of `project_dirs`).
             Only relevant for `slurm_sudo` and `slurm_ssh` backends.
         fractal_ssh:
             `FractalSSH` object, only relevant for the `slurm_ssh` backend.
@@ -107,7 +113,7 @@ def process_workflow(
         common_script_lines=worker_init,
         user_cache_dir=user_cache_dir,
     ) as runner:
-        execute_tasks_v2(
+        execute_tasks(
             wf_task_list=workflow.task_list[
                 first_task_index : (last_task_index + 1)
             ],
@@ -121,4 +127,5 @@ def process_workflow(
             job_attribute_filters=job_attribute_filters,
             job_type_filters=job_type_filters,
             user_id=user_id,
+            resource_id=resource.id,
         )

fractal_server/runner/v2/_slurm_sudo.py

@@ -15,19 +15,25 @@ Slurm Backend
 
 This backend runs fractal workflows in a SLURM cluster.
 """
+
 from pathlib import Path
 
-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 Profile
 from fractal_server.app.models.v2 import Resource
 from fractal_server.app.models.v2 import WorkflowV2
+from fractal_server.runner.executors.slurm_common.get_slurm_config import (
+    get_slurm_config,
+)
+from fractal_server.runner.executors.slurm_sudo.runner import SlurmSudoRunner
+from fractal_server.runner.set_start_and_last_task_index import (
+    set_start_and_last_task_index,
+)
 from fractal_server.ssh._fabric import FractalSSH
 from fractal_server.types import AttributeFilters
 
+from .runner import execute_tasks
+
 
 def process_workflow(
     *,
@@ -71,7 +77,7 @@ def process_workflow(
         resource: Computational resource for running this job.
         profile: Computational profile for running this job.
         user_cache_dir:
-            User-writeable folder (typically a subfolder of `project_dir`).
+            User-writeable folder (typically a subfolder of `project_dirs`).
             Only relevant for `slurm_sudo` and `slurm_ssh` backends.
         fractal_ssh:
             `FractalSSH` object, only relevant for the `slurm_ssh` backend.
@@ -94,7 +100,7 @@ def process_workflow(
     if isinstance(worker_init, str):
         worker_init = worker_init.split("\n")
 
-    with SudoSlurmRunner(
+    with SlurmSudoRunner(
         root_dir_local=workflow_dir_local,
         root_dir_remote=workflow_dir_remote,
         common_script_lines=worker_init,
@@ -103,7 +109,7 @@ def process_workflow(
         user_cache_dir=user_cache_dir,
         slurm_account=slurm_account,
     ) as runner:
-        execute_tasks_v2(
+        execute_tasks(
             wf_task_list=workflow.task_list[
                 first_task_index : (last_task_index + 1)
             ],
@@ -117,4 +123,5 @@ def process_workflow(
             job_attribute_filters=job_attribute_filters,
             job_type_filters=job_type_filters,
             user_id=user_id,
+            resource_id=resource.id,
         )

fractal_server/runner/v2/db_tools.py

@@ -10,7 +10,6 @@ from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.logger import set_logger
 
-
 _CHUNK_SIZE = 2_000
 
 logger = set_logger(__name__)

fractal_server/runner/v2/deduplicate_list.py

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

fractal_server/runner/v2/runner.py

@@ -7,13 +7,6 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlmodel import delete
 from sqlmodel import update
 
-from .merge_outputs import merge_outputs
-from .runner_functions import GetRunnerConfigType
-from .runner_functions import run_v2_task_compound
-from .runner_functions import run_v2_task_non_parallel
-from .runner_functions import run_v2_task_parallel
-from .runner_functions import SubmissionOutcome
-from .task_interface import TaskOutput
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models.v2 import AccountingRecord
 from fractal_server.app.models.v2 import DatasetV2
@@ -21,15 +14,16 @@ from fractal_server.app.models.v2 import HistoryImageCache
 from fractal_server.app.models.v2 import HistoryRun
 from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import JobV2
+from fractal_server.app.models.v2 import Resource
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
-from fractal_server.app.schemas.v2 import TaskDumpV2
-from fractal_server.app.schemas.v2 import TaskGroupDumpV2
+from fractal_server.app.schemas.v2 import TaskDump
+from fractal_server.app.schemas.v2 import TaskGroupDump
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.images import SingleImage
-from fractal_server.images.status_tools import enrich_images_unsorted_sync
 from fractal_server.images.status_tools import IMAGE_STATUS_KEY
+from fractal_server.images.status_tools import enrich_images_unsorted_sync
 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
@@ -39,6 +33,14 @@ 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
 
+from .merge_outputs import merge_outputs
+from .runner_functions import GetRunnerConfigType
+from .runner_functions import SubmissionOutcome
+from .runner_functions import run_task_compound
+from .runner_functions import run_task_non_parallel
+from .runner_functions import run_task_parallel
+from .task_interface import TaskOutput
+
 
 def _remove_status_from_attributes(
     images: list[dict[str, Any]],
@@ -81,7 +83,7 @@ def get_origin_attribute_and_types(
     return updated_attributes, updated_types
 
 
-def execute_tasks_v2(
+def execute_tasks(
     *,
     wf_task_list: list[WorkflowTaskV2],
     dataset: DatasetV2,
@@ -94,6 +96,7 @@ def execute_tasks_v2(
     get_runner_config: GetRunnerConfigType,
     job_type_filters: dict[str, bool],
     job_attribute_filters: AttributeFilters,
+    resource_id: int,
 ) -> None:
     logger = get_logger(logger_name=logger_name)
 
@@ -164,10 +167,10 @@ def execute_tasks_v2(
             # Create dumps for workflowtask and taskgroup
             workflowtask_dump = dict(
                 **wftask.model_dump(exclude={"task"}),
-                task=TaskDumpV2(**wftask.task.model_dump()).model_dump(),
+                task=TaskDump(**wftask.task.model_dump()).model_dump(),
             )
             task_group = db.get(TaskGroupV2, wftask.task.taskgroupv2_id)
-            task_group_dump = TaskGroupDumpV2(
+            task_group_dump = TaskGroupDump(
                 **task_group.model_dump()
             ).model_dump()
             # Create HistoryRun
@@ -210,20 +213,37 @@ def execute_tasks_v2(
                 f"attribute_filters={job_attribute_filters})."
             )
             logger.info(error_msg)
-            update_status_of_history_run(
-                history_run_id=history_run_id,
-                status=HistoryUnitStatus.FAILED,
-                db_sync=db,
-            )
+            with next(get_sync_db()) as db:
+                update_status_of_history_run(
+                    history_run_id=history_run_id,
+                    status=HistoryUnitStatus.FAILED,
+                    db_sync=db,
+                )
             raise JobExecutionError(error_msg)
 
-        # TASK EXECUTION (V2)
+        # Fail if the resource is not open for new submissions
+        with next(get_sync_db()) as db:
+            resource = db.get(Resource, resource_id)
+            if resource.prevent_new_submissions:
+                error_msg = (
+                    f"Cannot run '{task.name}', since the '{resource.name}' "
+                    "resource is not currently active."
+                )
+                logger.info(error_msg)
+                update_status_of_history_run(
+                    history_run_id=history_run_id,
+                    status=HistoryUnitStatus.FAILED,
+                    db_sync=db,
+                )
+                raise JobExecutionError(error_msg)
+
+        # TASK EXECUTION
         try:
             if task.type in [
                 TaskType.NON_PARALLEL,
                 TaskType.CONVERTER_NON_PARALLEL,
             ]:
-                outcomes_dict, num_tasks = run_v2_task_non_parallel(
+                outcomes_dict, num_tasks = run_task_non_parallel(
                     images=filtered_images,
                     zarr_dir=zarr_dir,
                     wftask=wftask,
@@ -238,7 +258,7 @@ def execute_tasks_v2(
                     user_id=user_id,
                 )
             elif task.type == TaskType.PARALLEL:
-                outcomes_dict, num_tasks = run_v2_task_parallel(
+                outcomes_dict, num_tasks = run_task_parallel(
                     images=filtered_images,
                     wftask=wftask,
                     task=task,
@@ -254,7 +274,7 @@ def execute_tasks_v2(
                 TaskType.COMPOUND,
                 TaskType.CONVERTER_COMPOUND,
             ]:
-                outcomes_dict, num_tasks = run_v2_task_compound(
+                outcomes_dict, num_tasks = run_task_compound(
                     images=filtered_images,
                     zarr_dir=zarr_dir,
                     wftask=wftask,
@@ -312,9 +332,7 @@ def execute_tasks_v2(
             # history status.
             for image_obj in current_task_output.image_list_updates:
                 image = image_obj.model_dump()
-                if image["zarr_url"] in [
-                    img["zarr_url"] for img in tmp_images
-                ]:
+                if image["zarr_url"] in [img["zarr_url"] for img in tmp_images]:
                     img_search = find_image_by_zarr_url(
                         images=tmp_images,
                         zarr_url=image["zarr_url"],
@@ -418,9 +436,7 @@ def execute_tasks_v2(
 
             # Update type_filters based on task-manifest output_types
             type_filters_from_task_manifest = task.output_types
-            current_dataset_type_filters.update(
-                type_filters_from_task_manifest
-            )
+            current_dataset_type_filters.update(type_filters_from_task_manifest)
         except Exception as e:
             logger.error(
                 "Unexpected error in post-task-execution block. "

fractal_server/runner/v2/runner_functions.py

@@ -6,12 +6,6 @@ from typing import Protocol
 from pydantic import BaseModel
 from pydantic import ConfigDict
 
-from ..exceptions import JobExecutionError
-from ..exceptions import TaskOutputValidationError
-from .db_tools import update_status_of_history_unit
-from .deduplicate_list import deduplicate_list
-from .task_interface import InitTaskOutput
-from .task_interface import TaskOutput
 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
@@ -22,16 +16,16 @@ from fractal_server.exceptions import UnreachableBranchError
 from fractal_server.logger import set_logger
 from fractal_server.runner.config import JobRunnerConfigLocal
 from fractal_server.runner.config import JobRunnerConfigSLURM
+from fractal_server.runner.exceptions import JobExecutionError
+from fractal_server.runner.exceptions import TaskOutputValidationError
 from fractal_server.runner.executors.base_runner import BaseRunner
 from fractal_server.runner.executors.slurm_common.slurm_config import (
     SlurmConfig,
 )
-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.runner.task_files import enrich_task_files_multisubmit
+from fractal_server.runner.v2.db_tools import bulk_update_status_of_history_unit
 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,
@@ -40,6 +34,11 @@ from fractal_server.runner.v2.task_interface import (
     _cast_and_validate_TaskOutput,
 )
 
+from .db_tools import update_status_of_history_unit
+from .deduplicate_list import deduplicate_list
+from .task_interface import InitTaskOutput
+from .task_interface import TaskOutput
+
 
 class GetRunnerConfigTypeLocal(Protocol):
     def __call__(
@@ -48,8 +47,7 @@ class GetRunnerConfigTypeLocal(Protocol):
         wftask: WorkflowTaskV2,
         which_type: Literal["non_parallel", "parallel"],
         tot_tasks: int,
-    ) -> JobRunnerConfigLocal:
-        ...
+    ) -> JobRunnerConfigLocal: ...
 
 
 class GetRunnerConfigTypeSLURM(Protocol):
@@ -59,17 +57,16 @@ class GetRunnerConfigTypeSLURM(Protocol):
         wftask: WorkflowTaskV2,
         which_type: Literal["non_parallel", "parallel"],
         tot_tasks: int,
-    ) -> SlurmConfig:
-        ...
+    ) -> SlurmConfig: ...
 
 
 GetRunnerConfigType = GetRunnerConfigTypeLocal | GetRunnerConfigTypeSLURM
 
 
 __all__ = [
-    "run_v2_task_parallel",
-    "run_v2_task_non_parallel",
-    "run_v2_task_compound",
+    "run_task_parallel",
+    "run_task_non_parallel",
+    "run_task_compound",
 ]
 
 
@@ -148,7 +145,7 @@ def _check_parallelization_list_size(my_list):
         )
 
 
-def run_v2_task_non_parallel(
+def run_task_non_parallel(
     *,
     images: list[dict[str, Any]],
     zarr_dir: str,
@@ -171,9 +168,7 @@ def run_v2_task_non_parallel(
         TaskType.NON_PARALLEL,
         TaskType.CONVERTER_NON_PARALLEL,
     ]:
-        raise ValueError(
-            f"Invalid {task_type=} for `run_v2_task_non_parallel`."
-        )
+        raise ValueError(f"Invalid {task_type=} for `run_task_non_parallel`.")
 
     # Get TaskFiles object
     task_files = TaskFiles(
@@ -216,7 +211,7 @@ def run_v2_task_non_parallel(
         db.commit()
         db.refresh(history_unit)
         logger.debug(
-            "[run_v2_task_non_parallel] Created `HistoryUnit` with "
+            "[run_task_non_parallel] Created `HistoryUnit` with "
             f"{history_run_id=}."
         )
         history_unit_id = history_unit.id
@@ -268,7 +263,7 @@ def run_v2_task_non_parallel(
     return outcome, num_tasks
 
 
-def run_v2_task_parallel(
+def run_task_parallel(
     *,
     images: list[dict[str, Any]],
     task: TaskV2,
@@ -329,7 +324,7 @@ def run_v2_task_parallel(
         db.add_all(history_units)
         db.commit()
         logger.debug(
-            f"[run_v2_task_non_parallel] Created {len(history_units)} "
+            f"[run_task_non_parallel] Created {len(history_units)} "
             "`HistoryUnit`s."
         )
 
@@ -391,7 +386,7 @@ def run_v2_task_parallel(
     return outcome, num_tasks
 
 
-def run_v2_task_compound(
+def run_task_compound(
     *,
     images: list[dict[str, Any]],
     zarr_dir: str,
@@ -448,7 +443,7 @@ def run_v2_task_compound(
         db.refresh(history_unit)
         init_history_unit_id = history_unit.id
         logger.debug(
-            "[run_v2_task_compound] Created `HistoryUnit` with "
+            "[run_task_compound] Created `HistoryUnit` with "
             f"{init_history_unit_id=}."
         )
         # Create one `HistoryImageCache` for each input image
@@ -560,8 +555,7 @@ def run_v2_task_compound(
         for history_unit in history_units:
             db.refresh(history_unit)
         logger.debug(
-            f"[run_v2_task_compound] Created {len(history_units)} "
-            "`HistoryUnit`s."
+            f"[run_task_compound] Created {len(history_units)} `HistoryUnit`s."
         )
         history_unit_ids = [history_unit.id for history_unit in history_units]