fractal-server 2.14.0a7__py3-none-any.whl → 2.14.0a8__py3-none-any.whl

fractal_server/app/runner/v2/runner_functions.py

@@ -15,7 +15,6 @@ from .runner_functions_low_level import run_single_task
 from .task_interface import InitTaskOutput
 from .task_interface import TaskOutput
 from fractal_server.app.db import get_sync_db
-from fractal_server.app.history.status_enum import XXXStatus
 from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
@@ -23,12 +22,15 @@ from fractal_server.app.runner.components import _COMPONENT_KEY_
 from fractal_server.app.runner.components import _index_to_component
 from fractal_server.app.runner.executors.base_runner import BaseRunner
 from fractal_server.app.runner.v2._db_tools import bulk_upsert_image_cache_fast
+from fractal_server.app.schemas.v2 import HistoryUnitStatus
 
 
 __all__ = [
-    "run_v2_task_non_parallel",
     "run_v2_task_parallel",
+    "run_v2_task_non_parallel",
     "run_v2_task_compound",
+    "run_v2_task_converter_non_parallel",
+    "run_v2_task_converter_compound",
 ]
 
 MAX_PARALLELIZATION_LIST_SIZE = 20_000
@@ -125,7 +127,7 @@ def run_v2_task_non_parallel(
     with next(get_sync_db()) as db:
         history_unit = HistoryUnit(
             history_run_id=history_run_id,
-            status=XXXStatus.SUBMITTED,
+            status=HistoryUnitStatus.SUBMITTED,
             logfile=None,  # FIXME
             zarr_urls=function_kwargs["zarr_urls"],
         )
@@ -165,7 +167,7 @@ def run_v2_task_non_parallel(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.DONE)
+                .values(status=HistoryUnitStatus.DONE)
             )
             db.commit()
             if result is None:
@@ -176,7 +178,7 @@ def run_v2_task_non_parallel(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.FAILED)
+                .values(status=HistoryUnitStatus.FAILED)
             )
             db.commit()
             return (TaskOutput(), num_tasks, {0: exception})
@@ -222,7 +224,7 @@ def run_v2_task_converter_non_parallel(
     with next(get_sync_db()) as db:
         history_unit = HistoryUnit(
             history_run_id=history_run_id,
-            status=XXXStatus.SUBMITTED,
+            status=HistoryUnitStatus.SUBMITTED,
             logfile=None,  # FIXME
             zarr_urls=[],
         )
@@ -250,7 +252,7 @@ def run_v2_task_converter_non_parallel(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.DONE)
+                .values(status=HistoryUnitStatus.DONE)
             )
             db.commit()
             if result is None:
@@ -261,7 +263,7 @@ def run_v2_task_converter_non_parallel(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.FAILED)
+                .values(status=HistoryUnitStatus.FAILED)
             )
             db.commit()
             return (TaskOutput(), num_tasks, {0: exception})
@@ -303,7 +305,7 @@ def run_v2_task_parallel(
     history_units = [
         HistoryUnit(
             history_run_id=history_run_id,
-            status=XXXStatus.SUBMITTED,
+            status=HistoryUnitStatus.SUBMITTED,
             logfile=None,  # FIXME
             zarr_urls=[image["zarr_url"]],
         )
@@ -367,12 +369,12 @@ def run_v2_task_parallel(
         db.execute(
             update(HistoryUnit)
             .where(HistoryUnit.id.in_(history_unit_ids_done))
-            .values(status=XXXStatus.DONE)
+            .values(status=HistoryUnitStatus.DONE)
         )
         db.execute(
             update(HistoryUnit)
             .where(HistoryUnit.id.in_(history_unit_ids_failed))
-            .values(status=XXXStatus.FAILED)
+            .values(status=HistoryUnitStatus.FAILED)
         )
         db.commit()
 
@@ -421,7 +423,7 @@ def run_v2_task_compound(
         # Create a single `HistoryUnit` for the whole compound task
         history_unit = HistoryUnit(
             history_run_id=history_run_id,
-            status=XXXStatus.SUBMITTED,
+            status=HistoryUnitStatus.SUBMITTED,
             logfile=None,  # FIXME
             zarr_urls=input_image_zarr_urls,
         )
@@ -467,7 +469,7 @@ def run_v2_task_compound(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.FAILED)
+                .values(status=HistoryUnitStatus.FAILED)
             )
             db.commit()
         return (TaskOutput(), num_tasks, {0: exception})
@@ -485,7 +487,7 @@ def run_v2_task_compound(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.DONE)
+                .values(status=HistoryUnitStatus.DONE)
             )
             db.commit()
         return (TaskOutput(), 0, {})
@@ -535,13 +537,13 @@ def run_v2_task_compound(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.FAILED)
+                .values(status=HistoryUnitStatus.FAILED)
             )
         else:
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.DONE)
+                .values(status=HistoryUnitStatus.DONE)
             )
         db.commit()
 
