fractal-server 2.17.2__py3-none-any.whl → 2.18.0__py3-none-any.whl

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

@@ -33,10 +33,10 @@ from fractal_server.app.routes.aux.validate_user_profile import (
 )
 from fractal_server.app.schemas.v2 import FractalUploadedFile
 from fractal_server.app.schemas.v2 import ResourceType
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
-from fractal_server.app.schemas.v2.task_group import TaskGroupV2OriginEnum
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2 import TaskGroupActivityRead
+from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
+from fractal_server.app.schemas.v2.task_group import TaskGroupOriginEnum
 from fractal_server.logger import set_logger
 from fractal_server.tasks.v2.local import collect_local_pixi
 from fractal_server.tasks.v2.ssh import collect_ssh_pixi
@@ -74,7 +74,7 @@ def validate_pkgname_and_version(filename: str) -> tuple[str, str]:
 @router.post(
     "/collect/pixi/",
     status_code=202,
-    response_model=TaskGroupActivityV2Read,
+    response_model=TaskGroupActivityRead,
 )
 async def collect_task_pixi(
     response: Response,
@@ -85,7 +85,7 @@ async def collect_task_pixi(
     user_group_id: int | None = None,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupActivityV2Read:
+) -> TaskGroupActivityRead:
     # Get validated resource and profile
     resource, profile = await validate_user_profile(user=user, db=db)
     resource_id = resource.id
@@ -136,7 +136,7 @@ async def collect_task_pixi(
         user_id=user.id,
         user_group_id=user_group_id,
         resource_id=resource_id,
-        origin=TaskGroupV2OriginEnum.PIXI,
+        origin=TaskGroupOriginEnum.PIXI,
         pixi_version=pixi_version,
         pkg_name=pkg_name,
         version=version,
@@ -178,8 +178,8 @@ async def collect_task_pixi(
     task_group_activity = TaskGroupActivityV2(
         user_id=task_group.user_id,
         taskgroupv2_id=task_group.id,
-        status=TaskGroupActivityStatusV2.PENDING,
-        action=TaskGroupActivityActionV2.COLLECT,
+        status=TaskGroupActivityStatus.PENDING,
+        action=TaskGroupActivityAction.COLLECT,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
     )

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

@@ -24,11 +24,11 @@ from fractal_server.app.routes.auth._aux_auth import (
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
-from fractal_server.app.schemas.v2 import TaskGroupReadV2
-from fractal_server.app.schemas.v2 import TaskGroupUpdateV2
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2 import TaskGroupActivityRead
+from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
+from fractal_server.app.schemas.v2 import TaskGroupRead
+from fractal_server.app.schemas.v2 import TaskGroupUpdate
 from fractal_server.logger import set_logger
 
 from ._aux_functions import _get_user_resource_id
@@ -62,17 +62,17 @@ def _version_sort_key(
         return (1, task_group.version)
 
 
-@router.get("/activity/", response_model=list[TaskGroupActivityV2Read])
+@router.get("/activity/", response_model=list[TaskGroupActivityRead])
 async def get_task_group_activity_list(
     task_group_activity_id: int | None = None,
     taskgroupv2_id: int | None = None,
     pkg_name: str | None = None,
-    status: TaskGroupActivityStatusV2 | None = None,
-    action: TaskGroupActivityActionV2 | None = None,
+    status: TaskGroupActivityStatus | None = None,
+    action: TaskGroupActivityAction | None = None,
     timestamp_started_min: AwareDatetime | None = None,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> list[TaskGroupActivityV2Read]:
+) -> list[TaskGroupActivityRead]:
     stm = select(TaskGroupActivityV2).where(
         TaskGroupActivityV2.user_id == user.id
     )
@@ -98,13 +98,13 @@ async def get_task_group_activity_list(
 
 @router.get(
     "/activity/{task_group_activity_id}/",
-    response_model=TaskGroupActivityV2Read,
+    response_model=TaskGroupActivityRead,
 )
 async def get_task_group_activity(
     task_group_activity_id: int,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupActivityV2Read:
+) -> TaskGroupActivityRead:
     activity = await db.get(TaskGroupActivityV2, task_group_activity_id)
 
     if activity is None:
@@ -124,14 +124,14 @@ async def get_task_group_activity(
     return activity
 
 
-@router.get("/", response_model=list[tuple[str, list[TaskGroupReadV2]]])
+@router.get("/", response_model=list[tuple[str, list[TaskGroupRead]]])
 async def get_task_group_list(
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
     only_active: bool = False,
     only_owner: bool = False,
     args_schema: bool = True,
-) -> list[tuple[str, list[TaskGroupReadV2]]]:
+) -> list[tuple[str, list[TaskGroupRead]]]:
     """
     Get all accessible TaskGroups
     """
@@ -190,12 +190,12 @@ async def get_task_group_list(
     return grouped_result
 
 
-@router.get("/{task_group_id}/", response_model=TaskGroupReadV2)
+@router.get("/{task_group_id}/", response_model=TaskGroupRead)
 async def get_task_group(
     task_group_id: int,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupReadV2:
+) -> TaskGroupRead:
     """
     Get single TaskGroup
     """
@@ -207,13 +207,13 @@ async def get_task_group(
     return task_group
 
 
-@router.patch("/{task_group_id}/", response_model=TaskGroupReadV2)
+@router.patch("/{task_group_id}/", response_model=TaskGroupRead)
 async def patch_task_group(
     task_group_id: int,
-    task_group_update: TaskGroupUpdateV2,
+    task_group_update: TaskGroupUpdate,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupReadV2:
+) -> TaskGroupRead:
     """
     Patch single TaskGroup
     """

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

@@ -14,11 +14,11 @@ from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
 from fractal_server.app.schemas.v2 import ResourceType
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
-from fractal_server.app.schemas.v2 import TaskGroupReadV2
-from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2 import TaskGroupActivityRead
+from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
+from fractal_server.app.schemas.v2 import TaskGroupOriginEnum
+from fractal_server.app.schemas.v2 import TaskGroupRead
 from fractal_server.logger import set_logger
 from fractal_server.tasks.v2.local import deactivate_local
 from fractal_server.tasks.v2.local import deactivate_local_pixi
@@ -45,7 +45,7 @@ logger = set_logger(__name__)
 
 @router.post(
     "/{task_group_id}/deactivate/",
-    response_model=TaskGroupActivityV2Read,
+    response_model=TaskGroupActivityRead,
 )
 async def deactivate_task_group(
     task_group_id: int,
@@ -53,7 +53,7 @@ async def deactivate_task_group(
     response: Response,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupActivityV2Read:
+) -> TaskGroupActivityRead:
     """
     Deactivate task-group venv
     """
@@ -84,13 +84,13 @@ async def deactivate_task_group(
         )
 
     # Shortcut for task-group with origin="other"
-    if task_group.origin == TaskGroupV2OriginEnum.OTHER:
+    if task_group.origin == TaskGroupOriginEnum.OTHER:
         task_group.active = False
         task_group_activity = TaskGroupActivityV2(
             user_id=task_group.user_id,
             taskgroupv2_id=task_group.id,
-            status=TaskGroupActivityStatusV2.OK,
-            action=TaskGroupActivityActionV2.DEACTIVATE,
+            status=TaskGroupActivityStatus.OK,
+            action=TaskGroupActivityAction.DEACTIVATE,
             pkg_name=task_group.pkg_name,
             version=(task_group.version or "N/A"),
             log=(
@@ -109,8 +109,8 @@ async def deactivate_task_group(
     task_group_activity = TaskGroupActivityV2(
         user_id=task_group.user_id,
         taskgroupv2_id=task_group.id,
-        status=TaskGroupActivityStatusV2.PENDING,
-        action=TaskGroupActivityActionV2.DEACTIVATE,
+        status=TaskGroupActivityStatus.PENDING,
+        action=TaskGroupActivityAction.DEACTIVATE,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
         timestamp_started=get_timestamp(),
@@ -122,12 +122,12 @@ async def deactivate_task_group(
 
     # Submit background task
     if resource.type == ResourceType.SLURM_SSH:
-        if task_group.origin == TaskGroupV2OriginEnum.PIXI:
+        if task_group.origin == TaskGroupOriginEnum.PIXI:
             deactivate_function = deactivate_ssh_pixi
         else:
             deactivate_function = deactivate_ssh
     else:
-        if task_group.origin == TaskGroupV2OriginEnum.PIXI:
+        if task_group.origin == TaskGroupOriginEnum.PIXI:
             deactivate_function = deactivate_local_pixi
         else:
             deactivate_function = deactivate_local
@@ -149,7 +149,7 @@ async def deactivate_task_group(
 
 @router.post(
     "/{task_group_id}/reactivate/",
-    response_model=TaskGroupActivityV2Read,
+    response_model=TaskGroupActivityRead,
 )
 async def reactivate_task_group(
     task_group_id: int,
@@ -157,7 +157,7 @@ async def reactivate_task_group(
     response: Response,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupReadV2:
+) -> TaskGroupRead:
     """
     Deactivate task-group venv
     """
@@ -187,13 +187,13 @@ async def reactivate_task_group(
     await check_no_submitted_job(task_group_id=task_group.id, db=db)
 
     # Shortcut for task-group with origin="other"
-    if task_group.origin == TaskGroupV2OriginEnum.OTHER:
+    if task_group.origin == TaskGroupOriginEnum.OTHER:
         task_group.active = True
         task_group_activity = TaskGroupActivityV2(
             user_id=task_group.user_id,
             taskgroupv2_id=task_group.id,
-            status=TaskGroupActivityStatusV2.OK,
-            action=TaskGroupActivityActionV2.REACTIVATE,
+            status=TaskGroupActivityStatus.OK,
+            action=TaskGroupActivityAction.REACTIVATE,
             pkg_name=task_group.pkg_name,
             version=(task_group.version or "N/A"),
             log=(
@@ -220,8 +220,8 @@ async def reactivate_task_group(
     task_group_activity = TaskGroupActivityV2(
         user_id=task_group.user_id,
         taskgroupv2_id=task_group.id,
-        status=TaskGroupActivityStatusV2.PENDING,
-        action=TaskGroupActivityActionV2.REACTIVATE,
+        status=TaskGroupActivityStatus.PENDING,
+        action=TaskGroupActivityAction.REACTIVATE,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
         timestamp_started=get_timestamp(),
@@ -231,12 +231,12 @@ async def reactivate_task_group(
 
     # Submit background task
     if resource.type == ResourceType.SLURM_SSH:
-        if task_group.origin == TaskGroupV2OriginEnum.PIXI:
+        if task_group.origin == TaskGroupOriginEnum.PIXI:
             reactivate_function = reactivate_ssh_pixi
         else:
             reactivate_function = reactivate_ssh
     else:
-        if task_group.origin == TaskGroupV2OriginEnum.PIXI:
+        if task_group.origin == TaskGroupOriginEnum.PIXI:
             reactivate_function = reactivate_local_pixi
         else:
             reactivate_function = reactivate_local
@@ -265,7 +265,7 @@ async def delete_task_group(
     response: Response,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupActivityV2Read:
+) -> TaskGroupActivityRead:
     """
     Deletion of task-group from db and file system
     """
@@ -283,8 +283,8 @@ async def delete_task_group(
     task_group_activity = TaskGroupActivityV2(
         user_id=task_group.user_id,
         taskgroupv2_id=task_group.id,
-        status=TaskGroupActivityStatusV2.PENDING,
-        action=TaskGroupActivityActionV2.DELETE,
+        status=TaskGroupActivityStatus.PENDING,
+        action=TaskGroupActivityAction.DELETE,
         pkg_name=task_group.pkg_name,
         version=(task_group.version or "N/A"),
         timestamp_started=get_timestamp(),

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

@@ -19,11 +19,12 @@ from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.models.v2 import TaskV2
 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 WorkflowTaskReadV2
-from fractal_server.app.schemas.v2 import WorkflowTaskReplaceV2
+from fractal_server.app.schemas.v2 import WorkflowTaskRead
+from fractal_server.app.schemas.v2 import WorkflowTaskReplace
+from fractal_server.app.schemas.v2.sharing import ProjectPermissions
 
-from ._aux_functions import _get_workflow_check_owner
-from ._aux_functions import _get_workflow_task_check_owner
+from ._aux_functions import _get_workflow_check_access
+from ._aux_functions import _get_workflow_task_check_access
 from ._aux_functions_task_version_update import get_new_workflow_task_meta
 from ._aux_functions_tasks import _check_type_filters_compatibility
 from ._aux_functions_tasks import _get_task_group_or_404
@@ -79,10 +80,11 @@ async def get_workflow_version_update_candidates(
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[list[TaskVersionRead]]:
-    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,
     )
 
@@ -169,7 +171,7 @@ async def get_workflow_version_update_candidates(
 
 @router.post(
     "/project/{project_id}/workflow/{workflow_id}/wftask/replace-task/",
-    response_model=WorkflowTaskReadV2,
+    response_model=WorkflowTaskRead,
     status_code=status.HTTP_201_CREATED,
 )
 async def replace_workflowtask(
@@ -177,16 +179,17 @@ async def replace_workflowtask(
     workflow_id: int,
     workflow_task_id: int,
     task_id: int,
-    replace: WorkflowTaskReplaceV2,
+    replace: WorkflowTaskReplace,
     user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
-) -> WorkflowTaskReadV2:
+) -> WorkflowTaskRead:
     # Get objects from database
-    workflow_task, workflow = await _get_workflow_task_check_owner(
+    workflow_task, workflow = await _get_workflow_task_check_access(
         project_id=project_id,
         workflow_id=workflow_id,
         workflow_task_id=workflow_task_id,
         user_id=user.id,
+        required_permissions=ProjectPermissions.WRITE,
         db=db,
     )
     new_task = await _get_task_read_access(

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

@@ -15,17 +15,18 @@ 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 WorkflowCreateV2
-from fractal_server.app.schemas.v2 import WorkflowExportV2
-from fractal_server.app.schemas.v2 import WorkflowReadV2
-from fractal_server.app.schemas.v2 import WorkflowReadV2WithWarnings
-from fractal_server.app.schemas.v2 import WorkflowUpdateV2
+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_owner
+from ._aux_functions import _get_project_check_access
 from ._aux_functions import _get_submitted_jobs_statement
-from ._aux_functions import _get_workflow_check_owner
+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
 
@@ -34,19 +35,22 @@ 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,7 +279,7 @@ async def export_workflow(
             name=wftask.task.name,
         )
 
-    wf = WorkflowExportV2(
+    wf = WorkflowExport(
         **workflow.model_dump(),
         task_list=wf_task_list,
     )
@@ -293,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,
     )