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

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.19.0"
+__VERSION__ = "2.19.0a0"

fractal_server/app/models/v2/dataset.py

@@ -27,6 +27,10 @@ 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/app/models/v2/job.py

@@ -5,7 +5,6 @@ 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
@@ -45,9 +44,6 @@ 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/app/models/v2/task.py

@@ -14,6 +14,7 @@ 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/app/models/v2/task_group.py

@@ -4,7 +4,6 @@ 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
@@ -152,6 +151,3 @@ 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/app/models/v2/workflow.py

@@ -32,5 +32,3 @@ 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/app/models/v2/workflowtask.py

@@ -39,6 +39,3 @@ 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/app/routes/admin/v2/task.py

@@ -30,6 +30,7 @@ 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
 
 
@@ -54,6 +55,7 @@ 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,
@@ -79,6 +81,9 @@ 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/app/routes/admin/v2/task_group_lifecycle.py

@@ -5,7 +5,6 @@ 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
@@ -94,7 +93,6 @@ 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)
@@ -110,7 +108,6 @@ 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()
@@ -191,7 +188,6 @@ 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)
@@ -215,7 +211,6 @@ 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()
@@ -269,7 +264,6 @@ async def delete_task_group(
         pkg_name=task_group.pkg_name,
         version=(task_group.version or "N/A"),
         timestamp_started=get_timestamp(),
-        fractal_server_version=__VERSION__,
     )
     db.add(task_group_activity)
     await db.commit()

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

@@ -14,6 +14,7 @@ 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
@@ -36,6 +37,7 @@ 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/app/routes/api/v2/_aux_functions_task_lifecycle.py

@@ -2,6 +2,8 @@ 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
 
@@ -12,7 +14,6 @@ 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
@@ -25,6 +26,24 @@ 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/app/routes/api/v2/status_legacy.py

@@ -0,0 +1,156 @@
+from fastapi import APIRouter
+from fastapi import Depends
+
+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 JobV2
+from fractal_server.app.routes.auth import get_api_guest
+from fractal_server.app.schemas.v2.sharing import ProjectPermissions
+from fractal_server.app.schemas.v2.status_legacy import LegacyStatusRead
+from fractal_server.app.schemas.v2.status_legacy import WorkflowTaskStatusType
+from fractal_server.logger import set_logger
+
+from ._aux_functions import _get_dataset_check_access
+from ._aux_functions import _get_submitted_jobs_statement
+from ._aux_functions import _get_workflow_check_access
+
+router = APIRouter()
+
+logger = set_logger(__name__)
+
+
+@router.get(
+    "/project/{project_id}/status-legacy/",
+    response_model=LegacyStatusRead,
+)
+async def get_workflowtask_status(
+    project_id: int,
+    dataset_id: int,
+    workflow_id: int,
+    user: UserOAuth = Depends(get_api_guest),
+    db: AsyncSession = Depends(get_async_db),
+) -> LegacyStatusRead | None:
+    """
+    Extract the status of all `WorkflowTaskV2` of a given `WorkflowV2` that ran
+    on a given `DatasetV2`.
+
+    *NOTE*: the current endpoint is not guaranteed to provide consistent
+    results if the workflow task list is modified in a non-trivial way
+    (that is, by adding intermediate tasks, removing tasks, or changing their
+    order). See fractal-server GitHub issues: 793, 1083.
+    """
+    # Get the dataset DB entry
+    output = await _get_dataset_check_access(
+        project_id=project_id,
+        dataset_id=dataset_id,
+        user_id=user.id,
+        required_permissions=ProjectPermissions.READ,
+        db=db,
+    )
+    dataset = output["dataset"]
+
+    # Get the workflow DB entry
+    workflow = await _get_workflow_check_access(
+        project_id=project_id,
+        workflow_id=workflow_id,
+        user_id=user.id,
+        required_permissions=ProjectPermissions.READ,
+        db=db,
+    )
+
+    # Check whether there exists a submitted job associated to this
+    # workflow/dataset pair. If it does exist, it will be used later.
+    # If there are multiple jobs, raise an error.
+    res = await db.execute(
+        _get_submitted_jobs_statement()
+        .where(JobV2.dataset_id == dataset_id)
+        .where(JobV2.workflow_id == workflow_id)
+    )
+    running_job = res.scalars().one_or_none()
+
+    # Initialize empty dictionary for WorkflowTaskV2 status
+    workflow_tasks_status_dict: dict = {}
+
+    # Lowest priority: read status from DB, which corresponds to jobs that are
+    # not running
+    history = dataset.history
+    for history_item in history:
+        wftask_id = history_item["workflowtask"]["id"]
+        wftask_status = history_item["status"]
+        workflow_tasks_status_dict[wftask_id] = wftask_status
+
+    if running_job is None:
+        # If no job is running, the chronological-last history item is also the
+        # positional-last workflow task to be included in the response.
+        if len(history) > 0:
+            last_valid_wftask_id = history[-1]["workflowtask"]["id"]
+        else:
+            last_valid_wftask_id = None
+    else:
+        # If a job is running, then gather more up-to-date information
+
+        # Mid priority: Set all WorkflowTask's that are part of the running job
+        # as "submitted"
+        start = running_job.first_task_index
+        end = running_job.last_task_index + 1
+
+        running_job_wftasks = workflow.task_list[start:end]
+        running_job_statuses = [
+            workflow_tasks_status_dict.get(wft.id, None)
+            for wft in running_job_wftasks
+        ]
+        try:
+            first_submitted_index = running_job_statuses.index(
+                WorkflowTaskStatusType.SUBMITTED
+            )
+        except ValueError:
+            logger.warning(
+                f"Job {running_job.id} is submitted but its task list does not"
+                f" contain a {WorkflowTaskStatusType.SUBMITTED} task."
+            )
+            first_submitted_index = 0
+
+        for wftask in running_job_wftasks[first_submitted_index:]:
+            workflow_tasks_status_dict[wftask.id] = (
+                WorkflowTaskStatusType.SUBMITTED
+            )
+
+        # The last workflow task that is included in the submitted job is also
+        # the positional-last workflow task to be included in the response.
+        try:
+            last_valid_wftask_id = workflow.task_list[end - 1].id
+        except IndexError as e:
+            logger.warning(
+                f"Handled IndexError in `get_workflowtask_status` ({str(e)})."
+            )
+            logger.warning(
+                "Additional information: "
+                f"{running_job.first_task_index=}; "
+                f"{running_job.last_task_index=}; "
+                f"{len(workflow.task_list)=}; "
+                f"{dataset_id=}; "
+                f"{workflow_id=}."
+            )
+            last_valid_wftask_id = None
+            logger.warning(f"Now setting {last_valid_wftask_id=}.")
+
+    # Based on previously-gathered information, clean up the response body
+    clean_workflow_tasks_status_dict = {}
+    for wf_task in workflow.task_list:
+        wf_task_status = workflow_tasks_status_dict.get(wf_task.id)
+        if wf_task_status is None:
+            # If a wftask ID was not found, ignore it and continue
+            continue
+        clean_workflow_tasks_status_dict[str(wf_task.id)] = wf_task_status
+        if wf_task_status == WorkflowTaskStatusType.FAILED:
+            # Starting from the beginning of `workflow.task_list`, stop the
+            # first time that you hit a failed job
+            break
+        if wf_task.id == last_valid_wftask_id:
+            # Starting from the beginning of `workflow.task_list`, stop the
+            # first time that you hit `last_valid_wftask_id``
+            break
+
+    response_body = LegacyStatusRead(status=clean_workflow_tasks_status_dict)
+    return response_body

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

