fractal-server 2.19.0a2__tar.gz → 2.19.1__tar.gz

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.19.0a2
+Version: 2.19.1
 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>

fractal_server-2.19.1/fractal_server/__init__.py

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

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/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.19.0a2 → fractal_server-2.19.1}/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.19.0a2 → fractal_server-2.19.1}/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.19.0a2 → fractal_server-2.19.1}/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.0a2 → fractal_server-2.19.1}/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.19.0a2 → fractal_server-2.19.1}/fractal_server/app/routes/api/v2/_aux_functions.py

@@ -400,6 +400,8 @@ async def _workflow_insert_task(
     args_non_parallel: dict[str, Any] | None = None,
     args_parallel: dict[str, Any] | None = None,
     type_filters: dict[str, bool] | None = None,
+    description: str | None = None,
+    alias: str | None = None,
     db: AsyncSession,
 ) -> WorkflowTaskV2:
     """
@@ -414,6 +416,8 @@ async def _workflow_insert_task(
         args_non_parallel:
         args_parallel:
         type_filters:
+        description:
+        alias:
         db:
     """
     db_workflow = await db.get(WorkflowV2, workflow_id)
@@ -448,6 +452,8 @@ async def _workflow_insert_task(
         meta_parallel=final_meta_parallel,
         meta_non_parallel=final_meta_non_parallel,
         type_filters=(type_filters or dict()),
+        description=description,
+        alias=alias,
     )
     db_workflow.task_list.append(wf_task)
     flag_modified(db_workflow, "task_list")

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/app/routes/api/v2/submit.py

@@ -11,6 +11,7 @@ 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
@@ -221,6 +222,7 @@ async def submit_job(
         project_dump=json.loads(
             project.model_dump_json(exclude={"resource_id"})
         ),
+        fractal_server_version=__VERSION__,
         **job_create.model_dump(),
     )
 

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/app/routes/api/v2/task_collection.py

@@ -14,6 +14,7 @@ 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
@@ -332,6 +333,7 @@ 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-2.19.0a2 → fractal_server-2.19.1}/fractal_server/app/routes/api/v2/task_collection_pixi.py

@@ -10,6 +10,7 @@ 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
@@ -182,6 +183,7 @@ 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-2.19.0a2 → fractal_server-2.19.1}/fractal_server/app/routes/api/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
@@ -99,6 +100,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)
@@ -114,6 +116,7 @@ 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)
@@ -202,6 +205,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)
@@ -225,6 +229,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()
@@ -288,6 +293,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.0a2 → fractal_server-2.19.1}/fractal_server/app/routes/api/v2/workflowtask.py

@@ -93,6 +93,8 @@ async def create_workflowtask(
         args_non_parallel=wftask.args_non_parallel,
         args_parallel=wftask.args_parallel,
         type_filters=wftask.type_filters,
+        description=wftask.description,
+        alias=wftask.alias,
         db=db,
     )
 

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/app/schemas/v2/workflow.py

