fractal-server 2.18.5__tar.gz → 2.19.0__tar.gz

{fractal_server-2.18.5 → fractal_server-2.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.18.5
+Version: 2.19.0
 Summary: Backend component of the Fractal analytics platform
 Author: Tommaso Comparin, Marco Franzon, Yuri Chiucconi, Jacopo Nespolo
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>, Marco Franzon <marco.franzon@exact-lab.it>, Yuri Chiucconi <yuri.chiucconi@exact-lab.it>, Jacopo Nespolo <jacopo.nespolo@exact-lab.it>
@@ -17,10 +17,10 @@ Requires-Dist: pydantic>=2.12.0,<2.13.0
 Requires-Dist: pydantic-settings==2.12.0
 Requires-Dist: packaging>=25.0.0,<26.0.0
 Requires-Dist: fabric>=3.2.2,<3.3.0
-Requires-Dist: gunicorn>=23.0,<24.0
+Requires-Dist: gunicorn>=24.1,<25
 Requires-Dist: psycopg[binary]>=3.1.0,<4.0.0
 Requires-Dist: tomli-w>=1.2.0,<1.3.0
-Requires-Python: >=3.11, <3.15
+Requires-Python: >=3.12, <3.15
 Project-URL: changelog, https://github.com/fractal-analytics-platform/fractal-server/blob/main/CHANGELOG.md
 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.19.0/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.19.0"

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/db/__init__.py

@@ -54,7 +54,6 @@ class DB:
             cls._engine_async,
             class_=AsyncSession,
             expire_on_commit=False,
-            future=True,
         )
 
     @classmethod
@@ -68,12 +67,7 @@ class DB:
             pool_pre_ping=True,
         )
 
-        cls._sync_session_maker = sessionmaker(
-            bind=cls._engine_sync,
-            autocommit=False,
-            autoflush=False,
-            future=True,
-        )
+        cls._sync_session_maker = sessionmaker(cls._engine_sync)
 
     @classmethod
     async def get_async_db(cls) -> AsyncGenerator[AsyncSession, None]:

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/models/security.py

@@ -7,6 +7,8 @@ from sqlalchemy import Column
 from sqlalchemy import String
 from sqlalchemy.dialects.postgresql import ARRAY
 from sqlalchemy.types import DateTime
+from sqlmodel import BOOLEAN
+from sqlmodel import CheckConstraint
 from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
@@ -100,6 +102,13 @@ class UserOAuth(SQLModel, table=True):
     is_active: bool = Field(default=True, nullable=False)
     is_superuser: bool = Field(default=False, nullable=False)
     is_verified: bool = Field(default=False, nullable=False)
+    is_guest: bool = Field(
+        sa_column=Column(
+            BOOLEAN,
+            server_default="false",
+            nullable=False,
+        ),
+    )
 
     oauth_accounts: list["OAuthAccount"] = Relationship(
         back_populates="user",
@@ -120,6 +129,13 @@ class UserOAuth(SQLModel, table=True):
         sa_column=Column(ARRAY(String), server_default="{}"),
     )
 
