fractal-server 2.17.0a4__tar.gz → 2.17.0a6__tar.gz

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.17.0a4
+Version: 2.17.0a6
 Summary: Backend component of the Fractal analytics platform
 License-Expression: BSD-3-Clause
 License-File: LICENSE
@@ -12,20 +12,18 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alembic (>=1.13.1,<2.0.0)
-Requires-Dist: cryptography (>=46.0.0,<47.0.0)
 Requires-Dist: fabric (>=3.2.2,<3.3.0)
-Requires-Dist: fastapi (>=0.118.0,<0.119.0)
-Requires-Dist: fastapi-users[oauth] (>=14,<15)
+Requires-Dist: fastapi (>=0.120.0,<0.121.0)
+Requires-Dist: fastapi-users[oauth] (>=15,<16)
 Requires-Dist: gunicorn (>=23.0,<24.0)
 Requires-Dist: packaging (>=25.0.0,<26.0.0)
 Requires-Dist: psycopg[binary] (>=3.1.0,<4.0.0)
 Requires-Dist: pydantic (>=2.12.0,<2.13.0)
 Requires-Dist: pydantic-settings (==2.11.0)
-Requires-Dist: python-dotenv (>=1.1.0,<1.2.0)
 Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)
 Requires-Dist: sqlmodel (==0.0.27)
 Requires-Dist: tomli_w (>=1.2.0,<1.3.0)
-Requires-Dist: uvicorn (>=0.37.0,<0.38.0)
+Requires-Dist: uvicorn (>=0.38.0,<0.39.0)
 Requires-Dist: uvicorn-worker (==0.4.0)
 Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server
 Project-URL: Homepage, https://github.com/fractal-analytics-platform/fractal-server

fractal_server-2.17.0a6/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.17.0a6"

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/__main__.py

