fractal-server 2.14.0a18__tar.gz → 2.14.0a20__tar.gz

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/PKG-INFO

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

fractal_server-2.14.0a20/fractal_server/__init__.py

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

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/app/routes/api/v2/task_collection_custom.py

@@ -12,9 +12,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from ._aux_functions_tasks import _get_valid_user_group_id
 from ._aux_functions_tasks import _verify_non_duplication_group_constraint
 from ._aux_functions_tasks import _verify_non_duplication_user_constraint
-from fractal_server.app.db import DBSyncSession
 from fractal_server.app.db import get_async_db
-from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.routes.auth import current_active_verified_user
@@ -31,7 +29,7 @@ from fractal_server.tasks.v2.utils_background import (
     _prepare_tasks_metadata,
 )
 from fractal_server.tasks.v2.utils_database import (
-    create_db_tasks_and_update_task_group,
+    create_db_tasks_and_update_task_group_async,
 )
 
 router = APIRouter()
@@ -47,10 +45,7 @@ async def collect_task_custom(
     private: bool = False,
     user_group_id: Optional[int] = None,
     user: UserOAuth = Depends(current_active_verified_user),
-    db: AsyncSession = Depends(get_async_db),  # FIXME: using both sync/async
-    db_sync: DBSyncSession = Depends(
-        get_sync_db
-    ),  # FIXME: using both sync/async
+    db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskReadV2]:
 
     settings = Inject(get_settings)