@@ -11,7 +11,6 @@ from fastapi import status
 from sqlmodel import select
 from sqlmodel import update
 
-from fractal_server import __VERSION__
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import Profile
@@ -217,12 +216,11 @@ async def submit_job(
             dataset.model_dump_json(exclude={"images", "history"})
         ),
         workflow_dump=json.loads(
-            workflow.model_dump_json(exclude={"task_list", "description"})
+            workflow.model_dump_json(exclude={"task_list"})
         ),
         project_dump=json.loads(
             project.model_dump_json(exclude={"resource_id"})
         ),
-        fractal_server_version=__VERSION__,
         **job_create.model_dump(),
     )
 

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

@@ -14,7 +14,6 @@ from pydantic import BaseModel
 from pydantic import ValidationError
 from pydantic import model_validator
 
-from fractal_server import __VERSION__
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
@@ -333,7 +332,6 @@ async def collect_tasks_pip(
         action=TaskGroupActivityAction.COLLECT,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
-        fractal_server_version=__VERSION__,
     )
     db.add(task_group_activity)
     await db.commit()

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

@@ -10,7 +10,6 @@ from fastapi import Response
 from fastapi import UploadFile
 from fastapi import status
 
-from fractal_server import __VERSION__
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
@@ -183,7 +182,6 @@ async def collect_task_pixi(
         action=TaskGroupActivityAction.COLLECT,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
-        fractal_server_version=__VERSION__,
     )
     db.add(task_group_activity)
     await db.commit()

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

@@ -4,6 +4,9 @@ from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
+from packaging.version import InvalidVersion
+from packaging.version import Version
+from packaging.version import parse
 from pydantic.types import AwareDatetime
 from sqlmodel import or_
 from sqlmodel import select
@@ -22,7 +25,6 @@ from fractal_server.app.routes.auth._aux_auth import (
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
-from fractal_server.app.routes.aux._versions import _version_sort_key
 from fractal_server.app.schemas.v2 import TaskGroupActivityAction
 from fractal_server.app.schemas.v2 import TaskGroupActivityRead
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
@@ -41,6 +43,26 @@ router = APIRouter()
 logger = set_logger(__name__)
 
 
+def _version_sort_key(
+    task_group: TaskGroupV2,
+) -> tuple[int, Version | str | None]:
+    """
+    Returns a tuple used as (reverse) ordering key for TaskGroups in
+    `get_task_group_list`.
+    The TaskGroups with a parsable versions are the first in order,
+    sorted according to the sorting rules of packaging.version.Version.
+    Next in order we have the TaskGroups with non-null non-parsable versions,
+    sorted alphabetically.
+    Last we have the TaskGroups with null version.
+    """
+    if task_group.version is None:
+        return (0, task_group.version)
+    try:
+        return (2, parse(task_group.version))
+    except InvalidVersion:
+        return (1, task_group.version)
+
+
 @router.get("/activity/", response_model=list[TaskGroupActivityRead])
 async def get_task_group_activity_list(
     task_group_activity_id: int | None = None,
@@ -154,7 +176,7 @@ async def get_task_group_list(
                 await remove_duplicate_task_groups(
                     task_groups=sorted(
                         list(groups),
-                        key=lambda group: _version_sort_key(group.version),
+                        key=_version_sort_key,
                         reverse=True,
                     ),
                     user_id=user.id,

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

@@ -5,7 +5,6 @@ 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
@@ -100,7 +99,6 @@ 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)
@@ -116,7 +114,6 @@ async def deactivate_task_group(
         pkg_name=task_group.pkg_name,
         version=task_group.version,
         timestamp_started=get_timestamp(),
-        fractal_server_version=__VERSION__,
     )
     task_group.active = False
     db.add(task_group)
@@ -205,7 +202,6 @@ 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)
@@ -229,7 +225,6 @@ 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()
@@ -293,7 +288,6 @@ async def delete_task_group(
         pkg_name=task_group.pkg_name,
         version=(task_group.version or "N/A"),
         timestamp_started=get_timestamp(),
-        fractal_server_version=__VERSION__,
     )
     db.add(task_group_activity)
     await db.commit()

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

@@ -149,7 +149,7 @@ async def update_workflow(
         db=db,
     )
 
-    if patch.name and patch.name != workflow.name:
+    if patch.name:
         await _check_workflow_exists(
             name=patch.name, project_id=project_id, db=db
         )

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

@@ -19,8 +19,8 @@ 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,6 +73,32 @@ 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,
@@ -115,15 +141,14 @@ 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."
         )
-        version = max(
-            [tg.version for tg in matching_task_groups],
-            key=_version_sort_key,
-        )
+        latest_task = max(matching_task_groups, key=lambda tg: tg.version or "")
+        version = latest_task.version
         logger.debug(
             f"[_get_task_by_taskimport] Latest version set to {version}."
         )
@@ -221,13 +246,19 @@ async def import_workflow(
     list_task_ids = []
     for wf_task in workflow_import.task_list:
         task_import = wf_task.task
-        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 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,
+            )
         if task_id is None:
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,

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

@@ -193,8 +193,13 @@ async def update_workflowtask(
             if not actual_args:
                 actual_args = None
             setattr(db_wf_task, key, actual_args)
-        else:
+        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=}",
+            )
 
     await db.commit()
     await db.refresh(db_wf_task)

