fractal-server 2.14.0a36__py3-none-any.whl → 2.14.2__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.0a36"
+__VERSION__ = "2.14.2"

fractal_server/app/routes/admin/v2/job.py

@@ -154,7 +154,7 @@ async def update_job(
     if job_update.status != JobStatusTypeV2.FAILED:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=f"Cannot set job status to {job_update.status}",
+            detail=f"Cannot set job status to {job_update.status.value}",
         )
 
     setattr(job, "status", job_update.status)

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

@@ -7,6 +7,7 @@ from .dataset import router as dataset_router_v2
 from .history import router as history_router_v2
 from .images import router as images_routes_v2
 from .job import router as job_router_v2
+from .pre_submission_checks import router as pre_submission_checks_router
 from .project import router as project_router_v2
 from .status_legacy import router as status_legacy_router_v2
 from .submit import router as submit_job_router_v2
@@ -15,7 +16,6 @@ from .task_collection import router as task_collection_router_v2
 from .task_collection_custom import router as task_collection_router_v2_custom
 from .task_group import router as task_group_router_v2
 from .task_group_lifecycle import router as task_group_lifecycle_router_v2
-from .verify_image_types import router as verify_image_types_router
 from .workflow import router as workflow_router_v2
 from .workflow_import import router as workflow_import_router_v2
 from .workflowtask import router as workflowtask_router_v2
@@ -26,7 +26,7 @@ from fractal_server.syringe import Inject
 router_api_v2 = APIRouter()
 
 router_api_v2.include_router(dataset_router_v2, tags=["V2 Dataset"])
-router_api_v2.include_router(verify_image_types_router, tags=["V2 Job"])
+router_api_v2.include_router(pre_submission_checks_router, tags=["V2 Job"])
 router_api_v2.include_router(job_router_v2, tags=["V2 Job"])
 router_api_v2.include_router(images_routes_v2, tags=["V2 Images"])
 router_api_v2.include_router(project_router_v2, tags=["V2 Project"])

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

@@ -0,0 +1,144 @@
+from typing import Optional
+
+from fastapi import APIRouter
+from fastapi import Depends
+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
+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.images.models import AttributeFiltersType
+from fractal_server.images.tools import aggregate_types
+from fractal_server.images.tools import filter_image_list
+
+router = APIRouter()
+
+
+@router.post(
+    "/project/{project_id}/dataset/{dataset_id}/images/verify-unique-types/",
+    status_code=status.HTTP_200_OK,
+)
+async def verify_unique_types(
+    project_id: int,
+    dataset_id: int,
+    query: Optional[ImageQuery] = None,
+    user: UserOAuth = Depends(current_active_user),
+    db: AsyncSession = Depends(get_async_db),
+) -> list[str]:
+    # Get dataset
+    output = await _get_dataset_check_owner(
+        project_id=project_id, dataset_id=dataset_id, user_id=user.id, db=db
+    )
+    dataset = output["dataset"]
+
+    # Filter images
+    if query is None:
+        filtered_images = dataset.images
+    else:
+        filtered_images = filter_image_list(
+            images=dataset.images,
+            attribute_filters=query.attribute_filters,
+            type_filters=query.type_filters,
+        )
+
+    # 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
+    }
+    for _img in filtered_images:
+        for _type in available_types:
+            values_per_type[_type].add(_img["types"].get(_type, False))
+
+    # Find types with non-unique value
+    non_unique_types = [
+        key for key, value in values_per_type.items() if len(value) > 1
+    ]
+    non_unique_types = sorted(non_unique_types)
+
+    return non_unique_types
+
+
+class NonProcessedImagesPayload(BaseModel):
+    attribute_filters: AttributeFiltersType = Field(default_factory=dict)
+    type_filters: dict[str, bool] = Field(default_factory=dict)
+
+
+@router.post(
+    "/project/{project_id}/dataset/{dataset_id}/images/non-processed/",
+    status_code=status.HTTP_200_OK,
+)
+async def check_workflowtask(
+    project_id: int,
+    dataset_id: int,
+    workflow_id: int,
+    workflowtask_id: int,
+    filters: NonProcessedImagesPayload,
+    user: UserOAuth = Depends(current_active_user),
+    db: AsyncSession = Depends(get_async_db),
+) -> JSONResponse:
+
+    db_workflow_task, db_workflow = await _get_workflow_task_check_owner(
+        project_id=project_id,
+        workflow_task_id=workflowtask_id,
+        workflow_id=workflow_id,
+        user_id=user.id,
+        db=db,
+    )
+
+    if db_workflow_task.order == 0:
+        # Skip check for first task in the workflow
+        return JSONResponse(status_code=200, content=[])
+
+    previous_wft = db_workflow.task_list[db_workflow_task.order - 1]
+
+    if previous_wft.task.output_types != {}:
+        # Skip check if previous task has non-trivial `output_types`
+        return JSONResponse(status_code=200, content=[])
+    elif previous_wft.task.type in [
+        "converter_compound",
+        "converter_non_parallel",
+    ]:
+        # Skip check if previous task is converter
+        return JSONResponse(status_code=200, content=[])
+
+    res = await _get_dataset_check_owner(
+        project_id=project_id,
+        dataset_id=dataset_id,
+        user_id=user.id,
+        db=db,
+    )
+    dataset = res["dataset"]
+    filtered_images = filter_image_list(
+        images=dataset.images,
+        type_filters=filters.type_filters,
+        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)
+    )
+    done_zarr_urls = res.scalars().all()
+
+    missing_zarr_urls = list(set(filtered_zarr_urls) - set(done_zarr_urls))
+
+    return JSONResponse(status_code=200, content=missing_zarr_urls)

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

@@ -118,8 +118,8 @@ async def get_workflowtask_status(
             )
         except ValueError:
             logger.warning(
-                f"Job {running_job.id} is submitted but its task list does "
-                f"not contain a {WorkflowTaskStatusTypeV2.SUBMITTED} task."
+                f"Job {running_job.id} is submitted but its task list does not"
+                f" contain a {WorkflowTaskStatusTypeV2.SUBMITTED.value} task."
             )
             first_submitted_index = 0
 

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

