fractal-server 2.14.0a29__py3-none-any.whl → 2.14.0a31__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.0a29"
+__VERSION__ = "2.14.0a31"

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

@@ -142,11 +142,6 @@ async def get_workflow_tasks_statuses(
                 value["num_available_images"] = None
         new_response[key] = value
 
-    for wftask in workflow.task_list:
-        logger.debug(
-            f"({dataset_id=}, {wftask.id=}): {new_response[wftask.id]}"
-        )
-
     return JSONResponse(content=new_response, status_code=200)
 
 

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

@@ -10,6 +10,7 @@ from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_active_user
+from fractal_server.images.tools import aggregate_types
 from fractal_server.images.tools import filter_image_list
 
 router = APIRouter()
@@ -42,12 +43,8 @@ async def verify_unique_types(
             type_filters=query.type_filters,
         )
 
-    # NOTE: see issue 2486
-    available_types = set(
-        _type for _img in filtered_images for _type in _img["types"].keys()
-    )
-
     # Get actual values for each available type
+    available_types = aggregate_types(filtered_images)
     values_per_type: dict[str, set] = {
         _type: set() for _type in available_types
     }

fractal_server/app/runner/v2/runner.py

@@ -130,10 +130,6 @@ def execute_tasks_v2(
             db.commit()
             db.refresh(history_run)
             history_run_id = history_run.id
-            logger.debug(
-                "[execute_tasks_v2] Created `HistoryRun` with "
-                f"{history_run_id=}."
-            )
 
         # TASK EXECUTION (V2)
         if task.type in ["non_parallel", "converter_non_parallel"]:

fractal_server/app/runner/v2/runner_functions.py

@@ -480,14 +480,6 @@ 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=init_history_unit_id,
-            status=HistoryUnitStatus.DONE,
-            db_sync=db,
-        )
-
     # 3/B: parallel part of a compound task
     _check_parallelization_list_size(parallelization_list)
 
@@ -601,7 +593,7 @@ def run_v2_task_compound(
         else:
             bulk_update_status_of_history_unit(
                 history_unit_ids=history_unit_ids,
-                status=HistoryUnitStatus.DONE,
+                status=HistoryUnitStatus.DONE + [init_history_unit_id],
                 db_sync=db,
             )
 

{fractal_server-2.14.0a29.dist-info → fractal_server-2.14.0a31.dist-info}/METADATA

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

{fractal_server-2.14.0a29.dist-info → fractal_server-2.14.0a31.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=kUL0dbn6Xeh51ncedqHsdAUJ9AyGZJ6Jg5xDra2AQec,26
+fractal_server/__init__.py,sha256=AP6Ge4A5_FJX881ADkuAqQ-e7MqAvMKtIIALfLociC4,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
@@ -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=SljYnMClbSTz3Rs42ELYKHdtiAr9pxn8nkEHoXEOAnc,17936
+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
@@ -47,7 +47,7 @@ fractal_server/app/routes/api/v2/task_collection.py,sha256=IDNF6sjDuU37HIQ0TuQA-
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=totsl0DOC2DFLw8vgqOFivvftpEk3KbFDeOHT0UVQUs,5997
 fractal_server/app/routes/api/v2/task_group.py,sha256=62zcVTdheXM5V3WmFuqisIqgETjXmZaRpNMcDX5bXS0,7408
 fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=3o9bCC8ubMwffQPPaxQZy-CjH9IB2RkIReIecI6L2_w,9300
-fractal_server/app/routes/api/v2/verify_image_types.py,sha256=zGT1el58P-E7dVttyuo6MdCC0DtsxiP-NqMawl6EpGE,1950
+fractal_server/app/routes/api/v2/verify_image_types.py,sha256=RBi6-3Sp1wYm_obDPRcEBtLvRfsRknufbZyhGGHVo6I,1924
 fractal_server/app/routes/api/v2/workflow.py,sha256=sW6Nm7dfzUY354hawyEkpQHy7rUvV2FCV8DPorH-TDU,10270
 fractal_server/app/routes/api/v2/workflow_import.py,sha256=INmnhlMEBJp-vHPR0f940DANPmIidts3OfcooeM_aNA,11205
 fractal_server/app/routes/api/v2/workflowtask.py,sha256=7_syX2EO7ibF6Xkm7HBPhsUYq6aYnKNeC5iSaafQhG4,11342
@@ -101,8 +101,8 @@ fractal_server/app/runner/v2/_slurm_sudo.py,sha256=TVihkQKMX6YWEWxXJjQo0WEQOjVy7
 fractal_server/app/runner/v2/db_tools.py,sha256=du5dKhMMFMErQXbGIgu9JvO_vtMensodyPsyDeqz1yQ,3324
 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=aNMPABdTS9kJADL2JUeRNI6Ir-gDFTOnRI2tFRohjOU,15848
-fractal_server/app/runner/v2/runner_functions.py,sha256=X8veuvIxoEYEhQTOqGHv7FIYFiu8MbrH__YOjV_7WU4,18745
+fractal_server/app/runner/v2/runner.py,sha256=B4kAF1S-zHf2PbyHedfuiaNpu4oslVDp33KgXYcoXIk,15706
+fractal_server/app/runner/v2/runner_functions.py,sha256=a7pmlFrtQ9f42NVwHUwiS_3rVwtaLeR0l3zastvn2jk,18518
 fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=_h_OOffq3d7V0uHa8Uvs0mj31y1GSZBUXjDDF3WjVjY,3620
 fractal_server/app/runner/v2/submit_workflow.py,sha256=QywUGIoHAHnrWgfnyX8W9kVqKY-RvVyNLpzrbsXZOZ4,13075
 fractal_server/app/runner/v2/task_interface.py,sha256=IXdQTI8rXFgXv1Ez0js4CjKFf3QwO2GCHRTuwiFtiTQ,2891
@@ -209,8 +209,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.0a29.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.0a29.dist-info/METADATA,sha256=3i4Ng70jNwtP8x-LM_n5OI02RsO6kqtfijb-iKYuVR8,4563
-fractal_server-2.14.0a29.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.0a29.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.0a29.dist-info/RECORD,,
+fractal_server-2.14.0a31.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.0a31.dist-info/METADATA,sha256=gWthjo3HdoO6koOD4uwA7A7LyDXuNPDHFvGYHhHwh20,4563
+fractal_server-2.14.0a31.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.0a31.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.0a31.dist-info/RECORD,,