fractal-server 2.15.8__py3-none-any.whl → 2.15.9__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.15.8"
+__VERSION__ = "2.15.9"

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

@@ -354,21 +354,21 @@ async def get_history_images(
     # Setup prefix for logging
     prefix = f"[DS{dataset.id}-WFT{workflowtask_id}-images]"
 
-    # (1) Apply type filters
-    type_filtered_images = filter_image_list(
-        images=dataset.images,
-        type_filters=request_body.type_filters,
-    )
-
-    # (2) Extract valid values for attributes and types
-    attributes = aggregate_attributes(type_filtered_images)
+    # (1) Extract valid values for attributes and types
+    types = aggregate_types(dataset.images)
+    attributes = aggregate_attributes(dataset.images)
     attributes[IMAGE_STATUS_KEY] = [
         HistoryUnitStatusWithUnset.DONE,
         HistoryUnitStatusWithUnset.SUBMITTED,
         HistoryUnitStatusWithUnset.FAILED,
         HistoryUnitStatusWithUnset.UNSET,
     ]
-    types = aggregate_types(type_filtered_images)
+
+    # (2) Apply type filters
+    type_filtered_images = filter_image_list(
+        images=dataset.images,
+        type_filters=request_body.type_filters,
+    )
 
     # (3) Enrich images with status attribute
     type_filtered_images_with_status = await enrich_images_unsorted_async(

fractal_server/images/tools.py

@@ -131,8 +131,8 @@ def aggregate_attributes(images: list[dict[str, Any]]) -> dict[str, list[Any]]:
     for image in images:
         for k, v in image["attributes"].items():
             attributes.setdefault(k, []).append(v)
-        for k, v in attributes.items():
-            attributes[k] = list(set(v))
+    for k, v in attributes.items():
+        attributes[k] = list(set(v))
     sorted_attributes = {
         key: sorted(value) for key, value in attributes.items()
     }

{fractal_server-2.15.8.dist-info → fractal_server-2.15.9.dist-info}/METADATA

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

{fractal_server-2.15.8.dist-info → fractal_server-2.15.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=eybsCSXKOGknxAUjcGaSuqucfMoHoV6kgH5_eHJcYyQ,23
+fractal_server/__init__.py,sha256=Gvh-OyCbsn-ww63peFcKRjQRDTKP9siJQsqqO9Y34W0,23
 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
@@ -37,7 +37,7 @@ fractal_server/app/routes/api/v2/_aux_functions_task_version_update.py,sha256=PK
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=sjlhv6LliDvhttVTjC2xhIFO-Vj3roE3bEv7_TZ1h0A,12494
 fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=8x1_q9FyCzItnPmdSdLQuwUTy4B9xCsXscp97_lJcpM,4635
 fractal_server/app/routes/api/v2/dataset.py,sha256=6u4MFqJ3YZ0Zq6Xx8CRMrTPKW55ZaR63Uno21DqFr4Q,8889
-fractal_server/app/routes/api/v2/history.py,sha256=03QPe08pyy-NWEe21NVKprsLgqxljQO4gMZ8plt9wys,17112
+fractal_server/app/routes/api/v2/history.py,sha256=EUD_Gdqzj1GwcB6cKqwP2ULxmRer-TqcAu4sPylIx4E,17100
 fractal_server/app/routes/api/v2/images.py,sha256=amQz2uoaeSSuUeYfjfQ_zyEak6h_F7KSgI5RM81cqDI,7864
 fractal_server/app/routes/api/v2/job.py,sha256=8xRTwh_OCHmK9IfI_zUASa2ozewR0qu0zVBl_a4IvHw,6467
 fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=AEN6w2X5kCkSpZydudvuTPhl_VZUQ4zUav6D3NiF6r8,4935
@@ -138,7 +138,7 @@ fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_
 fractal_server/images/__init__.py,sha256=-_wjoKtSX02P1KjDxDP_EXKvmbONTRmbf7iGVTsyBpM,154
 fractal_server/images/models.py,sha256=6WchcIzLLLwdkLNRfg71Dl4Y-9UFLPyrrzh1lWgjuP0,1245
 fractal_server/images/status_tools.py,sha256=KICcThwHniHNkDftzJmK_n2gQK2IeTKlR_PFAesf204,4912
-fractal_server/images/tools.py,sha256=92kmt2Fnyp8ycTbyuar9_U8kJTi0wKpBk8ZagARWl9Y,4177
+fractal_server/images/tools.py,sha256=nhkp_7bBI6pmJpqbg1s7xjoZKW5S4aNInkym5ntvJYA,4169
 fractal_server/logger.py,sha256=QIeVn3QpZsiIL2jDdrKotr-MLyDcZYgiPiTluFU46lE,5317
 fractal_server/main.py,sha256=0lh7JQGt7e6wekLHzhiSWURKzkE8GeRz6lhlCWjF8Ho,4560
 fractal_server/migrations/env.py,sha256=nfyBpMIOT3kny6t-b-tUjyRjZ4k906bb1_wCQ7me1BI,1353
@@ -230,8 +230,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=Vn35lApt1T1J8nc09sAVqd10Cy0sa3dLipcljI-hkuk,2185
 fractal_server/zip_tools.py,sha256=H0w7wS5yE4ebj7hw1_77YQ959dl2c-L0WX6J_ro1TY4,4884
-fractal_server-2.15.8.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.15.8.dist-info/METADATA,sha256=rCOwXnSjjBclcc6-qtpSeGkHxWtfyaE3Iglq7grOi1Y,4334
-fractal_server-2.15.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-fractal_server-2.15.8.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.15.8.dist-info/RECORD,,
+fractal_server-2.15.9.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.15.9.dist-info/METADATA,sha256=TRPQhHKsxpbePglpT_A3xYW2QC-3OCJr5GmeOIIBB1I,4334
+fractal_server-2.15.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+fractal_server-2.15.9.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.15.9.dist-info/RECORD,,