@@ -586,7 +588,7 @@ def run_v2_task_converter_compound(
         # Create a single `HistoryUnit` for the whole compound task
         history_unit = HistoryUnit(
             history_run_id=history_run_id,
-            status=XXXStatus.SUBMITTED,
+            status=HistoryUnitStatus.SUBMITTED,
             logfile=None,  # FIXME
             zarr_urls=[],
         )
@@ -619,7 +621,7 @@ def run_v2_task_converter_compound(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.FAILED)
+                .values(status=HistoryUnitStatus.FAILED)
             )
             db.commit()
         return (TaskOutput(), num_tasks, {0: exception})
@@ -637,7 +639,7 @@ def run_v2_task_converter_compound(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.DONE)
+                .values(status=HistoryUnitStatus.DONE)
             )
             db.commit()
         return (TaskOutput(), 0, {})
@@ -687,13 +689,13 @@ def run_v2_task_converter_compound(
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.FAILED)
+                .values(status=HistoryUnitStatus.FAILED)
             )
         else:
             db.execute(
                 update(HistoryUnit)
                 .where(HistoryUnit.id == history_unit_id)
-                .values(status=XXXStatus.DONE)
+                .values(status=HistoryUnitStatus.DONE)
             )
         db.commit()
 

fractal_server/app/schemas/v2/__init__.py

@@ -7,8 +7,14 @@ from .dataset import DatasetUpdateV2  # noqa F401
 from .dumps import DatasetDumpV2  # noqa F401
 from .dumps import ProjectDumpV2  # noqa F401
 from .dumps import TaskDumpV2  # noqa F401
+from .dumps import TaskGroupDumpV2  # noqa F401
 from .dumps import WorkflowDumpV2  # noqa F401
 from .dumps import WorkflowTaskDumpV2  # noqa F401
+from .history import HistoryRunReadAggregated  # noqa F401
+from .history import HistoryUnitRead  # noqa F401
+from .history import HistoryUnitStatus  # noqa F401
+from .history import ImageLogsRequest  # noqa F401
+from .history import ZarrUrlAndStatus  # noqa F401
 from .job import JobCreateV2  # noqa F401
 from .job import JobReadV2  # noqa F401
 from .job import JobStatusTypeV2  # noqa F401
@@ -18,6 +24,7 @@ from .manifest import TaskManifestV2  # noqa F401
 from .project import ProjectCreateV2  # noqa F401
 from .project import ProjectReadV2  # noqa F401
 from .project import ProjectUpdateV2  # noqa F401
+from .status_legacy import WorkflowTaskStatusTypeV2  # noqa F401
 from .task import TaskCreateV2  # noqa F401
 from .task import TaskExportV2  # noqa F401
 from .task import TaskImportV2  # noqa F401
@@ -47,5 +54,4 @@ from .workflowtask import WorkflowTaskImportV2  # noqa F401
 from .workflowtask import WorkflowTaskReadV2  # noqa F401
 from .workflowtask import WorkflowTaskReadV2WithWarning  # noqa F401
 from .workflowtask import WorkflowTaskReplaceV2  # noqa F401
