fractal-server 2.14.0a34__tar.gz → 2.14.0a36__tar.gz

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/PKG-INFO

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

fractal_server-2.14.0a36/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.14.0a36"

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/app/runner/executors/base_runner.py

@@ -32,6 +32,7 @@ class BaseRunner(object):
         task_type: TaskTypeType,
         task_files: TaskFiles,
         config: Any,
+        user_id: int,
     ) -> tuple[Any, BaseException]:
         """
         Run a single fractal task.
@@ -44,6 +45,7 @@ class BaseRunner(object):
             task_type: Task type.
             task_files: `TaskFiles` object.
             config: Runner-specific parameters.
+            user_id:
         """
         raise NotImplementedError()
 
@@ -55,6 +57,7 @@ class BaseRunner(object):
         list_task_files: list[TaskFiles],
         task_type: TaskTypeType,
         config: Any,
+        user_id: int,
     ) -> tuple[dict[int, Any], dict[int, BaseException]]:
         """
         Run a parallel fractal task.
@@ -68,6 +71,7 @@ class BaseRunner(object):
             task_type: Task type.
             task_files: `TaskFiles` object.
             config: Runner-specific parameters.
+            user_id
         """
         raise NotImplementedError()
 

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/app/runner/executors/local/runner.py

@@ -58,6 +58,7 @@ class LocalRunner(BaseRunner):
             "converter_compound",
         ],
         config: LocalBackendConfig,
+        user_id: int,
     ) -> tuple[Any, Exception]:
         logger.debug("[submit] START")
 
@@ -116,6 +117,7 @@ class LocalRunner(BaseRunner):
         list_task_files: list[TaskFiles],
         task_type: Literal["parallel", "compound", "converter_compound"],
         config: LocalBackendConfig,
