fractal-server 2.17.1a1__py3-none-any.whl → 2.18.0__py3-none-any.whl

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

@@ -8,45 +8,49 @@ from fastapi import status
 from pydantic import BaseModel
 from sqlmodel import select
 
-from ....db import AsyncSession
-from ....db import get_async_db
-from ....models.v2 import JobV2
-from ....models.v2 import ProjectV2
-from ....models.v2 import WorkflowV2
-from ....schemas.v2 import WorkflowCreateV2
-from ....schemas.v2 import WorkflowExportV2
-from ....schemas.v2 import WorkflowReadV2
-from ....schemas.v2 import WorkflowReadV2WithWarnings
-from ....schemas.v2 import WorkflowUpdateV2
-from ._aux_functions import _check_workflow_exists
-from ._aux_functions import _get_project_check_owner
-from ._aux_functions import _get_submitted_jobs_statement
-from ._aux_functions import _get_workflow_check_owner
-from ._aux_functions import _workflow_has_submitted_job
-from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
+from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import TaskGroupV2
+from fractal_server.app.models.v2 import WorkflowV2
 from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.schemas.v2 import WorkflowCreate
+from fractal_server.app.schemas.v2 import WorkflowExport
+from fractal_server.app.schemas.v2 import WorkflowRead
+from fractal_server.app.schemas.v2 import WorkflowReadWithWarnings
+from fractal_server.app.schemas.v2 import WorkflowUpdate
+from fractal_server.app.schemas.v2.sharing import ProjectPermissions
 from fractal_server.images.tools import merge_type_filters
 
+from ._aux_functions import _check_workflow_exists
+from ._aux_functions import _get_project_check_access
+from ._aux_functions import _get_submitted_jobs_statement
+from ._aux_functions import _get_workflow_check_access
+from ._aux_functions import _workflow_has_submitted_job
+from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
+
 router = APIRouter()
 
 
 @router.get(
     "/project/{project_id}/workflow/",
-    response_model=list[WorkflowReadV2],
+    response_model=list[WorkflowRead],
 )
 async def get_workflow_list(
     project_id: int,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> list[WorkflowReadV2] | None:
+) -> list[WorkflowRead] | None:
     """
     Get workflow list for given project
     """
     # Access control
