fractal-server 2.15.2__py3-none-any.whl → 2.15.3__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.15.2"
+__VERSION__ = "2.15.3"

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

@@ -6,6 +6,7 @@ from typing import Literal
 
 from fastapi import HTTPException
 from fastapi import status
+from sqlalchemy.exc import MultipleResultsFound
 from sqlalchemy.orm.attributes import flag_modified
 from sqlmodel import select
 from sqlmodel.sql.expression import SelectOfScalar
@@ -19,6 +20,9 @@ from ....models.v2 import TaskV2
 from ....models.v2 import WorkflowTaskV2
 from ....models.v2 import WorkflowV2
 from ....schemas.v2 import JobStatusTypeV2
+from fractal_server.logger import set_logger
+
+logger = set_logger(__name__)
 
 
 async def _get_project_check_owner(
@@ -499,3 +503,39 @@ async def _get_workflowtask_or_404(
         )
     else:
         return wftask
+
+
+async def _get_submitted_job_or_none(
+    *,
+    dataset_id: int,
+    workflow_id: int,
+    db: AsyncSession,
+) -> JobV2 | None:
+    """
+    Get the submitted job for given dataset/workflow, if any.
+
+    This function also handles the invalid branch where more than one job
+    is found.
+
+    Args:
+        dataset_id:
+        workflow_id:
+        db:
+    """
+    res = await db.execute(
+        _get_submitted_jobs_statement()
+        .where(JobV2.dataset_id == dataset_id)
+        .where(JobV2.workflow_id == workflow_id)
+    )
+    try:
+        return res.scalars().one_or_none()
+    except MultipleResultsFound as e:
+        error_msg = (
+            "Multiple running jobs found for "
+            f"{dataset_id=} and {workflow_id=}."
+        )
+        logger.error(f"{error_msg} Original error: {str(e)}.")
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=error_msg,
+        )

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

@@ -1,5 +1,3 @@
-from copy import deepcopy
-
 from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
@@ -9,6 +7,7 @@ from sqlmodel import func
 from sqlmodel import select
 
 from ._aux_functions import _get_dataset_check_owner
+from ._aux_functions import _get_submitted_job_or_none
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions_history import _verify_workflow_and_dataset_access
 from ._aux_functions_history import get_history_run_or_404
@@ -72,6 +71,7 @@ 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,
@@ -86,6 +86,19 @@ async def get_workflow_tasks_statuses(
         db=db,
     )
 