+    __table_args__ = (
+        CheckConstraint(
+            "NOT (is_superuser AND is_guest)",
+            name="superuser_is_not_guest",
+        ),
+    )
+
 
 class UserGroup(SQLModel, table=True):
     """

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/models/v2/dataset.py

@@ -27,10 +27,6 @@ class DatasetV2(SQLModel, table=True):
         sa_relationship_kwargs=dict(lazy="selectin"),
     )
 
-    history: list[dict[str, Any]] = Field(
-        sa_column=Column(JSONB, server_default="[]", nullable=False)
-    )
-
     timestamp_created: datetime = Field(
         default_factory=get_timestamp,
         sa_column=Column(DateTime(timezone=True), nullable=False),

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/models/v2/job.py

@@ -5,6 +5,7 @@ from pydantic import ConfigDict
 from sqlalchemy import Column
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
+from sqlalchemy.types import String
 from sqlmodel import Field
 from sqlmodel import Index
 from sqlmodel import SQLModel
@@ -44,6 +45,9 @@ class JobV2(SQLModel, table=True):
     project_dump: dict[str, Any] = Field(
         sa_column=Column(JSONB, nullable=False)
     )
+    fractal_server_version: str = Field(
+        sa_column=Column(String, server_default="pre-2.19.0", nullable=False)
+    )
 
     worker_init: str | None = None
     working_dir: str | None = None

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/models/v2/task.py

@@ -14,7 +14,6 @@ class TaskV2(SQLModel, table=True):
     type: str
     command_non_parallel: str | None = None
     command_parallel: str | None = None
-    source: str | None = None
 
     meta_non_parallel: dict[str, Any] = Field(
         sa_column=Column(JSON, server_default="{}", default={}, nullable=False)

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/models/v2/task_group.py

@@ -4,6 +4,7 @@ from datetime import timezone
 from sqlalchemy import Column
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
+from sqlalchemy.types import String
 from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
@@ -151,3 +152,6 @@ class TaskGroupActivityV2(SQLModel, table=True):
         default=None,
         sa_column=Column(DateTime(timezone=True)),
     )
+    fractal_server_version: str = Field(
+        sa_column=Column(String, server_default="pre-2.19.0", nullable=False)
+    )

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/models/v2/workflow.py

@@ -32,3 +32,5 @@ class WorkflowV2(SQLModel, table=True):
         default_factory=get_timestamp,
         sa_column=Column(DateTime(timezone=True), nullable=False),
     )
+
+    description: str | None = Field(default=None, nullable=True)

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/models/v2/workflowtask.py

@@ -39,3 +39,6 @@ class WorkflowTaskV2(SQLModel, table=True):
     task_type: str
     task_id: int = Field(foreign_key="taskv2.id")
     task: TaskV2 = Relationship(sa_relationship_kwargs=dict(lazy="selectin"))
+
+    alias: str | None = Field(default=None, nullable=True)
+    description: str | None = Field(default=None, nullable=True)

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/admin/v2/job.py

@@ -176,7 +176,6 @@ async def view_single_job(
             status_code=status.HTTP_404_NOT_FOUND,
             detail=f"Job {job_id} not found",
         )
-    await db.close()
 
     if show_tmp_logs and (job.status == JobStatusType.SUBMITTED):
         try:
@@ -249,7 +248,6 @@ async def update_job(
 
     await db.commit()
     await db.refresh(job)
-    await db.close()
     return job
 
 

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/admin/v2/sharing.py

@@ -1,5 +1,8 @@
 from fastapi import APIRouter
 from fastapi import Depends
+from fastapi import HTTPException
+from fastapi import Response
+from fastapi import status
 from sqlalchemy import func
 from sqlmodel import select
 
@@ -8,11 +11,16 @@ from fractal_server.app.db import get_async_db
 from fractal_server.app.models import LinkUserProjectV2
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import ProjectV2
+from fractal_server.app.routes.api.v2._aux_functions_sharing import (
+    get_pending_invitation_or_404,
+)
 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.app.routes.pagination import PaginationRequest
 from fractal_server.app.routes.pagination import PaginationResponse
 from fractal_server.app.routes.pagination import get_pagination_params
 from fractal_server.app.schemas.v2 import LinkUserProjectRead
+from fractal_server.app.schemas.v2.sharing import ProjectPermissions
 
 router = APIRouter()
 
@@ -101,3 +109,42 @@ async def view_link_user_project(
             for linkuserproject, user_email, project_name in items
         ],
     )
+
+
+@router.post("/verify/", status_code=200)
+async def verify_invitation_for_guest(
+    guest_user_id: int,
+    project_id: int,
+    superuser: UserOAuth = Depends(current_superuser_act),
+    db: AsyncSession = Depends(get_async_db),
+) -> None:
+    """
+    Verify the invitation to join a project for a guest user
+
+    Note that a guest user would not be allowed to do this themselves.
+    """
+    # Get user and verify that they actually are a guest
+    guest_user = await _user_or_404(guest_user_id, db)
+    if not guest_user.is_guest:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+            detail="Cannot accept invitations for non-guest users.",
+        )
+
+    # Find verification and check that permissions are set to R
+    link = await get_pending_invitation_or_404(
+        user_id=guest_user_id, project_id=project_id, db=db
+    )
+    if link.permissions != ProjectPermissions.READ:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+            detail=(
+                "Guest users can only have 'r' permission "
+                f"(given: '{link.permissions}')"
+            ),
+        )
+    # Mark the invitation as verified
+    link.is_verified = True
+    await db.commit()
+
+    return Response(status_code=status.HTTP_200_OK)

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/admin/v2/task.py

@@ -30,7 +30,6 @@ class TaskMinimal(BaseModel):
     taskgroupv2_id: int
     command_non_parallel: str | None = None
     command_parallel: str | None = None
-    source: str | None = None
     version: str | None = None
 
 
@@ -55,7 +54,6 @@ class TaskInfo(BaseModel):
 @router.get("/", response_model=PaginationResponse[TaskInfo])
 async def query_tasks(
     id: int | None = None,
-    source: str | None = None,
     version: str | None = None,
     name: str | None = None,
     task_type: TaskType | None = None,
@@ -81,9 +79,6 @@ async def query_tasks(
     if id is not None:
         stm = stm.where(TaskV2.id == id)
         stm_count = stm_count.where(TaskV2.id == id)
-    if source is not None:
-        stm = stm.where(TaskV2.source.icontains(source))
-        stm_count = stm_count.where(TaskV2.source.icontains(source))
     if version is not None:
         stm = stm.where(TaskV2.version == version)
         stm_count = stm_count.where(TaskV2.version == version)

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/admin/v2/task_group_lifecycle.py

@@ -5,6 +5,7 @@ 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
@@ -93,6 +94,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)
@@ -108,6 +110,7 @@ async def deactivate_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()
@@ -188,6 +191,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)
@@ -211,6 +215,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()
@@ -264,6 +269,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-2.19.0/fractal_server/app/routes/api/__init__.py

@@ -0,0 +1,9 @@
+from fastapi import APIRouter
+
+from .alive import router as router_alive
+from .settings import router as router_settings
+
+router_api = APIRouter()
+
+router_api.include_router(router_alive)
+router_api.include_router(router_settings)

fractal_server-2.19.0/fractal_server/app/routes/api/alive.py

@@ -0,0 +1,13 @@
+from fastapi import APIRouter
+
+import fractal_server
+
+router = APIRouter()
+
+
+@router.get("/alive/")
+async def alive():
+    return dict(
+        alive=True,
+        version=fractal_server.__VERSION__,
+    )

fractal_server-2.18.5/fractal_server/app/routes/api/__init__.py → fractal_server-2.19.0/fractal_server/app/routes/api/settings.py

@@ -1,11 +1,6 @@
-"""
-`api` module
-"""
-
 from fastapi import APIRouter
 from fastapi import Depends
 
-import fractal_server
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.config import get_db_settings
@@ -14,18 +9,10 @@ from fractal_server.config import get_oauth_settings
 from fractal_server.config import get_settings
 from fractal_server.syringe import Inject
 
-router_api = APIRouter()
-
-
-@router_api.get("/alive/")
-async def alive():
-    return dict(
-        alive=True,
-        version=fractal_server.__VERSION__,
-    )
+router = APIRouter()
 
 
-@router_api.get("/settings/app/")
+@router.get("/settings/app/")
 async def view_settings(
     user: UserOAuth = Depends(current_superuser_act),
 ):
@@ -33,7 +20,7 @@ async def view_settings(
     return settings.model_dump()
 
 
-@router_api.get("/settings/database/")
+@router.get("/settings/database/")
 async def view_db_settings(
     user: UserOAuth = Depends(current_superuser_act),
 ):
@@ -41,7 +28,7 @@ async def view_db_settings(
     return settings.model_dump()
 
 
-@router_api.get("/settings/email/")
+@router.get("/settings/email/")
 async def view_email_settings(
     user: UserOAuth = Depends(current_superuser_act),
 ):
@@ -49,7 +36,7 @@ async def view_email_settings(
     return settings.model_dump()
 
 
-@router_api.get("/settings/oauth/")
+@router.get("/settings/oauth/")
 async def view_oauth_settings(
     user: UserOAuth = Depends(current_superuser_act),
 ):

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/api/v2/__init__.py

@@ -14,7 +14,6 @@ from .job import router as job_router
 from .pre_submission_checks import router as pre_submission_checks_router
 from .project import router as project_router
 from .sharing import router as sharing_router
-from .status_legacy import router as status_legacy_router
 from .submit import router as submit_job_router
 from .task import router as task_router
 from .task_collection import router as task_collection_router
@@ -37,7 +36,6 @@ router_api.include_router(sharing_router, tags=["Project Sharing"])
 router_api.include_router(project_router, tags=["Project"])
 router_api.include_router(submit_job_router, tags=["Job"])
 router_api.include_router(history_router, tags=["History"])
-router_api.include_router(status_legacy_router, tags=["Status Legacy"])
 
 
 settings = Inject(get_settings)

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py

@@ -2,8 +2,6 @@ from fastapi import HTTPException
 from fastapi import status
 from httpx import AsyncClient
 from httpx import TimeoutException
-from packaging.version import InvalidVersion
-from packaging.version import Version
 from sqlmodel import func
 from sqlmodel import select
 
@@ -14,6 +12,7 @@ from fractal_server.app.models.v2 import TaskGroupV2
 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.aux._versions import _find_latest_version_or_422
 from fractal_server.app.schemas.v2 import JobStatusType
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
 from fractal_server.logger import set_logger
@@ -26,24 +25,6 @@ PYPI_JSON_HEADERS = {"Accept": "application/vnd.pypi.simple.v1+json"}
 logger = set_logger(__name__)
 
 
-def _find_latest_version_or_422(versions: list[str]) -> str:
-    """
-    > For PEP 440 versions, this is easy enough for the client to do (using
-    > the `packaging` library [...]. For non-standard versions, there is no
-    > well-defined ordering, and clients will need to decide on what rule is
-    > appropriate for their needs.
-    (https://peps.python.org/pep-0700/#why-not-provide-a-latest-version-value)
-    """
-    try:
-        latest = max(versions, key=lambda v_str: Version(v_str))
-        return latest
-    except InvalidVersion as e:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-            detail=f"Cannot find latest version (original error: {str(e)}).",
-        )
-
-
 async def get_package_version_from_pypi(
     name: str,
     version: str | None = None,

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/api/v2/dataset.py

@@ -13,7 +13,8 @@ from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import DatasetV2
 from fractal_server.app.models.v2 import JobV2
-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 DatasetCreate
 from fractal_server.app.schemas.v2 import DatasetRead
 from fractal_server.app.schemas.v2 import DatasetUpdate
@@ -38,7 +39,7 @@ router = APIRouter()
 async def create_dataset(
     project_id: int,
     dataset: DatasetCreate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> DatasetRead | None:
     """
@@ -96,7 +97,7 @@ async def create_dataset(
 )
 async def read_dataset_list(
     project_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[DatasetRead] | None:
     """
@@ -126,7 +127,7 @@ async def read_dataset_list(
 async def read_dataset(
     project_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),
 ) -> DatasetRead | None:
     """
@@ -151,7 +152,7 @@ async def update_dataset(
     project_id: int,
     dataset_id: int,
     dataset_update: DatasetUpdate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> DatasetRead | None:
     """
@@ -182,7 +183,7 @@ async def update_dataset(
 async def delete_dataset(
     project_id: int,
     dataset_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -226,7 +227,7 @@ async def delete_dataset(
 async def export_dataset(
     project_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),
 ) -> DatasetExport | None:
     """
@@ -252,7 +253,7 @@ async def export_dataset(
 async def import_dataset(
     project_id: int,
     dataset: DatasetImport,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> DatasetRead | None:
     """

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/api/v2/history.py

@@ -14,7 +14,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 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.pagination import PaginationRequest
 from fractal_server.app.routes.pagination import PaginationResponse
 from fractal_server.app.routes.pagination import get_pagination_params
@@ -71,7 +71,7 @@ async def get_workflow_tasks_statuses(
     project_id: int,
     dataset_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),
 ) -> JSONResponse:
     # Access control
@@ -186,7 +186,7 @@ async def get_history_run_list(
     project_id: int,
     dataset_id: int,
     workflowtask_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[HistoryRunReadAggregated]:
     # Access control
@@ -279,7 +279,7 @@ async def get_history_run_units(
     workflowtask_id: int,
     history_run_id: int,
     unit_status: HistoryUnitStatus | None = None,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
     pagination: PaginationRequest = Depends(get_pagination_params),
 ) -> PaginationResponse[HistoryUnitRead]:
@@ -339,7 +339,7 @@ async def get_history_images(
     dataset_id: int,
     workflowtask_id: int,
     request_body: ImageQuery,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
     pagination: PaginationRequest = Depends(get_pagination_params),
 ) -> ImagePage:
@@ -423,7 +423,7 @@ async def get_history_images(
 async def get_image_log(
     project_id: int,
     request_data: ImageLogsRequest,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> JSONResponse:
     # Access control
@@ -482,7 +482,7 @@ async def get_history_unit_log(
     history_unit_id: int,
     workflowtask_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),
 ) -> JSONResponse:
     # Access control
@@ -535,7 +535,7 @@ async def get_history_unit_log(
 async def get_dataset_history(
     project_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),
 ) -> list[HistoryRunRead]:
     """

{fractal_server-2.18.5 → fractal_server-2.19.0}/fractal_server/app/routes/api/v2/images.py

@@ -12,7 +12,8 @@ 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_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.pagination import PaginationRequest
 from fractal_server.app.routes.pagination import PaginationResponse
 from fractal_server.app.routes.pagination import get_pagination_params
@@ -62,7 +63,7 @@ async def post_new_image(
     project_id: int,
     dataset_id: int,
     new_image: SingleImage,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     output = await _get_dataset_check_access(
@@ -118,7 +119,7 @@ async def query_dataset_images(
     dataset_id: int,
     query: ImageQueryWithZarrUrl | None = None,
     pagination: PaginationRequest = Depends(get_pagination_params),
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ) -> ImagePage:
     page = pagination.page
@@ -193,7 +194,7 @@ async def delete_dataset_images(
     project_id: int,
     dataset_id: int,
     zarr_url: str,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     output = await _get_dataset_check_access(
@@ -241,7 +242,7 @@ async def patch_dataset_image(
     project_id: int,
     dataset_id: int,
     image_update: SingleImageUpdate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ):
     output = await _get_dataset_check_access(
@@ -274,5 +275,4 @@ async def patch_dataset_image(
     flag_modified(db_dataset, "images")
 
     await db.commit()
-    await db.close()
     return db_dataset.images[index]