-from .workflowtask import WorkflowTaskStatusTypeV2  # noqa F401
 from .workflowtask import WorkflowTaskUpdateV2  # noqa F401

fractal_server/app/schemas/v2/dumps.py

@@ -1,18 +1,20 @@
 """
-
 Dump models differ from their Read counterpart in that:
 * They are directly JSON-able, without any additional encoder.
-* They may only include a subset of the Read attributes.
+* They may include only a subset of the available fields.
 
 These models are used in at least two situations:
 1. In the "*_dump" attributes of Job models;
-2. In the `_DatasetHistoryItem.workflowtask` model, to trim its size.
+2. In the history items, to trim their size.
 """
 from typing import Optional
 
 from pydantic import BaseModel
 from pydantic import ConfigDict
+from pydantic import Field
 
+from .task import TaskTypeType
+from .task_group import TaskGroupV2OriginEnum
 from fractal_server.images.models import AttributeFiltersType
 
 
@@ -26,7 +28,7 @@ class ProjectDumpV2(BaseModel):
 class TaskDumpV2(BaseModel):
     id: int
     name: str
-    type: str
+    type: TaskTypeType
 
     command_non_parallel: Optional[str] = None
     command_parallel: Optional[str] = None
@@ -72,3 +74,17 @@ class DatasetDumpV2(BaseModel):
     zarr_dir: str
     type_filters: dict[str, bool]
     attribute_filters: AttributeFiltersType
+
+
+class TaskGroupDumpV2(BaseModel):
+    id: int
+    origin: TaskGroupV2OriginEnum
+    pkg_name: str
+    version: Optional[str] = None
+    python_version: Optional[str] = None
+    pip_extras: Optional[str] = None
+    pinned_package_versions: dict[str, str] = Field(default_factory=dict)
+
+    path: Optional[str] = None
+    venv_path: Optional[str] = None
+    wheel_path: Optional[str] = None

fractal_server/app/schemas/v2/history.py

@@ -0,0 +1,54 @@
+from datetime import datetime
+from enum import Enum
+from typing import Any
+from typing import Optional
+
+from pydantic import AwareDatetime
+from pydantic import BaseModel
+from pydantic import field_serializer
+
+
+class HistoryUnitStatus(str, Enum):
+    """
+    Available status for images
+
+    Attributes:
+        SUBMITTED:
+        DONE:
+        FAILED:
+    """
+
+    SUBMITTED = "submitted"
+    DONE = "done"
+    FAILED = "failed"
+
+
+class HistoryUnitRead(BaseModel):
+    id: int
+    logfile: Optional[str] = None
+    status: HistoryUnitStatus
+    zarr_urls: list[str]
+
+
+class HistoryRunReadAggregated(BaseModel):
+    id: int
+    timestamp_started: AwareDatetime
+    workflowtask_dump: dict[str, Any]
+    num_submitted_units: int
+    num_done_units: int
+    num_failed_units: int
+
+    @field_serializer("timestamp_started")
+    def serialize_datetime(v: datetime) -> str:
+        return v.isoformat()
+
+
+class ImageLogsRequest(BaseModel):
+    workflowtask_id: int
+    dataset_id: int
+    zarr_url: str
+
+
+class ZarrUrlAndStatus(BaseModel):
+    zarr_url: str
+    status: Optional[HistoryUnitStatus] = None

fractal_server/app/schemas/v2/status_legacy.py

@@ -0,0 +1,35 @@
+from enum import Enum
+
+from pydantic import BaseModel
+from pydantic import Field
+
+
+class WorkflowTaskStatusTypeV2(str, Enum):
+    """
+    Define the available values for the status of a `WorkflowTask`.
+
+    This model is used within the `Dataset.history` attribute, which is
+    constructed in the runner and then used in the API (e.g. in the
+    `api/v2/project/{project_id}/dataset/{dataset_id}/status` endpoint).
+
+    Attributes:
+        SUBMITTED: The `WorkflowTask` is part of a running job.
+        DONE: The most-recent execution of this `WorkflowTask` was successful.
+        FAILED: The most-recent execution of this `WorkflowTask` failed.
+    """
+
+    SUBMITTED = "submitted"
+    DONE = "done"
+    FAILED = "failed"
+
+
+class LegacyStatusReadV2(BaseModel):
+    """
+    Response type for the
+    `/project/{project_id}/status/` endpoint
+    """
+
+    status: dict[
+        str,
+        WorkflowTaskStatusTypeV2,
+    ] = Field(default_factory=dict)