+    running_job = await _get_submitted_job_or_none(
+        db=db,
+        dataset_id=dataset_id,
+        workflow_id=workflow_id,
+    )
+    if running_job is not None:
+        running_wftasks = workflow.task_list[
+            running_job.first_task_index : running_job.last_task_index + 1
+        ]
+        running_wftask_ids = [wft.id for wft in running_wftasks]
+    else:
+        running_wftask_ids = []
+
     response: dict[int, dict[str, int | str] | None] = {}
     for wftask in workflow.task_list:
         res = await db.execute(
@@ -95,17 +108,37 @@ async def get_workflow_tasks_statuses(
             .order_by(HistoryRun.timestamp_started.desc())
             .limit(1)
         )
-        latest_history_run = res.scalar_one_or_none()
-        if latest_history_run is None:
-            logger.debug(
-                f"No HistoryRun found for {dataset_id=} and {wftask.id=}."
-            )
-            response[wftask.id] = None
+        latest_run = res.scalar_one_or_none()
+
+        if latest_run is None:
+            if wftask.id in running_wftask_ids:
+                logger.debug(f"A1: No HistoryRun for {wftask.id=}.")
+                response[wftask.id] = dict(status=HistoryUnitStatus.SUBMITTED)
+            else:
+                logger.debug(f"A2: No HistoryRun for {wftask.id=}.")
+                response[wftask.id] = None
             continue
-        response[wftask.id] = dict(
-            status=latest_history_run.status,
-            num_available_images=latest_history_run.num_available_images,
-        )
+        else:
+            if wftask.id in running_wftask_ids:
+                if latest_run.job_id == running_job.id:
+                    logger.debug(
+                        f"B1 for {wftask.id} and {latest_run.job_id=}."
+                    )
+                    response[wftask.id] = dict(status=latest_run.status)
+                else:
+                    logger.debug(
+                        f"B2 for {wftask.id} and {latest_run.job_id=}."
+                    )
+                    response[wftask.id] = dict(
+                        status=HistoryUnitStatus.SUBMITTED
+                    )
+            else:
+                logger.debug(f"C1: {wftask.id=} not in {running_wftask_ids=}.")
+                response[wftask.id] = dict(status=latest_run.status)
+
+        response[wftask.id][
+            "num_available_images"
+        ] = latest_run.num_available_images
 
         for target_status in HistoryUnitStatus:
             stm = (
@@ -122,18 +155,24 @@ async def get_workflow_tasks_statuses(
             num_images = res.scalar()
             response[wftask.id][f"num_{target_status}_images"] = num_images
 
-    new_response = deepcopy(response)
-    for key, value in response.items():
-        if value is not None:
-            num_total_images = sum(
-                value[f"num_{target_status}_images"]
-                for target_status in HistoryUnitStatus
-            )
-            if num_total_images > value["num_available_images"]:
-                value["num_available_images"] = None
-        new_response[key] = value
+    # Set `num_available_images=None` for cases where it would be
+    # smaller than `num_total_images`
+    values_to_skip = (None, {"status": HistoryUnitStatus.SUBMITTED})
+    response_update = {}
+    for wftask_id, status_value in response.items():
+        if status_value in values_to_skip:
+            # Skip cases where status has no image counters
+            continue
+        num_total_images = sum(
+            status_value[f"num_{target_status}_images"]
+            for target_status in HistoryUnitStatus
+        )
+        if num_total_images > status_value["num_available_images"]:
+            status_value["num_available_images"] = None
+            response_update[wftask_id] = status_value
+    response.update(response_update)
 
-    return JSONResponse(content=new_response, status_code=200)
+    return JSONResponse(content=response, status_code=200)
 
 
 @router.get("/project/{project_id}/status/run/")

{fractal_server-2.15.2.dist-info → fractal_server-2.15.3.dist-info}/METADATA

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

{fractal_server-2.15.2.dist-info → fractal_server-2.15.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=3aUOEwrozdEb6uIH3H2d1pXz5bTLTWOObIlVGVMgxVc,23
+fractal_server/__init__.py,sha256=TohihjKSFnz5CZYMVH94PEv_l0OHohZckQFN39DhyqE,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
@@ -30,14 +30,14 @@ fractal_server/app/routes/admin/v2/task_group.py,sha256=biibAvMPD2w-267eyTm3wH2s
 fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=2J3M9VXWD_0j9jRTZ5APuUXl9E-aVv0qF8K02vvcO3s,9150
 fractal_server/app/routes/api/__init__.py,sha256=B8l6PSAhR10iZqHEiyTat-_0tkeKdrCigIE6DJGP5b8,638
 fractal_server/app/routes/api/v2/__init__.py,sha256=D3sRRsqkmZO6kBxUjg40q0aRDsnuXI4sOOfn0xF9JsM,2820
-fractal_server/app/routes/api/v2/_aux_functions.py,sha256=oavMb8HM4lWKMW7_Iyx8Sc9AHKpbmFyyqcPqQLstP_I,13192
+fractal_server/app/routes/api/v2/_aux_functions.py,sha256=YU7yT9L6yc01VMWozXPnRcx0X0063rTylmeU6PKNyKM,14260
 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=MNty8CBnTMPSAKE5gMT7tCY8QWpCQyhft_shq12hHpA,12208
 fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=8x1_q9FyCzItnPmdSdLQuwUTy4B9xCsXscp97_lJcpM,4635
 fractal_server/app/routes/api/v2/dataset.py,sha256=6u4MFqJ3YZ0Zq6Xx8CRMrTPKW55ZaR63Uno21DqFr4Q,8889
-fractal_server/app/routes/api/v2/history.py,sha256=BHBZYFSF5lw-YYOl0OVV5yEZPMxiqjH72_KwR66EtaE,15495
+fractal_server/app/routes/api/v2/history.py,sha256=ErLqkJbhx9XzHL4KQvMraVAtD9WOmDNh5tZi5wmNkL0,17114
 fractal_server/app/routes/api/v2/images.py,sha256=TS1ltUhP0_SaViupdHrSh3MLDi5OVk-lOhE1VCVyZj0,7869
 fractal_server/app/routes/api/v2/job.py,sha256=8xRTwh_OCHmK9IfI_zUASa2ozewR0qu0zVBl_a4IvHw,6467
 fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=2jaaM5WJBTGpOWhm6a42JViT8j4X5hixltxIY1p-188,4936
@@ -230,8 +230,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=Vn35lApt1T1J8nc09sAVqd10Cy0sa3dLipcljI-hkuk,2185
 fractal_server/zip_tools.py,sha256=tqz_8f-vQ9OBRW-4OQfO6xxY-YInHTyHmZxU7U4PqZo,4885
-fractal_server-2.15.2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.15.2.dist-info/METADATA,sha256=ey4BDGRNNq1SLK-pmXThhvEbXwbgyB2jWyTOI3ADuC4,4243
-fractal_server-2.15.2.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.15.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.15.2.dist-info/RECORD,,
+fractal_server-2.15.3.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.15.3.dist-info/METADATA,sha256=-Z1TLhBsEtPcHcx4oq8Hij5f1mUfDyTiL3ttW1cBmTE,4243
+fractal_server-2.15.3.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.15.3.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.15.3.dist-info/RECORD,,