+        user_id: int,
     ) -> tuple[dict[int, Any], dict[int, BaseException]]:
         """
         Note: `list_parameters`, `list_task_files` and `history_unit_ids`

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py

@@ -15,6 +15,7 @@ from ..slurm_common.slurm_job_task_models import SlurmTask
 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
@@ -34,7 +35,20 @@ SHUTDOWN_EXCEPTION = JobExecutionError(SHUTDOWN_ERROR_MESSAGE)
 
 logger = set_logger(__name__)
 
-# NOTE: see issue 2481.
+
+def create_accounting_record_slurm(
+    *,
+    user_id: int,
+    slurm_job_ids: list[int],
+) -> None:
+    with next(get_sync_db()) as db:
+        db.add(
+            AccountingRecordSlurm(
+                user_id=user_id,
+                slurm_job_ids=slurm_job_ids,
+            )
+        )
+        db.commit()
 
 
 class BaseSlurmRunner(BaseRunner):
@@ -158,7 +172,7 @@ class BaseSlurmRunner(BaseRunner):
         slurm_job: SlurmJob,
         slurm_config: SlurmConfig,
     ) -> str:
-        logger.info("[_submit_single_sbatch] START")
+        logger.debug("[_submit_single_sbatch] START")
         # Prepare input pickle(s)
         versions = dict(
             python=sys.version_info[:3],
@@ -175,7 +189,7 @@ class BaseSlurmRunner(BaseRunner):
             funcser = cloudpickle.dumps((versions, func, _args, _kwargs))
             with open(task.input_pickle_file_local, "wb") as f:
                 f.write(funcser)
-            logger.info(
+            logger.debug(
                 "[_submit_single_sbatch] Written "
                 f"{task.input_pickle_file_local=}"
             )
@@ -186,7 +200,7 @@ class BaseSlurmRunner(BaseRunner):
                     local=task.input_pickle_file_local,
                     remote=task.input_pickle_file_remote,
                 )
-                logger.info(
+                logger.debug(
                     "[_submit_single_sbatch] Transferred "
                     f"{task.input_pickle_file_local=}"
                 )
@@ -229,7 +243,7 @@ class BaseSlurmRunner(BaseRunner):
             ]
         )
         script_lines = slurm_config.sort_script_lines(script_lines)
-        logger.info(script_lines)
+        logger.debug(script_lines)
 
         # Always print output of `uname -n` and `pwd`
         script_lines.append('\necho "Hostname: $(uname -n)"')
@@ -258,7 +272,7 @@ class BaseSlurmRunner(BaseRunner):
         # Write submission script
         with open(slurm_job.slurm_submission_script_local, "w") as f:
             f.write(script)
-        logger.info(
+        logger.debug(
             "[_submit_single_sbatch] Written "
             f"{slurm_job.slurm_submission_script_local=}"
         )
@@ -280,10 +294,10 @@ class BaseSlurmRunner(BaseRunner):
         # Run sbatch
         pre_submission_cmds = slurm_config.pre_submission_commands
         if len(pre_submission_cmds) == 0:
-            logger.info(f"Now run {submit_command=}")
+            logger.debug(f"Now run {submit_command=}")
             sbatch_stdout = self._run_remote_cmd(submit_command)
         else:
-            logger.info(f"Now using {pre_submission_cmds=}")
+            logger.debug(f"Now using {pre_submission_cmds=}")
             script_lines = pre_submission_cmds + [submit_command]
             wrapper_script_contents = "\n".join(script_lines)
             wrapper_script_contents = f"{wrapper_script_contents}\n"
@@ -300,22 +314,22 @@ class BaseSlurmRunner(BaseRunner):
                 )
                 with open(wrapper_script, "w") as f:
                     f.write(wrapper_script_contents)
-            logger.info(f"Now run {wrapper_script=}")
+            logger.debug(f"Now run {wrapper_script=}")
             sbatch_stdout = self._run_remote_cmd(f"bash {wrapper_script}")
 
         # Submit SLURM job and retrieve job ID
-        logger.info(f"[_submit_single_sbatc] {sbatch_stdout=}")
+        logger.info(f"[_submit_single_sbatch] {sbatch_stdout=}")
         stdout = sbatch_stdout.strip("\n")
         submitted_job_id = int(stdout)
         slurm_job.slurm_job_id = str(submitted_job_id)
 
         # Add job to self.jobs
         self.jobs[slurm_job.slurm_job_id] = slurm_job
-        logger.info(
+        logger.debug(
             "[_submit_single_sbatch] Added "
             f"{slurm_job.slurm_job_id} to self.jobs."
         )
-        logger.info("[_submit_single_sbatch] END")
+        logger.debug("[_submit_single_sbatch] END")
 
     def _fetch_artifacts(
         self,
@@ -448,8 +462,9 @@ class BaseSlurmRunner(BaseRunner):
             "compound",
             "converter_compound",
         ],
+        user_id: int,
     ) -> tuple[Any, Exception]:
-        logger.info("[submit] START")
+        logger.debug("[submit] START")
         try:
             workdir_local = task_files.wftask_subfolder_local
             workdir_remote = task_files.wftask_subfolder_remote
@@ -473,10 +488,10 @@ class BaseSlurmRunner(BaseRunner):
             )
 
             # Create task subfolder
-            logger.info("[submit] Create local/remote folders - START")
+            logger.debug("[submit] Create local/remote folders - START")
             self._mkdir_local_folder(folder=workdir_local.as_posix())
             self._mkdir_remote_folder(folder=workdir_remote.as_posix())
-            logger.info("[submit] Create local/remote folders - END")
+            logger.debug("[submit] Create local/remote folders - END")
 
             # Submission phase
             slurm_job = SlurmJob(
@@ -502,7 +517,12 @@ class BaseSlurmRunner(BaseRunner):
                 slurm_job=slurm_job,
                 slurm_config=config,
             )
-            logger.info(f"[submit] END submission phase, {self.job_ids=}")
+            logger.debug(f"[submit] END submission phase, {self.job_ids=}")
+
+            create_accounting_record_slurm(
+                user_id=user_id,
+                slurm_job_ids=self.job_ids,
+            )
 
             # NOTE: see issue 2444
             settings = Inject(get_settings)
@@ -511,7 +531,7 @@ class BaseSlurmRunner(BaseRunner):
             time.sleep(sleep_time)
 
             # Retrieval phase
-            logger.info("[submit] START retrieval phase")
+            logger.debug("[submit] START retrieval phase")
             scancelled_job_ids = []
             while len(self.jobs) > 0:
                 # Look for finished jobs
@@ -554,7 +574,7 @@ class BaseSlurmRunner(BaseRunner):
                 if len(self.jobs) > 0:
                     scancelled_job_ids = self.wait_and_check_shutdown()
 
-            logger.info("[submit] END")
+            logger.debug("[submit] END")
             return result, exception
 
         except Exception as e:
@@ -578,6 +598,7 @@ class BaseSlurmRunner(BaseRunner):
         list_task_files: list[TaskFiles],
         task_type: Literal["parallel", "compound", "converter_compound"],
         config: SlurmConfig,
+        user_id: int,
     ) -> tuple[dict[int, Any], dict[int, BaseException]]:
         """
         Note: `list_parameters`, `list_task_files` and `history_unit_ids`