fractal_server/app/schemas/v2/task.py

@@ -135,7 +135,7 @@ class TaskCreateV2(BaseModel):
 class TaskReadV2(BaseModel):
     id: int
     name: str
-    type: Literal["parallel", "non_parallel", "compound"]
+    type: TaskTypeType
     source: Optional[str] = None
     version: Optional[str] = None
 
@@ -158,8 +158,6 @@ class TaskReadV2(BaseModel):
     authors: Optional[str] = None
     tags: list[str]
 
-    type: Optional[TaskTypeType] = None
-
 
 class TaskUpdateV2(BaseModel):
     model_config = ConfigDict(extra="forbid")

fractal_server/app/schemas/v2/workflowtask.py

@@ -1,4 +1,3 @@
-from enum import Enum
 from typing import Any
 from typing import Optional
 from typing import Union
@@ -21,25 +20,6 @@ from .task import TaskTypeType
 RESERVED_ARGUMENTS = {"zarr_dir", "zarr_url", "zarr_urls", "init_args"}
 
 
-class WorkflowTaskStatusTypeV2(str, Enum):
-    """
-    Define the available values for the status of a `WorkflowTask`.
-
-    This model is used within the `Dataset.history` attribute, which is
-    constructed in the runner and then used in the API (e.g. in the
-    `api/v2/project/{project_id}/dataset/{dataset_id}/status` endpoint).
-
-    Attributes:
-        SUBMITTED: The `WorkflowTask` is part of a running job.
-        DONE: The most-recent execution of this `WorkflowTask` was successful.
-        FAILED: The most-recent execution of this `WorkflowTask` failed.
-    """
-
-    SUBMITTED = "submitted"
-    DONE = "done"
-    FAILED = "failed"
-
-
 class WorkflowTaskCreateV2(BaseModel):
     model_config = ConfigDict(extra="forbid")
 

{fractal_server-2.14.0a7.dist-info → fractal_server-2.14.0a8.dist-info}/METADATA

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.14.0a7
+Version: 2.14.0a8
 Summary: Backend component of the Fractal analytics platform
-Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause
 Author: Tommaso Comparin
 Author-email: tommaso.comparin@exact-lab.it
@@ -29,6 +28,7 @@ Requires-Dist: sqlmodel (==0.0.22)
 Requires-Dist: uvicorn (>=0.29.0,<0.35.0)
 Requires-Dist: uvicorn-worker (==0.3.0)
 Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server
+Project-URL: Homepage, https://github.com/fractal-analytics-platform/fractal-server
 Project-URL: Repository, https://github.com/fractal-analytics-platform/fractal-server
 Project-URL: changelog, https://github.com/fractal-analytics-platform/fractal-server/blob/main/CHANGELOG.md
 Description-Content-Type: text/markdown

{fractal_server-2.14.0a7.dist-info → fractal_server-2.14.0a8.dist-info}/RECORD

@@ -1,11 +1,9 @@
-fractal_server/__init__.py,sha256=1JU9zoVeJhUgQtGc2wlEGMoG-HAWT8I6UZKOOCDkSGA,25
+fractal_server/__init__.py,sha256=kGAQu3H-ucHD5NhKhR9WUJUdDh_6vyFTxQN6G9BnBpY,25
 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
 fractal_server/app/db/__init__.py,sha256=wup2wcOkyOh8Vd0Xm76PZn_naxeMqaL4eF8DHHXTGlI,2889