-    project = await _get_project_check_owner(
-        project_id=project_id, user_id=user.id, db=db
+    project = await _get_project_check_access(
+        project_id=project_id,
+        user_id=user.id,
+        required_permissions=ProjectPermissions.READ,
+        db=db,
     )
     # Find workflows of the current project. Note: this select/where approach
     # has much better scaling than refreshing all elements of
@@ -59,20 +63,23 @@ async def get_workflow_list(
 
 @router.post(
     "/project/{project_id}/workflow/",
-    response_model=WorkflowReadV2,
+    response_model=WorkflowRead,
     status_code=status.HTTP_201_CREATED,
 )
 async def create_workflow(
     project_id: int,
-    workflow: WorkflowCreateV2,
+    workflow: WorkflowCreate,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> WorkflowReadV2 | None:
+) -> WorkflowRead | None:
     """
     Create a workflow, associate to a project
     """
-    await _get_project_check_owner(
-        project_id=project_id, user_id=user.id, db=db
+    await _get_project_check_access(
+        project_id=project_id,
+        user_id=user.id,
+        required_permissions=ProjectPermissions.WRITE,
+        db=db,
     )
     await _check_workflow_exists(
         name=workflow.name, project_id=project_id, db=db
@@ -88,22 +95,23 @@ async def create_workflow(
 
 @router.get(
     "/project/{project_id}/workflow/{workflow_id}/",
-    response_model=WorkflowReadV2WithWarnings,
+    response_model=WorkflowReadWithWarnings,
 )
 async def read_workflow(
     project_id: int,
     workflow_id: int,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> WorkflowReadV2WithWarnings | None:
+) -> WorkflowReadWithWarnings | None:
     """
     Get info on an existing workflow
     """
 
-    workflow = await _get_workflow_check_owner(
+    workflow = await _get_workflow_check_access(
         project_id=project_id,
         workflow_id=workflow_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.READ,
         db=db,
     )
 
@@ -121,22 +129,23 @@ async def read_workflow(
 
 @router.patch(
     "/project/{project_id}/workflow/{workflow_id}/",
-    response_model=WorkflowReadV2WithWarnings,
+    response_model=WorkflowReadWithWarnings,
 )
 async def update_workflow(
     project_id: int,
     workflow_id: int,
-    patch: WorkflowUpdateV2,
+    patch: WorkflowUpdate,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> WorkflowReadV2WithWarnings | None:
+) -> WorkflowReadWithWarnings | None:
     """
     Edit a workflow
     """
-    workflow = await _get_workflow_check_owner(
+    workflow = await _get_workflow_check_access(
         project_id=project_id,
         workflow_id=workflow_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.WRITE,
         db=db,
     )
 
@@ -208,10 +217,11 @@ async def delete_workflow(
     Delete a workflow
     """
 
-    workflow = await _get_workflow_check_owner(
+    workflow = await _get_workflow_check_access(
         project_id=project_id,
         workflow_id=workflow_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.WRITE,
         db=db,
     )
 
@@ -241,21 +251,22 @@ async def delete_workflow(
 
 @router.get(
     "/project/{project_id}/workflow/{workflow_id}/export/",
-    response_model=WorkflowExportV2,
+    response_model=WorkflowExport,
 )
 async def export_workflow(
     project_id: int,
     workflow_id: int,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> WorkflowExportV2 | None:
+) -> WorkflowExport | None:
     """
     Export an existing workflow, after stripping all IDs
     """
-    workflow = await _get_workflow_check_owner(
+    workflow = await _get_workflow_check_access(
         project_id=project_id,
         workflow_id=workflow_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.READ,
         db=db,
     )
     wf_task_list = []
@@ -268,30 +279,13 @@ async def export_workflow(
             name=wftask.task.name,
         )
 
-    wf = WorkflowExportV2(
+    wf = WorkflowExport(
         **workflow.model_dump(),
         task_list=wf_task_list,
     )
     return wf
 
 
-@router.get("/workflow/", response_model=list[WorkflowReadV2])
-async def get_user_workflows(
-    user: UserOAuth = Depends(current_user_act_ver_prof),
-    db: AsyncSession = Depends(get_async_db),
-) -> list[WorkflowReadV2]:
-    """
-    Returns all the workflows of the current user
-    """
-    stm = select(WorkflowV2)
-    stm = stm.join(ProjectV2).where(
-        ProjectV2.user_list.any(UserOAuth.id == user.id)
-    )
-    res = await db.execute(stm)
-    workflow_list = res.scalars().all()
-    return workflow_list
-
-
 class WorkflowTaskTypeFiltersInfo(BaseModel):
     workflowtask_id: int
     current_type_filters: dict[str, bool]
@@ -310,10 +304,11 @@ async def get_workflow_type_filters(
     Get info on type/type-filters flow for a workflow.
     """
 
-    workflow = await _get_workflow_check_owner(
+    workflow = await _get_workflow_check_access(
         project_id=project_id,
         workflow_id=workflow_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.READ,
         db=db,
     )
 

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

@@ -5,23 +5,13 @@ from fastapi import status
 from sqlmodel import or_
 from sqlmodel import select
 
-from ....db import AsyncSession
-from ....db import get_async_db
-from ....models.v2 import TaskV2
-from ....models.v2 import WorkflowV2
-from ....schemas.v2 import TaskImportV2Legacy
-from ....schemas.v2 import WorkflowImportV2
-from ....schemas.v2 import WorkflowReadV2WithWarnings
-from ....schemas.v2 import WorkflowTaskCreateV2
-from ._aux_functions import _check_workflow_exists
-from ._aux_functions import _get_project_check_owner
-from ._aux_functions import _get_user_resource_id
-from ._aux_functions import _workflow_insert_task
-from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
-from ._aux_functions_tasks import _check_type_filters_compatibility
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
+from fractal_server.app.models.v2 import TaskV2
+from fractal_server.app.models.v2 import WorkflowV2
 from fractal_server.app.routes.api.v2._aux_task_group_disambiguation import (
     _disambiguate_task_groups,
 )
@@ -29,9 +19,21 @@ from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.routes.auth._aux_auth import (
     _get_default_usergroup_id_or_none,
 )
-from fractal_server.app.schemas.v2 import TaskImportV2
+from fractal_server.app.schemas.v2 import TaskImport
+from fractal_server.app.schemas.v2 import TaskImportLegacy
+from fractal_server.app.schemas.v2 import WorkflowImport
+from fractal_server.app.schemas.v2 import WorkflowReadWithWarnings
+from fractal_server.app.schemas.v2 import WorkflowTaskCreate
+from fractal_server.app.schemas.v2.sharing import ProjectPermissions
 from fractal_server.logger import set_logger
 
+from ._aux_functions import _check_workflow_exists
+from ._aux_functions import _get_project_check_access
+from ._aux_functions import _get_user_resource_id
+from ._aux_functions import _workflow_insert_task
+from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
+from ._aux_functions_tasks import _check_type_filters_compatibility
+
 router = APIRouter()
 
 
@@ -64,7 +66,7 @@ async def _get_user_accessible_taskgroups(
     )
     res = await db.execute(stm)
     accessible_task_groups = res.scalars().all()
-    logger.info(
+    logger.debug(
         f"Found {len(accessible_task_groups)} accessible "
         f"task groups for {user_id=}."
     )
@@ -99,7 +101,7 @@ async def _get_task_by_source(
 
 async def _get_task_by_taskimport(
     *,
-    task_import: TaskImportV2,
+    task_import: TaskImport,
     task_groups_list: list[TaskGroupV2],
     user_id: int,
     default_group_id: int | None,
@@ -119,7 +121,7 @@ async def _get_task_by_taskimport(
         `id` of the matching task, or `None`.
     """
 
-    logger.info(f"[_get_task_by_taskimport] START, {task_import=}")
+    logger.debug(f"[_get_task_by_taskimport] START, {task_import=}")
 
     # Filter by `pkg_name` and by presence of a task with given `name`.
     matching_task_groups = [
@@ -127,12 +129,11 @@ async def _get_task_by_taskimport(
         for task_group in task_groups_list
         if (
             task_group.pkg_name == task_import.pkg_name
-            and task_import.name
-            in [task.name for task in task_group.task_list]
+            and task_import.name in [task.name for task in task_group.task_list]
         )
     ]
     if len(matching_task_groups) < 1:
-        logger.info(
+        logger.debug(
             "[_get_task_by_taskimport] "
             f"No task group with {task_import.pkg_name=} "
             f"and a task with {task_import.name=}."
@@ -142,15 +143,13 @@ async def _get_task_by_taskimport(
     # Determine target `version`
     # Note that task_import.version cannot be "", due to a validator
     if task_import.version is None:
-        logger.info(
+        logger.debug(
             "[_get_task_by_taskimport] "
             "No version requested, looking for latest."
         )
-        latest_task = max(
-            matching_task_groups, key=lambda tg: tg.version or ""
-        )
+        latest_task = max(matching_task_groups, key=lambda tg: tg.version or "")
         version = latest_task.version
-        logger.info(
+        logger.debug(
             f"[_get_task_by_taskimport] Latest version set to {version}."
         )
     else:
@@ -162,19 +161,19 @@ async def _get_task_by_taskimport(
     )
 
     if len(final_matching_task_groups) < 1:
-        logger.info(
+        logger.debug(
             "[_get_task_by_taskimport] "
             "No task group left after filtering by version."
         )
         return None
     elif len(final_matching_task_groups) == 1:
         final_task_group = final_matching_task_groups[0]
-        logger.info(
+        logger.debug(
             "[_get_task_by_taskimport] "
             "Found a single task group, after filtering by version."
         )
     else:
-        logger.info(
+        logger.debug(
             "[_get_task_by_taskimport] "
             f"Found {len(final_matching_task_groups)} task groups, "
             "after filtering by version."
@@ -186,7 +185,7 @@ async def _get_task_by_taskimport(
             default_group_id=default_group_id,
         )
         if final_task_group is None:
-            logger.info(
+            logger.debug(
                 "[_get_task_by_taskimport] Disambiguation returned None."
             )
             return None
@@ -201,22 +200,22 @@ async def _get_task_by_taskimport(
         None,
     )
 
-    logger.info(f"[_get_task_by_taskimport] END, {task_import=}, {task_id=}.")
+    logger.debug(f"[_get_task_by_taskimport] END, {task_import=}, {task_id=}.")
 
     return task_id
 
 
 @router.post(
     "/project/{project_id}/workflow/import/",
-    response_model=WorkflowReadV2WithWarnings,
+    response_model=WorkflowReadWithWarnings,
     status_code=status.HTTP_201_CREATED,
 )
 async def import_workflow(
     project_id: int,
-    workflow_import: WorkflowImportV2,
+    workflow_import: WorkflowImport,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> WorkflowReadV2WithWarnings:
+) -> WorkflowReadWithWarnings:
     """
     Import an existing workflow into a project and create required objects.
     """
@@ -224,9 +223,10 @@ async def import_workflow(
     user_resource_id = await _get_user_resource_id(user_id=user.id, db=db)
 
     # Preliminary checks
-    await _get_project_check_owner(
+    await _get_project_check_access(
         project_id=project_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.WRITE,
         db=db,
     )
     await _check_workflow_exists(
@@ -246,7 +246,7 @@ async def import_workflow(
     list_task_ids = []
     for wf_task in workflow_import.task_list:
         task_import = wf_task.task
-        if isinstance(task_import, TaskImportV2Legacy):
+        if isinstance(task_import, TaskImportLegacy):
             task_id = await _get_task_by_source(
                 source=task_import.source,
                 task_groups_list=task_group_list,
@@ -264,7 +264,7 @@ async def import_workflow(
                 status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=f"Could not find a task matching with {wf_task.task}.",
             )
-        new_wf_task = WorkflowTaskCreateV2(
+        new_wf_task = WorkflowTaskCreate(
             **wf_task.model_dump(exclude_none=True, exclude={"task"})
         )
         list_wf_tasks.append(new_wf_task)

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

@@ -6,43 +6,49 @@ from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
 
-from ....db import AsyncSession
-from ....db import get_async_db
-from ._aux_functions import _get_workflow_check_owner
-from ._aux_functions import _get_workflow_task_check_owner
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.schemas.v2 import TaskType
+from fractal_server.app.schemas.v2 import WorkflowTaskCreate
+from fractal_server.app.schemas.v2 import WorkflowTaskRead
+from fractal_server.app.schemas.v2 import WorkflowTaskUpdate
+from fractal_server.app.schemas.v2.sharing import ProjectPermissions
+
+from ._aux_functions import _get_workflow_check_access
+from ._aux_functions import _get_workflow_task_check_access
 from ._aux_functions import _workflow_has_submitted_job
 from ._aux_functions import _workflow_insert_task
 from ._aux_functions_tasks import _check_type_filters_compatibility
 from ._aux_functions_tasks import _get_task_read_access
-from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_user_act_ver_prof
-from fractal_server.app.schemas.v2 import TaskType
-from fractal_server.app.schemas.v2 import WorkflowTaskCreateV2
-from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
-from fractal_server.app.schemas.v2 import WorkflowTaskUpdateV2
 
 router = APIRouter()
 
 
 @router.post(
     "/project/{project_id}/workflow/{workflow_id}/wftask/",
-    response_model=WorkflowTaskReadV2,
+    response_model=WorkflowTaskRead,
     status_code=status.HTTP_201_CREATED,
 )
 async def create_workflowtask(
     project_id: int,
     workflow_id: int,
     task_id: int,
-    wftask: WorkflowTaskCreateV2,
+    wftask: WorkflowTaskCreate,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> WorkflowTaskReadV2 | None:
+) -> WorkflowTaskRead | None:
     """
     Add a WorkflowTask to a Workflow
     """
 
-    workflow = await _get_workflow_check_owner(
-        project_id=project_id, workflow_id=workflow_id, user_id=user.id, db=db
+    workflow = await _get_workflow_check_access(
+        project_id=project_id,
+        workflow_id=workflow_id,
+        user_id=user.id,
+        required_permissions=ProjectPermissions.WRITE,
+        db=db,
     )
 
     task = await _get_task_read_access(
@@ -63,10 +69,7 @@ async def create_workflowtask(
                 ),
             )
     elif task.type == TaskType.NON_PARALLEL:
-        if (
-            wftask.meta_parallel is not None
-            or wftask.args_parallel is not None
-        ):
+        if wftask.meta_parallel is not None or wftask.args_parallel is not None:
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
@@ -97,7 +100,7 @@ async def create_workflowtask(
 
 @router.get(
     "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}/",
-    response_model=WorkflowTaskReadV2,
+    response_model=WorkflowTaskRead,
 )
 async def read_workflowtask(
     project_id: int,
@@ -106,11 +109,12 @@ async def read_workflowtask(
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ):
-    workflow_task, _ = await _get_workflow_task_check_owner(
+    workflow_task, _ = await _get_workflow_task_check_access(
         project_id=project_id,
         workflow_task_id=workflow_task_id,
         workflow_id=workflow_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.READ,
         db=db,
     )
     return workflow_task
@@ -118,25 +122,26 @@ async def read_workflowtask(
 
 @router.patch(
     "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}/",
-    response_model=WorkflowTaskReadV2,
+    response_model=WorkflowTaskRead,
 )
 async def update_workflowtask(
     project_id: int,
     workflow_id: int,
     workflow_task_id: int,
-    workflow_task_update: WorkflowTaskUpdateV2,
+    workflow_task_update: WorkflowTaskUpdate,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> WorkflowTaskReadV2 | None:
+) -> WorkflowTaskRead | None:
     """
     Edit a WorkflowTask of a Workflow
     """
 
-    db_wf_task, db_workflow = await _get_workflow_task_check_owner(
+    db_wf_task, db_workflow = await _get_workflow_task_check_access(
         project_id=project_id,
         workflow_task_id=workflow_task_id,
         workflow_id=workflow_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.WRITE,
         db=db,
     )
     if workflow_task_update.type_filters is not None:
@@ -217,11 +222,12 @@ async def delete_workflowtask(
     Delete a WorkflowTask of a Workflow
     """
 
-    db_workflow_task, db_workflow = await _get_workflow_task_check_owner(
+    db_workflow_task, db_workflow = await _get_workflow_task_check_access(
         project_id=project_id,
         workflow_task_id=workflow_task_id,
         workflow_id=workflow_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.WRITE,
         db=db,
     )
 

fractal_server/app/routes/auth/__init__.py

@@ -12,7 +12,6 @@ from fractal_server.app.security import get_user_manager
 from fractal_server.config import get_settings
 from fractal_server.syringe import Inject
 
-
 bearer_transport = BearerTransport(tokenUrl="/auth/token/login")
 cookie_transport = CookieTransport(cookie_samesite="none")
 
@@ -71,8 +70,7 @@ async def current_user_act_ver_prof(
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail=(
-                f"Forbidden access "
-                f"({user.is_verified=} {user.profile_id=})."
+                f"Forbidden access ({user.is_verified=} {user.profile_id=})."
             ),
         )
     return user