@@ -1,3 +1,4 @@
+import os
 import shlex
 import subprocess  # nosec
 from pathlib import Path
@@ -65,25 +66,36 @@ async def collect_task_custom(
                 detail="Cannot infer 'package_root' with 'slurm_ssh' backend.",
             )
     else:
-        if not Path(task_collect.python_interpreter).is_file():
+        if not os.access(
+            task_collect.python_interpreter, os.X_OK
+        ) or not os.access(task_collect.python_interpreter, os.R_OK):
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                 detail=(
                     f"{task_collect.python_interpreter=} "
-                    "doesn't exist or is not a file."
+                    "is not accessible to the Fractal user "
+                    "or it is not executable."
                 ),
             )
-        if (
-            task_collect.package_root is not None
-            and not Path(task_collect.package_root).is_dir()
-        ):
+        if not Path(task_collect.python_interpreter).is_file():
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                detail=(
-                    f"{task_collect.package_root=} "
-                    "doesn't exist or is not a directory."
-                ),
+                detail=f"{task_collect.python_interpreter=} is not a file.",
             )
+        if task_collect.package_root is not None:
+            if not os.access(task_collect.package_root, os.R_OK):
+                raise HTTPException(
+                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    detail=(
+                        f"{task_collect.package_root=} "
+                        "is not accessible to the Fractal user."
+                    ),
+                )
+            if not Path(task_collect.package_root).is_dir():
+                raise HTTPException(
+                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    detail=f"{task_collect.package_root=} is not a directory.",
+                )
 
     if task_collect.package_root is None:
 

fractal_server/app/runner/compress_folder.py

@@ -80,6 +80,7 @@ def _remove_temp_subfolder(subfolder_path_tmp_copy: Path, logger_name: str):
 def compress_folder(
     subfolder_path: Path,
     filelist_path: str | None,
+    default_logging_level: int | None = None,
 ) -> str:
     """
     Compress e.g. `/path/archive` into `/path/archive.tar.gz`
@@ -90,13 +91,17 @@ def compress_folder(
     Args:
         subfolder_path: Absolute path to the folder to compress.
         remote_to_local: If `True`, exclude some files from the tar.gz archive.
+        default_logging_level:
 
     Returns:
         Absolute path to the tar.gz archive.
     """
 
     logger_name = "compress_folder"
-    logger = set_logger(logger_name)
+    logger = set_logger(
+        logger_name,
+        default_logging_level=default_logging_level,
+    )
 
     logger.debug("START")
     logger.debug(f"{subfolder_path=}")
@@ -132,7 +137,10 @@ def compress_folder(
         )
 
 
-def main(sys_argv: list[str]):
+def main(
+    sys_argv: list[str],
+    default_logging_level: int | None = None,
+):
 
     help_msg = (
         "Expected use:\n"
@@ -146,15 +154,19 @@ def main(sys_argv: list[str]):
         compress_folder(
             subfolder_path=Path(sys_argv[1]),
             filelist_path=None,
+            default_logging_level=default_logging_level,
         )
     elif num_args == 3 and sys_argv[2] == "--filelist":
         compress_folder(
             subfolder_path=Path(sys_argv[1]),
             filelist_path=sys_argv[3],
+            default_logging_level=default_logging_level,
         )
     else:
         sys.exit(f"Invalid argument.\n{help_msg}\nProvided: {sys_argv[1:]=}")
 
 
 if __name__ == "__main__":
-    main(sys.argv)
+    import logging
+
+    main(sys.argv, default_logging_level=logging.DEBUG)

fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py

@@ -524,12 +524,6 @@ class BaseSlurmRunner(BaseRunner):
                 slurm_job_ids=self.job_ids,
             )
 
-            # NOTE: see issue 2444
-            settings = Inject(get_settings)
-            sleep_time = settings.FRACTAL_SLURM_INTERVAL_BEFORE_RETRIEVAL
-            logger.warning(f"[submit] Now sleep {sleep_time} seconds.")
-            time.sleep(sleep_time)
-
             # Retrieval phase
             logger.debug("[submit] START retrieval phase")
             scancelled_job_ids = []
@@ -705,10 +699,6 @@ class BaseSlurmRunner(BaseRunner):
                 slurm_job_ids=self.job_ids,
             )
 
