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

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

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

@@ -14,7 +14,8 @@ from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.models.v2 import WorkflowV2
-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 WorkflowCreate
 from fractal_server.app.schemas.v2 import WorkflowExport
 from fractal_server.app.schemas.v2 import WorkflowRead
@@ -39,7 +40,7 @@ router = APIRouter()
 )
 async def get_workflow_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[WorkflowRead] | None:
     """
@@ -69,7 +70,7 @@ async def get_workflow_list(
 async def create_workflow(
     project_id: int,
     workflow: WorkflowCreate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowRead | None:
     """
@@ -89,7 +90,6 @@ async def create_workflow(
     db.add(db_workflow)
     await db.commit()
     await db.refresh(db_workflow)
-    await db.close()
     return db_workflow
 
 
@@ -100,7 +100,7 @@ async def create_workflow(
 async def read_workflow(
     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),
 ) -> WorkflowReadWithWarnings | None:
     """
@@ -135,7 +135,7 @@ async def update_workflow(
     project_id: int,
     workflow_id: int,
     patch: WorkflowUpdate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadWithWarnings | None:
     """
@@ -149,7 +149,7 @@ async def update_workflow(
         db=db,
     )
 
-    if patch.name:
+    if patch.name and patch.name != workflow.name:
         await _check_workflow_exists(
             name=patch.name, project_id=project_id, db=db
         )
@@ -189,7 +189,6 @@ async def update_workflow(
 
     await db.commit()
     await db.refresh(workflow)
-    await db.close()
 
     wftask_list_with_warnings = await _add_warnings_to_workflow_tasks(
         wftask_list=workflow.task_list, user_id=user.id, db=db
@@ -210,7 +209,7 @@ async def update_workflow(
 async def delete_workflow(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -256,7 +255,7 @@ async def delete_workflow(
 async def export_workflow(
     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),
 ) -> WorkflowExport | None:
     """
@@ -297,7 +296,7 @@ class WorkflowTaskTypeFiltersInfo(BaseModel):
 async def get_workflow_type_filters(
     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[WorkflowTaskTypeFiltersInfo]:
     """

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

@@ -15,12 +15,12 @@ from fractal_server.app.models.v2 import WorkflowV2
 from fractal_server.app.routes.api.v2._aux_task_group_disambiguation import (
     _disambiguate_task_groups,
 )
-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.auth._aux_auth import (
     _get_default_usergroup_id_or_none,
 )
+from fractal_server.app.routes.aux._versions import _version_sort_key
 from fractal_server.app.schemas.v2 import TaskImport
-from fractal_server.app.schemas.v2 import TaskImportLegacy
 from fractal_server.app.schemas.v2 import WorkflowImport
 from fractal_server.app.schemas.v2 import WorkflowReadWithWarnings
 from fractal_server.app.schemas.v2 import WorkflowTaskCreate
@@ -73,32 +73,6 @@ async def _get_user_accessible_taskgroups(
     return accessible_task_groups
 
 
-async def _get_task_by_source(
-    source: str,
-    task_groups_list: list[TaskGroupV2],
-) -> int | None:
-    """
-    Find task with a given source.
-
-    Args:
-        source: `source` of the task to be imported.
-        task_groups_list: Current list of valid task groups.
-
-    Return:
-        `id` of the matching task, or `None`.
-    """
-    task_id = next(
-        iter(
-            task.id
-            for task_group in task_groups_list
-            for task in task_group.task_list
-            if task.source == source
-        ),
-        None,
-    )
-    return task_id
-
-
 async def _get_task_by_taskimport(
     *,
     task_import: TaskImport,
@@ -141,14 +115,15 @@ async def _get_task_by_taskimport(
         return None
 
     # Determine target `version`
-    # Note that task_import.version cannot be "", due to a validator
     if task_import.version is None:
         logger.debug(
             "[_get_task_by_taskimport] "
             "No version requested, looking for latest."
         )
-        latest_task = max(matching_task_groups, key=lambda tg: tg.version or "")
-        version = latest_task.version
+        version = max(
+            [tg.version for tg in matching_task_groups],
+            key=_version_sort_key,
+        )
         logger.debug(
             f"[_get_task_by_taskimport] Latest version set to {version}."
         )
@@ -213,7 +188,7 @@ async def _get_task_by_taskimport(
 async def import_workflow(
     project_id: int,
     workflow_import: WorkflowImport,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadWithWarnings:
     """
@@ -246,19 +221,13 @@ async def import_workflow(
     list_task_ids = []
     for wf_task in workflow_import.task_list:
         task_import = wf_task.task
-        if isinstance(task_import, TaskImportLegacy):
-            task_id = await _get_task_by_source(
-                source=task_import.source,
-                task_groups_list=task_group_list,
-            )
-        else:
-            task_id = await _get_task_by_taskimport(
-                task_import=task_import,
-                user_id=user.id,
-                default_group_id=default_group_id,
-                task_groups_list=task_group_list,
-                db=db,
-            )
+        task_id = await _get_task_by_taskimport(
+            task_import=task_import,
+            user_id=user.id,
+            default_group_id=default_group_id,
+            task_groups_list=task_group_list,
+            db=db,
+        )
         if task_id is None:
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,

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

@@ -9,7 +9,8 @@ from fastapi import status
 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.routes.auth import get_api_user
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2 import WorkflowTaskCreate
 from fractal_server.app.schemas.v2 import WorkflowTaskRead
@@ -36,7 +37,7 @@ async def create_workflowtask(
     workflow_id: int,
     task_id: int,
     wftask: WorkflowTaskCreate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowTaskRead | None:
     """
@@ -106,7 +107,7 @@ async def read_workflowtask(
     project_id: int,
     workflow_id: int,
     workflow_task_id: int,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_guest),
     db: AsyncSession = Depends(get_async_db),
 ):
     workflow_task, _ = await _get_workflow_task_check_access(
@@ -129,7 +130,7 @@ async def update_workflowtask(
     workflow_id: int,
     workflow_task_id: int,
     workflow_task_update: WorkflowTaskUpdate,
-    user: UserOAuth = Depends(current_user_act_ver_prof),
+    user: UserOAuth = Depends(get_api_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowTaskRead | None:
     """
@@ -192,17 +193,11 @@ async def update_workflowtask(
             if not actual_args:
                 actual_args = None
             setattr(db_wf_task, key, actual_args)
-        elif key in ["meta_parallel", "meta_non_parallel", "type_filters"]:
-            setattr(db_wf_task, key, value)
         else:
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-                detail=f"patch_workflow_task endpoint cannot set {key=}",
-            )
+            setattr(db_wf_task, key, value)
 
     await db.commit()
     await db.refresh(db_wf_task)
-    await db.close()
 
     return db_wf_task
 
@@ -215,7 +210,7 @@ async def delete_workflowtask(
     project_id: int,
     workflow_id: int,
     workflow_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/auth/__init__.py

@@ -57,7 +57,7 @@ current_user_act_ver = fastapi_users.current_user(
 )
 
 
-async def current_user_act_ver_prof(
+async def get_api_guest(
     user: UserOAuth = Depends(current_user_act_ver),
 ) -> UserOAuth:
     """
@@ -76,6 +76,23 @@ async def current_user_act_ver_prof(
     return user
 
 
+async def get_api_user(
+    user: UserOAuth = Depends(get_api_guest),
+) -> UserOAuth:
+    """
+    Require a active&verified non-guest user, with a non-null `profile_id`.
+
+    Raises 401 if user does not exist or is not active.
+    Raises 403 if user is not verified, is a guest or has null `profile_id`.
+    """
+    if user.is_guest:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="This feature is not available for guest users.",
+        )
+    return user
+
+
 current_superuser_act = fastapi_users.current_user(
     active=True,
     superuser=True,

fractal_server/app/routes/auth/current_user.py

@@ -4,6 +4,8 @@ Definition of `/auth/current-user/` endpoints
 
 from fastapi import APIRouter
 from fastapi import Depends
+from fastapi import HTTPException
+from fastapi import status
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select
 
@@ -52,6 +54,12 @@ async def patch_current_user(
     Note: a user cannot patch their own password (as enforced within the
     `UserUpdateStrict` schema).
     """
+    if current_user.is_guest:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="This feature is not available for guest users.",
+        )
+
     update = UserUpdate(**user_update.model_dump(exclude_unset=True))
 
     # NOTE: here it would be relevant to catch an `InvalidPasswordException`

fractal_server/app/routes/auth/oauth.py

@@ -1,3 +1,5 @@
+from typing import override
+
 from fastapi import APIRouter
 from httpx_oauth.clients.github import GitHubOAuth2
 from httpx_oauth.clients.google import GoogleOAuth2
@@ -25,7 +27,7 @@ class FractalOpenID(OpenID):
         super().__init__(**kwargs)
         self.email_claim = email_claim
 
-    # TODO-requires-py312: add `@override` decorator
+    @override
     async def get_id_email(self, token: str) -> tuple[str, str | None]:
         """
         Identical to the parent-class method (httpx-oauth version 0.16.1),

fractal_server/app/routes/auth/users.py

@@ -83,6 +83,17 @@ async def patch_user(
             db=db,
         )
 
+    will_be_superuser = (
+        user_update.is_superuser
+        if user_update.is_superuser is not None
+        else user_to_patch.is_superuser
+    )
+    if user_update.is_guest and will_be_superuser:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+            detail="Superuser cannot be guest.",
+        )
+
     # Modify user attributes
     try:
         user = await user_manager.update(

fractal_server/app/routes/aux/_versions.py

@@ -0,0 +1,42 @@
+from fastapi import HTTPException
+from fastapi import status
+from packaging.version import InvalidVersion
+from packaging.version import Version
+
+
+def _version_sort_key(version: str | None) -> tuple[int, Version | str | None]:
+    """
+    Returns a tuple used as (reverse) ordering key for TaskGroups in
+    `get_task_group_list`.
+    The parsable versions are the first in order, sorted according to the
+    sorting rules of packaging.version.Version.
+    Next in order we have the non-null non-parsable versions, sorted
+    alphabetically.
+    """
+    if version is None:
+        return (0, None)
+    try:
+        return (2, Version(version))
+    except InvalidVersion:
+        return (1, version)
+
+
+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)
+
+    The `versions` array is coming from the PyPI API, and its elements are
+    assumed parsable.
+    """
+    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)}).",
+        )

fractal_server/app/schemas/user.py

@@ -41,13 +41,16 @@ class UserRead(schemas.BaseUser[int]):
     Schema for `User` read from database.
 
     Attributes:
+        is_guest:
         group_ids_names:
         oauth_accounts:
         profile_id:
         project_dirs:
         slurm_accounts:
+
     """
 
+    is_guest: bool
     group_ids_names: list[tuple[int, str]] | None = None
     oauth_accounts: list[OAuthAccountRead]
     profile_id: int | None = None
@@ -65,6 +68,7 @@ class UserUpdate(schemas.BaseUserUpdate):
         is_active:
         is_superuser:
         is_verified:
+        is_guest:
         profile_id:
         project_dirs:
         slurm_accounts:
@@ -76,6 +80,7 @@ class UserUpdate(schemas.BaseUserUpdate):
     is_active: bool = None
     is_superuser: bool = None
     is_verified: bool = None
+    is_guest: bool = None
     profile_id: int | None = None
     project_dirs: Annotated[
         ListUniqueAbsolutePathStr, AfterValidator(_validate_cmd_list)
@@ -100,11 +105,13 @@ class UserCreate(schemas.BaseUserCreate):
     Schema for `User` creation.
 
     Attributes:
+        is_guest:
         profile_id:
         project_dirs:
         slurm_accounts:
     """
 
+    is_guest: bool = False
     profile_id: int | None = None
     project_dirs: Annotated[
         ListUniqueAbsolutePathStr, AfterValidator(_validate_cmd_list)

fractal_server/app/schemas/v2/__init__.py

@@ -47,7 +47,6 @@ from .status_legacy import WorkflowTaskStatusType  # noqa F401
 from .task import TaskCreate  # noqa F401
 from .task import TaskExport  # noqa F401
 from .task import TaskImport  # noqa F401
-from .task import TaskImportLegacy  # noqa F401
 from .task import TaskRead  # noqa F401
 from .task import TaskType  # noqa F401
 from .task import TaskUpdate  # noqa F401

fractal_server/app/schemas/v2/dumps.py

@@ -30,7 +30,6 @@ class TaskDump(BaseModel):
 
     command_non_parallel: str | None = None
     command_parallel: str | None = None
-    source: str | None = None
     version: str | None = None
 
     input_types: dict[str, bool]

fractal_server/app/schemas/v2/task.py

@@ -94,7 +94,6 @@ class TaskRead(BaseModel):
     id: int
     name: str
     type: TaskType
-    source: str | None = None
     version: str | None = None
 
     command_non_parallel: str | None = None
@@ -139,10 +138,6 @@ class TaskImport(BaseModel):
     name: NonEmptyStr
 
 
-class TaskImportLegacy(BaseModel):
-    source: NonEmptyStr
-
-
 class TaskExport(BaseModel):
     pkg_name: NonEmptyStr
     version: NonEmptyStr | None = None

fractal_server/app/schemas/v2/workflow.py

@@ -29,6 +29,7 @@ class WorkflowRead(BaseModel):
     task_list: list[WorkflowTaskRead]
     project: ProjectRead
     timestamp_created: AwareDatetime
+    description: str | None
 
     @field_serializer("timestamp_created")
     def serialize_datetime(v: datetime) -> str:
@@ -44,6 +45,7 @@ class WorkflowUpdate(BaseModel):
 
     name: NonEmptyStr = None
     reordered_workflowtask_ids: ListUniqueNonNegativeInt | None = None
+    description: str | None = None
 
 
 class WorkflowImport(BaseModel):

fractal_server/app/schemas/v2/workflowtask.py

@@ -11,7 +11,6 @@ from fractal_server.types import WorkflowTaskArgument
 
 from .task import TaskExport
 from .task import TaskImport
-from .task import TaskImportLegacy
 from .task import TaskRead
 from .task import TaskType
 
@@ -50,6 +49,9 @@ class WorkflowTaskRead(BaseModel):
     task_id: int
     task: TaskRead
 
+    alias: str | None = None
+    description: str | None = None
+
 
 class WorkflowTaskReadWithWarning(WorkflowTaskRead):
     warning: str | None = None
@@ -63,6 +65,8 @@ class WorkflowTaskUpdate(BaseModel):
     args_non_parallel: WorkflowTaskArgument | None = None
     args_parallel: WorkflowTaskArgument | None = None
     type_filters: TypeFilters = None
+    description: str | None = None
+    alias: str | None = None
 
 
 class WorkflowTaskImport(BaseModel):
@@ -75,7 +79,7 @@ class WorkflowTaskImport(BaseModel):
     type_filters: TypeFilters | None = None
     input_filters: dict[str, Any] | None = None
 
-    task: TaskImport | TaskImportLegacy
+    task: TaskImport
 
     @model_validator(mode="before")
     @classmethod

fractal_server/app/security/__init__.py

@@ -21,6 +21,7 @@ from collections.abc import AsyncGenerator
 from typing import Any
 from typing import Generic
 from typing import Self
+from typing import override
 
 from fastapi import Depends
 from fastapi import Request
@@ -188,19 +189,22 @@ class UserManager(IntegerIDMixin, BaseUserManager[UserOAuth, int]):
             password_helper=password_helper,
         )
 
+    @override
     async def validate_password(self, password: str, user: UserOAuth) -> None:
         # check password length
         min_length = 4
-        max_length = 100
+        max_length = 72
         if len(password) < min_length:
             raise InvalidPasswordException(
                 f"The password is too short (minimum length: {min_length})."
             )
-        elif len(password) > max_length:
+        if len(password.encode("utf-8")) > max_length:
             raise InvalidPasswordException(
-                f"The password is too long (maximum length: {min_length})."
+                "The password is too long "
+                f"(maximum length: {max_length} bytes)."
             )
 
+    @override
     async def oauth_callback(
         self: Self,
         oauth_name: str,
@@ -324,6 +328,7 @@ class UserManager(IntegerIDMixin, BaseUserManager[UserOAuth, int]):
 
         return user
 
+    @override
     async def on_after_register(
         self, user: UserOAuth, request: Request | None = None
     ):

fractal_server/migrations/versions/18a26fcdea5d_drop_dataset_history.py

@@ -0,0 +1,41 @@
+"""drop dataset.history
+
+Revision ID: 18a26fcdea5d
+Revises: 1bf8785755f9
+Create Date: 2026-01-29 10:15:18.467384
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "18a26fcdea5d"
+down_revision = "1bf8785755f9"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("datasetv2", schema=None) as batch_op:
+        batch_op.drop_column("history")
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("datasetv2", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "history",
+                postgresql.JSONB(astext_type=sa.Text()),
+                server_default=sa.text("'[]'::json"),
+                autoincrement=False,
+                nullable=False,
+            )
+        )
+
+    # ### end Alembic commands ###