fractal-server 2.14.14__py3-none-any.whl → 2.14.15__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.14"
+__VERSION__ = "2.14.15"

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

@@ -4,7 +4,6 @@ from fastapi import status
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel
 from pydantic import Field
-from sqlmodel import select
 
 from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_workflow_task_check_owner
@@ -12,11 +11,11 @@ from .images import ImageQuery
 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.models.v2 import HistoryImageCache
-from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.routes.auth import current_active_user
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskType
+from fractal_server.images.status_tools import enrich_images_async
+from fractal_server.images.status_tools import IMAGE_STATUS_KEY
 from fractal_server.images.tools import aggregate_types
 from fractal_server.images.tools import filter_image_list
 from fractal_server.types import AttributeFilters
@@ -31,6 +30,7 @@ router = APIRouter()
 async def verify_unique_types(
     project_id: int,
     dataset_id: int,
+    workflowtask_id: int,
     query: ImageQuery | None = None,
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
@@ -45,8 +45,17 @@ async def verify_unique_types(
     if query is None:
         filtered_images = dataset.images
     else:
+        if IMAGE_STATUS_KEY in query.attribute_filters.keys():
+            images = await enrich_images_async(
+                dataset_id=dataset_id,
+                workflowtask_id=workflowtask_id,
+                images=dataset.images,
+                db=db,
+            )
+        else:
+            images = dataset.images
         filtered_images = filter_image_list(
-            images=dataset.images,
+            images=images,
             attribute_filters=query.attribute_filters,
             type_filters=query.type_filters,
         )
@@ -78,7 +87,7 @@ class NonProcessedImagesPayload(BaseModel):
     "/project/{project_id}/dataset/{dataset_id}/images/non-processed/",
     status_code=status.HTTP_200_OK,
 )
-async def check_workflowtask(
+async def check_non_processed_images(
     project_id: int,
     dataset_id: int,
     workflow_id: int,
@@ -125,19 +134,16 @@ async def check_workflowtask(
         attribute_filters=filters.attribute_filters,
     )
 
-    filtered_zarr_urls = [image["zarr_url"] for image in filtered_images]
-
-    res = await db.execute(
-        select(HistoryImageCache.zarr_url)
-        .join(HistoryUnit)
-        .where(HistoryImageCache.zarr_url.in_(filtered_zarr_urls))
-        .where(HistoryImageCache.dataset_id == dataset_id)
-        .where(HistoryImageCache.workflowtask_id == previous_wft.id)
-        .where(HistoryImageCache.latest_history_unit_id == HistoryUnit.id)
-        .where(HistoryUnit.status == HistoryUnitStatus.DONE)
+    filtered_images_with_status = await enrich_images_async(
+        dataset_id=dataset_id,
+        workflowtask_id=previous_wft.id,
+        images=filtered_images,
+        db=db,
     )
-    done_zarr_urls = res.scalars().all()
-
-    missing_zarr_urls = list(set(filtered_zarr_urls) - set(done_zarr_urls))
+    missing_zarr_urls = [
+        img["zarr_url"]
+        for img in filtered_images_with_status
+        if img["attributes"][IMAGE_STATUS_KEY] != HistoryUnitStatus.DONE
+    ]
 
     return JSONResponse(status_code=200, content=missing_zarr_urls)

{fractal_server-2.14.14.dist-info → fractal_server-2.14.15.dist-info}/METADATA

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

{fractal_server-2.14.14.dist-info → fractal_server-2.14.15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=vMwYn-JjDRvK-MC0CiCG-6inE2aJMQ7D6z9D_4s1WBI,24
+fractal_server/__init__.py,sha256=1lO5LXhx8fwsKnWQVdnMtEvVmWkDE9cZ0L2RpkoG0O8,24
 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
@@ -40,7 +40,7 @@ fractal_server/app/routes/api/v2/dataset.py,sha256=6u4MFqJ3YZ0Zq6Xx8CRMrTPKW55Za
 fractal_server/app/routes/api/v2/history.py,sha256=BEmf_ENF5HNMy8yXrxRdo4280rWuRUa1Jw4u8R9-LQQ,15477
 fractal_server/app/routes/api/v2/images.py,sha256=TS1ltUhP0_SaViupdHrSh3MLDi5OVk-lOhE1VCVyZj0,7869
 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=bMcsZkXovK12EjtWarj_adEGIEuPOCIAug7myBcMlfs,4833
+fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=122MlfYwBBIw39bo9b3xuhvzBG20olPvjCzudAxX8H4,4909
 fractal_server/app/routes/api/v2/project.py,sha256=ldMEyjtwGpX2teu85sCNWaubDFlw-En8U1SA7G1VaIw,4567
 fractal_server/app/routes/api/v2/status_legacy.py,sha256=ZckHeBy8y21cyQ_OLY-VmkapzMhd3g9ae-qg-r4-uVo,6317
 fractal_server/app/routes/api/v2/submit.py,sha256=_BDkWtFdo8-p7kZ0Oxaidei04MfuBeaEsWtwJaKZQ_Y,8781
@@ -216,8 +216,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=tqz_8f-vQ9OBRW-4OQfO6xxY-YInHTyHmZxU7U4PqZo,4885
-fractal_server-2.14.14.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.14.dist-info/METADATA,sha256=JbVyOg4xYuckhqbiJv8_j881MND0jPMwXFLiM6zY1Os,4244
-fractal_server-2.14.14.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.14.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.14.dist-info/RECORD,,
+fractal_server-2.14.15.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.15.dist-info/METADATA,sha256=Sz4teXD8HvAhlbNjhwBKfOiswHcP47lMAIMnHK6puVU,4244
+fractal_server-2.14.15.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.15.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.15.dist-info/RECORD,,