fractal-server 2.14.0a26__py3-none-any.whl → 2.14.0a27__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- fractal_server/__init__.py +1 -1
- fractal_server/app/runner/v2/runner_functions.py +11 -9
- {fractal_server-2.14.0a26.dist-info → fractal_server-2.14.0a27.dist-info}/METADATA +1 -1
- {fractal_server-2.14.0a26.dist-info → fractal_server-2.14.0a27.dist-info}/RECORD +7 -7
- {fractal_server-2.14.0a26.dist-info → fractal_server-2.14.0a27.dist-info}/LICENSE +0 -0
- {fractal_server-2.14.0a26.dist-info → fractal_server-2.14.0a27.dist-info}/WHEEL +0 -0
- {fractal_server-2.14.0a26.dist-info → fractal_server-2.14.0a27.dist-info}/entry_points.txt +0 -0
fractal_server/__init__.py
CHANGED
@@ -1 +1 @@
|
|
1
|
-
__VERSION__ = "2.14.
|
1
|
+
__VERSION__ = "2.14.0a27"
|
@@ -406,7 +406,7 @@ def run_v2_task_compound(
|
|
406
406
|
db.add(history_unit)
|
407
407
|
db.commit()
|
408
408
|
db.refresh(history_unit)
|
409
|
-
|
409
|
+
init_history_unit_id = history_unit.id
|
410
410
|
# Create one `HistoryImageCache` for each input image
|
411
411
|
bulk_upsert_image_cache_fast(
|
412
412
|
db=db,
|
@@ -415,7 +415,7 @@ def run_v2_task_compound(
|
|
415
415
|
workflowtask_id=wftask.id,
|
416
416
|
dataset_id=dataset_id,
|
417
417
|
zarr_url=zarr_url,
|
418
|
-
latest_history_unit_id=
|
418
|
+
latest_history_unit_id=init_history_unit_id,
|
419
419
|
)
|
420
420
|
for zarr_url in input_image_zarr_urls
|
421
421
|
],
|
@@ -431,7 +431,7 @@ def run_v2_task_compound(
|
|
431
431
|
parameters=function_kwargs,
|
432
432
|
task_type=task_type,
|
433
433
|
task_files=task_files_init,
|
434
|
-
history_unit_id=
|
434
|
+
history_unit_id=init_history_unit_id,
|
435
435
|
config=runner_config_init,
|
436
436
|
)
|
437
437
|
|
@@ -459,7 +459,7 @@ def run_v2_task_compound(
|
|
459
459
|
# Mark the init-task `HistoryUnit` as "done"
|
460
460
|
with next(get_sync_db()) as db:
|
461
461
|
update_status_of_history_unit(
|
462
|
-
history_unit_id=
|
462
|
+
history_unit_id=init_history_unit_id,
|
463
463
|
status=HistoryUnitStatus.DONE,
|
464
464
|
db_sync=db,
|
465
465
|
)
|
@@ -470,7 +470,7 @@ def run_v2_task_compound(
|
|
470
470
|
if len(parallelization_list) == 0:
|
471
471
|
with next(get_sync_db()) as db:
|
472
472
|
update_status_of_history_unit(
|
473
|
-
history_unit_id=
|
473
|
+
history_unit_id=init_history_unit_id,
|
474
474
|
status=HistoryUnitStatus.DONE,
|
475
475
|
db_sync=db,
|
476
476
|
)
|
@@ -541,7 +541,7 @@ def run_v2_task_compound(
|
|
541
541
|
config=runner_config_compute,
|
542
542
|
)
|
543
543
|
|
544
|
-
|
544
|
+
compute_outcomes: dict[int, SubmissionOutcome] = {}
|
545
545
|
failure = False
|
546
546
|
for ind in range(len(list_function_kwargs)):
|
547
547
|
if ind not in results.keys() and ind not in exceptions.keys():
|
@@ -552,10 +552,12 @@ def run_v2_task_compound(
|
|
552
552
|
)
|
553
553
|
logger.error(error_msg)
|
554
554
|
raise RuntimeError(error_msg)
|
555
|
-
|
555
|
+
compute_outcomes[ind] = _process_task_output(
|
556
556
|
result=results.get(ind, None),
|
557
557
|
exception=exceptions.get(ind, None),
|
558
558
|
)
|
559
|
+
if compute_outcomes[ind].exception is not None:
|
560
|
+
failure = True
|
559
561
|
|
560
562
|
# NOTE: For compound tasks, we update `HistoryUnit.status` from here,
|
561
563
|
# rather than within the submit/multisubmit runner methods. This is
|
@@ -564,7 +566,7 @@ def run_v2_task_compound(
|
|
564
566
|
with next(get_sync_db()) as db:
|
565
567
|
if failure:
|
566
568
|
bulk_update_status_of_history_unit(
|
567
|
-
history_unit_ids=history_unit_ids,
|
569
|
+
history_unit_ids=history_unit_ids + [init_history_unit_id],
|
568
570
|
status=HistoryUnitStatus.FAILED,
|
569
571
|
db_sync=db,
|
570
572
|
)
|
@@ -575,4 +577,4 @@ def run_v2_task_compound(
|
|
575
577
|
db_sync=db,
|
576
578
|
)
|
577
579
|
|
578
|
-
return
|
580
|
+
return compute_outcomes, num_tasks
|
@@ -1,4 +1,4 @@
|
|
1
|
-
fractal_server/__init__.py,sha256=
|
1
|
+
fractal_server/__init__.py,sha256=CloicZW6sLyhonlS5tDSm-UfO9_zirGQq16Kn8P5ek0,26
|
2
2
|
fractal_server/__main__.py,sha256=rkM8xjY1KeS3l63irB8yCrlVobR-73uDapC4wvrIlxI,6957
|
3
3
|
fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
|
4
4
|
fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -102,7 +102,7 @@ fractal_server/app/runner/v2/db_tools.py,sha256=Ots6-Da7A_5yetSYrUGi-_yV-2r21Nc6
|
|
102
102
|
fractal_server/app/runner/v2/deduplicate_list.py,sha256=IVTE4abBU1bUprFTkxrTfYKnvkNTanWQ-KWh_etiT08,645
|
103
103
|
fractal_server/app/runner/v2/merge_outputs.py,sha256=D1L4Taieq9i71SPQyNc1kMokgHh-sV_MqF3bv7QMDBc,907
|
104
104
|
fractal_server/app/runner/v2/runner.py,sha256=sbBOH5gCErxK0fCPPGBWtLtqsSwtmrhTth5OLUGMeZQ,15658
|
105
|
-
fractal_server/app/runner/v2/runner_functions.py,sha256=
|
105
|
+
fractal_server/app/runner/v2/runner_functions.py,sha256=FsUkgnVC2Wb_YJzzMf_pAgVAwjfEGi6p6r4WLHtv-sw,17807
|
106
106
|
fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=9t1CHN3EyfsGRWfG257YPY5WjQ6zuztsw_KZrpEAFPo,3703
|
107
107
|
fractal_server/app/runner/v2/submit_workflow.py,sha256=EDUyUuIPwZHb2zm7SCRRoFsGq2cN-b5OKw6CYkZ8kWk,13048
|
108
108
|
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
|
|
208
208
|
fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
|
209
209
|
fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
|
210
210
|
fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
|
211
|
-
fractal_server-2.14.
|
212
|
-
fractal_server-2.14.
|
213
|
-
fractal_server-2.14.
|
214
|
-
fractal_server-2.14.
|
215
|
-
fractal_server-2.14.
|
211
|
+
fractal_server-2.14.0a27.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
|
212
|
+
fractal_server-2.14.0a27.dist-info/METADATA,sha256=C4cH5dZP3XZ1XpieeG5pOdYq24CGuSRrMkwXeUN6_BY,4563
|
213
|
+
fractal_server-2.14.0a27.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
|
214
|
+
fractal_server-2.14.0a27.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
|
215
|
+
fractal_server-2.14.0a27.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|