-fractal_server/app/history/__init__.py,sha256=ZF-5wb_NH_7SJkUiVkYq2X0MJAy1fFnYBRpgPfEirjo,234
-fractal_server/app/history/image_updates.py,sha256=ToY3yENMM6OdWUuFPG5F7qsLefrsaPqyRDFHaimsaHI,4188
-fractal_server/app/history/status_enum.py,sha256=umznsG4-ZunCLz2ks3Gb-K_s1irwd4ibOJ8vJ2Z0C-M,235
+fractal_server/app/history/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/models/__init__.py,sha256=xJWiGAwpXmCpnFMC4c_HTqoUCzMOXrakoGLUH_uMvdA,415
 fractal_server/app/models/linkusergroup.py,sha256=LWTUfhH2uAnn_4moK7QdRUIHWtpw-hPZuW-5jClv_OE,610
 fractal_server/app/models/linkuserproject.py,sha256=hvaxh3Lkiy2uUCwB8gvn8RorCpvxSSdzWdCS_U1GL7g,315
@@ -33,16 +31,16 @@ fractal_server/app/routes/admin/v2/task_group.py,sha256=XTjdqgABXZcx9EenaoqSmHh1
 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=Q65mxJOfuexzj53m6IB5fNl9PDec-Asu97W0bBxrRMM,2324
-fractal_server/app/routes/api/v2/_aux_functions.py,sha256=pmYbsHjJexb5-zMCJQLNStmU_95ZfeEIBpoCJx4GFIY,13480
-fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=dGr9mhuE1kJPx8RNDwFplCWBunV1Zh0QxNQbssGAqMI,1341
+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=nWO4jBoL3MWuMMwS-6TwxlTHzgRr8Xed30RSeetLvP8,4199
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=qdXCb6IP8-qPEAxGZKljtjIqNzIAyRaAsQSRi5VqFHM,6773
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=uhNSs-jcS7ndIUFKiOC1yrDiViw3uvKEXi9UL04BMks,11642
 fractal_server/app/routes/api/v2/dataset.py,sha256=osoWJIA5SZH4aAr-0TG6Uc3877wzsgCLB_Oek59hRjk,9230
-fractal_server/app/routes/api/v2/history.py,sha256=UInNe9u22GYmh4rCYQe_LrVBGNOFNCbETVgdmZsHKRw,13485
+fractal_server/app/routes/api/v2/history.py,sha256=9oux9P_BloLLFs0t-bSiKfjaWEH1Al0kzQSr4wFUxac,13042
 fractal_server/app/routes/api/v2/images.py,sha256=wUhYomNLGtJTtu_pD2oQorcH2LISxo64Wxo6ogc4IXc,8185
-fractal_server/app/routes/api/v2/job.py,sha256=m89FTh9Px25oXCeWj2k2NdGWQaO2oxMh-6lZppcsJOY,5551
+fractal_server/app/routes/api/v2/job.py,sha256=MU1sHIKk_89WrD0TD44d4ufzqnywot7On_W71KjyUbQ,6500
 fractal_server/app/routes/api/v2/project.py,sha256=hMvL9QLPUcAAiPGy6ta2LBLTVRozJsfvBPl5D06_MHg,6666
-fractal_server/app/routes/api/v2/status_legacy.py,sha256=sJLHGGHI9so_Sa4-8JuhMGBPeE6n4K2DmDuiw6IB4XY,6317
+fractal_server/app/routes/api/v2/status_legacy.py,sha256=Q5ZWQNfeZKL8Xgtou2Xr80iaF1uO-r4oSKgq5H42V_8,6349
 fractal_server/app/routes/api/v2/submit.py,sha256=K4OjcSg476JXIeeMUaYdTDk8Qpj5IO5UULvfErI7Y5Y,8624
 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
@@ -87,7 +85,7 @@ fractal_server/app/runner/executors/slurm_common/utils_executors.py,sha256=naPyJ
 fractal_server/app/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_ssh/_executor_wait_thread.py,sha256=lnW8dNNPqqbpQvojVBQaNJm4wN3Qkw02RWBZ1w68Hyw,3755
 fractal_server/app/runner/executors/slurm_ssh/_slurm_job.py,sha256=IL1C52dezEiincVX2yKryNiPHi4YOMURNLdQO_QPdGw,4406
