fractal-server 1.4.10__py3-none-any.whl → 2.0.0a0__py3-none-any.whl

fractal_server/app/routes/api/v1/workflow.py

@@ -27,12 +27,12 @@ from ....models import ApplyWorkflow
 from ....models import Project
 from ....models import Task
 from ....models import Workflow
-from ....schemas import WorkflowCreate
-from ....schemas import WorkflowExport
-from ....schemas import WorkflowImport
-from ....schemas import WorkflowRead
-from ....schemas import WorkflowTaskCreate
-from ....schemas import WorkflowUpdate
+from ....schemas.v1 import WorkflowCreateV1
+from ....schemas.v1 import WorkflowExportV1
+from ....schemas.v1 import WorkflowImportV1
+from ....schemas.v1 import WorkflowReadV1
+from ....schemas.v1 import WorkflowTaskCreateV1
+from ....schemas.v1 import WorkflowUpdateV1
 from ....security import current_active_user
 from ....security import User
 from ._aux_functions import _check_workflow_exists
@@ -47,13 +47,13 @@ router = APIRouter()
 
 @router.get(
     "/project/{project_id}/workflow/",
-    response_model=list[WorkflowRead],
+    response_model=list[WorkflowReadV1],
 )
 async def get_workflow_list(
     project_id: int,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> Optional[list[WorkflowRead]]:
+) -> Optional[list[WorkflowReadV1]]:
     """
     Get workflow list for given project
     """
