fractal-server 2.17.0a3__py3-none-any.whl → 2.17.0a5__py3-none-any.whl

fractal_server/app/routes/admin/v2/resource.py

@@ -13,8 +13,10 @@ 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 Profile
+from fractal_server.app.models.v2 import ProjectV2
 from fractal_server.app.models.v2 import Resource
-from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.models.v2 import TaskGroupV2
+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
@@ -55,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]:
     """
@@ -72,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:
     """
@@ -86,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:
     """
@@ -114,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:
     """
@@ -142,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),
 ):
     """
@@ -166,6 +168,38 @@ async def delete_resource(
             ),
         )
 
+    # Fail if at least one Project is associated with the Resource.
+    res = await db.execute(
+        select(func.count(ProjectV2.id)).where(
+            ProjectV2.resource_id == resource_id
+        )
+    )
+    associated_project_count = res.scalar()
+    if associated_project_count > 0:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+            detail=(
+                f"Cannot delete Resource {resource_id} because it's associated"
+                f" with {associated_project_count} Projects."
+            ),
+        )
+
+    # Fail if at least one TaskGroupV2 is associated with the Resource.
+    res = await db.execute(
+        select(func.count(TaskGroupV2.id)).where(
+            TaskGroupV2.resource_id == resource_id
+        )
+    )
+    associated_taskgroup_count = res.scalar()
+    if associated_taskgroup_count > 0:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+            detail=(
+                f"Cannot delete Resource {resource_id} because it's associated"
+                f" with {associated_taskgroup_count} TaskGroupV2."
+            ),
+        )
+
     # Delete
     await db.delete(resource)
     await db.commit()
@@ -180,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]:
     """
@@ -204,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/app/routes/admin/v2/task.py

@@ -14,7 +14,7 @@ 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 +58,7 @@ async def query_tasks(
     category: str | None = None,
     modality: str | None = None,
     author: str | None = None,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskV2Info]:
     """

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

@@ -12,7 +12,7 @@ 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,
 )
@@ -38,7 +38,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)
@@ -67,7 +67,7 @@ async def get_task_group_activity_list(
 @router.get("/{task_group_id}/", response_model=TaskGroupReadV2)
 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:
     task_group = await db.get(TaskGroupV2, task_group_id)
@@ -89,7 +89,7 @@ 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),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupReadV2]:
     stm = select(TaskGroupV2)
@@ -138,7 +138,7 @@ async def query_task_group_list(
 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]:
     task_group = await db.get(TaskGroupV2, task_group_id)

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(

fractal_server/app/routes/api/__init__.py

@@ -6,7 +6,7 @@ from fastapi import Depends
 
 import fractal_server
 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.config import get_db_settings
 from fractal_server.config import get_email_settings
 from fractal_server.config import get_oauth_settings
@@ -26,7 +26,7 @@ async def alive():
 
 @router_api.get("/settings/app/")
 async def view_settings(
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
 ):
     settings = Inject(get_settings)
     return settings.model_dump()
@@ -34,7 +34,7 @@ async def view_settings(
 
 @router_api.get("/settings/database/")
 async def view_db_settings(
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
 ):
     settings = Inject(get_db_settings)
     return settings.model_dump()
@@ -42,7 +42,7 @@ async def view_db_settings(
 
 @router_api.get("/settings/email/")
 async def view_email_settings(
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
 ):
     settings = Inject(get_email_settings)
     return settings.model_dump()
@@ -50,7 +50,7 @@ async def view_email_settings(
 
 @router_api.get("/settings/oauth/")
 async def view_oauth_settings(
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
 ):
     settings = Inject(get_oauth_settings)
     return settings.model_dump()

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

@@ -19,7 +19,7 @@ from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _get_submitted_jobs_statement
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.string_tools import sanitize_string
 from fractal_server.urls import normalize_url
 
@@ -34,7 +34,7 @@ router = APIRouter()
 async def create_dataset(
     project_id: int,
     dataset: DatasetCreateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> DatasetReadV2 | None:
     """
