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

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

@@ -7,8 +7,8 @@ from fastapi import Depends
 from fastapi import Form
 from fastapi import HTTPException
 from fastapi import Response
-from fastapi import status
 from fastapi import UploadFile
+from fastapi import status
 
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
@@ -33,17 +33,16 @@ 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
 from fractal_server.tasks.v2.utils_package_names import normalize_package_name
 from fractal_server.types import NonEmptyStr
 
-
 router = APIRouter()
 
 logger = set_logger(__name__)
@@ -75,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,
@@ -86,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
@@ -137,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,
@@ -179,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

@@ -5,17 +5,12 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
 from packaging.version import InvalidVersion
-from packaging.version import parse
 from packaging.version import Version
+from packaging.version import parse
 from pydantic.types import AwareDatetime
 from sqlmodel import or_
 from sqlmodel import select
 
-from ._aux_functions import _get_user_resource_id
-from ._aux_functions_tasks import _get_task_group_full_access
-from ._aux_functions_tasks import _get_task_group_read_access
-from ._aux_functions_tasks import _verify_non_duplication_group_constraint
-from ._aux_task_group_disambiguation import remove_duplicate_task_groups
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import LinkUserGroup
@@ -29,13 +24,19 @@ 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
+from ._aux_functions_tasks import _get_task_group_full_access
+from ._aux_functions_tasks import _get_task_group_read_access
+from ._aux_functions_tasks import _verify_non_duplication_group_constraint
+from ._aux_task_group_disambiguation import remove_duplicate_task_groups
+
 router = APIRouter()
 
 logger = set_logger(__name__)
@@ -61,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
     )
@@ -97,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:
@@ -123,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
     """
@@ -189,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
     """
@@ -206,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

@@ -5,10 +5,6 @@ from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
 
-from ._aux_functions_task_lifecycle import check_no_ongoing_activity
-from ._aux_functions_task_lifecycle import check_no_related_workflowtask
-from ._aux_functions_task_lifecycle import check_no_submitted_job
-from ._aux_functions_tasks import _get_task_group_full_access
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
@@ -18,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
@@ -36,6 +32,11 @@ from fractal_server.tasks.v2.ssh import reactivate_ssh
 from fractal_server.tasks.v2.ssh import reactivate_ssh_pixi
 from fractal_server.utils import get_timestamp
 
+from ._aux_functions_task_lifecycle import check_no_ongoing_activity
+from ._aux_functions_task_lifecycle import check_no_related_workflowtask
+from ._aux_functions_task_lifecycle import check_no_submitted_job
+from ._aux_functions_tasks import _get_task_group_full_access
+
 router = APIRouter()
 
 
@@ -44,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,
@@ -52,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
     """
@@ -83,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=(
@@ -108,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(),
@@ -121,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
@@ -148,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,
@@ -156,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
     """
@@ -186,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=(
@@ -212,16 +213,15 @@ async def reactivate_task_group(
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
-                "Cannot reactivate a task group with "
-                f"{task_group.env_info=}."
+                f"Cannot reactivate a task group with {task_group.env_info=}."
             ),
         )
 
     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

@@ -2,31 +2,33 @@ from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
-from packaging.version import parse
 from packaging.version import Version
+from packaging.version import parse
 from pydantic import BaseModel
 from pydantic import ConfigDict
+from sqlmodel import String
 from sqlmodel import cast
 from sqlmodel import or_
 from sqlmodel import select
-from sqlmodel import String
 
-from ....db import AsyncSession
-from ....db import get_async_db
-from ....models import LinkUserGroup
-from ....models.v2 import TaskV2
-from ._aux_functions import _get_workflow_check_owner
-from ._aux_functions import _get_workflow_task_check_owner
-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
-from ._aux_functions_tasks import _get_task_read_access
+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.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_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
+from ._aux_functions_tasks import _get_task_read_access
 
 router = APIRouter()
 
@@ -78,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,
     )
 
@@ -168,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(
@@ -176,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(