-fractal_server/app/runner/executors/slurm_ssh/executor.py,sha256=JW6zguEy9XsHebSPt_JTK4Kw78r5rlbDEipSOxOqoHk,53660
+fractal_server/app/runner/executors/slurm_ssh/executor.py,sha256=VXMDaQRijYaeKyxly4RkBkRg2inLBZ75rfuODg0Mgr8,53602
 fractal_server/app/runner/executors/slurm_sudo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_sudo/_check_jobs_status.py,sha256=eZd9lxbObsqc1M3B96IGMJ-1oC0jo8lBOX4Nto97VvE,2036
 fractal_server/app/runner/executors/slurm_sudo/_subprocess_run_as_user.py,sha256=O1bNg1DiSDJmQE0RmOk2Ii47DagiXp5ryd0R6KxO2OM,3177
@@ -105,8 +103,8 @@ fractal_server/app/runner/v2/_slurm_ssh.py,sha256=5w_lwQzySx-R3kVg2Bf-21n5JpWjJA
 fractal_server/app/runner/v2/_slurm_sudo.py,sha256=CzWUeC6at_Sj-wU1myjA68ZRKMiLZYBTLv9I9odUxBU,2914
 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=3M6xGeccY_AZKua305MgWLuCuhkACoqwKgTV4vuNguk,15534
-fractal_server/app/runner/v2/runner_functions.py,sha256=tztuEF7m0iE-ca5n6Vb-l1dDUldQXAGxZkD1OTL6I6w,21889
+fractal_server/app/runner/v2/runner.py,sha256=hsXBFQmoo8fqZC13DxlEwLLSVwsr7AvgTrTfiQXcXyk,15570
+fractal_server/app/runner/v2/runner_functions.py,sha256=9i7fHMr3BFrgguptJ-Pz3Gu68Okp5e3JvIIEqhdrG3Q,22120
 fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=dvvRK7od8iQ8vdPf80uGUxs3i5i0buGjCodBxSjZ7PQ,3671
 fractal_server/app/runner/v2/task_interface.py,sha256=e1GGQSYd0MyBj1EZvEVzqv-HpVE4YffXOq82WLrCaOc,1866
 fractal_server/app/runner/versions.py,sha256=dSaPRWqmFPHjg20kTCHmi_dmGNcCETflDtDLronNanU,852
@@ -116,19 +114,20 @@ fractal_server/app/schemas/_validators.py,sha256=ZzTlTTzRATzf9Snx4Xp67aDmG77GaM2
 fractal_server/app/schemas/user.py,sha256=oCftAKeHdFFowpLyh1G-RiylR8cIO7fTn0PkT5xjs0E,2494
 fractal_server/app/schemas/user_group.py,sha256=Uao1igRYflBu7Dg6Zs0kaFU3zBFJzIwDLrkFfaJk6z8,2176
 fractal_server/app/schemas/user_settings.py,sha256=z7hx54yTrWfjo98oX_1lkeRh1UGrC1dSRH6yIOpnCsY,2772
-fractal_server/app/schemas/v2/__init__.py,sha256=pjRUOJwZGzsDbBbxfnCgQgShs5V8SaHRqwIQDW3STpY,2676
+fractal_server/app/schemas/v2/__init__.py,sha256=Q1Sozuh6escPbU3SIsmiJbQMFl9kfIcfK-3Ctb-1wXQ,2988
 fractal_server/app/schemas/v2/accounting.py,sha256=Wylt7uWTiDIFlHJOh4XEtYitk2FjFlmnodDrJDxcr0E,397
 fractal_server/app/schemas/v2/dataset.py,sha256=9yc-tte70yPPk4CSfy2imykYVbCW8-23K499pi9z2e0,5206