@@ -585,7 +606,7 @@ class BaseSlurmRunner(BaseRunner):
         input images, while for compound tasks these can differ.
         """
 
-        logger.info(f"[multisubmit] START, {len(list_parameters)=}")
+        logger.debug(f"[multisubmit] START, {len(list_parameters)=}")
         try:
 
             if self.is_shutdown():
@@ -639,7 +660,7 @@ class BaseSlurmRunner(BaseRunner):
                 raise RuntimeError("Something wrong here while batching tasks")
 
             # Part 1/3: Iterate over chunks, prepare SlurmJob objects
-            logger.info("[multisubmit] Prepare `SlurmJob`s.")
+            logger.debug("[multisubmit] Prepare `SlurmJob`s.")
             jobs_to_submit = []
             for ind_batch, chunk in enumerate(args_batches):
                 # Read prefix based on the first task of this batch
@@ -669,7 +690,7 @@ class BaseSlurmRunner(BaseRunner):
                 )
 
             # NOTE: see issue 2431
-            logger.info("[multisubmit] Transfer files and submit jobs.")
+            logger.debug("[multisubmit] Transfer files and submit jobs.")
             for slurm_job in jobs_to_submit:
                 self._submit_single_sbatch(
                     func,
@@ -677,11 +698,16 @@ class BaseSlurmRunner(BaseRunner):
                     slurm_config=config,
                 )
 
-            logger.info(f"END submission phase, {self.job_ids=}")
+            logger.info(f"[multisubmit] END submission phase, {self.job_ids=}")
+
+            create_accounting_record_slurm(
+                user_id=user_id,
+                slurm_job_ids=self.job_ids,
+            )
 
             settings = Inject(get_settings)
             sleep_time = settings.FRACTAL_SLURM_INTERVAL_BEFORE_RETRIEVAL
-            logger.warning(f"[submit] Now sleep {sleep_time} seconds.")
+            logger.warning(f"[multisubmit] Now sleep {sleep_time} seconds.")
             time.sleep(sleep_time)
         except Exception as e:
             logger.error(
@@ -701,7 +727,7 @@ class BaseSlurmRunner(BaseRunner):
             return results, exceptions
 
         # Retrieval phase
-        logger.info("[multisubmit] START retrieval phase")
+        logger.debug("[multisubmit] START retrieval phase")
         scancelled_job_ids = []
         while len(self.jobs) > 0:
             # Look for finished jobs
@@ -723,10 +749,12 @@ class BaseSlurmRunner(BaseRunner):
 
             with next(get_sync_db()) as db:
                 for slurm_job_id in finished_job_ids:
-                    logger.info(f"[multisubmit] Now process {slurm_job_id=}")
+                    logger.debug(f"[multisubmit] Now process {slurm_job_id=}")
                     slurm_job = self.jobs.pop(slurm_job_id)
                     for task in slurm_job.tasks:
-                        logger.info(f"[multisubmit] Now process {task.index=}")
+                        logger.debug(
+                            f"[multisubmit] Now process {task.index=}"
+                        )
                         was_job_scancelled = slurm_job_id in scancelled_job_ids
                         if fetch_artifacts_exception is not None:
                             result = None
@@ -775,7 +803,7 @@ class BaseSlurmRunner(BaseRunner):
             if len(self.jobs) > 0:
                 scancelled_job_ids = self.wait_and_check_shutdown()
 
-        logger.info("[multisubmit] END")
+        logger.debug("[multisubmit] END")
         return results, exceptions
 
     def check_fractal_server_versions(self) -> None:
@@ -814,7 +842,7 @@ class BaseSlurmRunner(BaseRunner):
         if self.jobs:
             scancel_string = " ".join(scancelled_job_ids)
             scancel_cmd = f"scancel {scancel_string}"
-            logger.warning(f"Now scancel-ing SLURM jobs {scancel_string}")
+            logger.warning(f"[scancel_jobs] {scancel_string}")
             try:
                 self._run_remote_cmd(scancel_cmd)
             except Exception as e:

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/app/runner/executors/slurm_common/remote.py

@@ -54,18 +54,21 @@ def _check_versions_mismatch(
                                 do not match with the ones on the server
     """
 