@@ -72,15 +72,15 @@ async def get_workflow_list(
 
 @router.post(
     "/project/{project_id}/workflow/",
-    response_model=WorkflowRead,
+    response_model=WorkflowReadV1,
     status_code=status.HTTP_201_CREATED,
 )
 async def create_workflow(
     project_id: int,
-    workflow: WorkflowCreate,
+    workflow: WorkflowCreateV1,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> Optional[WorkflowRead]:
+) -> Optional[WorkflowReadV1]:
     """
     Create a workflow, associate to a project
     """
@@ -103,14 +103,14 @@ async def create_workflow(
 
 @router.get(
     "/project/{project_id}/workflow/{workflow_id}/",
-    response_model=WorkflowRead,
+    response_model=WorkflowReadV1,
 )
 async def read_workflow(
     project_id: int,
     workflow_id: int,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> Optional[WorkflowRead]:
+) -> Optional[WorkflowReadV1]:
     """
     Get info on an existing workflow
     """
@@ -124,15 +124,15 @@ async def read_workflow(
 
 @router.patch(
     "/project/{project_id}/workflow/{workflow_id}/",
-    response_model=WorkflowRead,
+    response_model=WorkflowReadV1,
 )
 async def update_workflow(
     project_id: int,
     workflow_id: int,
-    patch: WorkflowUpdate,
+    patch: WorkflowUpdateV1,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> Optional[WorkflowRead]:
+) -> Optional[WorkflowReadV1]:
     """
     Edit a workflow
     """
@@ -228,14 +228,14 @@ async def delete_workflow(
 
 @router.get(
     "/project/{project_id}/workflow/{workflow_id}/export/",
-    response_model=WorkflowExport,
+    response_model=WorkflowExportV1,
 )
 async def export_worfklow(
     project_id: int,
     workflow_id: int,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> Optional[WorkflowExport]:
+) -> Optional[WorkflowExportV1]:
     """
     Export an existing workflow, after stripping all IDs
     """
@@ -260,15 +260,15 @@ async def export_worfklow(
 
 @router.post(
     "/project/{project_id}/workflow/import/",
-    response_model=WorkflowRead,
+    response_model=WorkflowReadV1,
     status_code=status.HTTP_201_CREATED,
 )
 async def import_workflow(
     project_id: int,
-    workflow: WorkflowImport,
+    workflow: WorkflowImportV1,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> Optional[WorkflowRead]:
+) -> Optional[WorkflowReadV1]:
     """
     Import an existing workflow into a project
 
@@ -320,7 +320,7 @@ async def import_workflow(
             source = wf_task.task.source
             task_id = source_to_id[source]
             # Prepare new_wf_task
-            new_wf_task = WorkflowTaskCreate(
+            new_wf_task = WorkflowTaskCreateV1(
                 **wf_task.dict(exclude_none=True),
             )
             # Insert task
@@ -335,11 +335,11 @@ async def import_workflow(
     return db_workflow
 
 
-@router.get("/workflow/", response_model=list[WorkflowRead])
+@router.get("/workflow/", response_model=list[WorkflowReadV1])
 async def get_user_workflows(
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> list[WorkflowRead]:
+) -> list[WorkflowReadV1]:
     """
     Returns all the workflows of the current user
     """

fractal_server/app/routes/api/v1/workflowtask.py

@@ -23,9 +23,9 @@ from fastapi import status
 from ....db import AsyncSession
 from ....db import get_async_db
 from ....models import Task
-from ....schemas import WorkflowTaskCreate
-from ....schemas import WorkflowTaskRead
-from ....schemas import WorkflowTaskUpdate
+from ....schemas.v1 import WorkflowTaskCreateV1
+from ....schemas.v1 import WorkflowTaskReadV1
+from ....schemas.v1 import WorkflowTaskUpdateV1
 from ....security import current_active_user
 from ....security import User
 from ._aux_functions import _get_workflow_check_owner
@@ -37,17 +37,17 @@ router = APIRouter()
 
 @router.post(
     "/project/{project_id}/workflow/{workflow_id}/wftask/",
-    response_model=WorkflowTaskRead,
+    response_model=WorkflowTaskReadV1,
     status_code=status.HTTP_201_CREATED,
 )
 async def create_workflowtask(
     project_id: int,
     workflow_id: int,
     task_id: int,
-    new_task: WorkflowTaskCreate,
+    new_task: WorkflowTaskCreateV1,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> Optional[WorkflowTaskRead]:
+) -> Optional[WorkflowTaskReadV1]:
     """
     Add a WorkflowTask to a Workflow
     """
@@ -78,7 +78,7 @@ async def create_workflowtask(
 
 @router.get(
     "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}/",
-    response_model=WorkflowTaskRead,
+    response_model=WorkflowTaskReadV1,
 )
 async def read_workflowtask(
     project_id: int,
@@ -99,16 +99,16 @@ async def read_workflowtask(
 
 @router.patch(
     "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}/",
-    response_model=WorkflowTaskRead,
+    response_model=WorkflowTaskReadV1,
 )
 async def update_workflowtask(
     project_id: int,
     workflow_id: int,
     workflow_task_id: int,
-    workflow_task_update: WorkflowTaskUpdate,
+    workflow_task_update: WorkflowTaskUpdateV1,
     user: User = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
-) -> Optional[WorkflowTaskRead]:
+) -> Optional[WorkflowTaskReadV1]:
     """
     Edit a WorkflowTask of a Workflow
     """

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

@@ -0,0 +1,28 @@
+"""
+`api/v2` module
+"""
+from fastapi import APIRouter
+
+from .apply import router as runner_router_v2
+from .dataset import router as dataset_router_v2
+from .images import router as images_routes_v2
+from .job import router as job_router_v2
+from .project import router as project_router_v2
+from .task import router as task_router_v2
+from .task_collection import router as task_collection_router_v2
+from .workflow import router as workflow_router_v2
+from .workflowtask import router as workflowtask_router_v2
+
+router_api_v2 = APIRouter()
+
+router_api_v2.include_router(dataset_router_v2, tags=["V2 Dataset"])
+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"])
+router_api_v2.include_router(runner_router_v2, tags=["V2 Apply-workflow"])
+router_api_v2.include_router(task_router_v2, prefix="/task", tags=["V2 Task"])
+router_api_v2.include_router(
+    task_collection_router_v2, prefix="/task", tags=["V2 Task Collection"]
+)
+router_api_v2.include_router(workflow_router_v2, tags=["V2 Workflow"])
+router_api_v2.include_router(workflowtask_router_v2, tags=["V2 WorkflowTask"])