-fractal_server/app/schemas/v2/dumps.py,sha256=2GUjoqeblUvrSoojBz5odoUUf53IABtbY_5GvFZoMVc,1782
+fractal_server/app/schemas/v2/dumps.py,sha256=AhCSo4jaGyCdcNkmRvtIZ_QnIl4elu-KUAFlmP5I2rg,2261
+fractal_server/app/schemas/v2/history.py,sha256=aCzr68OdNtHzNHrW43F5uxSCCcT6dMaq-_Dq9GpuJ6k,1100
 fractal_server/app/schemas/v2/job.py,sha256=KhxQOfncpE_SAu7Wed8CXS2G6onh0v875GkotBvKBTY,4304
 fractal_server/app/schemas/v2/manifest.py,sha256=8mmB0QwxEgAeGgwKD_fT-o-wFy7lb6HxNXbp17IJqNY,7281
 fractal_server/app/schemas/v2/project.py,sha256=ulgCmUnX0w-0jrSjVYIT7sxeK95CSNGh2msXydhsgYI,885
-fractal_server/app/schemas/v2/status.py,sha256=SQaUpQkjFq5c5k5J4rOjNhuQaDOEg8lksPhkKmPU5VU,332
-fractal_server/app/schemas/v2/task.py,sha256=-oBE5-2tSUd6u75duAcaFyEFGk3MsQzrdBr_mFldOBc,6627
+fractal_server/app/schemas/v2/status_legacy.py,sha256=vc6C3Xri8222bb9OmsghMz05CNuEalO-t2s_nKo341s,954
+fractal_server/app/schemas/v2/task.py,sha256=8vc8c3ZL6dJo9kyCrfKozgO_pF37BBLvD5XYIXynlEc,6551
 fractal_server/app/schemas/v2/task_collection.py,sha256=dLu4sy-su5k5vDJqCZdJMW8mLT5TX2SV60l_RAvKhwY,5930
 fractal_server/app/schemas/v2/task_group.py,sha256=A3SFHNHLKPJyrnDz-wbnQvycetafKltp6UsH1u-euwA,3850
 fractal_server/app/schemas/v2/workflow.py,sha256=ZpM43zTMyLRnEUtkbr_J5DYP00NwjItaC8gweB7GGAA,2172
-fractal_server/app/schemas/v2/workflowtask.py,sha256=qOzpsWQ7QUNey-rK9hPB3PKFrRxXrMvcRzqZxRuEYAI,8096
+fractal_server/app/schemas/v2/workflowtask.py,sha256=rVbmNihDAJL_Sckbt1hBK2JEcb-8Xpxn3McvaomZLmQ,7429
 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
@@ -206,8 +205,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.0a7.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.0a7.dist-info/METADATA,sha256=-H-lBPwP4S9jTTot-k3weBihbHTA2utPTxzC1z7h8so,4550
-fractal_server-2.14.0a7.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.14.0a7.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.0a7.dist-info/RECORD,,
+fractal_server-2.14.0a8.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.0a8.dist-info/METADATA,sha256=9Y62LfjS5cZ88MZggxLwL2usMbt3Ny9GPiX8CBhFgpQ,4562
+fractal_server-2.14.0a8.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.0a8.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.0a8.dist-info/RECORD,,

