fractal-server 2.10.0a0__tar.gz → 2.10.1__tar.gz

{fractal_server-2.10.0a0 → fractal_server-2.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.10.0a0
+Version: 2.10.1
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.10.1/fractal_server/__init__.py

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

{fractal_server-2.10.0a0 → fractal_server-2.10.1}/fractal_server/app/routes/api/v2/workflowtask.py

@@ -6,22 +6,129 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
+from sqlalchemy.orm.attributes import flag_modified
 
 from ....db import AsyncSession
 from ....db import get_async_db
-from ....schemas.v2 import WorkflowTaskCreateV2
-from ....schemas.v2 import WorkflowTaskReadV2
-from ....schemas.v2 import WorkflowTaskUpdateV2
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import _get_workflow_task_check_owner
 from ._aux_functions import _workflow_insert_task
 from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
+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 WorkflowTaskCreateV2
+from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
+from fractal_server.app.schemas.v2 import WorkflowTaskReplaceV2
+from fractal_server.app.schemas.v2 import WorkflowTaskUpdateV2
 
 router = APIRouter()
 
 
+@router.post(
+    "/project/{project_id}/workflow/{workflow_id}/wftask/replace-task/",
+    response_model=WorkflowTaskReadV2,
+    status_code=status.HTTP_201_CREATED,
+)
+async def replace_workflowtask(
+    project_id: int,
+    workflow_id: int,
+    workflow_task_id: int,
+    task_id: int,
+    replace: Optional[WorkflowTaskReplaceV2] = None,
+    user: UserOAuth = Depends(current_active_user),
+    db: AsyncSession = Depends(get_async_db),
+) -> WorkflowTaskReadV2:
+
+    old_workflow_task, workflow = await _get_workflow_task_check_owner(
+        project_id=project_id,
+        workflow_id=workflow_id,
+        workflow_task_id=workflow_task_id,
+        user_id=user.id,
+        db=db,
+    )
+
+    task = await _get_task_read_access(
+        task_id=task_id, user_id=user.id, db=db, require_active=True
+    )
+
+    if task.type != old_workflow_task.task.type:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=(
+                f"Cannot replace a Task '{old_workflow_task.task.type}' with a"
+                f"  Task '{task.type}'."
+            ),
+        )
+
+    _args_non_parallel = old_workflow_task.args_non_parallel
+    _args_parallel = old_workflow_task.args_parallel
+    if replace is not None:
+        if replace.args_non_parallel is not None:
+            if task.type == "parallel":
+                raise HTTPException(
+                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    detail=(
+                        "Cannot set 'args_non_parallel' "
+                        "when Task is 'parallel'."
+                    ),
+                )
+            else:
+                _args_non_parallel = replace.args_non_parallel
+
+        if replace.args_parallel is not None:
+            if task.type == "non_parallel":
+                raise HTTPException(
+                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    detail=(
+                        "Cannot set 'args_parallel' "
+                        "when Task is 'non_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_workflow_task.meta_non_parallel
+        != old_workflow_task.task.meta_non_parallel
+    ) and (old_workflow_task.task.meta_non_parallel == task.meta_non_parallel):
+        _meta_non_parallel = old_workflow_task.meta_non_parallel
+    else:
+        _meta_non_parallel = task.meta_non_parallel
+    # Same for `meta_parallel`
+    if (
+        old_workflow_task.meta_parallel != old_workflow_task.task.meta_parallel
+    ) and (old_workflow_task.task.meta_parallel == task.meta_parallel):
+        _meta_parallel = old_workflow_task.meta_parallel
+    else:
+        _meta_parallel = task.meta_parallel
+
+    new_workflow_task = WorkflowTaskV2(
+        # new task
+        task_type=task.type,
+        task_id=task.id,
+        task=task,
+        # old values
+        order=old_workflow_task.order,
+        input_filters=old_workflow_task.input_filters,
+        # possibly new values
+        args_non_parallel=_args_non_parallel,
+        args_parallel=_args_parallel,
+        meta_non_parallel=_meta_non_parallel,
+        meta_parallel=_meta_parallel,
+    )
+
+    await db.delete(old_workflow_task)
+    workflow.task_list.insert(new_workflow_task.order, new_workflow_task)
+    flag_modified(workflow, "task_list")
+    await db.commit()
+
+    return new_workflow_task
+
+
 @router.post(
     "/project/{project_id}/workflow/{workflow_id}/wftask/",
     response_model=WorkflowTaskReadV2,
@@ -73,7 +180,6 @@ async def create_workflowtask(
                     "is `non_parallel`."
                 ),
             )
-
     workflow_task = await _workflow_insert_task(
         workflow_id=workflow.id,
         task_id=task_id,

{fractal_server-2.10.0a0 → fractal_server-2.10.1}/fractal_server/app/schemas/v2/__init__.py

@@ -45,5 +45,6 @@ from .workflowtask import WorkflowTaskExportV2  # noqa F401
 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-2.10.0a0 → fractal_server-2.10.1}/fractal_server/app/schemas/v2/workflowtask.py

@@ -82,6 +82,13 @@ class WorkflowTaskCreateV2(BaseModel, extra=Extra.forbid):
         return value
 
 
+class WorkflowTaskReplaceV2(BaseModel):
+    """Used by 'replace-task' endpoint"""
+
+    args_non_parallel: Optional[dict[str, Any]] = None
+    args_parallel: Optional[dict[str, Any]] = None
+
+
 class WorkflowTaskReadV2(BaseModel):
 
     id: int

{fractal_server-2.10.0a0 → fractal_server-2.10.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.10.0a0"
+version = "2.10.1"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -85,7 +85,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.10.0a0"
+current_version = "2.10.1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.10.0a0/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.10.0a0"