-    server_python_version = server_versions["python"]
-    worker_python_version = sys.version_info[:3]
+    server_python_version = list(server_versions["python"])
+    worker_python_version = list(sys.version_info[:3])
     if worker_python_version != server_python_version:
-        # FIXME: turn this into an error, after fixing a broader CI issue, see
-        # https://github.com/fractal-analytics-platform/fractal-server/issues/375
-        logging.warning(
-            f"{server_python_version=} but {worker_python_version=}. "
-            "cloudpickle is not guaranteed to correctly load "
-            "pickle files created with different python versions. "
-            "Note, however, that if you reached this line it means that "
-            "the pickle file was likely loaded correctly."
-        )
+        if worker_python_version[:2] != server_python_version[:2]:
+            # FIXME: Turn this into an error, in some version post 2.14.
+            logging.error(
+                f"{server_python_version=} but {worker_python_version=}. "
+                "This configuration will be deprecated in a future version, "
+                "please contact the admin of this Fractal instance."
+            )
+        else:
+            # Major.minor versions match, patch versions differ
+            logging.warning(
+                f"{server_python_version=} but {worker_python_version=}."
+            )
 
     server_cloudpickle_version = server_versions["cloudpickle"]
     worker_cloudpickle_version = cloudpickle.__version__

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/app/runner/executors/slurm_ssh/runner.py

@@ -113,7 +113,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         elapsed = time.perf_counter() - t_0
         logger.debug(
             "[_fetch_artifacts] Created filelist "
-            f"({len(filelist)=}, from start: {elapsed:.3f} s)."
+            f"({len(filelist)=}, from start: {elapsed=:.3f} s)."
         )
 
         # Write filelist to file remotely
@@ -125,7 +125,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         elapsed = time.perf_counter() - t_0
         logger.debug(
             f"[_fetch_artifacts] File list written to {tmp_filelist_path} "
-            f"(from start: {elapsed:.3f} s)."
+            f"(from start: {elapsed=:.3f} s)."
         )
 
         # Create remote tarfile
@@ -140,7 +140,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         t_1_tar = time.perf_counter()
         logger.info(
             f"[_fetch_artifacts] Remote archive {tarfile_path_remote} created"
-            f" - elapsed: {t_1_tar - t_0_tar:.3f} s"
+            f" - elapsed={t_1_tar - t_0_tar:.3f} s"
         )
 
         # Fetch tarfile
@@ -153,7 +153,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         logger.info(
             "[_fetch_artifacts] Subfolder archive transferred back "
             f"to {tarfile_path_local}"
-            f" - elapsed: {t_1_get - t_0_get:.3f} s"
+            f" - elapsed={t_1_get - t_0_get:.3f} s"
         )
 
         # Extract tarfile locally
@@ -163,7 +163,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         Path(tarfile_path_local).unlink(missing_ok=True)
 
         t_1 = time.perf_counter()