-            settings = Inject(get_settings)
-            sleep_time = settings.FRACTAL_SLURM_INTERVAL_BEFORE_RETRIEVAL
-            logger.warning(f"[multisubmit] Now sleep {sleep_time} seconds.")
-            time.sleep(sleep_time)
         except Exception as e:
             logger.error(
                 "[multisubmit] Unexpected exception during submission."

fractal_server/app/runner/executors/slurm_common/remote.py

@@ -148,10 +148,8 @@ def worker(
         out = cloudpickle.dumps(result)
 
     # Write the output pickle file
-    tempfile = out_fname + ".tmp"
-    with open(tempfile, "wb") as f:
+    with open(out_fname, "wb") as f:
         f.write(out)
-    os.rename(tempfile, out_fname)
 
 
 if __name__ == "__main__":

fractal_server/app/runner/executors/slurm_sudo/runner.py

@@ -151,7 +151,7 @@ class SudoSlurmRunner(BaseSlurmRunner):
         """
         Fetch artifacts for a list of SLURM jobs.
         """
-        MAX_NUM_THREADS = 4
+        MAX_NUM_THREADS = 12
         THREAD_NAME_PREFIX = "fetch_artifacts"
         logger.debug(
             "[_fetch_artifacts] START "

fractal_server/app/runner/extract_archive.py

@@ -25,7 +25,10 @@ def _remove_suffix(*, string: str, suffix: str) -> str:
         raise ValueError(f"Cannot remove {suffix=} from {string=}.")
 
 
-def extract_archive(archive_path: Path):
+def extract_archive(
+    archive_path: Path,
+    default_logging_level: int | None = None,
+):
     """
     Extract e.g. `/path/archive.tar.gz` archive into `/path/archive` folder
 
@@ -34,10 +37,14 @@ def extract_archive(archive_path: Path):
 
     Arguments:
         archive_path: Absolute path to the archive file.
+        default_logging_level
     """
 
     logger_name = "extract_archive"
-    logger = set_logger(logger_name)
+    logger = set_logger(
+        logger_name,
+        default_logging_level=default_logging_level,
+    )
 
     logger.debug("START")
     logger.debug(f"{archive_path.as_posix()=}")
@@ -65,7 +72,10 @@ def extract_archive(archive_path: Path):
     logger.debug("END")
 
 
-def main(sys_argv: list[str]):
+def main(
+    sys_argv: list[str],
+    default_logging_level: int | None = None,
+):
     help_msg = (
         "Expected use:\n"
         "python -m fractal_server.app.runner.extract_archive "
@@ -76,8 +86,14 @@ def main(sys_argv: list[str]):
         sys.exit(f"Invalid argument.\n{help_msg}\nProvided: {sys_argv[1:]=}")
     else:
         tarfile_path = Path(sys_argv[1])
-        extract_archive(tarfile_path)
+        extract_archive(
+            tarfile_path,
+            default_logging_level=default_logging_level,
+        )
 
 
 if __name__ == "__main__":
-    main(sys.argv)
+
+    import logging
+
+    main(sys.argv, default_logging_level=logging.DEBUG)

fractal_server/app/runner/v2/runner.py

@@ -9,6 +9,7 @@ from typing import Optional
 
 from sqlalchemy.orm.attributes import flag_modified
 from sqlmodel import delete
+from sqlmodel import update
 
 from ....images import SingleImage
 from ....images.tools import filter_image_list
@@ -25,6 +26,7 @@ from fractal_server.app.models.v2 import AccountingRecord
 from fractal_server.app.models.v2 import DatasetV2
 from fractal_server.app.models.v2 import HistoryImageCache
 from fractal_server.app.models.v2 import HistoryRun
+from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
 from fractal_server.app.runner.executors.base_runner import BaseRunner
@@ -36,6 +38,36 @@ from fractal_server.images.models import AttributeFiltersType
 from fractal_server.images.tools import merge_type_filters
 
 
+def drop_none_attributes(attributes: dict[str, Any]) -> dict[str, Any]:
+    # Unset attributes with `None` value
+    non_none_attributes = {
+        key: value for key, value in attributes.items() if value is not None
+    }
+    return non_none_attributes
+
+
+def get_origin_attribute_and_types(
+    *,
+    origin_url: str,
+    images: list[dict[str, Any]],
+) -> tuple[dict[str, Any], dict[str, bool]]:
+    """
+    Search for origin image and extract its attributes/types.
+    """
+    origin_img_search = find_image_by_zarr_url(
+        images=images,
+        zarr_url=origin_url,
+    )
+    if origin_img_search is None:
+        updated_attributes = {}
+        updated_types = {}
+    else:
+        origin_image = origin_img_search["image"]
+        updated_attributes = copy(origin_image["attributes"])
+        updated_types = copy(origin_image["types"])
+    return updated_attributes, updated_types
+
+
 def execute_tasks_v2(
     *,
     wf_task_list: list[WorkflowTaskV2],
@@ -189,154 +221,160 @@ def execute_tasks_v2(
             num_tasks = 0
 
         # POST TASK EXECUTION
-
-        non_failed_task_outputs = [
-            value.task_output
-            for value in outcomes_dict.values()
-            if value.task_output is not None
-        ]
-        if len(non_failed_task_outputs) > 0:
-            current_task_output = merge_outputs(non_failed_task_outputs)
-            # If `current_task_output` includes no images (to be created or
-            # removed), then flag all the input images as modified.
-            # See fractal-server issues #1374 and #2409.
-            if (
-                current_task_output.image_list_updates == []
-                and current_task_output.image_list_removals == []
-            ):
-                current_task_output = TaskOutput(
-                    image_list_updates=[
-                        dict(zarr_url=img["zarr_url"])
-                        for img in filtered_images
-                    ],
-                )
-        else:
-            current_task_output = TaskOutput()
-
-        # Update image list
-        num_new_images = 0
-        current_task_output.check_zarr_urls_are_unique()
-        # NOTE: In principle we could make the task-output processing more
-        # granular, and also associate output-processing failures to history
-        # status.
-        for image_obj in current_task_output.image_list_updates:
-            image = image_obj.model_dump()
-            # Edit existing image
-            tmp_image_paths = [img["zarr_url"] for img in tmp_images]
-            if image["zarr_url"] in tmp_image_paths:
+        try:
+            non_failed_task_outputs = [
+                value.task_output
+                for value in outcomes_dict.values()
+                if value.task_output is not None
+            ]
+            if len(non_failed_task_outputs) > 0:
+                current_task_output = merge_outputs(non_failed_task_outputs)
+                # If `current_task_output` includes no images (to be created or
+                # removed), then flag all the input images as modified.
+                # See fractal-server issues #1374 and #2409.
                 if (
-                    image["origin"] is not None
-                    and image["origin"] != image["zarr_url"]
+                    current_task_output.image_list_updates == []
+                    and current_task_output.image_list_removals == []
                 ):
-                    raise JobExecutionError(
-                        "Cannot edit an image with zarr_url different from "
-                        "origin.\n"
-                        f"zarr_url={image['zarr_url']}\n"
-                        f"origin={image['origin']}"
-                    )
-                img_search = find_image_by_zarr_url(
-                    images=tmp_images,
-                    zarr_url=image["zarr_url"],
-                )
-                if img_search is None:
-                    raise ValueError(
-                        "Unexpected error: "
-                        f"Image with zarr_url {image['zarr_url']} not found, "
-                        "while updating image list."
+                    current_task_output = TaskOutput(
+                        image_list_updates=[
+                            dict(zarr_url=img["zarr_url"])
+                            for img in filtered_images
+                        ],
                     )
-                original_img = img_search["image"]
-                original_index = img_search["index"]
-                updated_attributes = copy(original_img["attributes"])
-                updated_types = copy(original_img["types"])
+            else:
+                current_task_output = TaskOutput()
 
-                # Update image attributes/types with task output and manifest
-                updated_attributes.update(image["attributes"])
-                updated_types.update(image["types"])
-                updated_types.update(task.output_types)
+            # Update image list
+            num_new_images = 0
+            current_task_output.check_zarr_urls_are_unique()
+            # NOTE: In principle we could make the task-output processing more
+            # granular, and also associate output-processing failures to
+            # history status.
+            for image_obj in current_task_output.image_list_updates:
+                image = image_obj.model_dump()
+                if image["zarr_url"] in [
+                    img["zarr_url"] for img in tmp_images
+                ]:
+                    img_search = find_image_by_zarr_url(
+                        images=tmp_images,
+                        zarr_url=image["zarr_url"],
+                    )
+                    if img_search is None:
+                        raise ValueError(
+                            "Unexpected error: "
+                            f"Image with zarr_url {image['zarr_url']} not "
+                            "found, while updating image list."
+                        )
+                    existing_image_index = img_search["index"]
 
-                # Unset attributes with None value
-                updated_attributes = {
-                    key: value
-                    for key, value in updated_attributes.items()
-                    if value is not None
-                }
+                    if (
+                        image["origin"] is None
+                        or image["origin"] == image["zarr_url"]
+                    ):
+                        # CASE 1: Edit existing image
+                        existing_image = img_search["image"]
+                        new_attributes = copy(existing_image["attributes"])
+                        new_types = copy(existing_image["types"])
+                        new_image = dict(
+                            zarr_url=image["zarr_url"],
+                        )
+                        if "origin" in existing_image.keys():
+                            new_image["origin"] = existing_image["origin"]
+                    else:
+                        # CASE 2: Re-create existing image based on `origin`
+                        # Propagate attributes and types from `origin` (if any)
+                        (
+                            new_attributes,
+                            new_types,
+                        ) = get_origin_attribute_and_types(
+                            origin_url=image["origin"],
+                            images=tmp_images,
+                        )
+                        new_image = dict(
+                            zarr_url=image["zarr_url"],
+                            origin=image["origin"],
+                        )
+                    # Update attributes
+                    new_attributes.update(image["attributes"])
+                    new_attributes = drop_none_attributes(new_attributes)
+                    new_image["attributes"] = new_attributes
+                    # Update types
+                    new_types.update(image["types"])
+                    new_types.update(task.output_types)
+                    new_image["types"] = new_types
+                    # Validate new image
+                    SingleImage(**new_image)
+                    # Update image in the dataset image list
+                    tmp_images[existing_image_index] = new_image
 
-                # Validate new image
-                SingleImage(
-                    zarr_url=image["zarr_url"],
-                    types=updated_types,
-                    attributes=updated_attributes,
-                )
+                else:
+                    # CASE 3: Add new image
+                    # Check that image['zarr_url'] is a subfolder of zarr_dir
+                    if (
+                        not image["zarr_url"].startswith(zarr_dir)
+                        or image["zarr_url"] == zarr_dir
+                    ):
+                        raise JobExecutionError(
+                            "Cannot create image if zarr_url is not a "
+                            "subfolder of zarr_dir.\n"
+                            f"zarr_dir: {zarr_dir}\n"
+                            f"zarr_url: {image['zarr_url']}"
+                        )
 
-                # Update image in the dataset image list
-                tmp_images[original_index]["attributes"] = updated_attributes
-                tmp_images[original_index]["types"] = updated_types
-            # Add new image
-            else:
-                # Check that image['zarr_url'] is relative to zarr_dir
-                if not image["zarr_url"].startswith(zarr_dir):
-                    raise JobExecutionError(
-                        "Cannot create image if zarr_dir is not a parent "
-                        "directory of zarr_url.\n"
-                        f"zarr_dir: {zarr_dir}\n"
-                        f"zarr_url: {image['zarr_url']}"
-                    )
-                # Check that image['zarr_url'] is not equal to zarr_dir
-                if image["zarr_url"] == zarr_dir:
-                    raise JobExecutionError(
-                        "Cannot create image if zarr_url is equal to "
-                        "zarr_dir.\n"
-                        f"zarr_dir: {zarr_dir}\n"
-                        f"zarr_url: {image['zarr_url']}"
-                    )
-                # Propagate attributes and types from `origin` (if any)
-                updated_attributes = {}
-                updated_types = {}
-                if image["origin"] is not None:
-                    img_search = find_image_by_zarr_url(
+                    # Propagate attributes and types from `origin` (if any)
+                    new_attributes, new_types = get_origin_attribute_and_types(
+                        origin_url=image["origin"],
                         images=tmp_images,
-                        zarr_url=image["origin"],
                     )
-                    if img_search is not None:
-                        original_img = img_search["image"]
-                        updated_attributes = copy(original_img["attributes"])
-                        updated_types = copy(original_img["types"])
-                # Update image attributes/types with task output and manifest
-                updated_attributes.update(image["attributes"])
-                updated_attributes = {
-                    key: value
-                    for key, value in updated_attributes.items()
-                    if value is not None
-                }
-                updated_types.update(image["types"])
-                updated_types.update(task.output_types)
-                new_image = dict(
-                    zarr_url=image["zarr_url"],
-                    origin=image["origin"],
-                    attributes=updated_attributes,
-                    types=updated_types,
+                    # Prepare new image
+                    new_attributes.update(image["attributes"])
+                    new_attributes = drop_none_attributes(new_attributes)
+                    new_types.update(image["types"])
+                    new_types.update(task.output_types)
+                    new_image = dict(
+                        zarr_url=image["zarr_url"],
+                        origin=image["origin"],
+                        attributes=new_attributes,
+                        types=new_types,
+                    )
+                    # Validate new image
+                    SingleImage(**new_image)
+                    # Add image into the dataset image list
+                    tmp_images.append(new_image)
+                    num_new_images += 1
+
+            # Remove images from tmp_images
+            for img_zarr_url in current_task_output.image_list_removals:
+                img_search = find_image_by_zarr_url(
+                    images=tmp_images, zarr_url=img_zarr_url
                 )
-                # Validate new image
-                SingleImage(**new_image)
-                # Add image into the dataset image list
-                tmp_images.append(new_image)
-                num_new_images += 1
+                if img_search is None:
+                    raise JobExecutionError(
+                        "Cannot remove missing image "
+                        f"(zarr_url={img_zarr_url})."
+                    )
+                else:
+                    tmp_images.pop(img_search["index"])
 
-        # Remove images from tmp_images
-        for img_zarr_url in current_task_output.image_list_removals:
-            img_search = find_image_by_zarr_url(
-                images=tmp_images, zarr_url=img_zarr_url
+            # Update type_filters based on task-manifest output_types
+            type_filters_from_task_manifest = task.output_types
+            current_dataset_type_filters.update(
+                type_filters_from_task_manifest
             )
-            if img_search is None:
-                raise JobExecutionError(
-                    f"Cannot remove missing image (zarr_url={img_zarr_url})."
+        except Exception as e:
+            logger.error(
+                "Unexpected error in post-task-execution block. "
+                f"Original error: {str(e)}"
+            )
+            with next(get_sync_db()) as db:
+                db.execute(
+                    update(HistoryUnit)
+                    .where(HistoryUnit.history_run_id == history_run_id)
+                    .values(status=HistoryUnitStatus.FAILED)
                 )
-            else:
-                tmp_images.pop(img_search["index"])
-
-        # Update type_filters based on task-manifest output_types
-        type_filters_from_task_manifest = task.output_types
-        current_dataset_type_filters.update(type_filters_from_task_manifest)
+                db.commit()
+            raise e
 
         with next(get_sync_db()) as db:
             # Write current dataset images into the database.
@@ -381,7 +419,7 @@ def execute_tasks_v2(
                     status=HistoryUnitStatus.FAILED,
                     db_sync=db,
                 )
-                logger.error(
+                logger.warning(
                     f'END    {wftask.order}-th task (name="{task_name}") - '
                     "ERROR."
                 )

fractal_server/config.py

@@ -492,11 +492,6 @@ class Settings(BaseSettings):
     still running on SLURM.
     """
 
-    FRACTAL_SLURM_INTERVAL_BEFORE_RETRIEVAL: int = 2
-    """
-    NOTE: see issue 2444
-    """
-
     FRACTAL_SLURM_SBATCH_SLEEP: float = 0
     """
     Interval to wait (in seconds) between two subsequent `sbatch` calls, when

fractal_server/logger.py

@@ -58,6 +58,7 @@ def set_logger(
     logger_name: str,
     *,
     log_file_path: Optional[Union[str, Path]] = None,
+    default_logging_level: Optional[int] = None,
 ) -> logging.Logger:
     """
     Set up a `fractal-server` logger
@@ -66,7 +67,8 @@ def set_logger(
 
     * The attribute `Logger.propagate` set to `False`;
     * One and only one `logging.StreamHandler` handler, with severity level set
-    to `FRACTAL_LOGGING_LEVEL` and formatter set as in the `logger.LOG_FORMAT`
+    to `FRACTAL_LOGGING_LEVEL` (or `default_logging_level`, if set), and
+    formatter set as in the `logger.LOG_FORMAT`
     variable from the current module;
     * One or many `logging.FileHandler` handlers, including one pointint to
     `log_file_path` (if set); all these handlers have severity level set to
@@ -75,6 +77,7 @@ def set_logger(
     Args:
         logger_name: The identifier of the logger.
         log_file_path: Path to the log file.
+        default_logging_level: Override for `settings.FRACTAL_LOGGING_LEVEL`
 
     Returns:
         logger: The logger, as configured by the arguments.
@@ -92,8 +95,10 @@ def set_logger(
 
     if not current_stream_handlers:
         stream_handler = logging.StreamHandler()
-        settings = Inject(get_settings)
-        stream_handler.setLevel(settings.FRACTAL_LOGGING_LEVEL)
+        if default_logging_level is None:
+            settings = Inject(get_settings)
+            default_logging_level = settings.FRACTAL_LOGGING_LEVEL
+        stream_handler.setLevel(default_logging_level)
         stream_handler.setFormatter(LOG_FORMATTER)
         logger.addHandler(stream_handler)
 

fractal_server/tasks/v2/local/collect.py

@@ -132,7 +132,7 @@ def collect_local(
                     ).as_posix(),
                     prefix=(
                         f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.COLLECT}_"
+                        f"{TaskGroupActivityActionV2.COLLECT.value}_"
                     ),
                     logger_name=LOGGER_NAME,
                 )

fractal_server/tasks/v2/local/deactivate.py

@@ -107,7 +107,7 @@ def deactivate_local(
                         ).as_posix(),
                         prefix=(
                             f"{int(time.time())}_"
-                            f"{TaskGroupActivityActionV2.DEACTIVATE}_"
+                            f"{TaskGroupActivityActionV2.DEACTIVATE.value}_"
                         ),
                         logger_name=LOGGER_NAME,
                     )

fractal_server/tasks/v2/local/reactivate.py

@@ -107,7 +107,7 @@ def reactivate_local(
                     ).as_posix(),
                     prefix=(
                         f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.REACTIVATE}_"
+                        f"{TaskGroupActivityActionV2.REACTIVATE.value}_"
                     ),
                     logger_name=LOGGER_NAME,
                 )

fractal_server/tasks/v2/ssh/collect.py

@@ -166,7 +166,7 @@ def collect_ssh(
                     script_dir_remote=script_dir_remote,
                     prefix=(
                         f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.COLLECT}"
+                        f"{TaskGroupActivityActionV2.COLLECT.value}"
                     ),
                     fractal_ssh=fractal_ssh,
                     logger_name=LOGGER_NAME,

fractal_server/tasks/v2/ssh/deactivate.py

@@ -136,7 +136,7 @@ def deactivate_ssh(
                         script_dir_remote=script_dir_remote,
                         prefix=(
                             f"{int(time.time())}_"
-                            f"{TaskGroupActivityActionV2.DEACTIVATE}"
+                            f"{TaskGroupActivityActionV2.DEACTIVATE.value}"
                         ),
                         fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,

fractal_server/tasks/v2/ssh/reactivate.py

@@ -144,7 +144,7 @@ def reactivate_ssh(
                     script_dir_remote=script_dir_remote,
                     prefix=(
                         f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.REACTIVATE}"
+                        f"{TaskGroupActivityActionV2.REACTIVATE.value}"
                     ),
                     fractal_ssh=fractal_ssh,
                     logger_name=LOGGER_NAME,

{fractal_server-2.14.0a36.dist-info → fractal_server-2.14.2.dist-info}/METADATA

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

{fractal_server-2.14.0a36.dist-info → fractal_server-2.14.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=8fGTYA0v4yFRsbsrwIUxQDcJEeH1hYIY2CuXgnou2hM,26
+fractal_server/__init__.py,sha256=6Uu9b8c6XWTG60V3XHQPdFjCGQfgYX4y4FTD3DmRFXk,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
@@ -24,13 +24,13 @@ fractal_server/app/routes/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 fractal_server/app/routes/admin/v2/__init__.py,sha256=_5lqb6-M8-fZqE1HRMep6pAFYRUKMxrvbZOKs-RXWkw,933
 fractal_server/app/routes/admin/v2/accounting.py,sha256=UDMPD9DMhMBcu4UsEOEtKMCGnkVMtmwBuRklek-_ShQ,3631
 fractal_server/app/routes/admin/v2/impersonate.py,sha256=gc4lshfEPFR6W2asH7aKu6hqE6chzusdhAUVV9p51eU,1131
-fractal_server/app/routes/admin/v2/job.py,sha256=4soc-5d99QEsir7U9AqpofgaGggSBwgMm7mXW5LBvSI,7439
+fractal_server/app/routes/admin/v2/job.py,sha256=Elb3aP9Az6V8u1C0FvhSxt9NDPjBrQeJB0fH1hpXWQs,7445
 fractal_server/app/routes/admin/v2/project.py,sha256=luy-yiGX1JYTdPm1hpIdDUUqPm8xHuipLy9k2X6zu74,1223
 fractal_server/app/routes/admin/v2/task.py,sha256=QOwgyDU9m7T_wLMwkdgfFaoMjNxcDg6zMVpngxhUvqk,4374
 fractal_server/app/routes/admin/v2/task_group.py,sha256=LG41hAsllBL6kc-JLxRNG_IrI6frIKrIF3xD0GeeTiI,7173
 fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=0e0ZJ_k75TVHaT2o8Xk33DPDSgh-eBhZf-y4y7t-Adg,9429
 fractal_server/app/routes/api/__init__.py,sha256=B8l6PSAhR10iZqHEiyTat-_0tkeKdrCigIE6DJGP5b8,638
-fractal_server/app/routes/api/v2/__init__.py,sha256=9o9zxTU2IJrC_JQ8GUMft3niiBZ39YLvODUeraiRRdQ,2465
+fractal_server/app/routes/api/v2/__init__.py,sha256=WE6Znay9R_4_78eSKBMi-s5_lk3oLxWqyAGya4JcYY8,2474
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=eE-TdEMI_UX3LBDUGwjG5NyUcihDVaHYlG15NlTJ9DI,12872
 fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=ZlI6nwzB5r9AiY0C8TzJS_EQOTPKgkRYl3GpxFAu2bg,4430
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=qdXCb6IP8-qPEAxGZKljtjIqNzIAyRaAsQSRi5VqFHM,6773
@@ -39,15 +39,15 @@ fractal_server/app/routes/api/v2/dataset.py,sha256=h5AhE0sdhQ20ZlIbEJsFnHIOUW0S1
 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/pre_submission_checks.py,sha256=WyJAco9-96c15ImjgvsNfhd2169gG29CXkwtCTVLs38,4816
 fractal_server/app/routes/api/v2/project.py,sha256=uAZgATiHcOvbnRX-vv1D3HoaEUvLUd7vzVmGcqOP8ZY,4602
-fractal_server/app/routes/api/v2/status_legacy.py,sha256=Q5ZWQNfeZKL8Xgtou2Xr80iaF1uO-r4oSKgq5H42V_8,6349
+fractal_server/app/routes/api/v2/status_legacy.py,sha256=0QlbBErOT2Idf-LT0EvOiPtTjrm6WmIY0k69NOgjmWk,6355
 fractal_server/app/routes/api/v2/submit.py,sha256=hCwwC6bXP7EyhgGyVLv1ClybRH1YytDVoPunOzpsf0s,8822
 fractal_server/app/routes/api/v2/task.py,sha256=O7pquZhXIS4lRs5XqHvstiwe8BiCuS-B3ZKJI1g6EJU,6985
 fractal_server/app/routes/api/v2/task_collection.py,sha256=IDNF6sjDuU37HIQ0TuQA-TZIuf7nfHAQXUUNmkrlhLM,12706
-fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=totsl0DOC2DFLw8vgqOFivvftpEk3KbFDeOHT0UVQUs,5997
+fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=CRe23ehouz08tedJ3-pe9akqTVyxv7GfqhWTjx5E45Q,6677
 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=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
@@ -67,7 +67,7 @@ fractal_server/app/routes/aux/validate_user_settings.py,sha256=FLVi__8YFcm_6c_K5
 fractal_server/app/routes/pagination.py,sha256=L8F5JqekF39qz-LpeScdlhb57MQnSRXjK4ZEtsZqYLk,1210
 fractal_server/app/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/components.py,sha256=-Ii5l8d_V6f5DFOd-Zsr8VYmOsyqw0Hox9fEFQiuqxY,66
-fractal_server/app/runner/compress_folder.py,sha256=DX-4IYlSXlMd0EmXDD8M8FxisfKLbooSTrdNtzYAQAM,4876
+fractal_server/app/runner/compress_folder.py,sha256=PpamheggkacuAFhSiHkuW76x9zwawouqNySPBDyAuRI,5245
 fractal_server/app/runner/exceptions.py,sha256=JC5ufHyeA1hYD_rkZUscI30DD8D903ncag7Z3AArmUY,4215
 fractal_server/app/runner/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/base_runner.py,sha256=4xxMpYycIeAOz5niaJj2xtVW_Cq-shCxP1qk4g-KwOM,5137
@@ -78,17 +78,17 @@ fractal_server/app/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa
 fractal_server/app/runner/executors/slurm_common/_batching.py,sha256=ZY020JZlDS5mfpgpWTChQkyHU7iLE5kx2HVd57_C6XA,8850
 fractal_server/app/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
 fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=_feRRnVVnvQa3AsOQqfULfOgaoj2o6Ze0-fwXwic8p4,15795
-fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=kmou-asQJ7SHBR0VPPiQrMLP9gv_NZG3s9t2yoszGhY,33870
+fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=bqFD9uZfwXqmVXsScrgANp09zvbuc_LSGCDAmBV0wqo,33379
 fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=BW6fDpPyB0VH5leVxvwzkVH3r3hC7DuSyoWmRzHITWg,7305
-fractal_server/app/runner/executors/slurm_common/remote.py,sha256=L5llMccL6ctdFpDQvynJl5KbxtATX2wzpq13_3ppw-I,5929
+fractal_server/app/runner/executors/slurm_common/remote.py,sha256=WdzVSLYKOxLb9NmrvwZu0voXRPTO1gyKTUUuRJwu9Lc,5861
 fractal_server/app/runner/executors/slurm_common/slurm_job_task_models.py,sha256=RoxHLKOn0_wGjnY0Sv0a9nDSiqxYZHKRoMkT3p9_G1E,3607
 fractal_server/app/runner/executors/slurm_common/utils_executors.py,sha256=naPyJI0I3lD-sYHbSXbMFGUBK4h_SggA5V91Z1Ch1Xg,1416
 fractal_server/app/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_ssh/runner.py,sha256=yKK_cjskHDiasn_QQ-k14GhplP3tNaK7Kp4yiVn44Y0,9437
 fractal_server/app/runner/executors/slurm_sudo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_sudo/_subprocess_run_as_user.py,sha256=BlOz4NElv3v7rUYefyeki33uaJxcSDk6rPuVZx9ocdw,2776
-fractal_server/app/runner/executors/slurm_sudo/runner.py,sha256=lPWkRT499mChP3dNLrdDjMT-nw7-LWv6g58kdF_sMRw,6290
-fractal_server/app/runner/extract_archive.py,sha256=I7UGIHXXuFvlgVPsP7GMWPu2-DiS1EiyBs7a1bvgkxI,2458
+fractal_server/app/runner/executors/slurm_sudo/runner.py,sha256=zT-DH61oPEq4dvo08EMnXv3QMYpwAZ3teY7R3MJ5G_8,6291
+fractal_server/app/runner/extract_archive.py,sha256=8h6ZX7Gy0Vqv5KmrEGbWGPuA0MvW207cQZ-8CPYjwXc,2800
 fractal_server/app/runner/filenames.py,sha256=lPnxKHtdRizr6FqG3zOdjDPyWA7GoaJGTtiuJV0gA8E,70
 fractal_server/app/runner/run_subprocess.py,sha256=c3JbYXq3hX2aaflQU19qJ5Xs6J6oXGNvnTEoAfv2bxc,959
 fractal_server/app/runner/set_start_and_last_task_index.py,sha256=-q4zVybAj8ek2XlbENKlfOAJ39hT_zoJoZkqzDqiAMY,1254
@@ -101,7 +101,7 @@ 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=UmUhAOOcwAT-8b28o5bWn5S9APtr5EbEvulxWJPo6r4,16269
+fractal_server/app/runner/v2/runner.py,sha256=tYG-LB9Dm9_Lz3uYgAhcIeeFLy5I6xMqCdVuUKNXyII,17717
 fractal_server/app/runner/v2/runner_functions.py,sha256=AzsE7VF6NMz_5qc0htQkfow5_2rr-wkx50vFJTndj8I,19250
 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
@@ -130,14 +130,14 @@ fractal_server/app/schemas/v2/workflowtask.py,sha256=rVbmNihDAJL_Sckbt1hBK2JEcb-
 fractal_server/app/security/__init__.py,sha256=e2cveg5hQpieGD3bSPd5GTOMthvJ-HXH3buSb9WVfEU,14096
 fractal_server/app/security/signup_email.py,sha256=Xd6QYxcdmg0PHpDwmUE8XQmPcOj3Xjy5oROcIMhmltM,1472
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
-fractal_server/config.py,sha256=83dHIuZMdMiu4LAtzVGBe_iD1nWEYOiKmeC-HHZ0nhw,28534
+fractal_server/config.py,sha256=A3j1bxa2inTNqIp5Ry0sY6DS72k7X_AKA3OUaDwoYbA,28439
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
 fractal_server/images/__init__.py,sha256=-_wjoKtSX02P1KjDxDP_EXKvmbONTRmbf7iGVTsyBpM,154
 fractal_server/images/models.py,sha256=jdGKMPi8WlO9Kvns4grIOU5LjujnvwIGjMFMC0wNy08,3501
 fractal_server/images/tools.py,sha256=-zFDzRv6cbbRo21OrD0eZY5qWcoMX8dxgEnfyI3tOcg,4140
-fractal_server/logger.py,sha256=5Z3rfsFwl8UysVljTOaaIvt8Pyp6CVH492ez3jE8WAw,5113
+fractal_server/logger.py,sha256=2QxBu5mB6xN3qWqj60nuxdrxcbxwzlx0xL47jKHB5PU,5385
 fractal_server/main.py,sha256=FD9KzTTsXTQnTW0z3Hu7y0Nj_oAkBeZEInKDXFd4hjE,4561
 fractal_server/migrations/env.py,sha256=nfyBpMIOT3kny6t-b-tUjyRjZ4k906bb1_wCQ7me1BI,1353
 fractal_server/migrations/naming_convention.py,sha256=htbKrVdetx3pklowb_9Cdo5RqeF0fJ740DNecY5de_M,265
@@ -187,14 +187,14 @@ fractal_server/tasks/utils.py,sha256=V7dj8o2AnoHhGSTYlqJHcRFhCIpmOrMOUhtiE_DvRVA
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/tasks/v2/local/__init__.py,sha256=9RVItnS7OyLsJOuJjWMCicaky4ASUPQEYD4SzDs0hOE,141
 fractal_server/tasks/v2/local/_utils.py,sha256=EvhmVwYjqaNyDCUMEsTWYOUXLgEwR1xr6bu32apCEI8,2491
-fractal_server/tasks/v2/local/collect.py,sha256=-ScW8Vm0cguwEDQarNAaZFtai0jFFVBrIaVgo2G9KCE,12204
-fractal_server/tasks/v2/local/deactivate.py,sha256=94s_RDND8aR5Y8RxFrRx61rZBMPGqOmFnBFLVKK1HVY,10038
-fractal_server/tasks/v2/local/reactivate.py,sha256=eBgFgq5xVKNr4DIDX7QU8xXerhwMrPaHDJ1wTth7aQc,6191
+fractal_server/tasks/v2/local/collect.py,sha256=w1s96nqyGRSY_zhII3HP8JaBdJmzxPdqTksUO-ZH9lo,12210
+fractal_server/tasks/v2/local/deactivate.py,sha256=o3lVnW35bjaRyRkjN6cpqe0WyE54sVydi-I5-tmLFNI,10044
+fractal_server/tasks/v2/local/reactivate.py,sha256=hMgRWEY30qi-0lCMdC2GmyGLeAXOZYJCzNgamiucjEM,6197
 fractal_server/tasks/v2/ssh/__init__.py,sha256=aSQbVi6Ummt9QzcSLWNmSqYjfdxrn9ROmqgH6bDpI7k,135
 fractal_server/tasks/v2/ssh/_utils.py,sha256=LjaEYVUJDChilu3YuhxuGWYRNnVJ_zqNE9SDHdRTIHY,2824
-fractal_server/tasks/v2/ssh/collect.py,sha256=gGFdKTawfi3xyUuslyB-QoNNtc7SXx23a7K7wNH8HhM,13562
-fractal_server/tasks/v2/ssh/deactivate.py,sha256=EAVH2HtyvmIFXqUwsGYhlJcAcVh_MvIOaKDY8AyBODw,11400
-fractal_server/tasks/v2/ssh/reactivate.py,sha256=8Rnbbny7TjMEAHhboqfgxBVZZK5UNNmh4Ud-0y3jaVM,7970
+fractal_server/tasks/v2/ssh/collect.py,sha256=I-a2st4jo8mzc0u0EScs54Ccr3tNm_as7RZmn1FTGiE,13568
+fractal_server/tasks/v2/ssh/deactivate.py,sha256=meiAVd4mvDR-ikclR0KXkSoJp3PbBYci-eZlOJbcI1c,11406
+fractal_server/tasks/v2/ssh/reactivate.py,sha256=T6YPbMwaWV7RUD33Dmpn3K9173BGuOv0s7Vpr_YOCH4,7976
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
 fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=Md2LPt3BJ7IfN0USF2uivl4rP8OwbzJOUepGAr_Cicg,1836
 fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V4aI-FnX9ZvVNxgpSOBFc,168
@@ -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.0a36.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.0a36.dist-info/METADATA,sha256=5MOzziccWO5Ah9boFwgKLEMgJKoZbRLwHQvhcj4T0-w,4563
-fractal_server-2.14.0a36.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.0a36.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.0a36.dist-info/RECORD,,
+fractal_server-2.14.2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.2.dist-info/METADATA,sha256=LQDnOxlZL14XsZXYcQ42N-JR0NSMBfxN4qOP2raSiG4,4560
+fractal_server-2.14.2.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.2.dist-info/RECORD,,

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

@@ -1,61 +0,0 @@
-from typing import Optional
-
-from fastapi import APIRouter
-from fastapi import Depends
-from fastapi import status
-
-from ._aux_functions import _get_dataset_check_owner
-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.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()
-
-
-@router.post(
-    "/project/{project_id}/dataset/{dataset_id}/images/verify-unique-types/",
-    status_code=status.HTTP_200_OK,
-)
-async def verify_unique_types(
-    project_id: int,
-    dataset_id: int,
-    query: Optional[ImageQuery] = None,
-    user: UserOAuth = Depends(current_active_user),
-    db: AsyncSession = Depends(get_async_db),
-) -> list[str]:
-    # Get dataset
-    output = await _get_dataset_check_owner(
-        project_id=project_id, dataset_id=dataset_id, user_id=user.id, db=db
-    )
-    dataset = output["dataset"]
-
-    # Filter images
-    if query is None:
-        filtered_images = dataset.images
-    else:
-        filtered_images = filter_image_list(
-            images=dataset.images,
-            attribute_filters=query.attribute_filters,
-            type_filters=query.type_filters,
-        )
-
-    # 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
-    }
-    for _img in filtered_images:
-        for _type in available_types:
-            values_per_type[_type].add(_img["types"].get(_type, False))
-
-    # Find types with non-unique value
-    non_unique_types = [
-        key for key, value in values_per_type.items() if len(value) > 1
-    ]
-    non_unique_types = sorted(non_unique_types)
-
-    return non_unique_types