@@ -74,13 +74,20 @@ init_db_data_parser.add_argument(
 init_db_data_parser.add_argument(
     "--admin-email",
     type=str,
-    help="Email of the first admin user to create.",
+    help="Email of the first admin user.",
     required=False,
 )
 init_db_data_parser.add_argument(
     "--admin-pwd",
     type=str,
-    help="Password of the first admin user to create.",
+    help="Password for the first admin user.",
+    required=False,
+)
+
+init_db_data_parser.add_argument(
+    "--admin-project-dir",
+    type=str,
+    help="Project_dir for the first admin user.",
     required=False,
 )
 
@@ -90,15 +97,6 @@ update_db_data_parser = subparsers.add_parser(
     description="Apply data-migration script to an existing database.",
 )
 
-# fractalctl encrypt-email-password
-encrypt_email_password_parser = subparsers.add_parser(
-    "encrypt-email-password",
-    description=(
-        "Generate valid values for environment variables "
-        "FRACTAL_EMAIL_PASSWORD and FRACTAL_EMAIL_PASSWORD_KEY."
-    ),
-)
-
 
 def save_openapi(dest="openapi.json"):
     from fractal_server.main import start_application
@@ -136,10 +134,12 @@ def set_db():
 
 
 def init_db_data(
+    *,
     resource: str | None = None,
     profile: str | None = None,
     admin_email: str | None = None,
     admin_password: str | None = None,
+    admin_project_dir: str | None = None,
 ) -> None:
     from fractal_server.app.security import _create_first_user
     from fractal_server.app.security import _create_first_group
@@ -156,14 +156,22 @@ def init_db_data(
     print()
 
     # Create admin user if requested
-    if (admin_email is None) != (admin_password is None):
-        print("You must provide both --admin-email and --admin-pwd. Exit.")
+    if not (
+        (admin_email is None)
+        == (admin_password is None)
+        == (admin_project_dir is None)
+    ):
+        print(
+            "You must provide either or or none of `--admin-email`, "
+            "`--admin-pwd` and `--admin-project-dir`. Exit."
+        )
         sys.exit(1)
     if admin_password and admin_email:
         asyncio.run(
             _create_first_user(
                 email=admin_email,
                 password=admin_password,
+                project_dir=admin_project_dir,
                 is_superuser=True,
                 is_verified=True,
             )
@@ -325,17 +333,6 @@ def update_db_data():
     current_update_db_data_module.fix_db()
 
 
-def print_encrypted_password():
-    from cryptography.fernet import Fernet
-
-    password = input("Insert email password: ").encode("utf-8")
-    key = Fernet.generate_key().decode("utf-8")
-    encrypted_password = Fernet(key).encrypt(password).decode("utf-8")
-
-    print(f"\nFRACTAL_EMAIL_PASSWORD={encrypted_password}")
-    print(f"FRACTAL_EMAIL_PASSWORD_KEY={key}")
-
-
 def run():
     args = parser.parse_args(sys.argv[1:])
 
@@ -349,6 +346,7 @@ def run():
             profile=args.profile,
             admin_email=args.admin_email,
             admin_password=args.admin_pwd,
+            admin_project_dir=args.admin_project_dir,
         )
     elif args.cmd == "update-db-data":
         update_db_data()
@@ -359,8 +357,6 @@ def run():
             port=args.port,
             reload=args.reload,
         )
-    elif args.cmd == "encrypt-email-password":
-        print_encrypted_password()
     else:
         sys.exit(f"Error: invalid command '{args.cmd}'.")
 

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/models/security.py

@@ -1,27 +1,17 @@
-# This is based on fastapi_users_db_sqlmodel
-# <https://github.com/fastapi-users/fastapi-users-db-sqlmodel>
-# Original Copyright
-# Copyright 2022 François Voron
-# License: MIT
-#
-# Modified by:
-# Tommaso Comparin <tommaso.comparin@exact-lab.it>
-#
-# Copyright 2022 (C) Friedrich Miescher Institute for Biomedical Research and
-# University of Zurich
 from datetime import datetime
 from typing import Optional
 
 from pydantic import ConfigDict
 from pydantic import EmailStr
 from sqlalchemy import Column
+from sqlalchemy import String
+from sqlalchemy.dialects.postgresql import ARRAY
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
 from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
 
-from .user_settings import UserSettings
 from fractal_server.utils import get_timestamp
 
 
@@ -74,17 +64,20 @@ class UserOAuth(SQLModel, table=True):
         is_superuser:
         is_verified:
         oauth_accounts:
-        user_settings_id:
         profile_id:
-        settings:
+        project_dir:
+        slurm_accounts:
     """
 
+    model_config = ConfigDict(from_attributes=True)
+
     __tablename__ = "user_oauth"
 
     id: int | None = Field(default=None, primary_key=True)
 
     email: EmailStr = Field(
-        sa_column_kwargs={"unique": True, "index": True}, nullable=False
+        sa_column_kwargs={"unique": True, "index": True},
+        nullable=False,
     )
     hashed_password: str
     is_active: bool = Field(default=True, nullable=False)
@@ -96,18 +89,23 @@ class UserOAuth(SQLModel, table=True):
         sa_relationship_kwargs={"lazy": "joined", "cascade": "all, delete"},
     )
 
-    user_settings_id: int | None = Field(
-        foreign_key="user_settings.id", default=None
-    )
     profile_id: int | None = Field(
         foreign_key="profile.id",
         default=None,
         ondelete="SET NULL",
     )
-    settings: UserSettings | None = Relationship(
-        sa_relationship_kwargs=dict(lazy="selectin", cascade="all, delete")
+
+    # TODO-2.17.1: update to `project_dir: str`
+    project_dir: str = Field(
+        sa_column=Column(
+            String,
+            server_default="/PLACEHOLDER",
+            nullable=False,
+        )
+    )
+    slurm_accounts: list[str] = Field(
+        sa_column=Column(ARRAY(String), server_default="{}"),
     )
-    model_config = ConfigDict(from_attributes=True)
 
 
 class UserGroup(SQLModel, table=True):

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/models/user_settings.py

@@ -4,6 +4,7 @@ from sqlmodel import Field
 from sqlmodel import SQLModel
 
 
+# TODO-2.17.1: Drop `UserSettings`
 class UserSettings(SQLModel, table=True):
     """
     Comprehensive list of user settings.

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/models/v2/task_group.py

@@ -42,6 +42,7 @@ class TaskGroupV2(SQLModel, table=True):
     user_group_id: int | None = Field(
         foreign_key="usergroup.id", default=None, ondelete="SET NULL"
     )
+    # TODO-2.17.1: make `resource_id` not nullable
     resource_id: int | None = Field(
         foreign_key="resource.id", default=None, ondelete="SET NULL"
     )

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/accounting.py

@@ -13,7 +13,7 @@ from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import AccountingRecord
 from fractal_server.app.models.v2 import AccountingRecordSlurm
-from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.routes.pagination import get_pagination_params
 from fractal_server.app.routes.pagination import PaginationRequest
 from fractal_server.app.routes.pagination import PaginationResponse
@@ -34,7 +34,7 @@ async def query_accounting(
     query: AccountingQuery,
     # Dependencies
     pagination: PaginationRequest = Depends(get_pagination_params),
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> PaginationResponse[AccountingRecordRead]:
     page = pagination.page
@@ -79,7 +79,7 @@ async def query_accounting(
 async def query_accounting_slurm(
     query: AccountingQuery,
     # dependencies
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
     stm = select(AccountingRecordSlurm.slurm_job_ids)

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/impersonate.py

@@ -6,7 +6,7 @@ from fastapi_users.authentication import JWTStrategy
 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_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.routes.auth._aux_auth import _user_or_404
 from fractal_server.config import get_settings
 from fractal_server.syringe import Inject
@@ -17,7 +17,7 @@ router = APIRouter()
 @router.get("/{user_id}/")
 async def impersonate_user(
     user_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
     user = await _user_or_404(user_id, db)

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/job.py

@@ -16,7 +16,7 @@ from fractal_server.app.models.v2 import HistoryRun
 from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import ProjectV2
-from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 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 HistoryUnitStatus
@@ -43,7 +43,7 @@ async def view_job(
     end_timestamp_min: AwareDatetime | None = None,
     end_timestamp_max: AwareDatetime | None = None,
     log: bool = True,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[JobReadV2]:
     """
@@ -111,7 +111,7 @@ async def view_job(
 async def view_single_job(
     job_id: int,
     show_tmp_logs: bool = False,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> JobReadV2:
     job = await db.get(JobV2, job_id)
@@ -136,7 +136,7 @@ async def view_single_job(
 async def update_job(
     job_update: JobUpdateV2,
     job_id: int,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> JobReadV2 | None:
     """
@@ -200,7 +200,7 @@ async def update_job(
 @router.get("/{job_id}/stop/", status_code=202)
 async def stop_job(
     job_id: int,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -224,7 +224,7 @@ async def stop_job(
 @router.get("/{job_id}/download/", response_class=StreamingResponse)
 async def download_job_logs(
     job_id: int,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> StreamingResponse:
     """

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/profile.py

@@ -10,8 +10,9 @@ from ._aux_functions import _check_profile_name
 from ._aux_functions import _get_profile_or_404
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
+from fractal_server.app.models import Profile
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.schemas.v2 import ProfileCreate
 from fractal_server.app.schemas.v2 import ProfileRead
 
@@ -21,7 +22,7 @@ router = APIRouter()
 @router.get("/{profile_id}/", response_model=ProfileRead, status_code=200)
 async def get_single_profile(
     profile_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> ProfileRead:
     """
@@ -31,11 +32,24 @@ async def get_single_profile(
     return profile
 
 
+@router.get("/", response_model=list[ProfileRead], status_code=200)
+async def get_profile_list(
+    superuser: UserOAuth = Depends(current_superuser_act),
+    db: AsyncSession = Depends(get_async_db),
+) -> ProfileRead:
+    """
+    Query single `Profile`.
+    """
+    res = await db.execute(select(Profile).order_by(Profile.id))
+    profiles = res.scalars().all()
+    return profiles
+
+
 @router.put("/{profile_id}/", response_model=ProfileRead, status_code=200)
 async def put_profile(
     profile_id: int,
     profile_update: ProfileCreate,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> ProfileRead:
     """
@@ -56,7 +70,7 @@ async def put_profile(
 @router.delete("/{profile_id}/", status_code=204)
 async def delete_profile(
     profile_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ):
     """

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/project.py

@@ -6,7 +6,7 @@ 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 ProjectV2
-from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.schemas.v2 import ProjectReadV2
 
 router = APIRouter()
@@ -16,7 +16,7 @@ router = APIRouter()
 async def view_project(
     id: int | None = None,
     user_id: int | None = None,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ProjectReadV2]:
     """

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/resource.py

@@ -16,7 +16,7 @@ from fractal_server.app.models.v2 import Profile
 from fractal_server.app.models.v2 import ProjectV2
 from fractal_server.app.models.v2 import Resource
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.schemas.v2 import ProfileCreate
 from fractal_server.app.schemas.v2 import ProfileRead
 from fractal_server.app.schemas.v2 import ResourceCreate
@@ -57,7 +57,7 @@ def _check_type_match_or_422(new_resource: ResourceCreate) -> None:
 
 @router.get("/", response_model=list[ResourceRead], status_code=200)
 async def get_resource_list(
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ResourceRead]:
     """
@@ -74,7 +74,7 @@ async def get_resource_list(
 @router.get("/{resource_id}/", response_model=ResourceRead, status_code=200)
 async def get_resource(
     resource_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> ResourceRead:
     """
@@ -88,7 +88,7 @@ async def get_resource(
 @router.post("/", response_model=ResourceRead, status_code=201)
 async def post_resource(
     resource_create: ResourceCreate,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> ResourceRead:
     """
@@ -116,7 +116,7 @@ async def post_resource(
 async def put_resource(
     resource_id: int,
     resource_update: ResourceCreate,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> ResourceRead:
     """
@@ -144,7 +144,7 @@ async def put_resource(
 @router.delete("/{resource_id}/", status_code=204)
 async def delete_resource(
     resource_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ):
     """
@@ -214,7 +214,7 @@ async def delete_resource(
 )
 async def get_resource_profiles(
     resource_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ProfileRead]:
     """
@@ -238,7 +238,7 @@ async def get_resource_profiles(
 async def post_profile(
     resource_id: int,
     profile_create: ProfileCreate,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> ProfileRead:
     """

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/task.py

@@ -10,11 +10,12 @@ from sqlmodel import select
 
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
+from fractal_server.app.models import TaskGroupV2
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
 from fractal_server.app.models.v2 import WorkflowV2
-from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 
 router = APIRouter()
 
@@ -58,7 +59,8 @@ async def query_tasks(
     category: str | None = None,
     modality: str | None = None,
     author: str | None = None,
-    user: UserOAuth = Depends(current_active_superuser),
+    resource_id: int | None = None,
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskV2Info]:
     """
@@ -75,6 +77,7 @@ async def query_tasks(
         category:
         modality:
         author:
+        resource_id:
     """
 
     stm = select(TaskV2)
@@ -93,6 +96,12 @@ async def query_tasks(
         stm = stm.where(func.lower(TaskV2.modality) == modality.lower())
     if author is not None:
         stm = stm.where(TaskV2.authors.icontains(author))
+    if resource_id is not None:
+        stm = (
+            stm.join(TaskGroupV2)
+            .where(TaskGroupV2.id == TaskV2.taskgroupv2_id)
+            .where(TaskGroupV2.resource_id == resource_id)
+        )
 
     res = await db.execute(stm)
     task_list = res.scalars().all()

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/task_group.py

@@ -12,18 +12,19 @@ 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_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 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 TaskGroupReadSuperuser
 from fractal_server.app.schemas.v2 import TaskGroupUpdateV2
 from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
 from fractal_server.logger import set_logger
 
+
 router = APIRouter()
 
 logger = set_logger(__name__)
@@ -38,7 +39,7 @@ async def get_task_group_activity_list(
     status: TaskGroupActivityStatusV2 | None = None,
     action: TaskGroupActivityActionV2 | None = None,
     timestamp_started_min: AwareDatetime | None = None,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityV2Read]:
     stm = select(TaskGroupActivityV2)
@@ -64,12 +65,12 @@ async def get_task_group_activity_list(
     return activities
 
 
-@router.get("/{task_group_id}/", response_model=TaskGroupReadV2)
+@router.get("/{task_group_id}/", response_model=TaskGroupReadSuperuser)
 async def query_task_group(
     task_group_id: int,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupReadV2:
+) -> TaskGroupReadSuperuser:
     task_group = await db.get(TaskGroupV2, task_group_id)
     if task_group is None:
         raise HTTPException(
@@ -79,7 +80,7 @@ async def query_task_group(
     return task_group
 
 
-@router.get("/", response_model=list[TaskGroupReadV2])
+@router.get("/", response_model=list[TaskGroupReadSuperuser])
 async def query_task_group_list(
     user_id: int | None = None,
     user_group_id: int | None = None,
@@ -89,9 +90,10 @@ async def query_task_group_list(
     origin: TaskGroupV2OriginEnum | None = None,
     timestamp_last_used_min: AwareDatetime | None = None,
     timestamp_last_used_max: AwareDatetime | None = None,
-    user: UserOAuth = Depends(current_active_superuser),
+    resource_id: int | None = None,
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> list[TaskGroupReadV2]:
+) -> list[TaskGroupReadSuperuser]:
     stm = select(TaskGroupV2)
 
     if user_group_id is not None and private is True:
@@ -128,19 +130,21 @@ async def query_task_group_list(
         stm = stm.where(
             TaskGroupV2.timestamp_last_used <= timestamp_last_used_max
         )
+    if resource_id is not None:
+        stm = stm.where(TaskGroupV2.resource_id == resource_id)
 
     res = await db.execute(stm)
     task_groups_list = res.scalars().all()
     return task_groups_list
 
 
-@router.patch("/{task_group_id}/", response_model=TaskGroupReadV2)
+@router.patch("/{task_group_id}/", response_model=TaskGroupReadSuperuser)
 async def patch_task_group(
     task_group_id: int,
     task_group_update: TaskGroupUpdateV2,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> list[TaskGroupReadV2]:
+) -> list[TaskGroupReadSuperuser]:
     task_group = await db.get(TaskGroupV2, task_group_id)
     if task_group is None:
         raise HTTPException(

{fractal_server-2.17.0a4 → fractal_server-2.17.0a6}/fractal_server/app/routes/admin/v2/task_group_lifecycle.py

@@ -21,7 +21,7 @@ from fractal_server.app.routes.api.v2._aux_functions_task_lifecycle import (
 from fractal_server.app.routes.api.v2._aux_functions_tasks import (
     _get_task_group_or_404,
 )
-from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -52,7 +52,7 @@ async def deactivate_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     """
@@ -146,7 +146,7 @@ async def reactivate_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     """
@@ -247,7 +247,7 @@ async def delete_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ):
     task_group = await _get_task_group_or_404(