fractal_server/app/routes/auth/current_user.py

@@ -4,8 +4,6 @@ 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
 
@@ -54,12 +52,6 @@ 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/schemas/v2/__init__.py

@@ -47,6 +47,7 @@ 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,6 +30,7 @@ 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,6 +94,7 @@ class TaskRead(BaseModel):
     id: int
     name: str
     type: TaskType
+    source: str | None = None
     version: str | None = None
 
     command_non_parallel: str | None = None
@@ -138,6 +139,10 @@ 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,7 +29,6 @@ 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:
@@ -45,7 +44,6 @@ 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,6 +11,7 @@ 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
 
@@ -49,9 +50,6 @@ class WorkflowTaskRead(BaseModel):
     task_id: int
     task: TaskRead
 
-    alias: str | None = None
-    description: str | None = None
-
 
 class WorkflowTaskReadWithWarning(WorkflowTaskRead):
     warning: str | None = None
@@ -65,8 +63,6 @@ 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):
@@ -79,7 +75,7 @@ class WorkflowTaskImport(BaseModel):
     type_filters: TypeFilters | None = None
     input_filters: dict[str, Any] | None = None
 
-    task: TaskImport
+    task: TaskImport | TaskImportLegacy
 
     @model_validator(mode="before")
     @classmethod

fractal_server/app/security/__init__.py

@@ -21,7 +21,6 @@ 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
@@ -189,22 +188,19 @@ 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 = 72
+        max_length = 100
         if len(password) < min_length:
             raise InvalidPasswordException(
                 f"The password is too short (minimum length: {min_length})."
             )
-        if len(password.encode("utf-8")) > max_length:
+        elif len(password) > max_length:
             raise InvalidPasswordException(
-                "The password is too long "
-                f"(maximum length: {max_length} bytes)."
+                f"The password is too long (maximum length: {min_length})."
             )
 
