fractal-server 2.18.6__py3-none-any.whl → 2.19.0__py3-none-any.whl

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

@@ -15,7 +15,8 @@ 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 LinkUserProjectV2
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_guest
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.routes.aux._job import _write_shutdown_file
 from fractal_server.app.routes.aux._runner import _check_shutdown_is_supported
 from fractal_server.app.schemas.v2 import JobRead
@@ -41,12 +42,12 @@ router = APIRouter()
 
 @router.get("/job/", response_model=list[JobRead])
 async def get_user_jobs(
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     log: bool = True,
     db: AsyncSession = Depends(get_async_db),
 ) -> list[JobRead]:
     """
-    Returns all the jobs of the current user
+    Returns all the jobs from projects linked to the current user
     """
     stm = (
         select(JobV2)
@@ -73,7 +74,7 @@ async def get_user_jobs(
 async def get_workflow_jobs(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[JobRead] | None:
     """
@@ -100,7 +101,7 @@ async def get_latest_job(
     project_id: int,
     workflow_id: int,
     dataset_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> JobRead:
     await _get_workflow_check_access(
@@ -136,7 +137,7 @@ async def read_job(
     project_id: int,
     job_id: int,
     show_tmp_logs: bool = False,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> JobRead | None:
     """
@@ -169,7 +170,7 @@ async def read_job(
 async def download_job_logs(
     project_id: int,
     job_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> StreamingResponse:
     """
@@ -200,7 +201,7 @@ async def download_job_logs(
 )
 async def get_job_list(
     project_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     log: bool = True,
     db: AsyncSession = Depends(get_async_db),
 ) -> list[JobRead] | None:
@@ -234,7 +235,7 @@ async def get_job_list(
 async def stop_job(
     project_id: int,
     job_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """

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

@@ -8,7 +8,7 @@ from pydantic import Field
 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.routes.auth import get_api_guest
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2.sharing import ProjectPermissions
@@ -34,7 +34,7 @@ async def verify_unique_types(
     dataset_id: int,
     workflowtask_id: int,
     query: ImageQuery | None = None,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[str]:
     # Get dataset
@@ -99,7 +99,7 @@ async def check_non_processed_images(
     workflow_id: int,
     workflowtask_id: int,
     filters: NonProcessedImagesPayload,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
     db_workflow_task, db_workflow = await _get_workflow_task_check_access(

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

@@ -11,7 +11,8 @@ from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import LinkUserProjectV2
 from fractal_server.app.models.v2 import ProjectV2
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_guest
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -32,7 +33,7 @@ router = APIRouter()
 @router.get("/project/", response_model=list[ProjectRead])
 async def get_list_project(
     is_owner: bool = True,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ProjectV2]:
     """
@@ -53,7 +54,7 @@ async def get_list_project(
 @router.post("/project/", response_model=ProjectRead, status_code=201)
 async def create_project(
     project: ProjectCreate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> ProjectRead | None:
     """
@@ -94,7 +95,7 @@ async def create_project(
 @router.get("/project/{project_id}/", response_model=ProjectRead)
 async def read_project(
     project_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> ProjectRead | None:
     """
@@ -113,7 +114,7 @@ async def read_project(
 async def update_project(
     project_id: int,
     project_update: ProjectUpdate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ):
     project = await _get_project_check_access(
@@ -140,7 +141,7 @@ async def update_project(
 @router.delete("/project/{project_id}/", status_code=204)
 async def delete_project(
     project_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """

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

@@ -11,7 +11,8 @@ from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import LinkUserProjectV2
 from fractal_server.app.models.v2 import ProjectV2
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_guest
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.schemas.v2 import ProjectAccessRead
 from fractal_server.app.schemas.v2 import ProjectGuestCreate
 from fractal_server.app.schemas.v2 import ProjectGuestRead
@@ -33,7 +34,7 @@ router = APIRouter()
 )
 async def get_project_guests(
     project_id: int,
-    owner: UserOAuth = Depends(current_user_act_ver_prof),
+    owner: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ProjectGuestRead]:
     """
@@ -68,7 +69,7 @@ async def invite_guest(
     project_id: int,
     email: EmailStr,
     project_invitation: ProjectGuestCreate,
-    owner: UserOAuth = Depends(current_user_act_ver_prof),
+    owner: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -103,7 +104,7 @@ async def patch_guest(
     project_id: int,
     email: EmailStr,
     update: ProjectGuestUpdate,
-    owner: UserOAuth = Depends(current_user_act_ver_prof),
+    owner: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -137,7 +138,7 @@ async def patch_guest(
 async def revoke_guest_access(
     project_id: int,
     email: EmailStr,
-    owner: UserOAuth = Depends(current_user_act_ver_prof),
+    owner: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -171,13 +172,20 @@ async def revoke_guest_access(
     response_model=list[ProjectInvitationRead],
 )
 async def get_pending_invitations(
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ProjectInvitationRead]:
     """
     See your current invitations.
     """
 
+    if user.is_guest:
+        # The user's attribute `is_guest` is used to identify guest accounts,
+        # i.e. accounts with read only permissions on the API.
+        # This is a different concept from a project guest, which is a regular
+        # account with which a project has been shared.
+        return []
+
     res = await db.execute(
         select(
             ProjectV2.id,
@@ -225,7 +233,7 @@ async def get_pending_invitations(
 )
 async def get_access_info(
     project_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> ProjectAccessRead:
     """
@@ -272,7 +280,7 @@ async def get_access_info(
 @router.post("/project/{project_id}/access/accept/", status_code=200)
 async def accept_project_invitation(
     project_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -290,7 +298,7 @@ async def accept_project_invitation(
 @router.delete("/project/{project_id}/access/", status_code=204)
 async def leave_project(
     project_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """

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

@@ -11,6 +11,7 @@ from fastapi import status
 from sqlmodel import select
 from sqlmodel import update
 
+from fractal_server import __VERSION__
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import Profile
@@ -20,7 +21,7 @@ from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.routes.api.v2._aux_functions_tasks import (
     _get_task_read_access,
 )
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -59,7 +60,7 @@ async def submit_job(
     job_create: JobCreate,
     background_tasks: BackgroundTasks,
     request: Request,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> JobRead | None:
     # Remove non-submitted Jobs from the app state when the list grows
@@ -216,11 +217,12 @@ async def submit_job(
             dataset.model_dump_json(exclude={"images", "history"})
         ),
         workflow_dump=json.loads(
-            workflow.model_dump_json(exclude={"task_list"})
+            workflow.model_dump_json(exclude={"task_list", "description"})
         ),
         project_dump=json.loads(
             project.model_dump_json(exclude={"resource_id"})
         ),
+        fractal_server_version=__VERSION__,
         **job_create.model_dump(),
     )
 

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

@@ -24,7 +24,8 @@ 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.routes.auth import get_api_guest
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.schemas.v2 import TaskCreate
 from fractal_server.app.schemas.v2 import TaskGroupOriginEnum
 from fractal_server.app.schemas.v2 import TaskRead
@@ -43,7 +44,7 @@ async def get_list_task(
     category: str | None = None,
     modality: str | None = None,
     author: str | None = None,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskRead]:
     """
@@ -88,7 +89,7 @@ async def get_list_task(
 @router.get("/{task_id}/", response_model=TaskRead)
 async def get_task(
     task_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskRead:
     """
@@ -102,7 +103,7 @@ async def get_task(
 async def patch_task(
     task_id: int,
     task_update: TaskUpdate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskRead | None:
     """
@@ -140,7 +141,7 @@ async def create_task(
     task: TaskCreate,
     user_group_id: int | None = None,
     private: bool = False,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskRead | None:
     """
@@ -221,7 +222,7 @@ async def create_task(
 @router.delete("/{task_id}/", status_code=204)
 async def delete_task(
     task_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """

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

@@ -14,12 +14,13 @@ from pydantic import BaseModel
 from pydantic import ValidationError
 from pydantic import model_validator
 
+from fractal_server import __VERSION__
 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 TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -158,7 +159,7 @@ async def collect_tasks_pip(
     request_data: CollectionRequestData = Depends(parse_request_data),
     private: bool = False,
     user_group_id: int | None = None,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityRead:
     """
@@ -332,6 +333,7 @@ async def collect_tasks_pip(
         action=TaskGroupActivityAction.COLLECT,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
+        fractal_server_version=__VERSION__,
     )
     db.add(task_group_activity)
     await db.commit()

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

@@ -12,7 +12,7 @@ from sqlalchemy.ext.asyncio 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 TaskGroupV2
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -43,7 +43,7 @@ async def collect_task_custom(
     task_collect: TaskCollectCustom,
     private: bool = False,
     user_group_id: int | None = None,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskRead]:
     # Get validated resource and profile

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

@@ -10,6 +10,7 @@ from fastapi import Response
 from fastapi import UploadFile
 from fastapi import status
 
+from fractal_server import __VERSION__
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
@@ -27,7 +28,7 @@ from fractal_server.app.routes.api.v2._aux_functions_tasks import (
 from fractal_server.app.routes.api.v2._aux_functions_tasks import (
     _verify_non_duplication_user_constraint,
 )
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -83,7 +84,7 @@ async def collect_task_pixi(
     pixi_version: NonEmptyStr | None = Form(None),
     private: bool = False,
     user_group_id: int | None = None,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityRead:
     # Get validated resource and profile
@@ -182,6 +183,7 @@ async def collect_task_pixi(
         action=TaskGroupActivityAction.COLLECT,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
+        fractal_server_version=__VERSION__,
     )
     db.add(task_group_activity)
     await db.commit()

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

@@ -4,9 +4,6 @@ from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
-from packaging.version import InvalidVersion
-from packaging.version import Version
-from packaging.version import parse
 from pydantic.types import AwareDatetime
 from sqlmodel import or_
 from sqlmodel import select
@@ -17,13 +14,15 @@ from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_guest
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.routes.auth._aux_auth import (
     _get_default_usergroup_id_or_none,
 )
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
+from fractal_server.app.routes.aux._versions import _version_sort_key
 from fractal_server.app.schemas.v2 import TaskGroupActivityAction
 from fractal_server.app.schemas.v2 import TaskGroupActivityRead
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
@@ -42,26 +41,6 @@ router = APIRouter()
 logger = set_logger(__name__)
 
 
-def _version_sort_key(
-    task_group: TaskGroupV2,
-) -> tuple[int, Version | str | None]:
-    """
-    Returns a tuple used as (reverse) ordering key for TaskGroups in
-    `get_task_group_list`.
-    The TaskGroups with a parsable versions are the first in order,
-    sorted according to the sorting rules of packaging.version.Version.
-    Next in order we have the TaskGroups with non-null non-parsable versions,
-    sorted alphabetically.
-    Last we have the TaskGroups with null version.
-    """
-    if task_group.version is None:
-        return (0, task_group.version)
-    try:
-        return (2, parse(task_group.version))
-    except InvalidVersion:
-        return (1, task_group.version)
-
-
 @router.get("/activity/", response_model=list[TaskGroupActivityRead])
 async def get_task_group_activity_list(
     task_group_activity_id: int | None = None,
@@ -70,7 +49,7 @@ async def get_task_group_activity_list(
     status: TaskGroupActivityStatus | None = None,
     action: TaskGroupActivityAction | None = None,
     timestamp_started_min: AwareDatetime | None = None,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityRead]:
     stm = select(TaskGroupActivityV2).where(
@@ -102,7 +81,7 @@ async def get_task_group_activity_list(
 )
 async def get_task_group_activity(
     task_group_activity_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityRead:
     activity = await db.get(TaskGroupActivityV2, task_group_activity_id)
@@ -126,7 +105,7 @@ async def get_task_group_activity(
 
 @router.get("/", response_model=list[tuple[str, list[TaskGroupRead]]])
 async def get_task_group_list(
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
     only_active: bool = False,
     only_owner: bool = False,
@@ -175,7 +154,7 @@ async def get_task_group_list(
                 await remove_duplicate_task_groups(
                     task_groups=sorted(
                         list(groups),
-                        key=_version_sort_key,
+                        key=lambda group: _version_sort_key(group.version),
                         reverse=True,
                     ),
                     user_id=user.id,
@@ -194,7 +173,7 @@ async def get_task_group_list(
 @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),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupRead:
     """
@@ -212,7 +191,7 @@ async def get_task_group(
 async def patch_task_group(
     task_group_id: int,
     task_group_update: TaskGroupUpdate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupRead:
     """

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

@@ -5,11 +5,12 @@ from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
 
+from fractal_server import __VERSION__
 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 TaskGroupActivityV2
-from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -51,7 +52,7 @@ async def deactivate_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityRead:
     """
@@ -99,6 +100,7 @@ async def deactivate_task_group(
             ),
             timestamp_started=get_timestamp(),
             timestamp_ended=get_timestamp(),
+            fractal_server_version=__VERSION__,
         )
         db.add(task_group)
         db.add(task_group_activity)
@@ -114,6 +116,7 @@ async def deactivate_task_group(
         pkg_name=task_group.pkg_name,
         version=task_group.version,
         timestamp_started=get_timestamp(),
+        fractal_server_version=__VERSION__,
     )
     task_group.active = False
     db.add(task_group)
@@ -155,7 +158,7 @@ async def reactivate_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupRead:
     """
@@ -202,6 +205,7 @@ async def reactivate_task_group(
             ),
             timestamp_started=get_timestamp(),
             timestamp_ended=get_timestamp(),
+            fractal_server_version=__VERSION__,
         )
         db.add(task_group)
         db.add(task_group_activity)
@@ -225,6 +229,7 @@ async def reactivate_task_group(
         pkg_name=task_group.pkg_name,
         version=task_group.version,
         timestamp_started=get_timestamp(),
+        fractal_server_version=__VERSION__,
     )
     db.add(task_group_activity)
     await db.commit()
@@ -263,7 +268,7 @@ async def delete_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityRead:
     """
@@ -288,6 +293,7 @@ async def delete_task_group(
         pkg_name=task_group.pkg_name,
         version=(task_group.version or "N/A"),
         timestamp_started=get_timestamp(),
+        fractal_server_version=__VERSION__,
     )
     db.add(task_group_activity)
     await db.commit()

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

@@ -17,7 +17,8 @@ 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.routes.auth import get_api_guest
+from fractal_server.app.routes.auth import get_api_user
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2 import WorkflowTaskRead
 from fractal_server.app.schemas.v2 import WorkflowTaskReplace
@@ -77,7 +78,7 @@ class TaskVersionRead(BaseModel):
 async def get_workflow_version_update_candidates(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[list[TaskVersionRead]]:
     workflow = await _get_workflow_check_access(
@@ -180,7 +181,7 @@ async def replace_workflowtask(
     workflow_task_id: int,
     task_id: int,
     replace: WorkflowTaskReplace,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowTaskRead:
     # Get objects from database