-        logger.info(f"[_fetch_artifacts] End - elapsed: {t_1 - t_0:.3f} s")
+        logger.info(f"[_fetch_artifacts] End - elapsed={t_1 - t_0:.3f} s")
 
     def _send_inputs(self, jobs: list[SlurmJob]) -> None:
         """
@@ -190,7 +190,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
             t_1_put = time.perf_counter()
             logger.info(
                 f"Subfolder archive transferred to {tarfile_path_remote}"
-                f" - elapsed: {t_1_put - t_0_put:.3f} s"
+                f" - elapsed={t_1_put - t_0_put:.3f} s"
             )
 
             # Remove local archive

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/app/runner/executors/slurm_sudo/_subprocess_run_as_user.py

@@ -88,18 +88,3 @@ def _mkdir_as_user(*, folder: str, user: str) -> None:
 
     cmd = f"mkdir -p {folder}"
     _run_command_as_user(cmd=cmd, user=user, check=True)
-
-
-def _path_exists_as_user(*, path: str, user: Optional[str] = None) -> bool:
-    """
-    Impersonate a user and check if `path` exists via `ls`
-
-    Arguments:
-        path: Absolute file/folder path
-        user: If not `None`, user to be impersonated
-    """
-    res = _run_command_as_user(cmd=f"ls {path}", user=user)
-    if res.returncode == 0:
-        return True
-    else:
-        return False

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/app/runner/v2/runner.py

@@ -18,6 +18,7 @@ from .merge_outputs import merge_outputs
 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
@@ -132,48 +133,60 @@ def execute_tasks_v2(
             history_run_id = history_run.id
 
         # TASK EXECUTION (V2)
-        if task.type in ["non_parallel", "converter_non_parallel"]:
-            outcomes_dict, num_tasks = run_v2_task_non_parallel(
-                images=filtered_images,
-                zarr_dir=zarr_dir,
-                wftask=wftask,
-                task=task,
-                workflow_dir_local=workflow_dir_local,
-                workflow_dir_remote=workflow_dir_remote,
-                runner=runner,
-                get_runner_config=get_runner_config,
-                history_run_id=history_run_id,
-                dataset_id=dataset.id,
-                task_type=task.type,
-            )
-        elif task.type == "parallel":
-            outcomes_dict, num_tasks = run_v2_task_parallel(
-                images=filtered_images,
-                wftask=wftask,
-                task=task,
-                workflow_dir_local=workflow_dir_local,
-                workflow_dir_remote=workflow_dir_remote,
-                runner=runner,
-                get_runner_config=get_runner_config,
-                history_run_id=history_run_id,
-                dataset_id=dataset.id,
-            )
-        elif task.type in ["compound", "converter_compound"]:
-            outcomes_dict, num_tasks = run_v2_task_compound(
-                images=filtered_images,
-                zarr_dir=zarr_dir,
-                wftask=wftask,
-                task=task,
-                workflow_dir_local=workflow_dir_local,
-                workflow_dir_remote=workflow_dir_remote,
-                runner=runner,
-                get_runner_config=get_runner_config,
-                history_run_id=history_run_id,
-                dataset_id=dataset.id,
-                task_type=task.type,
-            )
-        else:
-            raise ValueError(f"Unexpected error: Invalid {task.type=}.")
+        try:
+            if task.type in ["non_parallel", "converter_non_parallel"]:
+                outcomes_dict, num_tasks = run_v2_task_non_parallel(
+                    images=filtered_images,
+                    zarr_dir=zarr_dir,
+                    wftask=wftask,
+                    task=task,
+                    workflow_dir_local=workflow_dir_local,
+                    workflow_dir_remote=workflow_dir_remote,
+                    runner=runner,
+                    get_runner_config=get_runner_config,
+                    history_run_id=history_run_id,
+                    dataset_id=dataset.id,
+                    user_id=user_id,
+                    task_type=task.type,
+                )
+            elif task.type == "parallel":
+                outcomes_dict, num_tasks = run_v2_task_parallel(
+                    images=filtered_images,
+                    wftask=wftask,
+                    task=task,
+                    workflow_dir_local=workflow_dir_local,
+                    workflow_dir_remote=workflow_dir_remote,
+                    runner=runner,
+                    get_runner_config=get_runner_config,
+                    history_run_id=history_run_id,
+                    dataset_id=dataset.id,
+                    user_id=user_id,
+                )
+            elif task.type in ["compound", "converter_compound"]:
+                outcomes_dict, num_tasks = run_v2_task_compound(
+                    images=filtered_images,
+                    zarr_dir=zarr_dir,
+                    wftask=wftask,
+                    task=task,
+                    workflow_dir_local=workflow_dir_local,
+                    workflow_dir_remote=workflow_dir_remote,
+                    runner=runner,
+                    get_runner_config=get_runner_config,
+                    history_run_id=history_run_id,
+                    dataset_id=dataset.id,
+                    task_type=task.type,
+                    user_id=user_id,
+                )
+            else:
+                raise ValueError(f"Unexpected error: Invalid {task.type=}.")
+        except Exception as e:
+            outcomes_dict = {
+                0: SubmissionOutcome(
+                    result=None,
+                    exception=e,
+                )
+            }
+            num_tasks = 0
 
         # POST TASK EXECUTION
 

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/app/runner/v2/runner_functions.py

@@ -139,6 +139,7 @@ def run_v2_task_non_parallel(
     dataset_id: int,
     history_run_id: int,
     task_type: Literal["non_parallel", "converter_non_parallel"],
+    user_id: int,
 ) -> tuple[dict[int, SubmissionOutcome], int]:
     """
     This runs server-side (see `executor` argument)