@@ -20,6 +20,7 @@ class WorkflowCreate(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     name: NonEmptyStr
+    description: NonEmptyStr | None = None
 
 
 class WorkflowRead(BaseModel):
@@ -45,7 +46,7 @@ class WorkflowUpdate(BaseModel):
 
     name: NonEmptyStr = None
     reordered_workflowtask_ids: ListUniqueNonNegativeInt | None = None
-    description: str | None = None
+    description: NonEmptyStr | None = None
 
 
 class WorkflowImport(BaseModel):
@@ -58,6 +59,7 @@ class WorkflowImport(BaseModel):
 
     model_config = ConfigDict(extra="forbid")
     name: NonEmptyStr
+    description: NonEmptyStr | None = None
     task_list: list[WorkflowTaskImport]
 
 
@@ -70,4 +72,5 @@ class WorkflowExport(BaseModel):
     """
 
     name: str
+    description: str | None
     task_list: list[WorkflowTaskExport]

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/app/schemas/v2/workflowtask.py

@@ -6,6 +6,7 @@ from pydantic import Field
 from pydantic import model_validator
 
 from fractal_server.types import DictStrAny
+from fractal_server.types import NonEmptyStr
 from fractal_server.types import TypeFilters
 from fractal_server.types import WorkflowTaskArgument
 
@@ -23,6 +24,8 @@ class WorkflowTaskCreate(BaseModel):
     args_non_parallel: WorkflowTaskArgument | None = None
     args_parallel: WorkflowTaskArgument | None = None
     type_filters: TypeFilters = Field(default_factory=dict)
+    description: NonEmptyStr | None = None
+    alias: NonEmptyStr | None = None
 
 
 class WorkflowTaskReplace(BaseModel):
@@ -65,8 +68,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
+    description: NonEmptyStr | None = None
+    alias: NonEmptyStr | None = None
 
 
 class WorkflowTaskImport(BaseModel):
@@ -78,6 +81,8 @@ class WorkflowTaskImport(BaseModel):
     args_parallel: DictStrAny | None = None
     type_filters: TypeFilters | None = None
     input_filters: dict[str, Any] | None = None
+    description: NonEmptyStr | None = None
+    alias: NonEmptyStr | None = None
 
     task: TaskImport
 
@@ -116,5 +121,7 @@ class WorkflowTaskExport(BaseModel):
     args_non_parallel: dict[str, Any] | None = None
     args_parallel: dict[str, Any] | None = None
     type_filters: dict[str, bool] = Field(default_factory=dict)
+    description: str | None = None
+    alias: str | None = None
 
     task: TaskExport

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/app/security/__init__.py

@@ -191,17 +191,22 @@ class UserManager(IntegerIDMixin, BaseUserManager[UserOAuth, int]):
 
     @override
     async def validate_password(self, password: str, user: UserOAuth) -> None:
-        # check password length
         min_length = 4
-        max_length = 72
-        if len(password) < min_length:
+        len_password = len(password)
+        if len_password < min_length:
             raise InvalidPasswordException(
-                f"The password is too short (minimum length: {min_length})."
+                "The password is too short "
+                f"(length = {len_password}, minimum length = {min_length})."
             )
-        if len(password.encode("utf-8")) > max_length:
+        max_length_in_bytes = 72
+        len_password_in_bytes = len(password.encode("utf-8"))
+        if len_password_in_bytes > max_length_in_bytes:
+            # See:
+            # https://github.com/pyca/bcrypt/blob/f0451e42e3ab6f6e1b9ac8b09bf04104bf8bdef8/src/_bcrypt/src/lib.rs#L85-L89
             raise InvalidPasswordException(
                 "The password is too long "
-                f"(maximum length: {max_length} bytes)."
+                f"(length = {len_password_in_bytes} bytes, "
+                f"maximum length = {max_length_in_bytes} bytes)."
             )
 
     @override

fractal_server-2.19.1/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 ###

fractal_server-2.19.1/fractal_server/migrations/versions/cfd13f7954e7_add_fractal_server_version_to_jobv2_and_.py

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

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/runner/config/_slurm.py

@@ -31,6 +31,7 @@ class SlurmConfigSet(BaseModel):
         time:
         exclude:
         nodelist:
+        nodes:
         account:
         extra_lines:
         gpus:
@@ -47,6 +48,7 @@ class SlurmConfigSet(BaseModel):
     gres: NonEmptyStr | None = None
     exclude: NonEmptyStr | None = None
     nodelist: NonEmptyStr | None = None
+    nodes: int | None = None
     time: NonEmptyStr | None = None
     account: NonEmptyStr | None = None
     extra_lines: list[NonEmptyStr] = Field(default_factory=list)

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/runner/executors/slurm_common/base_slurm_runner.py

@@ -41,6 +41,7 @@ STDERR_IGNORE_PATTERNS = [
     "step creation temporarily disabled, retrying",
     "step creation still disabled, retrying",
     "srun: step created for stepid=",
+    "srun: warning: can't run 1 processes on ",
 ]
 
 

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/runner/executors/slurm_common/get_slurm_config.py

@@ -118,6 +118,7 @@ def _get_slurm_config_internal(
             "gpus",
             "constraint",
             "nodelist",
+            "nodes",
             "exclude",
         ]:
             value = wftask_meta.get(key, None)

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/runner/executors/slurm_common/slurm_config.py

@@ -39,6 +39,7 @@ class SlurmConfig(BaseModel):
         gpus: Corresponds to SLURM option.
         time: Corresponds to SLURM option (WARNING: not fully supported).
         nodelist: Corresponds to SLURM option.
+        nodes: Corresponds to SLURM option.
         exclude: Corresponds to SLURM option.
         prefix: Prefix of configuration lines in SLURM submission scripts.
         shebang_line: Shebang line for SLURM submission scripts.
@@ -87,6 +88,7 @@ class SlurmConfig(BaseModel):
     time: str | None = None
     account: str | None = None
     nodelist: str | None = None
+    nodes: int | None = None
     exclude: str | None = None
 
     # Free-field attribute for extra lines to be added to the SLURM job
@@ -188,6 +190,7 @@ class SlurmConfig(BaseModel):
             "account",
             "exclude",
             "nodelist",
+            "nodes",
         ]:
             value = getattr(self, key)
             if value is not None:

{fractal_server-2.19.0a2 → fractal_server-2.19.1}/fractal_server/runner/v2/submit_workflow.py

@@ -13,7 +13,6 @@ 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
@@ -224,7 +223,6 @@ 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.0a2 → fractal_server-2.19.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.19.0a2"
+version = "2.19.1"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -58,16 +58,15 @@ dev = [
 
 docs = [
     "mkdocs==1.6.1",
-    "mkdocstrings[python]==0.30.1",
-    "mkdocs-material==9.7.0",
-    "mkdocs-gen-files==0.5.0",
+    "mkdocstrings[python]>=1.0.2,<1.1.0",
+    "mkdocs-material==9.7.1",
+    "mkdocs-gen-files==0.6.0",
     "mkdocs-literate-nav==0.6.2",
     "mkdocs-section-index==0.3.10",
-    "mkdocs-include-markdown-plugin==7.2.0",
+    "mkdocs-include-markdown-plugin==7.2.1",
     "mkdocs-render-swagger-plugin==0.1.2",
     "pyyaml>=6.0.0",
-    "click == 8.2.1"
-]
+    ]
 
 
 [build-system]
@@ -92,7 +91,7 @@ filterwarnings = [
 markers = ["container", "ssh", "fails_on_macos", "oauth"]
 
 [tool.bumpver]
-current_version = "2.19.0a2"
+current_version = "2.19.1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.19.0a2/fractal_server/__init__.py

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