fractal-server 2.14.0a4__py3-none-any.whl → 2.14.0a5__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.0a4"
+__VERSION__ = "2.14.0a5"

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

@@ -270,30 +270,39 @@ async def get_history_images(
     # FIXME reduce logging?
     prefix = f"[DS{dataset.id}-WFT{wftask.id}-images]"
 
-    # Reconstruct type filters by going through the workflow task list
-    latest_type_filters = {}
-    for current_wftask in workflow.task_list[0 : wftask.order + 1]:
-        patch = merge_type_filters(
-            wftask_type_filters=current_wftask.type_filters,
-            task_input_types=current_wftask.task.input_types,
-        )
-        latest_type_filters.update(patch)
-    logger.debug(f"{prefix} {latest_type_filters=}")
-
-    # Get all matching images from the dataset
+    # (1) Get the type-filtered list of dataset images
+
+    # (1A) Reconstruct dataset type filters by starting from {} and making
+    # incremental updates with `output_types` of all previous tasks
+    inferred_dataset_type_filters = {}
+    for current_wftask in workflow.task_list[0 : wftask.order]:
+        inferred_dataset_type_filters.update(current_wftask.task.output_types)
+    logger.debug(f"{prefix} {inferred_dataset_type_filters=}")
+    # (1B) Compute type filters for the current wftask
+    type_filters_patch = merge_type_filters(
+        task_input_types=wftask.task.input_types,
+        wftask_type_filters=wftask.type_filters,
+    )
+    logger.debug(f"{prefix} {type_filters_patch=}")
+    # (1C) Combine dataset type filters (lower priority) and current-wftask
+    # filters (higher priority)
+    actual_filters = inferred_dataset_type_filters
+    actual_filters.update(type_filters_patch)
+    logger.debug(f"{prefix} {actual_filters=}")
+    # (1D) Get all matching images from the dataset
     filtered_dataset_images = filter_image_list(
         images=dataset.images,
-        type_filters=latest_type_filters,
+        type_filters=inferred_dataset_type_filters,
     )
     logger.debug(f"{prefix} {len(dataset.images)=}")
     logger.debug(f"{prefix} {len(filtered_dataset_images)=}")
-
+    # (1E) Extract the list of URLs for filtered images
     filtered_dataset_images_url = list(
         img["zarr_url"] for img in filtered_dataset_images
     )
-    logger.debug(f"{prefix} {len(filtered_dataset_images_url)=}")
 
-    # Get pairs (zarr_url,status) for all processed images
+    # (2) Get `(zarr_url, status)` pairs for all images that have already
+    # been processed
     res = await db.execute(
         select(HistoryImageCache.zarr_url, HistoryUnit.status)
         .join(HistoryUnit)
@@ -306,8 +315,7 @@ async def get_history_images(
     list_processed_url_status = res.all()
     logger.debug(f"{prefix} {len(list_processed_url_status)=}")
 
-    # Further processing
-
+    # (3) Combine outputs from 1 and 2
     list_processed_url = list(item[0] for item in list_processed_url_status)
     logger.debug(f"{prefix} {len(list_processed_url)=}")
 

{fractal_server-2.14.0a4.dist-info → fractal_server-2.14.0a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.14.0a4
+Version: 2.14.0a5
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.14.0a4.dist-info → fractal_server-2.14.0a5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=7tAxXkNvimqYIX0U_oeIYOmpP_2NjEN3fI6It2ac4-s,25
+fractal_server/__init__.py,sha256=sgDDrxOsUDy3zySCXrYF7VhRC9RtP4pGuCH4ssm1pn0,25
 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
@@ -38,7 +38,7 @@ fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=dGr9mhuE1kJPx8
 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=osoWJIA5SZH4aAr-0TG6Uc3877wzsgCLB_Oek59hRjk,9230
-fractal_server/app/routes/api/v2/history.py,sha256=GPok8bYnagGPjNmoHvdLm2h-lirsd2ROUlMt2OjIoKM,12911
+fractal_server/app/routes/api/v2/history.py,sha256=UInNe9u22GYmh4rCYQe_LrVBGNOFNCbETVgdmZsHKRw,13485
 fractal_server/app/routes/api/v2/images.py,sha256=wUhYomNLGtJTtu_pD2oQorcH2LISxo64Wxo6ogc4IXc,8185
 fractal_server/app/routes/api/v2/job.py,sha256=m89FTh9Px25oXCeWj2k2NdGWQaO2oxMh-6lZppcsJOY,5551
 fractal_server/app/routes/api/v2/project.py,sha256=hMvL9QLPUcAAiPGy6ta2LBLTVRozJsfvBPl5D06_MHg,6666
@@ -205,8 +205,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.0a4.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.0a4.dist-info/METADATA,sha256=dnHmj3wrxhQa2uhKzb4A9tJ2sSWtvj6kPEiTSO26NBQ,4550
-fractal_server-2.14.0a4.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.14.0a4.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.0a4.dist-info/RECORD,,
+fractal_server-2.14.0a5.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.0a5.dist-info/METADATA,sha256=djodNy0t50zMf_TwN0uyw2tcP4nNfxxOm0g0rUbykUM,4550
+fractal_server-2.14.0a5.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+fractal_server-2.14.0a5.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.0a5.dist-info/RECORD,,