fractal-server 2.14.14__tar.gz → 2.14.15__tar.gz

{fractal_server-2.14.14 → fractal_server-2.14.15}/PKG-INFO

@@ -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.15/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.14.15"

{fractal_server-2.14.14 → fractal_server-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 → fractal_server-2.14.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.14.14"
+version = "2.14.15"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -94,7 +94,7 @@ filterwarnings = [
 markers = ["container", "ssh"]
 
 [tool.bumpver]
-current_version = "2.14.14"
+current_version = "2.14.15"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.14.14/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.14.14"