@@ -168,10 +163,10 @@ async def collect_task_custom(
     await db.refresh(task_group)
     db.expunge(task_group)
 
-    task_group = create_db_tasks_and_update_task_group(
+    task_group = await create_db_tasks_and_update_task_group_async(
         task_list=task_list,
         task_group_id=task_group.id,
-        db=db_sync,
+        db=db,
     )
 
     logger.debug(

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/app/runner/executors/base_runner.py

@@ -25,30 +25,25 @@ class BaseRunner(object):
     Base class for Fractal runners.
     """
 
-    def shutdown(self, *args, **kwargs):
-        raise NotImplementedError()
-
     def submit(
         self,
         func: callable,
         parameters: dict[str, Any],
         history_unit_id: int,
-        task_files: TaskFiles,
         task_type: TaskTypeType,
+        task_files: TaskFiles,
         config: Any,
     ) -> tuple[Any, BaseException]:
         """
         Run a single fractal task.
 
-        # FIXME: Describe more in detail
-
         Args:
             func: Function to be executed.
-            parameters:
-                Dictionary of parameters. Must include `zarr_urls` key.
-            history_item_id:
-                Database ID of the corresponding `HistoryItemV2` entry.
+            parameters: Dictionary of parameters.
+            history_unit_id:
+                Database ID of the corresponding `HistoryUnit` entry.
             task_type: Task type.
+            task_files: `TaskFiles` object.
             config: Runner-specific parameters.
         """
         raise NotImplementedError()
@@ -65,16 +60,14 @@ class BaseRunner(object):
         """
         Run a parallel fractal task.
 
-        # FIXME: Describe more in detail
-
         Args:
             func: Function to be executed.
-            list_parameters:
-                List of dictionaries of parameters. Each one must include a
-                `zarr_url` key.
-            history_item_id:
-                Database ID of the corresponding `HistoryItemV2` entry.
+            parameters:
+                Dictionary of parameters. Must include `zarr_urls` key.
+            history_unit_ids:
+                Database IDs of the corresponding `HistoryUnit` entries.
             task_type: Task type.
+            task_files: `TaskFiles` object.
             config: Runner-specific parameters.
         """
         raise NotImplementedError()
@@ -115,7 +108,7 @@ class BaseRunner(object):
         list_task_files: list[TaskFiles],
     ) -> None:
         """
-        Validate parameters for `multi_submit` method
+        Validate parameters for `multisubmit` method
 
         Args:
             list_parameters: List of parameters dictionaries.
@@ -152,6 +145,14 @@ class BaseRunner(object):
         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(

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/app/runner/executors/local/runner.py

@@ -40,16 +40,12 @@ class LocalRunner(BaseRunner):
         logger.debug("Enter LocalRunner")
         return self
 
-    def shutdown(self):
-        logger.debug("Now shut LocalRunner.executor down")
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        logger.debug("Exit LocalRunner")
         self.executor.shutdown(
             wait=False,
             cancel_futures=True,
         )
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        logger.debug("Exit LocalRunner")
-        self.shutdown()
         return self.executor.__exit__(exc_type, exc_val, exc_tb)
 
     def submit(
@@ -193,8 +189,6 @@ class LocalRunner(BaseRunner):
                     pass
 
             while active_futures:
-                # FIXME: add shutdown detection
-                # if file exists: cancel all futures, and raise
                 finished_futures = [
                     index_and_future
                     for index_and_future in active_futures.items()

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py

@@ -13,11 +13,11 @@ 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 ._handle_exception_proxy import _handle_exception_proxy
 from ._job_states import STATES_FINISHED
 from fractal_server import __VERSION__
 from fractal_server.app.db import get_sync_db
 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
@@ -96,8 +96,12 @@ class BaseSlurmRunner(BaseRunner):
         raise NotImplementedError("Implement in child class.")
 
     def run_squeue(self, job_ids: list[str]) -> tuple[bool, str]:
+
         # FIXME: review different cases (exception vs no job found)
-        # FIXME: Fail for empty list
+
+        if len(job_ids) == 0:
+            return (False, "")
+
         job_id_single_str = ",".join([str(j) for j in job_ids])
         cmd = (
             f"squeue --noheader --format='%i %T' --jobs {job_id_single_str}"
@@ -109,10 +113,10 @@ class BaseSlurmRunner(BaseRunner):
                 stdout = self._run_local_cmd(cmd)
             else:
                 stdout = self._run_remote_cmd(cmd)
-            return True, stdout
+            return (True, stdout)
         except Exception as e:
             logger.info(f"{cmd=} failed with {str(e)}")
-            return False, ""
+            return (False, "")
 
     def _get_finished_jobs(self, job_ids: list[str]) -> set[str]:
         #  If there is no Slurm job to check, return right away
@@ -353,11 +357,31 @@ class BaseSlurmRunner(BaseRunner):
                 outdata = f.read()
             success, output = cloudpickle.loads(outdata)
             if success:
+                # Task succeeded
                 result = output
-                return result, None
+                return (result, None)
             else:
-                exception = _handle_exception_proxy(output)
-                return None, exception
+                # Task failed in a controlled way, and produced an `output`
+                # object which is a dictionary with required keys
+                # `exc_type_name` and `traceback_string` and with optional
+                # keys `workflow_task_order`, `workflow_task_id` and
+                # `task_name`.
+                exc_type_name = output.get("exc_type_name")
+                logger.debug(
+                    f"Output pickle contains a '{exc_type_name}' exception."
+                )
+                traceback_string = output.get("traceback_string")
+                kwargs = {
+                    key: output[key]
+                    for key in [
+                        "workflow_task_order",
+                        "workflow_task_id",
+                        "task_name",
+                    ]
+                    if key in output.keys()
+                }
+                exception = TaskExecutionError(traceback_string, **kwargs)
+                return (None, exception)
 
         except Exception as e:
             exception = JobExecutionError(f"ERROR, {str(e)}")
@@ -369,8 +393,7 @@ class BaseSlurmRunner(BaseRunner):
                     f"for {task.index=}."
                 )
                 exception = SHUTDOWN_EXCEPTION
-
-            return None, exception
+            return (None, exception)
         finally:
             Path(task.input_pickle_file_local).unlink(missing_ok=True)
             Path(task.output_pickle_file_local).unlink(missing_ok=True)
@@ -460,10 +483,10 @@ class BaseSlurmRunner(BaseRunner):
         )
         logger.info(f"[submit] END submission phase, {self.job_ids=}")
 
-        # FIXME: replace this sleep a more precise check
+        # FIXME: replace this sleep with a more precise check
         settings = Inject(get_settings)
         sleep_time = settings.FRACTAL_SLURM_INTERVAL_BEFORE_RETRIEVAL
-        logger.warning(f"[submit] Now sleep {sleep_time} (FIXME)")
+        logger.warning(f"[submit] Now sleep {sleep_time} seconds.")
         time.sleep(sleep_time)
 
         # Retrieval phase
@@ -485,7 +508,9 @@ class BaseSlurmRunner(BaseRunner):
                 for slurm_job_id in finished_job_ids:
                     logger.debug(f"[submit] Now process {slurm_job_id=}")
                     slurm_job = self.jobs.pop(slurm_job_id)
-                    self._copy_files_from_remote_to_local(slurm_job)
+                    self._copy_files_from_remote_to_local(
+                        slurm_job
+                    )  # FIXME: add prefix  # noqa
                     was_job_scancelled = slurm_job_id in scancelled_job_ids
                     result, exception = self._postprocess_single_task(
                         task=slurm_job.tasks[0],
@@ -506,7 +531,8 @@ class BaseSlurmRunner(BaseRunner):
                                 db_sync=db,
                             )
 
-            time.sleep(self.poll_interval)
+            if len(self.jobs) > 0:
+                time.sleep(self.poll_interval)
 
         logger.info("[submit] END")
         return result, exception
@@ -650,10 +676,10 @@ class BaseSlurmRunner(BaseRunner):
 
         logger.info(f"END submission phase, {self.job_ids=}")
 
-        # FIXME: replace this sleep a more precise check
+        # FIXME: replace this sleep with a more precise check
         settings = Inject(get_settings)
         sleep_time = settings.FRACTAL_SLURM_INTERVAL_BEFORE_RETRIEVAL
-        logger.warning(f"[submit] Now sleep {sleep_time} (FIXME)")
+        logger.warning(f"[submit] Now sleep {sleep_time} seconds.")
         time.sleep(sleep_time)
 
         # FIXME: Could we merge the submit/multisubmit retrieval phases?
@@ -677,7 +703,9 @@ class BaseSlurmRunner(BaseRunner):
                 for slurm_job_id in finished_job_ids:
                     logger.info(f"[multisubmit] Now process {slurm_job_id=}")
                     slurm_job = self.jobs.pop(slurm_job_id)
-                    self._copy_files_from_remote_to_local(slurm_job)
+                    self._copy_files_from_remote_to_local(
+                        slurm_job
+                    )  # FIXME: add prefix  # noqa
                     for task in slurm_job.tasks:
                         logger.info(f"[multisubmit] Now process {task.index=}")
                         was_job_scancelled = slurm_job_id in scancelled_job_ids
@@ -713,7 +741,7 @@ class BaseSlurmRunner(BaseRunner):
             time.sleep(self.poll_interval)
         return results, exceptions
 
-    def check_fractal_server_versions(self):
+    def check_fractal_server_versions(self) -> None:
         """
         Compare fractal-server versions of local/remote Python interpreters.
         """

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/app/runner/executors/slurm_common/remote.py

@@ -19,7 +19,6 @@ import os
 import sys
 from typing import Literal
 from typing import Optional
-from typing import Type
 from typing import Union
 
 import cloudpickle
@@ -27,30 +26,6 @@ import cloudpickle
 from fractal_server import __VERSION__
 
 
-class ExceptionProxy:
-    """
-    Proxy class to serialise exceptions
-
-    In general exceptions are not serialisable. This proxy class saves the
-    serialisable content of an exception. On the receiving end, it can be used
-    to reconstruct a TaskExecutionError.
-
-    Attributes:
-        exc_type_name: Name of the exception type
-        tb: TBD
-        args: TBD
-        kwargs: TBD
-    """
-
-    def __init__(
-        self, exc_type: Type[BaseException], tb: str, *args, **kwargs
-    ):
-        self.exc_type_name: str = exc_type.__name__
-        self.tb: str = tb
-        self.args = args
-        self.kwargs: dict = kwargs
-
-
 class FractalVersionMismatch(RuntimeError):
     """
     Custom exception for version mismatch
@@ -141,21 +116,32 @@ def worker(
         server_versions, fun, args, kwargs = cloudpickle.loads(indata)
         _check_versions_mismatch(server_versions)
 
-        result = True, fun(*args, **kwargs)
+        result = (True, fun(*args, **kwargs))
         out = cloudpickle.dumps(result)
     except Exception as e:
+        # Exception objects are not serialisable. Here we save the relevant
+        # exception contents in a serializable dictionary. Note that whenever
+        # the task failed "properly", the exception is a `TaskExecutionError`
+        # and it has additional attributes.
+
         import traceback
 
-        typ, value, tb = sys.exc_info()
-        tb = tb.tb_next
-        exc_proxy = ExceptionProxy(
-            typ,
-            "".join(traceback.format_exception(typ, value, tb)),
-            *e.args,
-            **e.__dict__,
+        exc_type, exc_value, traceback_obj = sys.exc_info()
+        traceback_obj = traceback_obj.tb_next
+        traceback_list = traceback.format_exception(
+            exc_type,
+            exc_value,
+            traceback_obj,
         )
-
-        result = False, exc_proxy
+        traceback_string = "".join(traceback_list)
+        exc_proxy = dict(
+            exc_type_name=exc_type.__name__,
+            traceback_string=traceback_string,
+            workflow_task_order=getattr(e, "workflow_task_order", None),
+            workflow_task_id=getattr(e, "workflow_task_id", None),
+            task_name=getattr(e, "task_name", None),
+        )
+        result = (False, exc_proxy)
         out = cloudpickle.dumps(result)
 
     # Write the output pickle file

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/app/runner/executors/slurm_ssh/runner.py

@@ -13,7 +13,6 @@ from fractal_server.syringe import Inject
 
 
 logger = set_logger(__name__)
-# FIXME: Transform several logger.info into logger.debug.
 
 
 class SlurmSSHRunner(BaseSlurmRunner):
@@ -72,15 +71,15 @@ class SlurmSSHRunner(BaseSlurmRunner):
         Transfer the jobs subfolder to the remote host.
         """
 
-        # Create compressed subfolder archive (locally)
+        # Create local archive
         tarfile_path_local = compress_folder(job.workdir_local)
-
         tarfile_name = Path(tarfile_path_local).name
         logger.info(f"Subfolder archive created at {tarfile_path_local}")
+
+        # Transfer archive
         tarfile_path_remote = (
             job.workdir_remote.parent / tarfile_name
         ).as_posix()
-        # Transfer archive
         t_0_put = time.perf_counter()
         self.fractal_ssh.send_file(
             local=tarfile_path_local,
@@ -91,7 +90,12 @@ class SlurmSSHRunner(BaseSlurmRunner):
             f"Subfolder archive transferred to {tarfile_path_remote}"
             f" - elapsed: {t_1_put - t_0_put:.3f} s"
         )
-        # Uncompress archive (remotely)
+
+        # Remove local archive
+        Path(tarfile_path_local).unlink()
+        logger.debug(f"Local archive {tarfile_path_local} removed")
+
+        # Uncompress remote archive
         tar_command = (
             f"{self.python_worker_interpreter} -m "
             "fractal_server.app.runner.extract_archive "
@@ -99,14 +103,6 @@ class SlurmSSHRunner(BaseSlurmRunner):
         )
         self.fractal_ssh.run_command(cmd=tar_command)
 
-        # Remove local version
-        t_0_rm = time.perf_counter()
-        Path(tarfile_path_local).unlink()
-        t_1_rm = time.perf_counter()
-        logger.info(
-            f"Local archive removed - elapsed: {t_1_rm - t_0_rm:.3f} s"
-        )
-
     def _get_subfolder_sftp(self, job: SlurmJob) -> None:
         """
         Fetch a remote folder via tar+sftp+tar
@@ -125,21 +121,30 @@ class SlurmSSHRunner(BaseSlurmRunner):
         try:
             rm_command = f"rm {tarfile_path_remote}"
             self.fractal_ssh.run_command(cmd=rm_command)
+            logger.info(f"Removed {tarfile_path_remote=}")
         except RuntimeError as e:
-            logger.warning(f"{tarfile_path_remote} already exists!\n {str(e)}")
+            logger.info(
+                f"Could not remove {tarfile_path_remote=}.\n"
+                f"Original error: {str(e)}"
+            )
 
         # Create remote tarfile
         # FIXME: introduce filtering by prefix, so that when the subfolder
         # includes N SLURM jobs we don't always copy the cumulative folder
         # but only the relevant part
+        t_0_tar = time.perf_counter()
         tar_command = (
             f"{self.python_worker_interpreter} "
             "-m fractal_server.app.runner.compress_folder "
             f"{job.workdir_remote.as_posix()} "
             "--remote-to-local"
         )
-        stdout = self.fractal_ssh.run_command(cmd=tar_command)
-        print(stdout)
+        self.fractal_ssh.run_command(cmd=tar_command)
+        t_1_tar = time.perf_counter()
+        logger.info(
+            f"Remote archive {tarfile_path_remote} created"
+            f" - elapsed: {t_1_tar - t_0_tar:.3f} s"
+        )
 
         # Fetch tarfile
         t_0_get = time.perf_counter()
@@ -157,9 +162,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         extract_archive(Path(tarfile_path_local))
 
         # Remove local tarfile
-        if Path(tarfile_path_local).exists():
-            logger.warning(f"Remove existing file {tarfile_path_local}.")
-            Path(tarfile_path_local).unlink()
+        Path(tarfile_path_local).unlink(missing_ok=True)
 
         t_1 = time.perf_counter()
         logger.info(f"[_get_subfolder_sftp] End - elapsed: {t_1 - t_0:.3f} s")

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/app/runner/executors/slurm_sudo/runner.py

@@ -17,7 +17,6 @@ from fractal_server.syringe import Inject
 
 
 logger = set_logger(__name__)
-# FIXME: Transform several logger.info into logger.debug.
 
 
 def _subprocess_run_or_raise(
@@ -93,7 +92,9 @@ class SudoSlurmRunner(BaseSlurmRunner):
         """
         Note: this would differ for SSH
         """
-        logger.info(f"[_copy_files_from_remote_to_local] {job.slurm_job_id=}")
+        logger.debug(
+            f"[_copy_files_from_remote_to_local] {job.slurm_job_id=} START"
+        )
         source_target_list = [
             (job.slurm_stdout_remote, job.slurm_stdout_local),
             (job.slurm_stderr_remote, job.slurm_stderr_local),
@@ -139,6 +140,9 @@ class SudoSlurmRunner(BaseSlurmRunner):
                     f"SKIP copy {source} into {target}. "
                     f"Original error: {str(e)}"
                 )
+        logger.debug(
+            f"[_copy_files_from_remote_to_local] {job.slurm_job_id=} END"
+        )
 
     def _run_remote_cmd(self, cmd: str) -> str:
         res = _run_command_as_user(

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/app/runner/task_files.py

@@ -6,8 +6,14 @@ from pydantic import BaseModel
 
 from fractal_server.string_tools import sanitize_string
 
+SUBMIT_PREFIX = "non_par"
+MULTISUBMIT_PREFIX = "par"
+
 
-def task_subfolder_name(order: Union[int, str], task_name: str) -> str:
+def task_subfolder_name(
+    order: Union[int, str],
+    task_name: str,
+) -> str:
     """
     Get name of task-specific subfolder.
 
@@ -21,7 +27,15 @@ def task_subfolder_name(order: Union[int, str], task_name: str) -> str:
 
 class TaskFiles(BaseModel):
     """
-    Group all file paths pertaining to a task     FIXME
+    Files related to a task.
+
+    Attributes:
+        root_dir_local:
+        root_dir_remote:
+        task_name:
+        task_order:
+        component:
+        prefix:
     """
 
     # Parent directory
@@ -114,7 +128,3 @@ class TaskFiles(BaseModel):
             metadiff_file_remote=self.metadiff_file_remote,
             log_file_remote=self.log_file_remote,
         )
-
-
-SUBMIT_PREFIX = "non_par"
-MULTISUBMIT_PREFIX = "par"

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/tasks/v2/local/collect.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Optional
 
-from ..utils_database import create_db_tasks_and_update_task_group
+from ..utils_database import create_db_tasks_and_update_task_group_sync
 from ._utils import _customize_and_run_template
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models.v2 import TaskGroupActivityV2
@@ -233,7 +233,7 @@ def collect_local(
                 activity = add_commit_refresh(obj=activity, db=db)
 
                 logger.info("create_db_tasks_and_update_task_group - " "start")
-                create_db_tasks_and_update_task_group(
+                create_db_tasks_and_update_task_group_sync(
                     task_list=task_list,
                     task_group_id=task_group.id,
                     db=db,

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/tasks/v2/ssh/collect.py

@@ -6,7 +6,7 @@ from typing import Optional
 
 from ..utils_background import _prepare_tasks_metadata
 from ..utils_background import fail_and_cleanup
-from ..utils_database import create_db_tasks_and_update_task_group
+from ..utils_database import create_db_tasks_and_update_task_group_sync
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
@@ -265,7 +265,7 @@ def collect_ssh(
                 logger.info("_prepare_tasks_metadata - end")
 
                 logger.info("create_db_tasks_and_update_task_group - " "start")
-                create_db_tasks_and_update_task_group(
+                create_db_tasks_and_update_task_group_sync(
                     task_list=task_list,
                     task_group_id=task_group.id,
                     db=db,

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/fractal_server/tasks/v2/utils_database.py

@@ -1,3 +1,4 @@
+from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session as DBSyncSession
 
 from fractal_server.app.models.v2 import TaskGroupV2
@@ -5,7 +6,7 @@ from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.schemas.v2 import TaskCreateV2
 
 
-def create_db_tasks_and_update_task_group(
+def create_db_tasks_and_update_task_group_sync(
     *,
     task_group_id: int,
     task_list: list[TaskCreateV2],
@@ -30,3 +31,30 @@ def create_db_tasks_and_update_task_group(
     db.refresh(task_group)
 
     return task_group
+
+
+async def create_db_tasks_and_update_task_group_async(
+    *,
+    task_group_id: int,
+    task_list: list[TaskCreateV2],
+    db: AsyncSession,
+) -> TaskGroupV2:
+    """
+    Create a `TaskGroupV2` with N `TaskV2`s, and insert them into the database.
+
+    Arguments:
+        task_group_id: ID of an existing `TaskGroupV2` object.
+        task_list: List of `TaskCreateV2` objects to be inserted into the db.
+        db: Synchronous database session
+
+    Returns:
+        Updated `TaskGroupV2` object.
+    """
+    actual_task_list = [TaskV2(**task.model_dump()) for task in task_list]
+    task_group = await db.get(TaskGroupV2, task_group_id)
+    task_group.task_list = actual_task_list
+    db.add(task_group)
+    await db.commit()
+    await db.refresh(task_group)
+
+    return task_group

{fractal_server-2.14.0a18 → fractal_server-2.14.0a20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.14.0a18"
+version = "2.14.0a20"
 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.0a18"
+current_version = "2.14.0a20"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.14.0a18/fractal_server/__init__.py

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