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

fractal_server/__init__.py

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

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

@@ -248,7 +248,7 @@ class BaseSlurmRunner(BaseRunner):
 
         # Always print output of `uname -n` and `pwd`
         script_lines.append('\necho "Hostname: $(uname -n)"')
-        script_lines.append('echo "Current directory : $(pwd)"')
+        script_lines.append('echo "Current directory: $(pwd)"')
         script_lines.append(
             'echo "Start time: $(date +"%Y-%m-%dT%H:%M:%S%z")"'
         )

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

@@ -137,7 +137,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         self.fractal_ssh.run_command(cmd=tar_command)
         t_1_tar = time.perf_counter()
         logger.info(
-            f"Remote archive {tarfile_path_remote} created"
+            f"[_fetch_artifacts] Remote archive {tarfile_path_remote} created"
             f" - elapsed: {t_1_tar - t_0_tar:.3f} s"
         )
 
@@ -149,7 +149,8 @@ class SlurmSSHRunner(BaseSlurmRunner):
         )
         t_1_get = time.perf_counter()
         logger.info(
-            f"Subfolder archive transferred back to {tarfile_path_local}"
+            "[_fetch_artifacts] Subfolder archive transferred back "
+            f"to {tarfile_path_local}"
             f" - elapsed: {t_1_get - t_0_get:.3f} s"
         )
 
@@ -160,7 +161,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         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")
+        logger.info(f"[_fetch_artifacts] End - elapsed: {t_1 - t_0:.3f} s")
 
     def _send_inputs(self, jobs: list[SlurmJob]) -> None:
         """

fractal_server/app/runner/v2/runner_functions.py

@@ -406,7 +406,7 @@ def run_v2_task_compound(
         db.add(history_unit)
         db.commit()
         db.refresh(history_unit)
-        history_unit_id = history_unit.id
+        init_history_unit_id = history_unit.id
         # Create one `HistoryImageCache` for each input image
         bulk_upsert_image_cache_fast(
             db=db,
@@ -415,7 +415,7 @@ def run_v2_task_compound(
                     workflowtask_id=wftask.id,
                     dataset_id=dataset_id,
                     zarr_url=zarr_url,
-                    latest_history_unit_id=history_unit_id,
+                    latest_history_unit_id=init_history_unit_id,
                 )
                 for zarr_url in input_image_zarr_urls
             ],
@@ -431,7 +431,7 @@ def run_v2_task_compound(
         parameters=function_kwargs,
         task_type=task_type,
         task_files=task_files_init,
-        history_unit_id=history_unit_id,
+        history_unit_id=init_history_unit_id,
         config=runner_config_init,
     )
 
@@ -459,7 +459,7 @@ def run_v2_task_compound(
     # 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,
+            history_unit_id=init_history_unit_id,
             status=HistoryUnitStatus.DONE,
             db_sync=db,
         )
@@ -470,7 +470,7 @@ def run_v2_task_compound(
     if len(parallelization_list) == 0:
         with next(get_sync_db()) as db:
             update_status_of_history_unit(
-                history_unit_id=history_unit_id,
+                history_unit_id=init_history_unit_id,
                 status=HistoryUnitStatus.DONE,
                 db_sync=db,
             )
@@ -525,30 +525,6 @@ def run_v2_task_compound(
         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(
@@ -565,7 +541,7 @@ def run_v2_task_compound(
         config=runner_config_compute,
     )
 
-    init_outcome = {}
+    compute_outcomes: dict[int, SubmissionOutcome] = {}
     failure = False
     for ind in range(len(list_function_kwargs)):
         if ind not in results.keys() and ind not in exceptions.keys():
@@ -576,10 +552,12 @@ def run_v2_task_compound(
             )
             logger.error(error_msg)
             raise RuntimeError(error_msg)
-        init_outcome[ind] = _process_task_output(
+        compute_outcomes[ind] = _process_task_output(
             result=results.get(ind, None),
             exception=exceptions.get(ind, None),
         )
+        if compute_outcomes[ind].exception is not None:
+            failure = True
 
     # NOTE: For compound tasks, we update `HistoryUnit.status` from here,
     # rather than within the submit/multisubmit runner methods. This is
@@ -588,7 +566,7 @@ def run_v2_task_compound(
     with next(get_sync_db()) as db:
         if failure:
             bulk_update_status_of_history_unit(
-                history_unit_ids=history_unit_ids,
+                history_unit_ids=history_unit_ids + [init_history_unit_id],
                 status=HistoryUnitStatus.FAILED,
                 db_sync=db,
             )
@@ -599,4 +577,4 @@ def run_v2_task_compound(
                 db_sync=db,
             )
 
-    return init_outcome, num_tasks
+    return compute_outcomes, num_tasks

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

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

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

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=-f2VHfuQvx-Yc-jvt6EsRwtcTp8dlvFHklFmfIV52Oo,26
+fractal_server/__init__.py,sha256=CloicZW6sLyhonlS5tDSm-UfO9_zirGQq16Kn8P5ek0,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
@@ -78,13 +78,13 @@ fractal_server/app/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa
 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=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/base_slurm_runner.py,sha256=vF2lAUgO7vbK9pR1Jd2dFsimO45ccw2OeJTJ0z1YWwQ,30729
 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=tHdgSnEzIZAFvq23UcA8zBndDemMU0cdwW4R4VZfIfA,7137
+fractal_server/app/runner/executors/slurm_ssh/runner.py,sha256=ULQYW8A12BwC4GK2_2RhS33DFOFJewZoxS6vn_80z8c,7187
 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
@@ -102,7 +102,7 @@ fractal_server/app/runner/v2/db_tools.py,sha256=Ots6-Da7A_5yetSYrUGi-_yV-2r21Nc6
 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=sbBOH5gCErxK0fCPPGBWtLtqsSwtmrhTth5OLUGMeZQ,15658
-fractal_server/app/runner/v2/runner_functions.py,sha256=QZYmU-3mHgS4Jx73JQzsjm2HQP4j1w2oTDswH9neA84,18580
+fractal_server/app/runner/v2/runner_functions.py,sha256=FsUkgnVC2Wb_YJzzMf_pAgVAwjfEGi6p6r4WLHtv-sw,17807
 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
@@ -208,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.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,,
+fractal_server-2.14.0a27.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.0a27.dist-info/METADATA,sha256=C4cH5dZP3XZ1XpieeG5pOdYq24CGuSRrMkwXeUN6_BY,4563
+fractal_server-2.14.0a27.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.0a27.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.0a27.dist-info/RECORD,,