{fractal_server-2.14.0a7.dist-info → fractal_server-2.14.0a8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.0
+Generator: poetry-core 2.1.0
 Root-Is-Purelib: true
 Tag: py3-none-any

fractal_server/app/history/image_updates.py

@@ -1,124 +0,0 @@
-# from typing import Optional
-# from sqlalchemy.orm import Session
-# from sqlalchemy.orm.attributes import flag_modified
-# from sqlmodel import select
-# from fractal_server.app.db import get_sync_db
-# from fractal_server.app.history.status_enum import HistoryItemImageStatus
-# from fractal_server.app.models.v2 import HistoryItemV2
-# from fractal_server.app.models.v2 import ImageStatus
-# from fractal_server.logger import set_logger
-# logger = set_logger(__name__)
-# def _update_single_image_status(
-#     *,
-#     zarr_url: str,
-#     workflowtask_id: int,
-#     dataset_id: int,
-#     status: HistoryItemImageStatus,
-#     db: Session,
-#     commit: bool = True,
-#     logfile: Optional[str] = None,
-# ) -> None:
-#     image_status = db.get(
-#         ImageStatus,
-#         (
-#             zarr_url,
-#             workflowtask_id,
-#             dataset_id,
-#         ),
-#     )
-#     if image_status is None:
-#         raise RuntimeError("This should have not happened")
-#     image_status.status = status
-#     if logfile is not None:
-#         image_status.logfile = logfile
-#     db.add(image_status)
-#     if commit:
-#         db.commit()
-# def update_single_image(
-#     *,
-#     history_item_id: int,
-#     zarr_url: str,
-#     status: HistoryItemImageStatus,
-# ) -> None:
-#     logger.debug(
-#         f"[update_single_image] {history_item_id=}, {status=}, {zarr_url=}"
-#     )
-#     # Note: thanks to `with_for_update`, a lock is acquired and kept
-#     # until `db.commit()`
-#     with next(get_sync_db()) as db:
-#         stm = (
-#             select(HistoryItemV2)
-#             .where(HistoryItemV2.id == history_item_id)
-#             .with_for_update(nowait=False)
-#         )
-#         history_item = db.execute(stm).scalar_one()
-#         history_item.images[zarr_url] = status
-#         flag_modified(history_item, "images")
-#         db.commit()
-#         _update_single_image_status(
-#             zarr_url=zarr_url,
-#             dataset_id=history_item.dataset_id,
-#             workflowtask_id=history_item.workflowtask_id,
-#             commit=True,
-#             status=status,
-#             db=db,
-#         )
-# def update_single_image_logfile(
-#     *,
-#     history_item_id: int,
-#     zarr_url: str,
-#     logfile: str,
-# ) -> None:
-#     logger.debug(
-#         "[update_single_image_logfile] "
-#         f"{history_item_id=}, {logfile=}, {zarr_url=}"
-#     )
-#     with next(get_sync_db()) as db:
-#         history_item = db.get(HistoryItemV2, history_item_id)
-#         image_status = db.get(
-#             ImageStatus,
-#             (
-#                 zarr_url,
-#                 history_item.workflowtask_id,
-#                 history_item.dataset_id,
-#             ),
-#         )
-#         if image_status is None:
-#             raise RuntimeError("This should have not happened")
-#         image_status.logfile = logfile
-#         db.merge(image_status)
-#         db.commit()
-# def update_all_images(
-#     *,
-#     history_item_id: int,
-#     status: HistoryItemImageStatus,
-#     logfile: Optional[str] = None,
-# ) -> None:
-#     logger.debug(f"[update_all_images] {history_item_id=}, {status=}")
-#     # Note: thanks to `with_for_update`, a lock is acquired and kept
-#     # until `db.commit()`
-#     stm = (
-#         select(HistoryItemV2)
-#         .where(HistoryItemV2.id == history_item_id)
-#         .with_for_update(nowait=False)
-#     )
-#     with next(get_sync_db()) as db:
-#         history_item = db.execute(stm).scalar_one()
-#         new_images = {
-#             zarr_url: status for zarr_url in history_item.images.keys()
-#         }
-#         history_item.images = new_images
-#         flag_modified(history_item, "images")
-#         db.commit()
-#         # FIXME: Make this a bulk edit, if possible
-#         for ind, zarr_url in enumerate(history_item.images.keys()):
-#             _update_single_image_status(
-#                 zarr_url=zarr_url,
-#                 dataset_id=history_item.dataset_id,
-#                 workflowtask_id=history_item.workflowtask_id,
-#                 commit=False,
-#                 status=status,
-#                 logfile=logfile,
-#                 db=db,
-#             )
-#         db.commit()

fractal_server/app/history/status_enum.py

@@ -1,16 +0,0 @@
-from enum import Enum
-
-
-class XXXStatus(str, Enum):
-    """
-    Available status for images
-
-    Attributes:
-        SUBMITTED:
-        DONE:
-        FAILED:
-    """
-
-    SUBMITTED = "submitted"
-    DONE = "done"
-    FAILED = "failed"