@@ -218,6 +219,7 @@ def run_v2_task_non_parallel(
         task_files=task_files,
         history_unit_id=history_unit_id,
         config=runner_config,
+        user_id=user_id,
     )
 
     positional_index = 0
@@ -261,6 +263,7 @@ def run_v2_task_parallel(
     ],
     dataset_id: int,
     history_run_id: int,
+    user_id: int,
 ) -> tuple[dict[int, SubmissionOutcome], int]:
     if len(images) == 0:
         return {}, 0
@@ -344,6 +347,7 @@ def run_v2_task_parallel(
         list_task_files=list_task_files,
         history_unit_ids=history_unit_ids,
         config=runner_config,
+        user_id=user_id,
     )
 
     outcome = {}
@@ -394,6 +398,7 @@ def run_v2_task_compound(
     dataset_id: int,
     history_run_id: int,
     task_type: Literal["compound", "converter_compound"],
+    user_id: int,
 ) -> tuple[dict[int, SubmissionOutcome], int]:
     # Get TaskFiles object
     task_files_init = TaskFiles(
@@ -463,6 +468,7 @@ def run_v2_task_compound(
         task_files=task_files_init,
         history_unit_id=init_history_unit_id,
         config=runner_config_init,
+        user_id=user_id,
     )
 
     init_outcome = _process_init_task_output(
@@ -565,6 +571,7 @@ def run_v2_task_compound(
         list_task_files=list_task_files,
         history_unit_ids=history_unit_ids,
         config=runner_config_compute,
+        user_id=user_id,
     )
 
     compute_outcomes: dict[int, SubmissionOutcome] = {}

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/fractal_server/ssh/_fabric.py

@@ -322,7 +322,7 @@ class FractalSSH(object):
                 t_1 = time.perf_counter()
                 self.logger.info(
                     f"{prefix} END   running '{cmd}' over SSH, "
-                    f"elapsed {t_1 - t_0:.3f}"
+                    f"elapsed={t_1 - t_0:.3f}"
                 )
                 self.logger.debug("STDOUT:")
                 self.logger.debug(res.stdout)

{fractal_server-2.14.0a34 → fractal_server-2.14.0a36}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.14.0a34"
+version = "2.14.0a36"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -95,7 +95,7 @@ filterwarnings = [
 markers = ["container", "ssh"]
 
 [tool.bumpver]
-current_version = "2.14.0a34"
+current_version = "2.14.0a36"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.14.0a34/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.14.0a34"