@@ -45,15 +45,6 @@ async def create_dataset(
     )
 
     if dataset.zarr_dir is None:
-        if user.settings.project_dir is None:
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-                detail=(
-                    "Both 'dataset.zarr_dir' and 'user.settings.project_dir' "
-                    "are null"
-                ),
-            )
-
         db_dataset = DatasetV2(
             project_id=project_id,
             zarr_dir="__PLACEHOLDER__",
@@ -63,7 +54,7 @@ async def create_dataset(
         await db.commit()
         await db.refresh(db_dataset)
         path = (
-            f"{user.settings.project_dir}/fractal/"
+            f"{user.project_dir}/fractal/"
             f"{project_id}_{sanitize_string(project.name)}/"
             f"{db_dataset.id}_{sanitize_string(db_dataset.name)}"
         )
@@ -88,7 +79,7 @@ async def create_dataset(
 )
 async def read_dataset_list(
     project_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[DatasetReadV2] | None:
     """
@@ -116,7 +107,7 @@ async def read_dataset_list(
 async def read_dataset(
     project_id: int,
     dataset_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> DatasetReadV2 | None:
     """
@@ -141,7 +132,7 @@ async def update_dataset(
     project_id: int,
     dataset_id: int,
     dataset_update: DatasetUpdateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> DatasetReadV2 | None:
     """
@@ -181,7 +172,7 @@ async def update_dataset(
 async def delete_dataset(
     project_id: int,
     dataset_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -219,7 +210,7 @@ async def delete_dataset(
 
 @router.get("/dataset/", response_model=list[DatasetReadV2])
 async def get_user_datasets(
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[DatasetReadV2]:
     """
@@ -243,7 +234,7 @@ async def get_user_datasets(
 async def export_dataset(
     project_id: int,
     dataset_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> DatasetExportV2 | None:
     """
@@ -270,7 +261,7 @@ async def export_dataset(
 async def import_dataset(
     project_id: int,
     dataset: DatasetImportV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> DatasetReadV2 | None:
     """

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

@@ -23,7 +23,7 @@ from fractal_server.app.models.v2 import HistoryImageCache
 from fractal_server.app.models.v2 import HistoryRun
 from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import TaskV2
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 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
@@ -68,7 +68,7 @@ async def get_workflow_tasks_statuses(
     project_id: int,
     dataset_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
     # Access control
@@ -179,7 +179,7 @@ async def get_history_run_list(
     project_id: int,
     dataset_id: int,
     workflowtask_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[HistoryRunReadAggregated]:
     # Access control
@@ -271,7 +271,7 @@ async def get_history_run_units(
     workflowtask_id: int,
     history_run_id: int,
     unit_status: HistoryUnitStatus | None = None,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
     pagination: PaginationRequest = Depends(get_pagination_params),
 ) -> PaginationResponse[HistoryUnitRead]:
@@ -330,7 +330,7 @@ async def get_history_images(
     dataset_id: int,
     workflowtask_id: int,
     request_body: ImageQuery,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
     pagination: PaginationRequest = Depends(get_pagination_params),
 ) -> ImagePage:
@@ -412,7 +412,7 @@ async def get_history_images(
 async def get_image_log(
     project_id: int,
     request_data: ImageLogsRequest,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
     # Access control
@@ -460,7 +460,7 @@ async def get_history_unit_log(
     history_unit_id: int,
     workflowtask_id: int,
     dataset_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
     # Access control
@@ -508,7 +508,7 @@ async def get_history_unit_log(
 async def get_dataset_history(
     project_id: int,
     dataset_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[HistoryRunRead]:
     """

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

@@ -13,7 +13,7 @@ from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import HistoryImageCache
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 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
@@ -60,7 +60,7 @@ async def post_new_image(
     project_id: int,
     dataset_id: int,
     new_image: SingleImage,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     output = await _get_dataset_check_owner(
@@ -112,7 +112,7 @@ async def query_dataset_images(
     dataset_id: int,
     query: ImageQueryWithZarrUrl | None = None,
     pagination: PaginationRequest = Depends(get_pagination_params),
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> ImagePage:
     page = pagination.page
@@ -183,7 +183,7 @@ async def delete_dataset_images(
     project_id: int,
     dataset_id: int,
     zarr_url: str,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     output = await _get_dataset_check_owner(
@@ -227,7 +227,7 @@ async def patch_dataset_image(
     project_id: int,
     dataset_id: int,
     image_update: SingleImageUpdate,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ):
     output = await _get_dataset_check_owner(

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

@@ -23,7 +23,7 @@ from ._aux_functions import _get_job_check_owner
 from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _get_workflow_check_owner
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.runner.filenames import WORKFLOW_LOG_FILENAME
 
 
@@ -39,7 +39,7 @@ router = APIRouter()
 
 @router.get("/job/", response_model=list[JobReadV2])
 async def get_user_jobs(
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     log: bool = True,
     db: AsyncSession = Depends(get_async_db),
 ) -> list[JobReadV2]:
@@ -68,7 +68,7 @@ async def get_user_jobs(
 async def get_workflow_jobs(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[JobReadV2] | None:
     """
@@ -88,7 +88,7 @@ async def get_latest_job(
     project_id: int,
     workflow_id: int,
     dataset_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> JobReadV2:
     await _get_workflow_check_owner(
@@ -120,7 +120,7 @@ async def read_job(
     project_id: int,
     job_id: int,
     show_tmp_logs: bool = False,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> JobReadV2 | None:
     """
@@ -153,7 +153,7 @@ async def read_job(
 async def download_job_logs(
     project_id: int,
     job_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> StreamingResponse:
     """
@@ -183,7 +183,7 @@ async def download_job_logs(
 )
 async def get_job_list(
     project_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     log: bool = True,
     db: AsyncSession = Depends(get_async_db),
 ) -> list[JobReadV2] | None:
@@ -212,7 +212,7 @@ async def get_job_list(
 async def stop_job(
     project_id: int,
     job_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """

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

@@ -11,7 +11,7 @@ from .images import ImageQuery
 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_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.images.status_tools import enrich_images_unsorted_async
@@ -32,7 +32,7 @@ async def verify_unique_types(
     dataset_id: int,
     workflowtask_id: int,
     query: ImageQuery | None = None,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[str]:
     # Get dataset
@@ -93,7 +93,7 @@ async def check_non_processed_images(
     workflow_id: int,
     workflowtask_id: int,
     filters: NonProcessedImagesPayload,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
     db_workflow_task, db_workflow = await _get_workflow_task_check_owner(

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

@@ -20,14 +20,14 @@ from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _get_resource_and_profile_ids
 from ._aux_functions import _get_submitted_jobs_statement
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 
 router = APIRouter()
 
 
 @router.get("/project/", response_model=list[ProjectReadV2])
 async def get_list_project(
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ProjectV2]:
     """
@@ -47,7 +47,7 @@ async def get_list_project(
 @router.post("/project/", response_model=ProjectReadV2, status_code=201)
 async def create_project(
     project: ProjectCreateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> ProjectReadV2 | None:
     """
@@ -76,7 +76,7 @@ async def create_project(
 @router.get("/project/{project_id}/", response_model=ProjectReadV2)
 async def read_project(
     project_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> ProjectReadV2 | None:
     """
@@ -93,7 +93,7 @@ async def read_project(
 async def update_project(
     project_id: int,
     project_update: ProjectUpdateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ):
     project = await _get_project_check_owner(
@@ -118,7 +118,7 @@ async def update_project(
 @router.delete("/project/{project_id}/", status_code=204)
 async def delete_project(
     project_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """

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

@@ -13,7 +13,7 @@ from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_submitted_jobs_statement
 from ._aux_functions import _get_workflow_check_owner
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 
 router = APIRouter()
 
@@ -28,7 +28,7 @@ async def get_workflowtask_status(
     project_id: int,
     dataset_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> LegacyStatusReadV2 | None:
     """