fractal-server 2.14.0a23__py3-none-any.whl → 2.14.0a25__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.0a23"
+__VERSION__ = "2.14.0a25"

fractal_server/app/models/v2/history.py

@@ -50,7 +50,7 @@ class HistoryUnit(SQLModel, table=True):
         ondelete="CASCADE",
     )
 
-    logfile: Optional[str]
+    logfile: str
     status: str
     zarr_urls: list[str] = Field(
         sa_column=Column(ARRAY(String)),

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

@@ -249,8 +249,10 @@ async def get_history_run_units(
     page_size = pagination.page_size or total_count
 
     # Query `HistoryUnit`s
-    stmt = select(HistoryUnit).where(
-        HistoryUnit.history_run_id == history_run_id
+    stmt = (
+        select(HistoryUnit)
+        .where(HistoryUnit.history_run_id == history_run_id)
+        .order_by(HistoryUnit.id)
     )
     if unit_status:
         stmt = stmt.where(HistoryUnit.status == unit_status)

fractal_server/app/runner/compress_folder.py

@@ -54,7 +54,7 @@ def _create_tar_archive(
             f"--files-from={filelist_path} --ignore-failed-read"
         )
 
-    logger.critical(f"cmd tar:\n{cmd_tar}")
+    logger.debug(f"cmd tar:\n{cmd_tar}")
 
     run_subprocess(cmd=cmd_tar, logger_name=logger_name, allow_char="*")
     elapsed = time.perf_counter() - t_start

fractal_server/app/runner/executors/base_runner.py

@@ -4,7 +4,6 @@ from fractal_server.app.runner.task_files import TaskFiles
 from fractal_server.app.schemas.v2.task import TaskTypeType
 from fractal_server.logger import set_logger
 
-
 TASK_TYPES_SUBMIT: list[TaskTypeType] = [
     "compound",
     "converter_compound",
@@ -103,29 +102,44 @@ class BaseRunner(object):
 
     def validate_multisubmit_parameters(
         self,
-        list_parameters: list[dict[str, Any]],
+        *,
         task_type: TaskTypeType,
+        list_parameters: list[dict[str, Any]],
         list_task_files: list[TaskFiles],
+        history_unit_ids: list[int],
     ) -> None:
         """
         Validate parameters for `multisubmit` method
 
         Args:
-            list_parameters: List of parameters dictionaries.
             task_type: Task type.
+            list_parameters: List of parameters dictionaries.
+            list_task_files:
+            history_unit_ids:
         """
         if task_type not in TASK_TYPES_MULTISUBMIT:
             raise ValueError(f"Invalid {task_type=} for `multisubmit`.")
 
+        if not isinstance(list_parameters, list):
+            raise ValueError("`parameters` must be a list.")
+
+        if len(list_parameters) != len(list_task_files):
+            raise ValueError(
+                f"{len(list_task_files)=} differs from "
+                f"{len(list_parameters)=}."
+            )
+        if len(history_unit_ids) != len(list_parameters):
+            raise ValueError(
+                f"{len(history_unit_ids)=} differs from "
+                f"{len(list_parameters)=}."
+            )
+
         subfolders = set(
             task_file.wftask_subfolder_local for task_file in list_task_files
         )
         if len(subfolders) != 1:
             raise ValueError(f"More than one subfolders: {subfolders}.")
 
-        if not isinstance(list_parameters, list):
-            raise ValueError("`parameters` must be a list.")
-
         for single_kwargs in list_parameters:
             if not isinstance(single_kwargs, dict):
                 raise ValueError("kwargs itemt must be a dictionary.")
@@ -137,33 +151,3 @@ class BaseRunner(object):
             zarr_urls = [kwargs["zarr_url"] for kwargs in list_parameters]
             if len(zarr_urls) != len(set(zarr_urls)):
                 raise ValueError("Non-unique zarr_urls")
-
-    def validate_multisubmit_history_unit_ids(
-        self,
-        *,
-        history_unit_ids: list[int],
-        task_type: TaskTypeType,
-        list_parameters: list[dict[str, Any]],
-    ) -> None:
-        """
-        Run preliminary check for multisubmit inputs.
-
-        Args:
-            history_unit_ids:
-            task_type:
-            list_parameters:
-        """
-        if task_type in ["compound", "converter_compound"]:
-            if len(history_unit_ids) != 1:
-                raise NotImplementedError(
-                    "We are breaking the assumption that compound/multisubmit "
-                    "is associated to a single HistoryUnit. This is not "
-                    "supported."
-                )
-            elif task_type == "parallel" and len(history_unit_ids) != len(
-                list_parameters
-            ):
-                raise ValueError(
-                    f"{len(history_unit_ids)=} differs from "
-                    f"{len(list_parameters)=}."
-                )

fractal_server/app/runner/executors/local/get_local_config.py

@@ -47,11 +47,16 @@ class LocalBackendConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
     parallel_tasks_per_job: Optional[int] = None
 
+    @property
+    def batch_size(self) -> int:
+        return self.parallel_tasks_per_job or 1
+
 
 def get_local_backend_config(
     wftask: WorkflowTaskV2,
     which_type: Literal["non_parallel", "parallel"],
     config_path: Optional[Path] = None,
+    tot_tasks: int = 1,
 ) -> LocalBackendConfig:
     """
     Prepare a `LocalBackendConfig` configuration object

fractal_server/app/runner/executors/local/runner.py

@@ -8,12 +8,7 @@ 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.task_files import MULTISUBMIT_PREFIX
-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 (
-    update_logfile_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.logger import set_logger
@@ -68,13 +63,6 @@ class LocalRunner(BaseRunner):
         workdir_local = task_files.wftask_subfolder_local
         workdir_local.mkdir()
 
-        # Add prefix to task_files object
-        task_files.prefix = SUBMIT_PREFIX
-        update_logfile_of_history_unit(
-            history_unit_id=history_unit_id,
-            logfile=task_files.log_file_local,
-        )
-
         # SUBMISSION PHASE
         future = self.executor.submit(
             func,
@@ -111,29 +99,18 @@ class LocalRunner(BaseRunner):
         list_task_files: list[TaskFiles],
         task_type: Literal["parallel", "compound", "converter_compound"],
         config: LocalBackendConfig,
-    ):
+    ) -> tuple[dict[int, Any], dict[int, BaseException]]:
         """
-        Note:
-
-        1. The number of sruns and futures is equal to `len(list_parameters)`.
-        2. The number of `HistoryUnit`s is equal to `len(history_unit_ids)`.
-        3. For compound tasks, these two numbers are not the same.
-
-        For this reason, we defer database updates to the caller function,
-        when we are in one of the "compound" cases
-
+        Note: `list_parameters`, `list_task_files` and `history_unit_ids`
+        have the same size. For parallel tasks, this is also the number of
+        input images, while for compound tasks these can differ.
         """
 
         self.validate_multisubmit_parameters(
             list_parameters=list_parameters,
             task_type=task_type,
             list_task_files=list_task_files,
-        )
-
-        self.validate_multisubmit_history_unit_ids(
             history_unit_ids=history_unit_ids,
-            task_type=task_type,
-            list_parameters=list_parameters,
         )
 
         logger.debug(f"[multisubmit] START, {len(list_parameters)=}")
@@ -159,9 +136,6 @@ class LocalRunner(BaseRunner):
             active_futures: dict[int, Future] = {}
             for ind_within_chunk, kwargs in enumerate(list_parameters_chunk):
                 positional_index = ind_chunk + ind_within_chunk
-                list_task_files[
-                    positional_index
-                ].prefix = f"{MULTISUBMIT_PREFIX}-{positional_index:06d}"
                 future = self.executor.submit(
                     func,
                     parameters=kwargs,
@@ -171,23 +145,6 @@ class LocalRunner(BaseRunner):
                 )
                 active_futures[positional_index] = future
 
-                if task_type == "parallel":
-                    # FIXME: replace loop with a `bulk_update_history_unit`
-                    # function
-                    update_logfile_of_history_unit(
-                        history_unit_id=history_unit_ids[positional_index],
-                        logfile=list_task_files[
-                            positional_index
-                        ].log_file_local,
-                    )
-                else:
-                    logger.debug(
-                        f"Unclear what logfile to associate to {task_type=} "
-                        "within multisubmit (see issue #2382)."
-                    )
-                    # FIXME: Improve definition for compound tasks
-                    pass
-
             while active_futures:
                 finished_futures = [
                     index_and_future

fractal_server/app/runner/executors/slurm_common/_slurm_config.py

@@ -407,6 +407,10 @@ class SlurmConfig(BaseModel):
 
         return lines
 
+    @property
+    def batch_size(self) -> int:
+        return self.tasks_per_job
+
 
 def _parse_mem_value(raw_mem: Union[str, int]) -> int:
     """

fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py

@@ -12,7 +12,6 @@ import cloudpickle
 from ..slurm_common._slurm_config import SlurmConfig
 from ..slurm_common.slurm_job_task_models import SlurmJob
 from ..slurm_common.slurm_job_task_models import SlurmTask
-from ._batching import heuristics
 from ._job_states import STATES_FINISHED
 from fractal_server import __VERSION__
 from fractal_server.app.db import get_sync_db
@@ -20,15 +19,10 @@ 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.filenames import SHUTDOWN_FILENAME
-from fractal_server.app.runner.task_files import MULTISUBMIT_PREFIX
-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 (
     bulk_update_status_of_history_unit,
 )
-from fractal_server.app.runner.v2.db_tools import (
-    update_logfile_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.config import get_settings
@@ -84,9 +78,18 @@ class BaseSlurmRunner(BaseRunner):
 
         # Create job folders. Note that the local one may or may not exist
         # depending on whether it is a test or an actual run
-        if not self.root_dir_local.is_dir():
-            self._mkdir_local_folder(self.root_dir_local.as_posix())
-        self._mkdir_remote_folder(self.root_dir_remote.as_posix())
+        try:
+            if not self.root_dir_local.is_dir():
+                self._mkdir_local_folder(self.root_dir_local.as_posix())
+            self._mkdir_remote_folder(self.root_dir_remote.as_posix())
+        except Exception as e:
+            error_msg = (
+                f"Could not mkdir {self.root_dir_local.as_posix()} or "
+                f"{self.root_dir_remote.as_posix()}. "
+                f"Original error: {str(e)}."
+            )
+            logger.error(error_msg)
+            raise RuntimeError(error_msg)
 
         self.shutdown_file = self.root_dir_local / SHUTDOWN_FILENAME
         self.jobs = {}
@@ -178,7 +181,7 @@ class BaseSlurmRunner(BaseRunner):
             fractal_server=__VERSION__,
         )
         for task in slurm_job.tasks:
-            # Wrinte input pickle
+            # Write input pickle
             _args = []
             _kwargs = dict(
                 parameters=task.parameters,
@@ -485,21 +488,14 @@ class BaseSlurmRunner(BaseRunner):
         self._mkdir_remote_folder(folder=workdir_remote.as_posix())
         logger.info("[submit] Create local/remote folders - END")
 
-        # Add prefix to task_files object
-        task_files.prefix = SUBMIT_PREFIX
-        update_logfile_of_history_unit(
-            history_unit_id=history_unit_id,
-            logfile=task_files.log_file_local,
-        )
-
         # Submission phase
         slurm_job = SlurmJob(
-            prefix=SUBMIT_PREFIX,
+            prefix=task_files.prefix,
             workdir_local=workdir_local,
             workdir_remote=workdir_remote,
             tasks=[
                 SlurmTask(
-                    prefix=SUBMIT_PREFIX,
+                    prefix=task_files.prefix,
                     index=0,
                     component=task_files.component,
                     parameters=parameters,
@@ -575,6 +571,11 @@ class BaseSlurmRunner(BaseRunner):
         task_type: Literal["parallel", "compound", "converter_compound"],
         config: SlurmConfig,
     ) -> tuple[dict[int, Any], dict[int, BaseException]]:
+        """
+        Note: `list_parameters`, `list_task_files` and `history_unit_ids`
+        have the same size. For parallel tasks, this is also the number of
+        input images, while for compound tasks these can differ.
+        """
 
         if len(self.jobs) > 0:
             raise RuntimeError(
@@ -599,11 +600,7 @@ class BaseSlurmRunner(BaseRunner):
             list_parameters=list_parameters,
             task_type=task_type,
             list_task_files=list_task_files,
-        )
-        self.validate_multisubmit_history_unit_ids(
             history_unit_ids=history_unit_ids,
-            task_type=task_type,
-            list_parameters=list_parameters,
         )
 
         logger.info(f"[multisubmit] START, {len(list_parameters)=}")
@@ -624,46 +621,28 @@ class BaseSlurmRunner(BaseRunner):
 
         tot_tasks = len(list_parameters)
 
-        # Set/validate parameters for task batching
-        tasks_per_job, parallel_tasks_per_job = heuristics(
-            # Number of parallel components (always known)
-            tot_tasks=tot_tasks,
-            # Optional WorkflowTask attributes:
-            tasks_per_job=config.tasks_per_job,
-            parallel_tasks_per_job=config.parallel_tasks_per_job,  # noqa
-            # Task requirements (multiple possible sources):
-            cpus_per_task=config.cpus_per_task,
-            mem_per_task=config.mem_per_task_MB,
-            # Fractal configuration variables (soft/hard limits):
-            target_cpus_per_job=config.target_cpus_per_job,
-            target_mem_per_job=config.target_mem_per_job,
-            target_num_jobs=config.target_num_jobs,
-            max_cpus_per_job=config.max_cpus_per_job,
-            max_mem_per_job=config.max_mem_per_job,
-            max_num_jobs=config.max_num_jobs,
-        )
-        config.parallel_tasks_per_job = parallel_tasks_per_job
-        config.tasks_per_job = tasks_per_job
+        # NOTE: chunking has already taken place in `get_slurm_config`,
+        # so that `config.tasks_per_job` is now set.
 
         # Divide arguments in batches of `tasks_per_job` tasks each
         args_batches = []
-        batch_size = tasks_per_job
+        batch_size = config.tasks_per_job
         for ind_chunk in range(0, tot_tasks, batch_size):
             args_batches.append(
                 list_parameters[ind_chunk : ind_chunk + batch_size]  # noqa
             )
-        if len(args_batches) != math.ceil(tot_tasks / tasks_per_job):
+        if len(args_batches) != math.ceil(tot_tasks / config.tasks_per_job):
             raise RuntimeError("Something wrong here while batching tasks")
 
         # Part 1/3: Iterate over chunks, prepare SlurmJob objects
         logger.info("[multisubmit] Prepare `SlurmJob`s.")
         jobs_to_submit = []
         for ind_batch, chunk in enumerate(args_batches):
-            prefix = f"{MULTISUBMIT_PREFIX}-{ind_batch:06d}"
+            # Read prefix based on the first task of this batch
+            prefix = list_task_files[ind_batch * batch_size].prefix
             tasks = []
             for ind_chunk, parameters in enumerate(chunk):
                 index = (ind_batch * batch_size) + ind_chunk
-                list_task_files[index].prefix = prefix
                 tasks.append(
                     SlurmTask(
                         prefix=prefix,
@@ -676,7 +655,6 @@ class BaseSlurmRunner(BaseRunner):
                         task_files=list_task_files[index],
                     ),
                 )
-
             jobs_to_submit.append(
                 SlurmJob(
                     prefix=prefix,
@@ -697,21 +675,6 @@ class BaseSlurmRunner(BaseRunner):
                 slurm_config=config,
             )
 
-        if task_type == "parallel":
-            # FIXME: replace loop with a `bulk_update_history_unit` function
-            for ind, task_files in enumerate(list_task_files):
-                update_logfile_of_history_unit(
-                    history_unit_id=history_unit_ids[ind],
-                    logfile=task_files.log_file_local,
-                )
-        else:
-            logger.debug(
-                f"Unclear what logfile to associate to {task_type=} "
-                "within multisubmit (see issue #2382)."
-            )
-            # FIXME: Improve definition for compound tasks
-            pass
-
         logger.info(f"END submission phase, {self.job_ids=}")
 
         # FIXME: replace this sleep with a more precise check
@@ -832,10 +795,8 @@ class BaseSlurmRunner(BaseRunner):
         """
         Check that a list of `SlurmJob`s have homogeneous working folders.
         """
-        # Extract `workdir_remote` and `workdir_local`
         set_workdir_local = set(_job.workdir_local for _job in slurm_jobs)
         set_workdir_remote = set(_job.workdir_remote for _job in slurm_jobs)
-
         if len(set_workdir_local) > 1:
             raise ValueError(f"Non-unique values in {set_workdir_local=}.")
         if len(set_workdir_remote) > 1:

fractal_server/app/runner/executors/slurm_common/get_slurm_config.py

@@ -2,6 +2,7 @@ from pathlib import Path
 from typing import Literal
 from typing import Optional
 
+from ._batching import heuristics
 from ._slurm_config import _parse_mem_value
 from ._slurm_config import load_slurm_config_file
 from ._slurm_config import logger
@@ -10,7 +11,7 @@ from ._slurm_config import SlurmConfigError
 from fractal_server.app.models.v2 import WorkflowTaskV2
 
 
-def get_slurm_config(
+def get_slurm_config_internal(
     wftask: WorkflowTaskV2,
     which_type: Literal["non_parallel", "parallel"],
     config_path: Optional[Path] = None,
@@ -162,3 +163,39 @@ def get_slurm_config(
     slurm_config = SlurmConfig(**slurm_dict)
 
     return slurm_config
+
+
+def get_slurm_config(
+    wftask: WorkflowTaskV2,
+    which_type: Literal["non_parallel", "parallel"],
+    config_path: Optional[Path] = None,
+    tot_tasks: int = 1,
+) -> SlurmConfig:
+    config = get_slurm_config_internal(
+        wftask,
+        which_type,
+        config_path,
+    )
+
+    # Set/validate parameters for task batching
+    tasks_per_job, parallel_tasks_per_job = heuristics(
+        # Number of parallel components (always known)
+        tot_tasks=tot_tasks,
+        # Optional WorkflowTask attributes:
+        tasks_per_job=config.tasks_per_job,
+        parallel_tasks_per_job=config.parallel_tasks_per_job,  # noqa
+        # Task requirements (multiple possible sources):
+        cpus_per_task=config.cpus_per_task,
+        mem_per_task=config.mem_per_task_MB,
+        # Fractal configuration variables (soft/hard limits):
+        target_cpus_per_job=config.target_cpus_per_job,
+        target_mem_per_job=config.target_mem_per_job,
+        target_num_jobs=config.target_num_jobs,
+        max_cpus_per_job=config.max_cpus_per_job,
+        max_mem_per_job=config.max_mem_per_job,
+        max_num_jobs=config.max_num_jobs,
+    )
+    config.parallel_tasks_per_job = parallel_tasks_per_job
+    config.tasks_per_job = tasks_per_job
+
+    return config

fractal_server/app/runner/executors/slurm_ssh/runner.py

@@ -90,7 +90,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         ).as_posix()
 
         # Create file list
-        # # FIXME can we make this more efficient with iterations?
+        # # FIXME can we make this more efficient with iterators?
         filelist = []
         for _slurm_job in finished_slurm_jobs:
             _single_job_filelist = [

fractal_server/app/runner/extract_archive.py

@@ -57,7 +57,7 @@ def extract_archive(archive_path: Path):
 
     # Run tar command
     cmd_tar = (
-        f"tar -xzvf {archive_path} " f"--directory={subfolder_path.as_posix()}"
+        f"tar -xzvf {archive_path} --directory={subfolder_path.as_posix()}"
     )
     logger.debug(f"{cmd_tar=}")
     run_subprocess(cmd=cmd_tar, logger_name=logger_name)

fractal_server/app/runner/task_files.py

@@ -4,6 +4,7 @@ from typing import Union
 
 from pydantic import BaseModel
 
+from fractal_server.app.runner.components import _index_to_component
 from fractal_server.string_tools import sanitize_string
 
 SUBMIT_PREFIX = "non_par"
@@ -140,3 +141,31 @@ class TaskFiles(BaseModel):
             metadiff_file_remote=self.metadiff_file_remote,
             log_file_remote=self.log_file_remote,
         )
+
+
+def enrich_task_files_multisubmit(
+    *,
+    tot_tasks: int,
+    batch_size: int,
+    base_task_files: TaskFiles,
+) -> list[TaskFiles]:
+    """
+    Expand `TaskFiles` objects with `component` and `prefix`.
+    """
+
+    new_list_task_files: list[TaskFiles] = []
+    for absolute_index in range(tot_tasks):
+        ind_batch = absolute_index // batch_size
+        new_list_task_files.append(
+            TaskFiles(
+                **base_task_files.model_dump(
+                    exclude={
+                        "component",
+                        "prefix",
+                    }
+                ),
+                prefix=f"{MULTISUBMIT_PREFIX}-{ind_batch:06d}",
+                component=_index_to_component(absolute_index),
+            )
+        )
+    return new_list_task_files

fractal_server/app/runner/v2/db_tools.py

@@ -4,7 +4,6 @@ from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.orm import Session
 from sqlmodel import update
 
-from fractal_server.app.db import get_sync_db
 from fractal_server.app.models.v2 import HistoryImageCache
 from fractal_server.app.models.v2 import HistoryRun
 from fractal_server.app.models.v2 import HistoryUnit
@@ -59,20 +58,6 @@ def bulk_update_status_of_history_unit(
         db_sync.commit()
 
 
-def update_logfile_of_history_unit(
-    *,
-    history_unit_id: int,
-    logfile: str,
-) -> None:
-    with next(get_sync_db()) as db_sync:
-        unit = db_sync.get(HistoryUnit, history_unit_id)
-        if unit is None:
-            raise ValueError(f"HistoryUnit {history_unit_id} not found.")
-        unit.logfile = logfile
-        db_sync.merge(unit)
-        db_sync.commit()
-
-
 def bulk_upsert_image_cache_fast(
     *,
     list_upsert_objects: list[dict[str, Any]],

fractal_server/app/runner/v2/runner.py

@@ -128,10 +128,6 @@ def execute_tasks_v2(
             db.commit()
             db.refresh(history_run)
             history_run_id = history_run.id
-            logger.debug(
-                f"Created {history_run_id=}, for "
-                f"{wftask.id=} and {dataset.id=}"
-            )
 
         # TASK EXECUTION (V2)
         if task.type in ["non_parallel", "converter_non_parallel"]:
@@ -205,9 +201,9 @@ def execute_tasks_v2(
         # Update image list
         num_new_images = 0
         current_task_output.check_zarr_urls_are_unique()
-        # FIXME: Introduce for loop over task outputs, and processe them
-        # sequentially
-        # each failure should lead to an update of the specific image status
+        # NOTE: In principle we could make the task-output processing more
+        # granular, and also associate output-processing failures to history
+        # status.
         for image_obj in current_task_output.image_list_updates:
             image = image_obj.model_dump()
             # Edit existing image
@@ -346,7 +342,7 @@ def execute_tasks_v2(
             )
 
             db.commit()
-            db.close()  # FIXME: why is this needed?
+            db.close()  # NOTE: this is needed, but the reason is unclear
 
             # Create accounting record
             record = AccountingRecord(

fractal_server/app/runner/v2/runner_functions.py

@@ -19,9 +19,13 @@ 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.components import _index_to_component
 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 (
+    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 (
     _cast_and_validate_InitTaskOutput,
@@ -128,6 +132,7 @@ def run_v2_task_non_parallel(
             WorkflowTaskV2,
             Literal["non_parallel", "parallel"],
             Optional[Path],
+            int,
         ],
         Any,
     ],
@@ -150,10 +155,14 @@ def run_v2_task_non_parallel(
         root_dir_remote=workflow_dir_remote,
         task_order=wftask.order,
         task_name=wftask.task.name,
-        component=_index_to_component(0),
+        component="",
+        prefix=SUBMIT_PREFIX,
     )
 
-    runner_config = get_runner_config(wftask=wftask, which_type="non_parallel")
+    runner_config = get_runner_config(
+        wftask=wftask,
+        which_type="non_parallel",
+    )
 
     function_kwargs = {
         "zarr_dir": zarr_dir,
@@ -172,7 +181,7 @@ def run_v2_task_non_parallel(
         history_unit = HistoryUnit(
             history_run_id=history_run_id,
             status=HistoryUnitStatus.SUBMITTED,
-            logfile=None,
+            logfile=task_files.log_file_local,
             zarr_urls=zarr_urls,
         )
         db.add(history_unit)
@@ -232,6 +241,7 @@ def run_v2_task_parallel(
             WorkflowTaskV2,
             Literal["non_parallel", "parallel"],
             Optional[Path],
+            int,
         ],
         Any,
     ],
@@ -254,6 +264,7 @@ def run_v2_task_parallel(
     runner_config = get_runner_config(
         wftask=wftask,
         which_type="parallel",
+        tot_tasks=len(images),
     )
 
     list_function_kwargs = [
@@ -263,19 +274,18 @@ def run_v2_task_parallel(
         }
         for image in images
     ]
-    list_task_files = [
-        TaskFiles(
-            **task_files.model_dump(exclude={"component"}),
-            component=_index_to_component(ind),
-        )
-        for ind in range(len(images))
-    ]
+
+    list_task_files = enrich_task_files_multisubmit(
+        base_task_files=task_files,
+        tot_tasks=len(images),
+        batch_size=runner_config.batch_size,
+    )
 
     history_units = [
         HistoryUnit(
             history_run_id=history_run_id,
             status=HistoryUnitStatus.SUBMITTED,
-            logfile=None,
+            logfile=list_task_files[ind].log_file_local,
             zarr_urls=[image["zarr_url"]],
         )
         for ind, image in enumerate(images)
@@ -337,14 +347,6 @@ def run_v2_task_parallel(
     return outcome, num_tasks
 
 
-# FIXME: THIS FOR CONVERTERS:
-# if task_type in ["converter_non_parallel"]:
-#     run = db.get(HistoryRun, history_run_id)
-#     run.status = HistoryUnitStatus.DONE
-#     db.merge(run)
-#     db.commit()
-
-
 def run_v2_task_compound(
     *,
     images: list[dict[str, Any]],
@@ -359,6 +361,7 @@ def run_v2_task_compound(
             WorkflowTaskV2,
             Literal["non_parallel", "parallel"],
             Optional[Path],
+            int,
         ],
         Any,
     ],
@@ -372,18 +375,14 @@ def run_v2_task_compound(
         root_dir_remote=workflow_dir_remote,
         task_order=wftask.order,
         task_name=wftask.task.name,
-        component=_index_to_component(0),
+        component="",
+        prefix=SUBMIT_PREFIX,
     )
 
     runner_config_init = get_runner_config(
         wftask=wftask,
         which_type="non_parallel",
     )
-    runner_config_compute = get_runner_config(
-        wftask=wftask,
-        which_type="parallel",
-    )
-
     # 3/A: non-parallel init task
     function_kwargs = {
         "zarr_dir": zarr_dir,
@@ -401,7 +400,7 @@ def run_v2_task_compound(
         history_unit = HistoryUnit(
             history_run_id=history_run_id,
             status=HistoryUnitStatus.SUBMITTED,
-            logfile=None,
+            logfile=task_files_init.log_file_local,
             zarr_urls=input_image_zarr_urls,
         )
         db.add(history_unit)
@@ -457,6 +456,14 @@ def run_v2_task_compound(
 
     num_tasks = 1 + len(parallelization_list)
 
+    # Mark the init-task `HistoryUnit` as "done"
+    with next(get_sync_db()) as db:
+        update_status_of_history_unit(
+            history_unit_id=history_unit_id,
+            status=HistoryUnitStatus.DONE,
+            db_sync=db,
+        )
+
     # 3/B: parallel part of a compound task
     _check_parallelization_list_size(parallelization_list)
 
@@ -476,16 +483,23 @@ def run_v2_task_compound(
         }
         return init_outcome, num_tasks
 
-    list_task_files = [
-        TaskFiles(
+    runner_config_compute = get_runner_config(
+        wftask=wftask,
+        which_type="parallel",
+        tot_tasks=len(parallelization_list),
+    )
+
+    list_task_files = enrich_task_files_multisubmit(
+        base_task_files=TaskFiles(
             root_dir_local=workflow_dir_local,
             root_dir_remote=workflow_dir_remote,
             task_order=wftask.order,
             task_name=wftask.task.name,
-            component=_index_to_component(ind),
-        )
-        for ind in range(len(parallelization_list))
-    ]
+        ),
+        tot_tasks=len(parallelization_list),
+        batch_size=runner_config_compute.batch_size,
+    )
+
     list_function_kwargs = [
         {
             "zarr_url": parallelization_item.zarr_url,
@@ -495,6 +509,47 @@ def run_v2_task_compound(
         for parallelization_item in parallelization_list
     ]
 
+    # Create one `HistoryUnit` per parallelization item
+    history_units = [
+        HistoryUnit(
+            history_run_id=history_run_id,
+            status=HistoryUnitStatus.SUBMITTED,
+            logfile=list_task_files[ind].log_file_local,
+            zarr_urls=[parallelization_item.zarr_url],
+        )
+        for ind, parallelization_item in enumerate(parallelization_list)
+    ]
+    with next(get_sync_db()) as db:
+        db.add_all(history_units)
+        db.commit()
+        for history_unit in history_units:
+            db.refresh(history_unit)
+        history_unit_ids = [history_unit.id for history_unit in history_units]
+    # Create one `HistoryImageCache` per `zarr_url`.
+    with next(get_sync_db()) as db:
+        visited_zarr_urls = set()
+        history_image_caches = []
+        for ind, history_unit in enumerate(history_units):
+            _zarr_url = history_unit.zarr_urls[0]
+            if _zarr_url in visited_zarr_urls:
+                # Note: This `HistoryUnit` won't be associated to any
+                # `HistoryImageCache`.
+                pass
+            else:
+                visited_zarr_urls.add(_zarr_url)
+                history_image_caches.append(
+                    dict(
+                        workflowtask_id=wftask.id,
+                        dataset_id=dataset_id,
+                        zarr_url=_zarr_url,
+                        latest_history_unit_id=history_unit.id,
+                    )
+                )
+        bulk_upsert_image_cache_fast(
+            db=db,
+            list_upsert_objects=history_image_caches,
+        )
+
     results, exceptions = runner.multisubmit(
         functools.partial(
             run_single_task,
@@ -506,7 +561,7 @@ def run_v2_task_compound(
         list_parameters=list_function_kwargs,
         task_type=task_type,
         list_task_files=list_task_files,
-        history_unit_ids=[history_unit_id],
+        history_unit_ids=history_unit_ids,
         config=runner_config_compute,
     )
 
@@ -526,18 +581,20 @@ def run_v2_task_compound(
             exception=exceptions.get(ind, None),
         )
 
-    # FIXME: In this case, we are performing db updates from here, rather
-    # than at lower level.
+    # NOTE: For compound tasks, we update `HistoryUnit.status` from here,
+    # rather than within the submit/multisubmit runner methods. This is
+    # to enforce the fact that either all units succeed or they all fail -
+    # at a difference with the parallel-task case.
     with next(get_sync_db()) as db:
         if failure:
-            update_status_of_history_unit(
-                history_unit_id=history_unit_id,
+            bulk_update_status_of_history_unit(
+                history_unit_ids=history_unit_ids,
                 status=HistoryUnitStatus.FAILED,
                 db_sync=db,
             )
         else:
-            update_status_of_history_unit(
-                history_unit_id=history_unit_id,
+            bulk_update_status_of_history_unit(
+                history_unit_ids=history_unit_ids,
                 status=HistoryUnitStatus.DONE,
                 db_sync=db,
             )

fractal_server/migrations/versions/f37aceb45062_make_historyunit_logfile_required.py

@@ -0,0 +1,39 @@
+"""Make HistoryUnit.logfile required
+
+Revision ID: f37aceb45062
+Revises: 9db60297b8b2
+Create Date: 2025-04-14 13:49:40.910342
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "f37aceb45062"
+down_revision = "9db60297b8b2"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("historyunit", schema=None) as batch_op:
+        batch_op.alter_column(
+            "logfile",
+            existing_type=sa.VARCHAR(),
+            nullable=False,
+            server_default="__LOGFILE_PLACEHOLDER__",
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("historyunit", schema=None) as batch_op:
+        batch_op.alter_column(
+            "logfile", existing_type=sa.VARCHAR(), nullable=True
+        )
+
+    # ### end Alembic commands ###

{fractal_server-2.14.0a23.dist-info → fractal_server-2.14.0a25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.14.0a23
+Version: 2.14.0a25
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin

{fractal_server-2.14.0a23.dist-info → fractal_server-2.14.0a25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=HmMn7o6LFtf7DorxF19ycJBUGPrTwAzfEUuVJ_cF14Q,26
+fractal_server/__init__.py,sha256=-f2VHfuQvx-Yc-jvt6EsRwtcTp8dlvFHklFmfIV52Oo,26
 fractal_server/__main__.py,sha256=rkM8xjY1KeS3l63irB8yCrlVobR-73uDapC4wvrIlxI,6957
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,7 +12,7 @@ fractal_server/app/models/user_settings.py,sha256=Y-ZV-uZAFLZqXxy8c5_Qeh_F7zQuZD
 fractal_server/app/models/v2/__init__.py,sha256=vjHwek7-IXmaZZL9VF0nD30YL9ca4wNc8P4RXJK_kDc,832
 fractal_server/app/models/v2/accounting.py,sha256=f2ALxfKKBNxFLJTtC2-YqRepVK253x68y7zkD2V_Nls,1115
 fractal_server/app/models/v2/dataset.py,sha256=Xa3YLmqvSChBJoqlSsjmt-5x0zC-6rSx2eafFnMukfo,1240
-fractal_server/app/models/v2/history.py,sha256=C0pqn_S5yqc8PjayoyRNcsk5Mt_SxvHitdQznuxJvGM,2044
+fractal_server/app/models/v2/history.py,sha256=u4i0NZko8eX5YKAk3MvVIIxU3owJ7D9tEPS_uJT9rrQ,2034
 fractal_server/app/models/v2/job.py,sha256=JWrEjX_E4iRFr5MbmtV_aY28J-5D469awLr0rfa5Kig,2052
 fractal_server/app/models/v2/project.py,sha256=rAHoh5KfYwIaW7rTX0_O0jvWmxEvfo1BafvmcXuSSRk,786
 fractal_server/app/models/v2/task.py,sha256=8KEROaadgccXRZIP7EriBp2j1FgzYkgiirOi5_fG79M,1494
@@ -36,7 +36,7 @@ fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=ZlI6nwzB5r9AiY
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=qdXCb6IP8-qPEAxGZKljtjIqNzIAyRaAsQSRi5VqFHM,6773
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=uhNSs-jcS7ndIUFKiOC1yrDiViw3uvKEXi9UL04BMks,11642
 fractal_server/app/routes/api/v2/dataset.py,sha256=h5AhE0sdhQ20ZlIbEJsFnHIOUW0S1VHFpoflpBkVScs,8936
-fractal_server/app/routes/api/v2/history.py,sha256=FvZGl66hIdo70GvWoOhRQ__knbkbp5u440sl6qhj7nA,17748
+fractal_server/app/routes/api/v2/history.py,sha256=pDztvwQFOh3JChtSk9GIG3H17yg4G5pk1mq14qXF4Ck,17793
 fractal_server/app/routes/api/v2/images.py,sha256=BGpO94gVd8BTpCN6Mun2RXmjrPmfkIp73m8RN7uiGW4,8361
 fractal_server/app/routes/api/v2/job.py,sha256=MU1sHIKk_89WrD0TD44d4ufzqnywot7On_W71KjyUbQ,6500
 fractal_server/app/routes/api/v2/project.py,sha256=uAZgATiHcOvbnRX-vv1D3HoaEUvLUd7vzVmGcqOP8ZY,4602
@@ -67,42 +67,42 @@ fractal_server/app/routes/aux/validate_user_settings.py,sha256=FLVi__8YFcm_6c_K5
 fractal_server/app/routes/pagination.py,sha256=L8F5JqekF39qz-LpeScdlhb57MQnSRXjK4ZEtsZqYLk,1210
 fractal_server/app/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/components.py,sha256=-Ii5l8d_V6f5DFOd-Zsr8VYmOsyqw0Hox9fEFQiuqxY,66
-fractal_server/app/runner/compress_folder.py,sha256=LswrzzW7h8LJzwNcVIdhhTwHMYo2-dua3BeO272DCaw,4879
+fractal_server/app/runner/compress_folder.py,sha256=DX-4IYlSXlMd0EmXDD8M8FxisfKLbooSTrdNtzYAQAM,4876
 fractal_server/app/runner/exceptions.py,sha256=JC5ufHyeA1hYD_rkZUscI30DD8D903ncag7Z3AArmUY,4215
 fractal_server/app/runner/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/runner/executors/base_runner.py,sha256=_elfqkuw1TGRacPG4aTTYKUTbF4A-Y2Rmft9LFi-Mwc,5554
+fractal_server/app/runner/executors/base_runner.py,sha256=knWOERUwRLhsd9eq5GwGxH2ZVsvPOZRRjQPGbiExqcU,5052
 fractal_server/app/runner/executors/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/runner/executors/local/get_local_config.py,sha256=wbrIYuGOvABOStrE7jNrC4ULPhtBQ5Q7Y3aKm_icomg,3508
-fractal_server/app/runner/executors/local/runner.py,sha256=wKkDIYWTdlI3zRVpuNTzcTEeU5C5ia-AFw8tMJ1q6Sw,8743
+fractal_server/app/runner/executors/local/get_local_config.py,sha256=KiakXxOahaLgWvQJ1LVGYGXht6DMGR9x8Xu-TuT9aY4,3628
+fractal_server/app/runner/executors/local/runner.py,sha256=5SVNWnCfj2D5hIw_KNf8VchC0czLhmfqmqdHM0kWsuY,7159
 fractal_server/app/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_common/_batching.py,sha256=ZY020JZlDS5mfpgpWTChQkyHU7iLE5kx2HVd57_C6XA,8850
 fractal_server/app/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
-fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=fZaFUUXqDH0p3DndCFUpFqTqyD2tMVCuSYgYLAycpVw,15897
-fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=UIQ3W0HGXLw8vGt-WeqFq_UafXtyPbuyDAAyXbV96Vo,32314
-fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=-fAX1DZMB5RZnyYanIJD72mWOJAPkh21jd4loDXKJw4,5994
+fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=qzWsMFUbcgxo2p5BltTlxDBLgGa6Z4gDKDdZioK3MB0,15979
+fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=Bd_yBt5Bu1Y_NKcQRYJXiPz7oipKQov5ff16w0zV7YY,30730
+fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=BW6fDpPyB0VH5leVxvwzkVH3r3hC7DuSyoWmRzHITWg,7305
 fractal_server/app/runner/executors/slurm_common/remote.py,sha256=FS_F8EaPp-A5eQT5_ZH3ICCHt0-C8b_2OSYcyRkXnb4,5851
 fractal_server/app/runner/executors/slurm_common/slurm_job_task_models.py,sha256=RoxHLKOn0_wGjnY0Sv0a9nDSiqxYZHKRoMkT3p9_G1E,3607
 fractal_server/app/runner/executors/slurm_common/utils_executors.py,sha256=naPyJI0I3lD-sYHbSXbMFGUBK4h_SggA5V91Z1Ch1Xg,1416
 fractal_server/app/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/runner/executors/slurm_ssh/runner.py,sha256=B_L4MczNPoOIqJPHYmJwwVRl5nLsVRecIcyW-OrgU6E,7138
+fractal_server/app/runner/executors/slurm_ssh/runner.py,sha256=tHdgSnEzIZAFvq23UcA8zBndDemMU0cdwW4R4VZfIfA,7137
 fractal_server/app/runner/executors/slurm_sudo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_sudo/_subprocess_run_as_user.py,sha256=O1bNg1DiSDJmQE0RmOk2Ii47DagiXp5ryd0R6KxO2OM,3177
 fractal_server/app/runner/executors/slurm_sudo/runner.py,sha256=WGGVHX_juqyC6OVhln9yg-YKjLiuAoWZhAGxBjhNkWw,5873
-fractal_server/app/runner/extract_archive.py,sha256=iQOsJNYW-ae1TCK5WqmBvmqw7FPEaEh3U7UivVCLayY,2462
+fractal_server/app/runner/extract_archive.py,sha256=I7UGIHXXuFvlgVPsP7GMWPu2-DiS1EiyBs7a1bvgkxI,2458
 fractal_server/app/runner/filenames.py,sha256=lPnxKHtdRizr6FqG3zOdjDPyWA7GoaJGTtiuJV0gA8E,70
 fractal_server/app/runner/run_subprocess.py,sha256=c3JbYXq3hX2aaflQU19qJ5Xs6J6oXGNvnTEoAfv2bxc,959
 fractal_server/app/runner/set_start_and_last_task_index.py,sha256=-q4zVybAj8ek2XlbENKlfOAJ39hT_zoJoZkqzDqiAMY,1254
 fractal_server/app/runner/shutdown.py,sha256=9pfSKHDNdIcm0eY-opgRTi7y0HmvfPmYiu9JR6Idark,2082
-fractal_server/app/runner/task_files.py,sha256=wWp7GjZAt04X-N5M1YHDRyWHeNz8kFjK-jSA6DaxC20,3510
+fractal_server/app/runner/task_files.py,sha256=27xFuPzSJc1Pw912CfSMPOhOIpvNwpkyLCnycqdo9lw,4365
 fractal_server/app/runner/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/v2/_local.py,sha256=DK8yagbvd6HHjcDVhUzTy0f7MURlTkQha-NM6OZKgJc,3044
 fractal_server/app/runner/v2/_slurm_ssh.py,sha256=_bytOf8z9sdrhI03D6eqg-aQPnJ7V2-qnqpcHAYizns,3278
 fractal_server/app/runner/v2/_slurm_sudo.py,sha256=DBCNxifXmMkpu71Wnk5u9-wKT7PV1WROQuY_4DYoZRI,2993
-fractal_server/app/runner/v2/db_tools.py,sha256=KoPpbUtY5a1M4__Pp4luN8_TkpdkaUZXH_lkNoXHu4s,3394
+fractal_server/app/runner/v2/db_tools.py,sha256=Ots6-Da7A_5yetSYrUGi-_yV-2r21Nc6XUBK3bv2mTM,2967
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=IVTE4abBU1bUprFTkxrTfYKnvkNTanWQ-KWh_etiT08,645
 fractal_server/app/runner/v2/merge_outputs.py,sha256=D1L4Taieq9i71SPQyNc1kMokgHh-sV_MqF3bv7QMDBc,907
-fractal_server/app/runner/v2/runner.py,sha256=4Wrtx0HjjWD92yuIHqIxywPv8DeDh4iR9dZHXozIysQ,15781
-fractal_server/app/runner/v2/runner_functions.py,sha256=5cK5O2rTrCsCxMTVN3iNPRwZ_891BC9_RMo64a8ZGYw,16338
+fractal_server/app/runner/v2/runner.py,sha256=sbBOH5gCErxK0fCPPGBWtLtqsSwtmrhTth5OLUGMeZQ,15658
+fractal_server/app/runner/v2/runner_functions.py,sha256=QZYmU-3mHgS4Jx73JQzsjm2HQP4j1w2oTDswH9neA84,18580
 fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=9t1CHN3EyfsGRWfG257YPY5WjQ6zuztsw_KZrpEAFPo,3703
 fractal_server/app/runner/v2/submit_workflow.py,sha256=EDUyUuIPwZHb2zm7SCRRoFsGq2cN-b5OKw6CYkZ8kWk,13048
 fractal_server/app/runner/v2/task_interface.py,sha256=IXdQTI8rXFgXv1Ez0js4CjKFf3QwO2GCHRTuwiFtiTQ,2891
@@ -173,6 +173,7 @@ fractal_server/migrations/versions/db09233ad13a_split_filters_and_keep_old_colum
 fractal_server/migrations/versions/e75cac726012_make_applyworkflow_start_timestamp_not_.py,sha256=lOggSvzGWqQvnxxFuSM6W50Ui49R918A-uBuiZJ0pNM,963
 fractal_server/migrations/versions/e81103413827_add_job_type_filters.py,sha256=t4ImlKNHx5JMgBL2sTpLWunv1gwY8OCFOKd3G338mdE,890
 fractal_server/migrations/versions/efa89c30e0a4_add_project_timestamp_created.py,sha256=jilQW3QIqYQ4Q6hCnUiG7UtNMpA41ujqrB3tPFiPM1Q,1221
+fractal_server/migrations/versions/f37aceb45062_make_historyunit_logfile_required.py,sha256=jLHcVq9z0Ou20u-mwPf6EICDKY4dwFAzBgbRRx9_xDw,1007
 fractal_server/migrations/versions/f384e1c0cf5d_drop_task_default_args_columns.py,sha256=9BwqUS9Gf7UW_KjrzHbtViC880qhD452KAytkHWWZyk,746
 fractal_server/migrations/versions/fbce16ff4e47_new_history_items.py,sha256=TDWCaIoM0Q4SpRWmR9zr_rdp3lJXhCfBPTMhtrP5xYE,3950
 fractal_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -207,8 +208,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=Kc_nSzdlV6KIsO0CQSPs1w70zLyENP
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.14.0a23.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.0a23.dist-info/METADATA,sha256=qQR1L3oMXG0_a_rgeKkdsUbv8EjsBt8j11xNKnTZm5Q,4563
-fractal_server-2.14.0a23.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.0a23.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.0a23.dist-info/RECORD,,
+fractal_server-2.14.0a25.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.0a25.dist-info/METADATA,sha256=VfnpA36svX36WiHYmOqhFuYv9TrddJwDxe62mmavhPE,4563
+fractal_server-2.14.0a25.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.0a25.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.0a25.dist-info/RECORD,,