fractal-server 2.14.7__py3-none-any.whl → 2.14.9__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.7"
+__VERSION__ = "2.14.9"

fractal_server/app/models/v2/history.py

@@ -27,6 +27,7 @@ class HistoryRun(SQLModel, table=True):
         ondelete="SET NULL",
     )
     job_id: int = Field(foreign_key="jobv2.id")
+    task_id: int | None = Field(foreign_key="taskv2.id", ondelete="SET NULL")
 
     workflowtask_dump: dict[str, Any] = Field(
         sa_column=Column(JSONB, nullable=False),

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

@@ -0,0 +1,42 @@
+from typing import Any
+
+
+def get_new_workflow_task_meta(
+    *,
+    old_workflow_task_meta: dict | None,
+    old_task_meta: dict | None,
+    new_task_meta: dict | None,
+) -> dict[str, Any]:
+    """
+    Prepare new meta field based on old/new tasks and old workflow task.
+    """
+
+    # When the whole `old_workflow_task_meta` is user-provided, use it
+    # as the outcome
+    if old_task_meta is None:
+        return old_workflow_task_meta
+
+    # When `old_workflow_task_meta` is unset, use the new-task meta as default.
+    if old_workflow_task_meta is None:
+        return new_task_meta
+
+    if new_task_meta is None:
+        new_task_meta = {}
+
+    # Find properties that were added to the old defaults
+    additions = {
+        k: v
+        for k, v in old_workflow_task_meta.items()
+        if v != old_task_meta.get(k)
+    }
+    # Find properties that were removed from the old defaults
+    removals = old_task_meta.keys() - old_workflow_task_meta.keys()
+
+    # Add `additions` and remove `removals`.
+    new_workflowtask_meta = {
+        k: v
+        for k, v in (new_task_meta | additions).items()
+        if k not in removals
+    }
+
+    return new_workflowtask_meta

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

@@ -23,6 +23,7 @@ from fractal_server.app.models import UserOAuth
 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 TaskV2
 from fractal_server.app.routes.auth import current_active_user
 from fractal_server.app.routes.pagination import get_pagination_params
 from fractal_server.app.routes.pagination import PaginationRequest
@@ -31,9 +32,11 @@ from fractal_server.app.schemas.v2 import HistoryRunRead
 from fractal_server.app.schemas.v2 import HistoryRunReadAggregated
 from fractal_server.app.schemas.v2 import HistoryUnitRead
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
-from fractal_server.app.schemas.v2 import HistoryUnitStatusQuery
+from fractal_server.app.schemas.v2 import HistoryUnitStatusWithUnset
 from fractal_server.app.schemas.v2 import ImageLogsRequest
 from fractal_server.app.schemas.v2 import SingleImageWithStatus
+from fractal_server.images.image_status import enrich_image_list
+from fractal_server.images.image_status import IMAGE_STATUS_KEY
 from fractal_server.images.tools import aggregate_attributes
 from fractal_server.images.tools import aggregate_types
 from fractal_server.images.tools import filter_image_list
@@ -60,7 +63,6 @@ def check_historyrun_related_to_dataset_and_wftask(
 
 
 class ImageWithStatusPage(PaginationResponse[SingleImageWithStatus]):
-
     attributes: dict[str, list[Any]]
     types: list[str]
 
@@ -77,7 +79,6 @@ async def get_workflow_tasks_statuses(
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
-
     # Access control
     workflow = await _get_workflow_check_owner(
         project_id=project_id,
@@ -150,7 +151,6 @@ async def get_history_run_list(
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[HistoryRunReadAggregated]:
-
     # Access control
     await get_wftask_check_owner(
         project_id=project_id,
@@ -199,7 +199,36 @@ async def get_history_run_list(
     for run_id, unit_status, count in unit_counts:
         count_map[run_id][f"num_{unit_status}_units"] = count
 
-    runs = [dict(**run.model_dump(), **count_map[run.id]) for run in runs]
+    res = await db.execute(
+        select(
+            TaskV2.id,
+            TaskV2.version,
+            TaskV2.args_schema_parallel,
+            TaskV2.args_schema_non_parallel,
+        ).where(
+            TaskV2.id.in_(
+                [run.task_id for run in runs if run.task_id is not None]
+            )
+        )
+    )
+
+    task_args = {
+        _id: {
+            "version": version,
+            "args_schema_parallel": parallel,
+            "args_schema_non_parallel": non_parallel,
+        }
+        for _id, version, parallel, non_parallel in res.all()
+    }
+
+    runs = [
+        dict(
+            **run.model_dump(),
+            **count_map[run.id],
+            **task_args.get(run.task_id, {}),
+        )
+        for run in runs
+    ]
 
     return runs
 
@@ -215,7 +244,6 @@ async def get_history_run_units(
     db: AsyncSession = Depends(get_async_db),
     pagination: PaginationRequest = Depends(get_pagination_params),
 ) -> PaginationResponse[HistoryUnitRead]:
-
     # Access control
     await get_wftask_check_owner(
         project_id=project_id,
@@ -271,12 +299,11 @@ async def get_history_images(
     dataset_id: int,
     workflowtask_id: int,
     request_body: ImageQuery,
-    unit_status: HistoryUnitStatusQuery | None = None,
+    unit_status: HistoryUnitStatusWithUnset | None = None,
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
     pagination: PaginationRequest = Depends(get_pagination_params),
 ) -> ImageWithStatusPage:
-
     # Access control and object retrieval
     wftask = await get_wftask_check_owner(
         project_id=project_id,
@@ -318,99 +345,62 @@ async def get_history_images(
     actual_filters.update(type_filters_patch)
     logger.debug(f"{prefix} {actual_filters=}")
     # (1D) Get all matching images from the dataset
+
     pre_filtered_dataset_images = filter_image_list(
         images=dataset.images,
         type_filters=inferred_dataset_type_filters,
     )
+
+    full_images_list = await enrich_image_list(
+        dataset_id=dataset_id,
+        workflowtask_id=workflowtask_id,
+        images=pre_filtered_dataset_images,
+        db=db,
+    )
+
+    if unit_status is not None:
+        request_body.attribute_filters[IMAGE_STATUS_KEY] = unit_status
+
     filtered_dataset_images = filter_image_list(
-        pre_filtered_dataset_images,
+        full_images_list,
         type_filters=request_body.type_filters,
         attribute_filters=request_body.attribute_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
-    )
-
-    # (2) Get `(zarr_url, status)` pairs for all images that have already
-    # been processed, and
-    # (3) When relevant, find images that have not been processed
-    base_stmt = (
-        select(HistoryImageCache.zarr_url, HistoryUnit.status)
-        .join(HistoryUnit)
-        .where(HistoryImageCache.dataset_id == dataset_id)
-        .where(HistoryImageCache.workflowtask_id == workflowtask_id)
-        .where(HistoryImageCache.latest_history_unit_id == HistoryUnit.id)
-        .where(HistoryImageCache.zarr_url.in_(filtered_dataset_images_url))
-    )
-
-    if unit_status in [HistoryUnitStatusQuery.UNSET, None]:
-        stmt = base_stmt.order_by(HistoryImageCache.zarr_url)
-        res = await db.execute(stmt)
-        list_processed_url_status = res.all()
-        list_processed_url = list(
-            item[0] for item in list_processed_url_status
-        )
-        list_non_processed_url_status = list(
-            (url, None)
-            for url in filtered_dataset_images_url
-            if url not in list_processed_url
-        )
-        if unit_status == HistoryUnitStatusQuery.UNSET:
-            list_processed_url_status = []
-    else:
-        stmt = base_stmt.where(HistoryUnit.status == unit_status).order_by(
-            HistoryImageCache.zarr_url
-        )
-        res = await db.execute(stmt)
-        list_processed_url_status = res.all()
-        list_non_processed_url_status = []
-
-    logger.debug(f"{prefix} {len(list_processed_url_status)=}")
-    logger.debug(f"{prefix} {len(list_non_processed_url_status)=}")
-
-    # (3) Combine outputs from 1 and 2
-    full_list_url_status = (
-        list_processed_url_status + list_non_processed_url_status
-    )
-    logger.debug(f"{prefix} {len(full_list_url_status)=}")
 
     attributes = aggregate_attributes(pre_filtered_dataset_images)
     types = aggregate_types(pre_filtered_dataset_images)
 
-    sorted_list_url_status = sorted(
-        full_list_url_status,
-        key=lambda url_status: url_status[0],
-    )
-    logger.debug(f"{prefix} {len(sorted_list_url_status)=}")
-
     # Final list of objects
 
-    total_count = len(sorted_list_url_status)
+    total_count = len(filtered_dataset_images)
     page_size = pagination.page_size or total_count
-
-    paginated_list_url_status = sorted_list_url_status[
+    sorted_images_list = sorted(
+        filtered_dataset_images,
+        key=lambda image: image["zarr_url"],
+    )
+    paginated_images_list = sorted_images_list[
         (pagination.page - 1) * page_size : pagination.page * page_size
     ]
 
-    # Aggregate information to create 'SingleImageWithStatus'
-    items = [
+    # FIXME: This is only for backwards-compatibility. To remove when we
+    # update the webclient
+    paginated_images_list = [
         {
-            **filtered_dataset_images[
-                filtered_dataset_images_url.index(url_status[0])
-            ],
-            "status": url_status[1],
+            **img,
+            "status": (
+                lambda x: None if x == HistoryUnitStatusWithUnset.UNSET else x
+            )(img["attributes"].pop(IMAGE_STATUS_KEY)),
         }
-        for url_status in paginated_list_url_status
+        for img in paginated_images_list
     ]
 
     return dict(
         current_page=pagination.page,
         page_size=page_size,
         total_count=total_count,
-        items=items,
+        items=paginated_images_list,
         attributes=attributes,
         types=types,
     )

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

@@ -17,12 +17,12 @@ from ....models import LinkUserGroup
 from ....models.v2 import TaskV2
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import _get_workflow_task_check_owner
+from ._aux_functions_task_version_update import get_new_workflow_task_meta
 from ._aux_functions_tasks import _check_type_filters_compatibility
 from ._aux_functions_tasks import _get_task_group_or_404
 from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.models.v2 import WorkflowTaskV2
 from fractal_server.app.routes.auth import current_active_user
 from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
 from fractal_server.app.schemas.v2 import WorkflowTaskReplaceV2
@@ -181,7 +181,7 @@ async def replace_workflowtask(
 ) -> WorkflowTaskReadV2:
 
     # Get objects from database
-    old_wftask, workflow = await _get_workflow_task_check_owner(
+    workflow_task, workflow = await _get_workflow_task_check_owner(
         project_id=project_id,
         workflow_id=workflow_id,
         workflow_task_id=workflow_task_id,
@@ -197,14 +197,14 @@ async def replace_workflowtask(
 
     # Preliminary checks
     if not _is_type_update_valid(
-        old_type=old_wftask.task_type,
+        old_type=workflow_task.task_type,
         new_type=new_task.type,
     ):
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail=(
                 "Cannot change task type from "
-                f"{old_wftask.task_type} to {new_task.type}."
+                f"{workflow_task.task_type} to {new_task.type}."
             ),
         )
 
@@ -220,51 +220,27 @@ async def replace_workflowtask(
         )
     _check_type_filters_compatibility(
         task_input_types=new_task.input_types,
-        wftask_type_filters=old_wftask.type_filters,
+        wftask_type_filters=workflow_task.type_filters,
     )
 
-    # Task arguments
-    if replace.args_non_parallel is None:
-        _args_non_parallel = old_wftask.args_non_parallel
-    else:
-        _args_non_parallel = replace.args_non_parallel
-    if replace.args_parallel is None:
-        _args_parallel = old_wftask.args_parallel
-    else:
-        _args_parallel = replace.args_parallel
-
-    # If user's changes to `meta_non_parallel` are compatible with new task,
-    # keep them; else, get `meta_non_parallel` from new task
-    if (
-        old_wftask.meta_non_parallel != old_wftask.task.meta_non_parallel
-    ) and (old_wftask.task.meta_non_parallel == new_task.meta_non_parallel):
-        _meta_non_parallel = old_wftask.meta_non_parallel
-    else:
-        _meta_non_parallel = new_task.meta_non_parallel
-    # Same for `meta_parallel`
-    if (old_wftask.meta_parallel != old_wftask.task.meta_parallel) and (
-        old_wftask.task.meta_parallel == new_task.meta_parallel
-    ):
-        _meta_parallel = old_wftask.meta_parallel
-    else:
-        _meta_parallel = new_task.meta_parallel
-
-    new_workflow_task = WorkflowTaskV2(
-        task_id=new_task.id,
-        task_type=new_task.type,
-        task=new_task,
-        # old-task values
-        type_filters=old_wftask.type_filters,
-        # possibly new values
-        args_non_parallel=_args_non_parallel,
-        args_parallel=_args_parallel,
-        meta_non_parallel=_meta_non_parallel,
-        meta_parallel=_meta_parallel,
+    workflow_task.task_id = new_task.id
+    workflow_task.task_type = new_task.type
+    workflow_task.meta_non_parallel = get_new_workflow_task_meta(
+        old_task_meta=workflow_task.task.meta_non_parallel,
+        old_workflow_task_meta=workflow_task.meta_non_parallel,
+        new_task_meta=new_task.meta_non_parallel,
+    )
+    workflow_task.meta_parallel = get_new_workflow_task_meta(
+        old_task_meta=workflow_task.task.meta_parallel,
+        old_workflow_task_meta=workflow_task.meta_parallel,
+        new_task_meta=new_task.meta_parallel,
     )
+    if replace.args_non_parallel is not None:
+        workflow_task.args_non_parallel = replace.args_non_parallel
+    if replace.args_parallel is not None:
+        workflow_task.args_parallel = replace.args_parallel
 
-    workflow_task_order = old_wftask.order
-    workflow.task_list.remove(old_wftask)
-    workflow.task_list.insert(workflow_task_order, new_workflow_task)
+    db.add(workflow_task)
     await db.commit()
-    await db.refresh(new_workflow_task)
-    return new_workflow_task
+    await db.refresh(workflow_task)
+    return workflow_task

fractal_server/app/runner/v2/runner.py

@@ -153,6 +153,7 @@ def execute_tasks_v2(
                 dataset_id=dataset.id,
                 workflowtask_id=wftask.id,
                 job_id=job_id,
+                task_id=wftask.task.id,
                 workflowtask_dump=workflowtask_dump,
                 task_group_dump=task_group_dump,
                 num_available_images=num_available_images,

fractal_server/app/schemas/v2/__init__.py

@@ -14,7 +14,7 @@ from .history import HistoryRunRead  # noqa F401
 from .history import HistoryRunReadAggregated  # noqa F401
 from .history import HistoryUnitRead  # noqa F401
 from .history import HistoryUnitStatus  # noqa F401
-from .history import HistoryUnitStatusQuery  # noqa F401
+from .history import HistoryUnitStatusWithUnset  # noqa F401
 from .history import ImageLogsRequest  # noqa F401
 from .history import SingleImageWithStatus  # noqa F401
 from .job import JobCreateV2  # noqa F401

fractal_server/app/schemas/v2/history.py

@@ -24,12 +24,19 @@ class HistoryUnitStatus(StrEnum):
     FAILED = "failed"
 
 
-class HistoryUnitStatusQuery(StrEnum):
+class HistoryUnitStatusWithUnset(StrEnum):
+    """
+    Available status for history queries
+
+    Attributes:
+        SUBMITTED:
+        DONE:
+        FAILED:
+    """
 
     SUBMITTED = "submitted"
     DONE = "done"
     FAILED = "failed"
-
     UNSET = "unset"
 
 
@@ -63,6 +70,9 @@ class HistoryRunReadAggregated(BaseModel):
     num_submitted_units: int
     num_done_units: int
     num_failed_units: int
+    args_schema_parallel: dict[str, Any] | None = None
+    args_schema_non_parallel: dict[str, Any] | None = None
+    version: str | None = None
 
     @field_serializer("timestamp_started")
     def serialize_datetime(v: datetime) -> str:
@@ -75,5 +85,6 @@ class ImageLogsRequest(BaseModel):
     zarr_url: str
 
 
+# FIXME: remove this when we update the webclient
 class SingleImageWithStatus(SingleImage):
     status: HistoryUnitStatus | None = None

fractal_server/data_migrations/2_14_9.py

@@ -0,0 +1,48 @@
+import logging
+
+from sqlmodel import select
+
+from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import HistoryRun
+from fractal_server.app.models import TaskV2
+from fractal_server.app.models import WorkflowTaskV2
+
+logger = logging.getLogger("fix_db")
+logger.setLevel(logging.INFO)
+
+
+def fix_db():
+    logger.info("START execution of fix_db function")
+
+    with next(get_sync_db()) as db:
+
+        stm = select(HistoryRun).order_by(HistoryRun.id)
+        history_runs = db.execute(stm).scalars().all()
+
+        for hr in history_runs:
+            logger.info(f"HistoryRun[{hr.id}] START")
+
+            wft = db.get(WorkflowTaskV2, hr.workflowtask_id)
+            if wft is None:
+                logger.warning(
+                    f"WorkflowTaskV2[{hr.workflowtask_id}] not found. "
+                    "Trying to use HistoryRun.workflowtask_dump"
+                )
+                task_id = hr.workflowtask_dump.get("task_id")
+                if task_id is not None and db.get(TaskV2, task_id) is not None:
+                    hr.task_id = task_id
+                else:
+                    logger.warning(f"TaskV2[{task_id}] not found")
+            else:
+                hr.task_id = wft.task_id
+                logger.info(
+                    f"HistoryRun[{hr.id}].task_id set to {wft.task_id}"
+                )
+
+            db.add(hr)
+            logger.info(f"HistoryRun[{hr.id}] END")
+
+        db.commit()
+        logger.info("Changes committed.")
+
+    logger.info("END execution of fix_db function")

fractal_server/images/image_status.py

@@ -0,0 +1,85 @@
+import time
+from copy import deepcopy
+from typing import Any
+
+from fastapi import Depends
+from sqlmodel import select
+
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models.v2 import HistoryImageCache
+from fractal_server.app.models.v2 import HistoryUnit
+from fractal_server.app.schemas.v2 import HistoryUnitStatusWithUnset
+from fractal_server.logger import set_logger
+
+IMAGE_STATUS_KEY = "__wftask_dataset_image_status__"
+
+logger = set_logger(__name__)
+
+
+def _enriched_image(*, img: dict[str, Any], status: str) -> dict[str, Any]:
+    img["attributes"][IMAGE_STATUS_KEY] = status
+    return img
+
+
+async def enrich_image_list(
+    *,
+    images: list[dict[str, Any]],
+    dataset_id: int,
+    workflowtask_id: int,
+    db: AsyncSession = Depends(get_async_db),
+) -> list[dict[str, Any]]:
+    start_time = time.perf_counter()
+    logger.info(
+        f"START {enrich_image_list.__name__} for {dataset_id=}, "
+        f"{workflowtask_id=}"
+    )
+
+    zarr_url_to_image = {img["zarr_url"]: deepcopy(img) for img in images}
+
+    stm = (
+        select(HistoryImageCache.zarr_url, HistoryUnit.status)
+        .join(HistoryUnit)
+        .where(HistoryImageCache.dataset_id == dataset_id)
+        .where(HistoryImageCache.workflowtask_id == workflowtask_id)
+        .where(HistoryImageCache.latest_history_unit_id == HistoryUnit.id)
+        .where(HistoryImageCache.zarr_url.in_(zarr_url_to_image.keys()))
+        .order_by(HistoryImageCache.zarr_url)
+    )
+    res = await db.execute(stm)
+    list_processed_url_status = res.all()
+    logger.debug(
+        f"POST db query, "
+        f"elapsed={time.perf_counter() - start_time:.3f} "
+        "seconds"
+    )
+
+    set_processed_urls = set(item[0] for item in list_processed_url_status)
+    processed_images_with_status = [
+        _enriched_image(
+            img=zarr_url_to_image[item[0]],
+            status=item[1],
+        )
+        for item in list_processed_url_status
+    ]
+    logger.debug(
+        f"POST processed_images_with_status, "
+        f"elapsed={time.perf_counter() - start_time:.3f} "
+        "seconds"
+    )
+
+    non_processed_urls = zarr_url_to_image.keys() - set_processed_urls
+    non_processed_images_with_status = [
+        _enriched_image(
+            img=zarr_url_to_image[zarr_url],
+            status=HistoryUnitStatusWithUnset.UNSET,
+        )
+        for zarr_url in non_processed_urls
+    ]
+    logger.debug(
+        f"POST non_processed_images_with_status, "
+        f"elapsed={time.perf_counter() - start_time:.3f} "
+        "seconds"
+    )
+
+    return processed_images_with_status + non_processed_images_with_status

fractal_server/migrations/versions/969d84257cac_add_historyrun_task_id.py

@@ -0,0 +1,42 @@
+"""add historyrun.task_id
+
+Revision ID: 969d84257cac
+Revises: c90a7c76e996
+Create Date: 2025-05-13 11:17:22.089308
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "969d84257cac"
+down_revision = "c90a7c76e996"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("historyrun", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("task_id", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            batch_op.f("fk_historyrun_task_id_taskv2"),
+            "taskv2",
+            ["task_id"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("historyrun", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f("fk_historyrun_task_id_taskv2"), type_="foreignkey"
+        )
+        batch_op.drop_column("task_id")
+
+    # ### end Alembic commands ###

fractal_server/tasks/v2/ssh/collect.py

@@ -108,21 +108,22 @@ def collect_ssh(
                     )
                     return
 
-                # Check that the (remote) task_group path does not exist
-                if fractal_ssh.remote_exists(task_group.path):
-                    error_msg = f"{task_group.path} already exists."
-                    logger.error(error_msg)
-                    fail_and_cleanup(
-                        task_group=task_group,
-                        task_group_activity=activity,
-                        logger_name=LOGGER_NAME,
-                        log_file_path=log_file_path,
-                        exception=FileExistsError(error_msg),
-                        db=db,
-                    )
-                    return
-
                 try:
+
+                    # Check that the (remote) task_group path does not exist
+                    if fractal_ssh.remote_exists(task_group.path):
+                        error_msg = f"{task_group.path} already exists."
+                        logger.error(error_msg)
+                        fail_and_cleanup(
+                            task_group=task_group,
+                            task_group_activity=activity,
+                            logger_name=LOGGER_NAME,
+                            log_file_path=log_file_path,
+                            exception=FileExistsError(error_msg),
+                            db=db,
+                        )
+                        return
+
                     # Create remote `task_group.path` and `script_dir_remote`
                     # folders (note that because of `parents=True` we  are in
                     # the `no error if existing, make parent directories as

fractal_server/tasks/v2/ssh/deactivate.py

@@ -94,22 +94,22 @@ def deactivate_ssh(
                     )
                     return
 
-                # Check that the (local) task_group venv_path does exist
-                if not fractal_ssh.remote_exists(task_group.venv_path):
-                    error_msg = f"{task_group.venv_path} does not exist."
-                    logger.error(error_msg)
-                    fail_and_cleanup(
-                        task_group=task_group,
-                        task_group_activity=activity,
-                        logger_name=LOGGER_NAME,
-                        log_file_path=log_file_path,
-                        exception=FileNotFoundError(error_msg),
-                        db=db,
-                    )
-                    return
-
                 try:
 
+                    # Check that the (local) task_group venv_path does exist
+                    if not fractal_ssh.remote_exists(task_group.venv_path):
+                        error_msg = f"{task_group.venv_path} does not exist."
+                        logger.error(error_msg)
+                        fail_and_cleanup(
+                            task_group=task_group,
+                            task_group_activity=activity,
+                            logger_name=LOGGER_NAME,
+                            log_file_path=log_file_path,
+                            exception=FileNotFoundError(error_msg),
+                            db=db,
+                        )
+                        return
+
                     activity.status = TaskGroupActivityStatusV2.ONGOING
                     activity = add_commit_refresh(obj=activity, db=db)
 

fractal_server/tasks/v2/ssh/reactivate.py

@@ -95,21 +95,22 @@ def reactivate_ssh(
                     )
                     return
 
-                # Check that the (remote) task_group venv_path does not exist
-                if fractal_ssh.remote_exists(task_group.venv_path):
-                    error_msg = f"{task_group.venv_path} already exists."
-                    logger.error(error_msg)
-                    fail_and_cleanup(
-                        task_group=task_group,
-                        task_group_activity=activity,
-                        logger_name=LOGGER_NAME,
-                        log_file_path=log_file_path,
-                        exception=FileExistsError(error_msg),
-                        db=db,
-                    )
-                    return
-
                 try:
+                    # Check that the (remote) task_group venv_path does not
+                    # exist
+                    if fractal_ssh.remote_exists(task_group.venv_path):
+                        error_msg = f"{task_group.venv_path} already exists."
+                        logger.error(error_msg)
+                        fail_and_cleanup(
+                            task_group=task_group,
+                            task_group_activity=activity,
+                            logger_name=LOGGER_NAME,
+                            log_file_path=log_file_path,
+                            exception=FileExistsError(error_msg),
+                            db=db,
+                        )
+                        return
+
                     activity.status = TaskGroupActivityStatusV2.ONGOING
                     activity = add_commit_refresh(obj=activity, db=db)
 

{fractal_server-2.14.7.dist-info → fractal_server-2.14.9.dist-info}/METADATA

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

{fractal_server-2.14.7.dist-info → fractal_server-2.14.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=QNdgEt2dlH38r7d-Aic7OiWBBWoFztVFsxx5rckKHWU,23
+fractal_server/__init__.py,sha256=DrlYBYsIKgHWXaavttetyr00t93DQZr6HVVppq1kegI,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
@@ -11,7 +11,7 @@ fractal_server/app/models/user_settings.py,sha256=RxzRBGLHF_wc5csrTeHGUSV77Md_X0
 fractal_server/app/models/v2/__init__.py,sha256=vjHwek7-IXmaZZL9VF0nD30YL9ca4wNc8P4RXJK_kDc,832
 fractal_server/app/models/v2/accounting.py,sha256=i-2TsjqyuclxFQ21C-TeDoss7ZBTRuXdzIJfVr2UxwE,1081
 fractal_server/app/models/v2/dataset.py,sha256=B_bPnYCSLRFN-vBIOc5nJ31JTruQPxLda9mqpPIJmGk,1209
-fractal_server/app/models/v2/history.py,sha256=fDYZ9GR8OViYrY2gdC8R_zeLL4ePmh47CjXLkDvnUWg,2045
+fractal_server/app/models/v2/history.py,sha256=XsaUb2HNIfVekaxfdpFOG2Y6q5QyTm1SO2shl8dLYQ0,2123
 fractal_server/app/models/v2/job.py,sha256=LfpwAedMVcA_6Ne0Rr4g3tt0asAQkWz3LSPm7IwZhYc,1978
 fractal_server/app/models/v2/project.py,sha256=RmU5BQR4HD6xifRndUhvPBy30wntml-giBRoEysdWXw,755
 fractal_server/app/models/v2/task.py,sha256=P7nsS5mCmVyzr4WtcjoiedesqkWvkHA2cQPsMbQt-7o,1427
@@ -33,9 +33,10 @@ fractal_server/app/routes/api/v2/__init__.py,sha256=3i4Aa-sgXq5Bb21hjONRilAloz0o
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=P5exwdiNm0ZxtoGw4wxvm_-u8e83gXz8iYEVFuUq_cU,12792
 fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=Z23xwvBaVEEQ5B-JsWZJpjj4_QqoXqHYONztnbAH6gw,4425
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=GpKfw9yj01LmOAuNMTOreU1PFkCKpjK5oCt7_wp35-A,6741
+fractal_server/app/routes/api/v2/_aux_functions_task_version_update.py,sha256=WLDOYCnb6fnS5avKflyx6yN24Vo1n5kJk5ZyiKbzb8Y,1175
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=MFYnyNPBACSHXTDLXe6cSennnpmlpajN84iivOOMW7Y,11599
 fractal_server/app/routes/api/v2/dataset.py,sha256=6u4MFqJ3YZ0Zq6Xx8CRMrTPKW55ZaR63Uno21DqFr4Q,8889
-fractal_server/app/routes/api/v2/history.py,sha256=QPY4yJCnoaKIYvAdR_W7PE1XYSFyRypDk_WkfR547ME,17711
+fractal_server/app/routes/api/v2/history.py,sha256=OHy3Y4lreGyGXk9v5iud73tzoGV-YAT027gMWJH-5p4,16958
 fractal_server/app/routes/api/v2/images.py,sha256=tJn0ANv4Tz2KHyb41sPbBRmSCpt632m8HEcgC3u-rHk,7709
 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=MmjvSQ0pNAWEw5BavR16zIZ4h13py302AmToaz8Vvco,4768
@@ -47,7 +48,7 @@ fractal_server/app/routes/api/v2/task_collection.py,sha256=FGMhTnU88Umd8nMdriUYP
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=EfGpv6W7xDyuYYp6E7XAcXLJiLNAImUHFqMDLgfh-4s,6730
 fractal_server/app/routes/api/v2/task_group.py,sha256=iShTvM9nJQhQLwR8ZpQRucVwYhJ7t00Lbesqh3M6mY4,7361
 fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=C2U2V76YbbqDWmErJ98MH9C2C26Lve2p_35FZ1dNmXg,9095
-fractal_server/app/routes/api/v2/task_version_update.py,sha256=shhhAA58zI7CLP363ndP7GOv7-WagtoW8-QacPAlOlM,8743
+fractal_server/app/routes/api/v2/task_version_update.py,sha256=h2c6aTLXj0_ZyBuHVsD5-ZTNMGEUpS96qZ4Ot1jlb74,7974
 fractal_server/app/routes/api/v2/workflow.py,sha256=gwMtpfUY_JiTv5_R_q1I9WNkp6nTqEVtYx8jWNJRxcU,10227
 fractal_server/app/routes/api/v2/workflow_import.py,sha256=Q4CnkSV47F11j6DkNT_U3AhwBK-LSsWWegItfdoOJ6c,11167
 fractal_server/app/routes/api/v2/workflowtask.py,sha256=vVqEoJa3lrMl2CU94WoxFaqO3U0QImPgvrkkUNdqDOU,7462
@@ -100,7 +101,7 @@ fractal_server/app/runner/v2/_slurm_sudo.py,sha256=Gvsh4tUlc1_3KdF3B7zEqs-YIntC_
 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=_34aVmm0jCaXWvixoMrY477p4c2ctwtvITIhIX0VccM,17673
+fractal_server/app/runner/v2/runner.py,sha256=YkxHhWA25Mv7HzviCaYMTxkyuP-JFHj73H9aPO6Fxm0,17713
 fractal_server/app/runner/v2/runner_functions.py,sha256=Q9AVIR2NEBfRpfqW1wtQTTQfks_R1TnwRFBRro2fvjQ,18837
 fractal_server/app/runner/v2/submit_workflow.py,sha256=AMnXdozwIGlXD55ch0_SNAG-ntKBO-QRhkbInrvsShU,13140
 fractal_server/app/runner/v2/task_interface.py,sha256=V2TWBK6tbhycyMrJvFaoJ9IpuKlrLrvmjJbfNMsBBXo,2527
@@ -109,11 +110,11 @@ fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMo
 fractal_server/app/schemas/user.py,sha256=t9nbyYjGCSOsxm9K97PDG3-9o27CsaFfhWb_L5nrjqA,1910
 fractal_server/app/schemas/user_group.py,sha256=x3-kqbo0q2wTP7QI0iZ7PU_9Dr957UYrFMKqS7BXLhE,1425
 fractal_server/app/schemas/user_settings.py,sha256=NpdC0Me0fgwwdfJuTSlFLCnLUjiWWzrJlPn_UPLjXnw,1862
-fractal_server/app/schemas/v2/__init__.py,sha256=wXS4ZEzobWx5dh-XLjMZWpd-JMwWFPODUeUVoMQGRv4,3099
+fractal_server/app/schemas/v2/__init__.py,sha256=M49RJ8SKcVoSfSTuiTCcbexSo8JMtLQTVFltCW4CuGQ,3103
 fractal_server/app/schemas/v2/accounting.py,sha256=Wylt7uWTiDIFlHJOh4XEtYitk2FjFlmnodDrJDxcr0E,397
 fractal_server/app/schemas/v2/dataset.py,sha256=NKCjBwGBC7mPiSlXktZAcleJsvlLY6KfNKw7Wx4Zfqk,1728
 fractal_server/app/schemas/v2/dumps.py,sha256=o4RiWoSmQ8UPoWxgKoeORykGNIdczeNmm-ng-dBRD7k,2216
-fractal_server/app/schemas/v2/history.py,sha256=Kn0OUqUyo4hb2fpM8DxDpG0y5Tipl8bMtGnZB53Zqg4,1637
+fractal_server/app/schemas/v2/history.py,sha256=BCOii7GW7OvcDr1mLZl5-kYxtczzefQciuAxp95zrFk,1958
 fractal_server/app/schemas/v2/job.py,sha256=fPay7dLSr-skKRdVRoZig8rf_sZwUdVdHZaJ4XM8vMI,3288
 fractal_server/app/schemas/v2/manifest.py,sha256=sZhj99iDgjE2MWXeTxnXSb6pFdKwRnFpCVQzcnpoTrI,6821
 fractal_server/app/schemas/v2/project.py,sha256=l96-3bCfB3knhITaLj1WSyBgbzP_k8CdtvgX_5jO_fU,657
@@ -127,10 +128,12 @@ fractal_server/app/security/__init__.py,sha256=oJ8RVglpOvWPQY4RokiE2YA72Nqo42dZE
 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=ldI9VzEWmwU75Z7zVku6I-rXGKS3bJDdCifZnwad9-4,25924
+fractal_server/data_migrations/2_14_9.py,sha256=cXmiMWPjtghr1f0uapZrs4mtbcj3tiliOebNz9LPR8Q,1532
 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/image_status.py,sha256=2EUxvuYEFKSKoICEiQntT5P3Un7FS8gv2Ef1HZFUfF4,2667
 fractal_server/images/models.py,sha256=6WchcIzLLLwdkLNRfg71Dl4Y-9UFLPyrrzh1lWgjuP0,1245
 fractal_server/images/tools.py,sha256=XKhbdjfWZpTSe1akK1bSQl4gzEQlj9ETDbELkuwayVg,4066
 fractal_server/logger.py,sha256=QIeVn3QpZsiIL2jDdrKotr-MLyDcZYgiPiTluFU46lE,5317
@@ -154,6 +157,7 @@ fractal_server/migrations/versions/84bf0fffde30_add_dumps_to_applyworkflow.py,sh
 fractal_server/migrations/versions/8e8f227a3e36_update_taskv2_post_2_7_0.py,sha256=68y9-fpSuKx6KPtM_9n8Ho0I1qwa8IoG-yJqXUYQrGg,1111
 fractal_server/migrations/versions/8f79bd162e35_add_docs_info_and_docs_link_to_task_.py,sha256=6pgODDtyAxevZvAJBj9IJ41inhV1RpwbpZr_qfPPu1A,1115
 fractal_server/migrations/versions/94a47ea2d3ff_remove_cache_dir_slurm_user_and_slurm_.py,sha256=yL3-Hvzw5jBLKj4LFP1z5ofZE9L9W3tLwYtPNW7z4ko,1508
+fractal_server/migrations/versions/969d84257cac_add_historyrun_task_id.py,sha256=4nLSYEMp_Tm7VRfo8p9YKLHVnoizTXaPV6lfcfvWhj0,1143
 fractal_server/migrations/versions/97f444d47249_add_applyworkflow_project_dump.py,sha256=eKTZm3EgUgapXBxO0RuHkEfTKic-TZG3ADaMpGLuc0k,1057
 fractal_server/migrations/versions/99ea79d9e5d2_add_dataset_history.py,sha256=0im6TxDr53sKKcjiPgeH4ftVRGnRXZSh2lPbRQ1Ir9w,883
 fractal_server/migrations/versions/9c5ae74c9b98_add_user_settings_table.py,sha256=syONdZNf4-OnAcWIsbzXpYwpXPsXZ4SsmjwVvmVG0PU,2256
@@ -188,9 +192,9 @@ fractal_server/tasks/v2/local/deactivate.py,sha256=94s_RDND8aR5Y8RxFrRx61rZBMPGq
 fractal_server/tasks/v2/local/reactivate.py,sha256=eBgFgq5xVKNr4DIDX7QU8xXerhwMrPaHDJ1wTth7aQc,6191
 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=Dxp1vd6gt3FZUqp9nVeqJR7w8l5i8F8CwvepYt4FRkg,14772
-fractal_server/tasks/v2/ssh/deactivate.py,sha256=eqMg1dOmKcQ2aKnlqDHmEQBwD22_ilUXMih9-i3IKaY,12876
-fractal_server/tasks/v2/ssh/reactivate.py,sha256=29DPb7_103tHeIkniJAGsWiC6f-6Cy92ZBY6APFipOs,8744
+fractal_server/tasks/v2/ssh/collect.py,sha256=bClq8hB04igrUXk1Mgc7pRWQws77mpYX8KYL-w6Lwtg,14825
+fractal_server/tasks/v2/ssh/deactivate.py,sha256=YO2PJ0VV-LhVW-6O-t-d6BQciO2fYAkYbz5Y9UBiXaA,12928
+fractal_server/tasks/v2/ssh/reactivate.py,sha256=1DIQduhqZLbrIeoVyyp54vemBWZu94tFDvjpmDsZZI0,8818
 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
@@ -210,8 +214,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=FCY6HUsRnnbsWkT2kwQ2izijiHuCrCD3Kh50G0QudxE,3531
 fractal_server/zip_tools.py,sha256=tqz_8f-vQ9OBRW-4OQfO6xxY-YInHTyHmZxU7U4PqZo,4885
-fractal_server-2.14.7.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.7.dist-info/METADATA,sha256=OuchiBpi477koEa1037Mif2_oDWNHdRneyBs7_Jjwuk,4243
-fractal_server-2.14.7.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.7.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.7.dist-info/RECORD,,
+fractal_server-2.14.9.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.9.dist-info/METADATA,sha256=0clmXo9yCW0yKDYn04AtdyVdVVqA0K6r77lqL9bmpMI,4243
+fractal_server-2.14.9.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.9.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.9.dist-info/RECORD,,