-    @override
     async def oauth_callback(
         self: Self,
         oauth_name: str,
@@ -328,7 +324,6 @@ class UserManager(IntegerIDMixin, BaseUserManager[UserOAuth, int]):
 
         return user
 
-    @override
     async def on_after_register(
         self, user: UserOAuth, request: Request | None = None
     ):

fractal_server/runner/v2/submit_workflow.py

@@ -13,6 +13,7 @@ from typing import Protocol
 
 from sqlalchemy.orm import Session as DBSyncSession
 
+from fractal_server import __VERSION__
 from fractal_server.app.db import DB
 from fractal_server.app.models.v2 import DatasetV2
 from fractal_server.app.models.v2 import JobV2
@@ -223,6 +224,7 @@ def submit_workflow(
             f'Start execution of workflow "{workflow.name}"; '
             f"more logs at {str(log_file_path)}"
         )
+        logger.debug(f"fractal_server.__VERSION__: {__VERSION__}")
         logger.debug(f"Resource name: {resource.name}")
         logger.debug(f"Profile name: {profile.name}")
         logger.debug(f"Username: {profile.username}")

{fractal_server-2.19.0.dist-info → fractal_server-2.19.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.19.0
+Version: 2.19.0a0
 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,7 +17,7 @@ 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>=24.1,<25
+Requires-Dist: gunicorn>=23.0,<24.0
 Requires-Dist: psycopg[binary]>=3.1.0,<4.0.0
 Requires-Dist: tomli-w>=1.2.0,<1.3.0
 Requires-Python: >=3.12, <3.15

{fractal_server-2.19.0.dist-info → fractal_server-2.19.0a0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=1UbL9iwVuF5UCZ96vJT-FT78kHbhBr9fS7C7nat-FUo,23
+fractal_server/__init__.py,sha256=eojcLMU9LbD_qBD5WbjnoYryBbA4evbtq1WKYGIlYlE,25
 fractal_server/__main__.py,sha256=QeKoAgqoiozLJDa8kSVe-Aso1WWgrk1yLUYWS8RxZVM,11405
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,16 +9,16 @@ fractal_server/app/models/linkuserproject.py,sha256=Bk0VzjzG7RbnVnOwrztqxKIPxz_A
 fractal_server/app/models/security.py,sha256=2gKF2JQX2Xpb58fW-s7UgkgUneEy5SspgawawWoju3M,4970
 fractal_server/app/models/v2/__init__.py,sha256=xL05Mvdx0dqUFhJf694oPfuqkUQxZbxOkoUgRuNIXl4,949
 fractal_server/app/models/v2/accounting.py,sha256=VNweFARrvY3mj5LI0834Ku061S2aGC61kuVHzi_tZhc,1187
-fractal_server/app/models/v2/dataset.py,sha256=5UEV75LZTYAOq5d8UqRAuIIVBh3rAer3D5qvWmGbw8s,1154
+fractal_server/app/models/v2/dataset.py,sha256=BL5elDU0UXnUSwvuXSO4JeKa9gje0QFerU_LP7sI754,1273
 fractal_server/app/models/v2/history.py,sha256=869RQzBssHFYnBLBvCGlKrLV_HAXwsdO5DgwG9U8D-U,2339
-fractal_server/app/models/v2/job.py,sha256=-9PKE5Gh9UCBStYE0DZj3I8XTPDa5qd7g2eVufp-9hw,2521
+fractal_server/app/models/v2/job.py,sha256=IwlOPgx4FU-6PsPd_aBJRGsp5qVXddRBv6xxSMdh524,2360
 fractal_server/app/models/v2/profile.py,sha256=YajSmV4J_-zC4RX917s-A_lJt4mxYdPRVS3RH_uvJ48,1006
 fractal_server/app/models/v2/project.py,sha256=VvLXrgzKYLH585mYg_txrO8q3JoSoSEy4XkWjex4sDU,585
 fractal_server/app/models/v2/resource.py,sha256=XaHlJj9CladIahkrpywWXn8JBSx7_qEHp_wnkFuQ0rU,3896
-fractal_server/app/models/v2/task.py,sha256=v0brBHnAbcHrgDiuRHMWYahklq0fgyezZ0c9krKSA10,1463
-fractal_server/app/models/v2/task_group.py,sha256=8UcyFMG-6J-_hkgSkrLIxFLSwVCyrWB0Fl-LCgkeo54,4756
-fractal_server/app/models/v2/workflow.py,sha256=VKXIX3L3jP8eCdIQhVf5AhhwKGO_LTxn7uB4_sCirLs,1135
-fractal_server/app/models/v2/workflowtask.py,sha256=jEt81PGHuXSY8MYid0t15CntIIg0Lzq39uvG4X4Mx6s,1391
+fractal_server/app/models/v2/task.py,sha256=iBIQB8POQE5MyKvLZhw7jZWlBhbrThzCDzRTcgiAczQ,1493
+fractal_server/app/models/v2/task_group.py,sha256=C03LGKIO61Asj7Qz7qeIrZwWdfzoXBliLCeb9jzT5WI,4595
+fractal_server/app/models/v2/workflow.py,sha256=AsL7p8UMGbow--21IG2lYZnOjQ--m85dRWaNCHqb35I,1069
+fractal_server/app/models/v2/workflowtask.py,sha256=qkTc-hcFLpJUVsEUbnDq2BJL0qg9jagy2doZeusF1ek,1266
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/admin/v2/__init__.py,sha256=VF4wg09fvz6gVgIFe-r7LoCU9tlF9kBcEhkQRQPhatY,1134
@@ -29,17 +29,17 @@ fractal_server/app/routes/admin/v2/job.py,sha256=VaVMUrHV7edHyjp2rsqoWf-wh5zlXFM
 fractal_server/app/routes/admin/v2/profile.py,sha256=DwLlA9K3hkl9BqzyifIDiaWeHOM_N_17kqB5CSJOhSI,3165
 fractal_server/app/routes/admin/v2/resource.py,sha256=c2z6b_D_W6_dqVnxNF8F8OdlI5Z4asex8Zgfwzjbi2Q,6330
 fractal_server/app/routes/admin/v2/sharing.py,sha256=I2BoyO0rZNWxFKyq3Em9sjz_0n3kfRynC-WmUZxSzzU,5455
-fractal_server/app/routes/admin/v2/task.py,sha256=9OglWWYjGbA1k2wdE8k8vr2ynLn6zqdp_BxwPGfjj9A,5873
+fractal_server/app/routes/admin/v2/task.py,sha256=M4cetPkzn73-6faftk49AU_PeaPLqKE_dZxrrQ_x_98,6087
 fractal_server/app/routes/admin/v2/task_group.py,sha256=3LxH2LEstj7L9qGNN3kkLo4JdFw4GXDlnlM6s4ulc_0,9377
-fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=mC7zKuoyDZSOOuOiXiQeGfFv78JYHFBQ9RNtNAdAQfQ,10202
+fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=LkHSQVXRRUkicpIDQpc7dwT944uabtCTTrZCoESHjik,9935
 fractal_server/app/routes/api/__init__.py,sha256=ZQtqy-HGJZsehAL8UjnTvRhWd9MI9Noi2NvwD5hE_xA,231
 fractal_server/app/routes/api/alive.py,sha256=hE42dfh1naix9EKvpyKCoLMA6WqThObgA3jIro2rx-M,206
 fractal_server/app/routes/api/settings.py,sha256=9wV4To1FjW3jCcRtFp-QGGu3235s1oUg4HwKQIw-TWc,1210
-fractal_server/app/routes/api/v2/__init__.py,sha256=_pNH8odiUYpv2Okiqbqe0VNjbvK2jWqIoaImlgYzI84,2580
+fractal_server/app/routes/api/v2/__init__.py,sha256=_J8ekQqNGJ3DC1mKum8m8SNOcv66oZ7A260MFjcEtGE,2710
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=pxXcauCMZEVKkft8nOCK_Nq5m7hkx7BVUXch_j2KVtg,15131
 fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=vB8AwSBf3Dp1sxpTAYtWj4s9kgAp_D5Hd1BX6Z8JTxc,6057
 fractal_server/app/routes/api/v2/_aux_functions_sharing.py,sha256=IvDII3Sl00eypdD3QRELQ4SLyC3gq6-HsXhuCx5Bp5I,2995
-fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=EffjYdQCHoUc5i59c7KmyH8hoLYxQsPh4RPo8qY8CYA,7796
+fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=qTJdKC3nKLwLYfuKbzJW6tREmzy-dNk57xcmvgi_UDA,8529
 fractal_server/app/routes/api/v2/_aux_functions_task_version_update.py,sha256=PKjV7r8YsPRXoNiVSnOK4KBYVV3l_Yb_ZPrqAkMkXrQ,1182
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=Hrumknv0vH5VX7SFp8WZDzsJv_z7quvFyNoDYmYoD7A,13623
 fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=vdvMTa3San1HMTzctN5Vk7zxpqe4ccByrFBQyHfgWW8,4889
@@ -50,20 +50,21 @@ fractal_server/app/routes/api/v2/job.py,sha256=gulXJyP0Kc2_dNkPHPpc_XZlWoBEA1lrr
 fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=wqZ44rCJ8f2WcpyFOQ0FZN3g-66EzDnuYCrJJXawSdY,5179
 fractal_server/app/routes/api/v2/project.py,sha256=dirGShqcuEnK1sVh-Bl6kemj_z6A32s8ARNqSLIFhM8,5729
 fractal_server/app/routes/api/v2/sharing.py,sha256=W8Zf_rmTJwbFYz3XCrL9IFN6KXph5c97YS6Ok8oHTHM,9658
-fractal_server/app/routes/api/v2/submit.py,sha256=fhWLAsD-XgEunUfZpoSDsTpuYl3wReKAPg811iAmFRU,9642
+fractal_server/app/routes/api/v2/status_legacy.py,sha256=qSV1wibqleOR084CTYNlXMuCkieL1aqlQXogTShd-1c,6002
+fractal_server/app/routes/api/v2/submit.py,sha256=1J2QABGo8jzMxWqMFTG8nM4Ru-88h8Zjf9rJa3xuaoA,9544
 fractal_server/app/routes/api/v2/task.py,sha256=xKeGon7aRBOu1gnYd9EnWW1V-pnIqSVpXkN3dnubH3A,7418
-fractal_server/app/routes/api/v2/task_collection.py,sha256=VkxPwkKxQxvKJJL8ShkGVT4YolX5KjP8yLBaNS7WkP8,12405
+fractal_server/app/routes/api/v2/task_collection.py,sha256=IFbFMadudfqBOu7CgMaQUr9dAhev_qiP-e43ZHV0gIE,12322
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=yZ0c3hWkq3nR5CKYP63yU6D1--xWjS2aimqoYWrQT5I,6894
-fractal_server/app/routes/api/v2/task_collection_pixi.py,sha256=IT-vhTFPUpMA2kY4z8i5us03vQCTquEvjjH7k7bgYVg,7229
-fractal_server/app/routes/api/v2/task_group.py,sha256=Jemgrc_1qA6b8at48BePMLJennterLIpJwoa077jMmc,7632
-fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=0iv4MOCesCngujiMUU9i3EdPADnoGIilXrR2Rc1yY04,10738
+fractal_server/app/routes/api/v2/task_collection_pixi.py,sha256=qNqKvXAwQg9c6kwIJ7kbR1KA3TqPWthyQkOaJrVCLUk,7146
+fractal_server/app/routes/api/v2/task_group.py,sha256=Q9KqhsnpT7Y4R0vg0oYzoJGX8b21Npe9pa3yIuN0Zcg,8348
+fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=GOwIq78_M-HZylHGkGZJcu0yLIyjM4wpDsB8jobpWwI,10471
 fractal_server/app/routes/api/v2/task_version_update.py,sha256=dFzUetvIkd0RXw-cgOGGQGu8843y62AG30RbCQL15Tc,8506
-fractal_server/app/routes/api/v2/workflow.py,sha256=lHssUNN3ekqvXp4wWX8a33-5m2ZwLuLPkoL3keCsFhA,10741
-fractal_server/app/routes/api/v2/workflow_import.py,sha256=UND3U9zE-2o_85BW0uWNsm3_9125PgDtnUlki13jDT4,8740
-fractal_server/app/routes/api/v2/workflowtask.py,sha256=vn3pvaCIC9ydJYwboDAFT61IWRIJ6uYe5p3u4W9iloQ,7962
+fractal_server/app/routes/api/v2/workflow.py,sha256=dHNytIVJgMqF-bGEzDrc2xFxgivFpF_xrDdUuYf_tyg,10709
+fractal_server/app/routes/api/v2/workflow_import.py,sha256=FOpWT68FxDawDiuLa1Jlkt5mfMeLe3AM6MdGMS5EKXg,9620
+fractal_server/app/routes/api/v2/workflowtask.py,sha256=f9tleS7TZlku-Z6G8rsyscXlO-bTF5TBHQbx9tAs1Gc,8226
 fractal_server/app/routes/auth/__init__.py,sha256=JL4MUBjPiNsNJLlb0lbn6_LbIzdRLosquQNqpn6niFw,2836
 fractal_server/app/routes/auth/_aux_auth.py,sha256=gKdYTWUzxcU44Iep787zReWwdAs4kW5baNDXCPmiKn8,9195
-fractal_server/app/routes/auth/current_user.py,sha256=gOLk-jUnkXTrBj8aN_yRlUcvCoJMHxxoWz13M8DBCbg,3502
+fractal_server/app/routes/auth/current_user.py,sha256=uDWttWo9isG69Jv1EGnnr2Ki5ZGd0D76jgjVDQMkn8c,3251
 fractal_server/app/routes/auth/group.py,sha256=uR98vdQHH-7BFl-Czj85ESPxT2yQymy4qtagaMrnUPU,6491
 fractal_server/app/routes/auth/login.py,sha256=buVa5Y8T0cd_SW1CqC-zMv-3SfPxGJknf7MYlUyKOl0,567
 fractal_server/app/routes/auth/oauth.py,sha256=dOt1bWz1viW36CAnHVLmLkYzdCHUMdOhdTNgoQp-VvU,3663
@@ -74,16 +75,15 @@ fractal_server/app/routes/auth/viewer_paths.py,sha256=uDIwP3AWjLOskG2ZSMUokmn6DW
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=n-UhONvomKyKkQDDqd0lFh2kCMhlCGXpfdMNW39R1E4,644
 fractal_server/app/routes/aux/_runner.py,sha256=-SvcXCVEV7Mb6q4PbbxuTCCruX6sAlR5QGXk9CzBVv8,979
-fractal_server/app/routes/aux/_versions.py,sha256=6ZnH5KcLlJXACfZsFXhgARQcp2AwekIaaTVz68H6HWs,1527
 fractal_server/app/routes/aux/validate_user_profile.py,sha256=fGqJDdAFkbQoEIjqZ5F9-SDY_4os63R2EUMqODC7eBg,1969
 fractal_server/app/routes/pagination.py,sha256=C4XW6cnyDfyu1XMHXRN4wgk72lsS0UtlINZmwGZFb4Y,1174
 fractal_server/app/schemas/__init__.py,sha256=VIWJCaqokte3OljDLX00o-EC2d12rFoPb5HOLKQI94Y,86
 fractal_server/app/schemas/user.py,sha256=ncPPxl6DsF_YDsEKJ1idTpAZTsVyh1iC9p4KfK25WZ4,3421
 fractal_server/app/schemas/user_group.py,sha256=irel29GbffKCXNcyrAYbNSN3pCgmoUQ1wG32_s6jvos,1082
-fractal_server/app/schemas/v2/__init__.py,sha256=cYyOsr-6jttq1jzRNa_tOuCXPp3zwV3jBDR72F4u4vU,3957
+fractal_server/app/schemas/v2/__init__.py,sha256=6W1uSthuLGXs9oOYnjmScoqJYkWyUTT-9cNHFZoTmkM,4005
 fractal_server/app/schemas/v2/accounting.py,sha256=6EVUdPTkFY6Wb9-Vc0cIEZYVXwGEvJ3tP4YOXYE1hao,546
 fractal_server/app/schemas/v2/dataset.py,sha256=SBS3TwHxPRHtLvFu-Bm4eQlI96DIkCiFF7oKvfcfTOc,2736
-fractal_server/app/schemas/v2/dumps.py,sha256=x3LK-Xq1OQgp7waAjy-5gaQVNbcF5JQNTqqPw86xkpM,2246
+fractal_server/app/schemas/v2/dumps.py,sha256=UPtb1Rqkd48AFpWsVfcHcAjKGzF2ZoHLdYrAJzPdsSM,2276
 fractal_server/app/schemas/v2/history.py,sha256=pZiMKfh6nMWbTp5MUtrnGySPKbeRFf5tM1VLFaTgGcw,1784
 fractal_server/app/schemas/v2/job.py,sha256=YnnxnrbI_l7EgZNzk_KgnuEuh0COg-RPoph2foHUvZo,3308
 fractal_server/app/schemas/v2/manifest.py,sha256=I8KyVZvW6r6_DrcKX5aZ9zJwa-Kk_u3gCKlz6HVPF5o,6655
@@ -92,12 +92,12 @@ fractal_server/app/schemas/v2/project.py,sha256=jTc4jhwdkO1Ht2K27AguA0z9wWX0CYKv
 fractal_server/app/schemas/v2/resource.py,sha256=LPi1D67vGngOn5BWNicqAIHCKExaf2XyzuZKByo7wfc,6841
 fractal_server/app/schemas/v2/sharing.py,sha256=wHBiEmqhU53NokQ2rmm6xkH3lumBR6TdWw4nvDz6uww,1818
 fractal_server/app/schemas/v2/status_legacy.py,sha256=ajLm2p0wNfJ_lQX9Oq3NJn0jxQj50U3eZxuRjOIdOpg,949
-fractal_server/app/schemas/v2/task.py,sha256=le62bHu4nRrXlN-cCOdpkStLQNLtkR_myqK1j8fLoNs,4260
+fractal_server/app/schemas/v2/task.py,sha256=Fd4n6vitliOuQyoofQ0daFy25QzIoWe9NPbXanNyrrE,4351
 fractal_server/app/schemas/v2/task_collection.py,sha256=ljGnZOmYg9pQ9PbYnNxLJDf4O2BDym-BQ_cXr-NWSd4,4590
 fractal_server/app/schemas/v2/task_group.py,sha256=sbg6AkvonU7F_-QC4G9kDxO6YVcz7wUPY3k3n9jYkRY,3392
-fractal_server/app/schemas/v2/workflow.py,sha256=m-udZHvOFokjaD3cGdTMHdtC8qHLNlmx7PsCEgcvN7U,1801
-fractal_server/app/schemas/v2/workflowtask.py,sha256=sAzu6ZHWGgwvQgviIZJB3J6X79TxchlClkqzNHMlxTo,3683
-fractal_server/app/security/__init__.py,sha256=Z-xQjt5jx6ldBBrz1iJ0IQ-SLKbv8Gq7fQ4U18NAxXc,18471
+fractal_server/app/schemas/v2/workflow.py,sha256=87Aa92H6ceBbkDUsDhDqVNJyuBZuVRRAgFqNeg_djwE,1738
+fractal_server/app/schemas/v2/workflowtask.py,sha256=1k56KHwzZDZGjl7FG1yslj-MKtKKR5fZ5RKGlJbopNc,3608
+fractal_server/app/security/__init__.py,sha256=sblIH9DFCt_iyk22WzV6k4LuKdbvNPtS1HqPCHIiBJ4,18363
 fractal_server/app/security/signup_email.py,sha256=R69U5eTi9X7gZHSTfZ26SaHMQAeqReYEpGnB8r3AVig,1992
 fractal_server/app/shutdown.py,sha256=bfEmf6Xdc906ES0zDDWsihmd6neQpGFyIc7qnadnNu8,2283
 fractal_server/config/__init__.py,sha256=WvcoE3qiY1qnkumv3qspcemCFw5iFG5NkSFR78vN4ks,562
@@ -122,10 +122,8 @@ fractal_server/migrations/versions/034a469ec2eb_task_groups.py,sha256=uuf0sJibC4
 fractal_server/migrations/versions/068496367952_drop_taskgroup_venv_size_and_files_.py,sha256=rVFmB7eO7LtOfJivNnfnniQecD8DebAWnSvYEE2yq7k,1239
 fractal_server/migrations/versions/091b01f51f88_add_usergroup_and_linkusergroup_table.py,sha256=cSz3Jc2X79dN7I-rh0OSefOd5WOJU65wNWFNMnX2LR4,1450
 fractal_server/migrations/versions/0f5f85bb2ae7_add_pre_pinned_packages.py,sha256=XH6msE3On7P7S2gz-Xec20bWAI6vR29zRT1ZafFwStI,1056
-fractal_server/migrations/versions/18a26fcdea5d_drop_dataset_history.py,sha256=AzCnz-PJCzKw8Sm28zN1cIrHexgv-5Bcw5dGIxkzDOU,1064
 fractal_server/migrations/versions/19eca0dd47a9_user_settings_project_dir.py,sha256=5OzcIQjTfwiqh9vK_yLQHJlNtIHxKiEPr-IjZ9iir-Y,961
 fractal_server/migrations/versions/1a83a5260664_rename.py,sha256=BGZrM2UfccWc0s0kNlpACEw1LB1K6AemHPR5irkJ1gA,790
-fractal_server/migrations/versions/1bf8785755f9_add_description_to_workflow_and_.py,sha256=OVugy2ftELqAE8_6zTGiwwpDxj1STmf8XNHOa8TBr6o,1507
 fractal_server/migrations/versions/1eac13a26c83_drop_v1_tables.py,sha256=DGdm1Q58UHfQ-6GAg0ucyKCiMxXb1JzELYQ50d1f5bo,1605
 fractal_server/migrations/versions/316140ff7ee1_remove_usersettings_cache_dir.py,sha256=5gIIZp3Apc2fTiUoHEvd-k34W-HIq7cjFt7Fwqjq6lE,911
 fractal_server/migrations/versions/40d6d6511b20_add_index_to_history_models.py,sha256=dZglAP0b3_YAeYc7Pphxs9iI73icSaMkgku7R6MaPL0,1357
@@ -137,7 +135,6 @@ fractal_server/migrations/versions/4cedeb448a53_workflowtask_foreign_keys_not_nu
 fractal_server/migrations/versions/501961cfcd85_remove_link_between_v1_and_v2_tasks_.py,sha256=SeBUvMEikyl4qkCjiOgkkqbcIeaim57EPuufjFh_X8k,3271
 fractal_server/migrations/versions/50a13d6138fd_initial_schema.py,sha256=sh0tB5K35ui8bfvBPI2jwDkeNVDtdlGvWrvTeumA0iY,8654
 fractal_server/migrations/versions/5bf02391cfef_v2.py,sha256=jTNyZ8H5VDh4eRvCEy-WliXAu55kUybddsaTeexXr6c,8367
-fractal_server/migrations/versions/5fb08bf05b14_drop_taskv2_source.py,sha256=bUs6xhVFGeCU4rR7yRdQXEXsns28lFUKBdcDsd-Bj4Q,880
 fractal_server/migrations/versions/70e77f1c38b0_add_applyworkflow_first_task_index_and_.py,sha256=vJ6nDb7UnkCMIPg2zNM7ZE0JOTvaqFL3Fe9UarP-ivM,1633
 fractal_server/migrations/versions/71eefd1dd202_add_slurm_accounts.py,sha256=qpHZC97AduFk5_G0xHs9akhnhpzb1LZooYCTPHy7n28,1353
 fractal_server/migrations/versions/7673fe18c05d_remove_project_dir_server_default.py,sha256=PwTfY9Kq3_cwb5G4E0sM9u7UjzOhOwsYCspymmPgipQ,795
@@ -165,7 +162,6 @@ fractal_server/migrations/versions/b7477cc98f45_2_18_1.py,sha256=clKGCwh95sWFTeU
 fractal_server/migrations/versions/bc0e8b3327a7_project_sharing.py,sha256=5h8ogjfQPbKbVwN0-pfh5ixPQSCCYsiVnQoOveUKKUA,2145
 fractal_server/migrations/versions/c90a7c76e996_job_id_in_history_run.py,sha256=CPQNKHqsx22wSY4ylqM8UMhDOWkQeC9eLAHlQQJYSfQ,1102
 fractal_server/migrations/versions/caba9fb1ea5e_drop_useroauth_user_settings_id.py,sha256=7MpunfOBk0LM6u-xrwca8GUHIjinAJZrS9AUT3l62qU,1320
-fractal_server/migrations/versions/cfd13f7954e7_add_fractal_server_version_to_jobv2_and_.py,sha256=rqF1f3j5exatdKyeEvccX-TMC_bcZEFcHmixguOQRqw,1447
 fractal_server/migrations/versions/d256a7379ab8_taskgroup_activity_and_venv_info_to_.py,sha256=bFMJUFJAnOaHYyYYKISHpbQWKBoQopiEKRT0PSidqhk,3796
 fractal_server/migrations/versions/d4fe3708d309_make_applyworkflow_workflow_dump_non_.py,sha256=zLHqar9iduiLs5Ib50B9RKrdLLbWSffahWxXDDePnI8,950
 fractal_server/migrations/versions/da2cb2ac4255_user_group_viewer_paths.py,sha256=-ihE-KJEVemb8ZhRejg6xdC5TPTW8GkKWnzcl1ReAHQ,901
@@ -220,7 +216,7 @@ fractal_server/runner/v2/deduplicate_list.py,sha256=TWxHDucal0VZPswy_H7IFaEb4ddG
 fractal_server/runner/v2/merge_outputs.py,sha256=0ahaSwdMFAoEhxVaEaO9nSJuKIcWg9pDZ356ktSHcC0,897
 fractal_server/runner/v2/runner.py,sha256=aKz5ocgsMcUUsvaz00db8cWbBHMBA_g_PJhwV973pdY,20884
 fractal_server/runner/v2/runner_functions.py,sha256=1wW2ByskwPtx_mhyJiCpKMXDnDyZ_y5fDWv8hktFZXI,19564
-fractal_server/runner/v2/submit_workflow.py,sha256=MNUyBlXKfPjSbJgB5HlpAhXPvDeuMtPXc2h6HHmJkU0,11761
+fractal_server/runner/v2/submit_workflow.py,sha256=FSqXF0_BzhNMRGqYxdjwSVD5rdonk4fTL6Fkp31O_fQ,11867
 fractal_server/runner/v2/task_interface.py,sha256=ftPPpOU16rbJD8q-QV7o_3ey8W7MQTFuWJiYUr4OmF4,2532
 fractal_server/runner/versions.py,sha256=uz59Dxj7BphnFnr-p0kyaZRH0h4w5Xkd0UJNVGtt4ds,474
 fractal_server/ssh/__init__.py,sha256=sVUmzxf7_DuXG1xoLQ1_00fo5NPhi2LJipSmU5EAkPs,124
@@ -274,8 +270,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=zt
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=-rjg8QTXQcKweXjn0NcmETFs1_uM9PGnbl0Q7c4ERPM,2181
 fractal_server/zip_tools.py,sha256=Uhn-ax4_9g1PJ32BdyaX30hFpAeVOv2tZYTUK-zVn1E,5719
-fractal_server-2.19.0.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.19.0.dist-info/WHEEL,sha256=eycQt0QpYmJMLKpE3X9iDk8R04v2ZF0x82ogq-zP6bQ,79
-fractal_server-2.19.0.dist-info/entry_points.txt,sha256=3TpdcjmETRYWJxFyAh3z-9955EWua9jdkSnBwxES1uE,60
-fractal_server-2.19.0.dist-info/METADATA,sha256=IxX_tJLqbH-qtYWusf2Q846BSHL9pIm6Pr7EcFTFuY0,4181
-fractal_server-2.19.0.dist-info/RECORD,,
+fractal_server-2.19.0a0.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.19.0a0.dist-info/WHEEL,sha256=eycQt0QpYmJMLKpE3X9iDk8R04v2ZF0x82ogq-zP6bQ,79
+fractal_server-2.19.0a0.dist-info/entry_points.txt,sha256=3TpdcjmETRYWJxFyAh3z-9955EWua9jdkSnBwxES1uE,60
+fractal_server-2.19.0a0.dist-info/METADATA,sha256=pmh1KIC1bSUPthf2eJlfOJq_J3Yw88vWkvPr4hgtYNA,4185
+fractal_server-2.19.0a0.dist-info/RECORD,,

fractal_server/app/routes/aux/_versions.py

@@ -1,42 +0,0 @@
-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/migrations/versions/18a26fcdea5d_drop_dataset_history.py

@@ -1,41 +0,0 @@
-"""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 ###

fractal_server/migrations/versions/1bf8785755f9_add_description_to_workflow_and_.py

@@ -1,53 +0,0 @@
-"""Add description to workflow and description and alias to workflow task
-
-Revision ID: 1bf8785755f9
-Revises: 5fb08bf05b14
-Create Date: 2026-01-26 09:03:18.396841
-
-"""
-
-import sqlalchemy as sa
-import sqlmodel
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "1bf8785755f9"
-down_revision = "5fb08bf05b14"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("workflowtaskv2", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "alias", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "description", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-
-    with op.batch_alter_table("workflowv2", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "description", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("workflowv2", schema=None) as batch_op:
-        batch_op.drop_column("description")
-
-    with op.batch_alter_table("workflowtaskv2", schema=None) as batch_op:
-        batch_op.drop_column("description")
-        batch_op.drop_column("alias")
-
-    # ### end Alembic commands ###

fractal_server/migrations/versions/5fb08bf05b14_drop_taskv2_source.py

@@ -1,36 +0,0 @@
-"""drop TaskV2.source
-
-Revision ID: 5fb08bf05b14
-Revises: e53dc51fdf93
-Create Date: 2026-01-21 12:50:39.072816
-
-"""
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "5fb08bf05b14"
-down_revision = "e53dc51fdf93"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("taskv2", schema=None) as batch_op:
-        batch_op.drop_column("source")
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("taskv2", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "source", sa.VARCHAR(), autoincrement=False, nullable=True
-            )
-        )
-
-    # ### end Alembic commands ###

fractal_server/migrations/versions/cfd13f7954e7_add_fractal_server_version_to_jobv2_and_.py

@@ -1,52 +0,0 @@
-"""add fractal_server_version to jobv2 and taskgroupactivityv2
-
-Revision ID: cfd13f7954e7
-Revises: 18a26fcdea5d
-Create Date: 2026-01-29 12:33:00.064562
-
-"""
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "cfd13f7954e7"
-down_revision = "18a26fcdea5d"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("jobv2", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "fractal_server_version",
-                sa.String(),
-                server_default="pre-2.19.0",
-                nullable=False,
-            )
-        )
-
-    with op.batch_alter_table("taskgroupactivityv2", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "fractal_server_version",
-                sa.String(),
-                server_default="pre-2.19.0",
-                nullable=False,
-            )
-        )
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("taskgroupactivityv2", schema=None) as batch_op:
-        batch_op.drop_column("fractal_server_version")
-
-    with op.batch_alter_table("jobv2", schema=None) as batch_op:
-        batch_op.drop_column("fractal_server_version")
-
-    # ### end Alembic commands ###