fractal-server 2.15.0a5__py3-none-any.whl → 2.15.2__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.15.0a5"
+__VERSION__ = "2.15.2"

fractal_server/app/db/__init__.py

@@ -45,13 +45,11 @@ class DB:
         settings = Inject(get_settings)
         settings.check_db()
 
-        engine_kwargs_async = {"pool_pre_ping": True}
-
         cls._engine_async = create_async_engine(
             settings.DATABASE_ASYNC_URL,
             echo=settings.DB_ECHO,
             future=True,
-            **engine_kwargs_async,
+            pool_pre_ping=True,
         )
         cls._async_session_maker = sessionmaker(
             cls._engine_async,
@@ -65,13 +63,11 @@ class DB:
         settings = Inject(get_settings)
         settings.check_db()
 
-        engine_kwargs_sync = {}
-
         cls._engine_sync = create_engine(
             settings.DATABASE_SYNC_URL,
             echo=settings.DB_ECHO,
             future=True,
-            **engine_kwargs_sync,
+            pool_pre_ping=True,
         )
 
         cls._sync_session_maker = sessionmaker(

fractal_server/app/models/security.py

@@ -15,8 +15,8 @@ from typing import Optional
 from pydantic import ConfigDict
 from pydantic import EmailStr
 from sqlalchemy import Column
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
-from sqlalchemy.types import JSON
 from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
@@ -124,5 +124,5 @@ class UserGroup(SQLModel, table=True):
         sa_column=Column(DateTime(timezone=True), nullable=False),
     )
     viewer_paths: list[str] = Field(
-        sa_column=Column(JSON, server_default="[]", nullable=False)
+        sa_column=Column(JSONB, server_default="[]", nullable=False)
     )

fractal_server/app/models/user_settings.py

@@ -1,5 +1,5 @@
 from sqlalchemy import Column
-from sqlalchemy.types import JSON
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlmodel import Field
 from sqlmodel import SQLModel
 
@@ -25,7 +25,7 @@ class UserSettings(SQLModel, table=True):
 
     id: int | None = Field(default=None, primary_key=True)
     slurm_accounts: list[str] = Field(
-        sa_column=Column(JSON, server_default="[]", nullable=False)
+        sa_column=Column(JSONB, server_default="[]", nullable=False)
     )
     ssh_host: str | None = None
     ssh_username: str | None = None

fractal_server/app/models/v2/dataset.py

@@ -3,8 +3,8 @@ from typing import Any
 
 from pydantic import ConfigDict
 from sqlalchemy import Column
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
-from sqlalchemy.types import JSON
 from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
@@ -24,7 +24,7 @@ class DatasetV2(SQLModel, table=True):
     )
 
     history: list[dict[str, Any]] = Field(
-        sa_column=Column(JSON, server_default="[]", nullable=False)
+        sa_column=Column(JSONB, server_default="[]", nullable=False)
     )
 
     timestamp_created: datetime = Field(
@@ -34,7 +34,7 @@ class DatasetV2(SQLModel, table=True):
 
     zarr_dir: str
     images: list[dict[str, Any]] = Field(
-        sa_column=Column(JSON, server_default="[]", nullable=False)
+        sa_column=Column(JSONB, server_default="[]", nullable=False)
     )
 
     @property

fractal_server/app/models/v2/job.py

@@ -3,8 +3,8 @@ from typing import Any
 
 from pydantic import ConfigDict
 from sqlalchemy import Column
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
-from sqlalchemy.types import JSON
 from sqlmodel import Field
 from sqlmodel import SQLModel
 
@@ -31,13 +31,13 @@ class JobV2(SQLModel, table=True):
     slurm_account: str | None = None
 
     dataset_dump: dict[str, Any] = Field(
-        sa_column=Column(JSON, nullable=False)
+        sa_column=Column(JSONB, nullable=False)
     )
     workflow_dump: dict[str, Any] = Field(
-        sa_column=Column(JSON, nullable=False)
+        sa_column=Column(JSONB, nullable=False)
     )
     project_dump: dict[str, Any] = Field(
-        sa_column=Column(JSON, nullable=False)
+        sa_column=Column(JSONB, nullable=False)
     )
 
     worker_init: str | None = None
@@ -57,8 +57,8 @@ class JobV2(SQLModel, table=True):
     log: str | None = None
 
     attribute_filters: AttributeFilters = Field(
-        sa_column=Column(JSON, nullable=False, server_default="{}")
+        sa_column=Column(JSONB, nullable=False, server_default="{}")
     )
     type_filters: dict[str, bool] = Field(
-        sa_column=Column(JSON, nullable=False, server_default="{}")
+        sa_column=Column(JSONB, nullable=False, server_default="{}")
     )

fractal_server/app/models/v2/task.py

@@ -1,7 +1,8 @@
 from typing import Any
 
 from sqlalchemy import Column
-from sqlalchemy.types import JSON
+from sqlalchemy.dialects.postgresql import JSON
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlmodel import Field
 from sqlmodel import SQLModel
 
@@ -33,8 +34,8 @@ class TaskV2(SQLModel, table=True):
     docs_info: str | None = None
     docs_link: str | None = None
 
-    input_types: dict[str, bool] = Field(sa_column=Column(JSON), default={})
-    output_types: dict[str, bool] = Field(sa_column=Column(JSON), default={})
+    input_types: dict[str, bool] = Field(sa_column=Column(JSONB), default={})
+    output_types: dict[str, bool] = Field(sa_column=Column(JSONB), default={})
 
     taskgroupv2_id: int = Field(foreign_key="taskgroupv2.id")
 
@@ -42,5 +43,5 @@ class TaskV2(SQLModel, table=True):
     modality: str | None = None
     authors: str | None = None
     tags: list[str] = Field(
-        sa_column=Column(JSON, server_default="[]", nullable=False)
+        sa_column=Column(JSONB, server_default="[]", nullable=False)
     )

fractal_server/app/models/v2/task_group.py

@@ -2,8 +2,8 @@ from datetime import datetime
 from datetime import timezone
 
 from sqlalchemy import Column
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
-from sqlalchemy.types import JSON
 from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
@@ -35,7 +35,7 @@ class TaskGroupV2(SQLModel, table=True):
     pip_extras: str | None = None
     pinned_package_versions: dict[str, str] = Field(
         sa_column=Column(
-            JSON,
+            JSONB,
             server_default="{}",
             default={},
             nullable=True,

fractal_server/app/models/v2/workflowtask.py

@@ -2,7 +2,8 @@ from typing import Any
 
 from pydantic import ConfigDict
 from sqlalchemy import Column
-from sqlalchemy.types import JSON
+from sqlalchemy.dialects.postgresql import JSON
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
@@ -24,14 +25,14 @@ class WorkflowTaskV2(SQLModel, table=True):
         sa_column=Column(JSON), default=None
     )
     args_parallel: dict[str, Any] | None = Field(
-        sa_column=Column(JSON), default=None
+        sa_column=Column(JSONB), default=None
     )
     args_non_parallel: dict[str, Any] | None = Field(
-        sa_column=Column(JSON), default=None
+        sa_column=Column(JSONB), default=None
     )
 
     type_filters: dict[str, bool] = Field(
-        sa_column=Column(JSON, nullable=False, server_default="{}")
+        sa_column=Column(JSONB, nullable=False, server_default="{}")
     )
 
     # Task

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

@@ -156,8 +156,15 @@ async def update_job(
             detail=f"Cannot set job status to {job_update.status}",
         )
 
+    timestamp = get_timestamp()
     setattr(job, "status", job_update.status)
-    setattr(job, "end_timestamp", get_timestamp())
+    setattr(job, "end_timestamp", timestamp)
+    setattr(
+        job,
+        "log",
+        f"{job.log or ''}\nThis job was manually marked as "
+        f"'{JobStatusTypeV2.FAILED}' by an admin ({timestamp.isoformat()}).",
+    )
     await db.commit()
     await db.refresh(job)
     await db.close()

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

@@ -325,6 +325,24 @@ def _get_submitted_jobs_statement() -> SelectOfScalar:
     return stm
 
 
+async def _workflow_has_submitted_job(
+    workflow_id: int,
+    db: AsyncSession,
+) -> bool:
+
+    res = await db.execute(
+        select(JobV2.id)
+        .where(JobV2.status == JobStatusTypeV2.SUBMITTED)
+        .where(JobV2.workflow_id == workflow_id)
+        .limit(1)
+    )
+    submitted_jobs = res.scalar_one_or_none()
+    if submitted_jobs is not None:
+        return True
+
+    return False
+
+
 async def _workflow_insert_task(
     *,
     workflow_id: int,

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

@@ -22,6 +22,7 @@ from ._aux_functions import _check_workflow_exists
 from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _get_submitted_jobs_statement
 from ._aux_functions import _get_workflow_check_owner
+from ._aux_functions import _workflow_has_submitted_job
 from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
@@ -146,6 +147,18 @@ async def update_workflow(
 
     for key, value in patch.model_dump(exclude_unset=True).items():
         if key == "reordered_workflowtask_ids":
+
+            if await _workflow_has_submitted_job(
+                workflow_id=workflow_id, db=db
+            ):
+                raise HTTPException(
+                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    detail=(
+                        "Cannot re-order WorkflowTasks while a Job is running "
+                        "for this Workflow."
+                    ),
+                )
+
             current_workflowtask_ids = [
                 wftask.id for wftask in workflow.task_list
             ]

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

@@ -10,6 +10,7 @@ from ....db import AsyncSession
 from ....db import get_async_db
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import _get_workflow_task_check_owner
+from ._aux_functions import _workflow_has_submitted_job
 from ._aux_functions import _workflow_insert_task
 from ._aux_functions_tasks import _check_type_filters_compatibility
 from ._aux_functions_tasks import _get_task_read_access
@@ -224,6 +225,15 @@ async def delete_workflowtask(
         db=db,
     )
 
+    if await _workflow_has_submitted_job(workflow_id=workflow_id, db=db):
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=(
+                "Cannot delete a WorkflowTask while a Job is running for this "
+                "Workflow."
+            ),
+        )
+
     # Delete WorkflowTask
     await db.delete(db_workflow_task)
     await db.commit()

fractal_server/app/runner/executors/slurm_common/_slurm_config.py

@@ -48,6 +48,8 @@ class _SlurmConfigSet(BaseModel):
         constraint:
         gres:
         time:
+        exclude:
+        nodelist:
         account:
         extra_lines:
     """
@@ -59,6 +61,8 @@ class _SlurmConfigSet(BaseModel):
     mem: int | str | None = None
     constraint: str | None = None
     gres: str | None = None
+    exclude: str | None = None
+    nodelist: str | None = None
     time: str | None = None
     account: str | None = None
     extra_lines: list[str] | None = None
@@ -227,6 +231,8 @@ class SlurmConfig(BaseModel):
         account: Corresponds to SLURM option.
         gpus: Corresponds to SLURM option.
         time: Corresponds to SLURM option (WARNING: not fully supported).
+        nodelist: 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.
         extra_lines: Additional lines to include in SLURM submission scripts.
@@ -268,6 +274,8 @@ class SlurmConfig(BaseModel):
     gpus: str | None = None
     time: str | None = None
     account: str | None = None
+    nodelist: str | None = None
+    exclude: str | None = None
 
     # Free-field attribute for extra lines to be added to the SLURM job
     # preamble
@@ -361,6 +369,8 @@ class SlurmConfig(BaseModel):
             "gpus",
             "time",
             "account",
+            "exclude",
+            "nodelist",
         ]:
             value = getattr(self, key)
             if value is not None:

fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py

@@ -137,6 +137,34 @@ class BaseSlurmRunner(BaseRunner):
     def run_squeue(self, *, job_ids: list[str], **kwargs) -> str:
         raise NotImplementedError("Implement in child class.")
 
+    def _is_squeue_error_recoverable(self, exception: BaseException) -> True:
+        """
+        Determine whether a `squeue` error is considered recoverable.
+
+        A _recoverable_ error is one which will disappear after some time,
+        without any specific action from the `fractal-server` side.
+
+        Note: if this function returns `True` for an error that does not
+        actually recover, this leads to an infinite loop  where
+        `fractal-server` keeps polling `squeue` information forever.
+
+        More info at
+        https://github.com/fractal-analytics-platform/fractal-server/issues/2682
+
+        Args:
+            exception: The exception raised by `self.run_squeue`.
+        Returns:
+            Whether the error is considered recoverable.
+        """
+        str_exception = str(exception)
+        if (
+            "slurm_load_jobs" in str_exception
+            and "Socket timed out on send/recv operation" in str_exception
+        ):
+            return True
+        else:
+            return False
+
     def _get_finished_jobs(self, job_ids: list[str]) -> set[str]:
         #  If there is no Slurm job to check, return right away
         if not job_ids:
@@ -161,12 +189,26 @@ class BaseSlurmRunner(BaseRunner):
                         {stdout.split()[0]: stdout.split()[1]}
                     )
                 except Exception as e:
-                    logger.warning(
-                        "[_get_finished_jobs] `squeue` failed for "
-                        f"{job_id=}, mark job as completed. "
+                    msg = (
+                        f"[_get_finished_jobs] `squeue` failed for {job_id=}. "
                         f"Original error: {str(e)}."
                     )
-                    slurm_statuses.update({str(job_id): "COMPLETED"})
+                    logger.warning(msg)
+                    if self._is_squeue_error_recoverable(e):
+                        logger.warning(
+                            "[_get_finished_jobs] Recoverable `squeue` "
+                            f"error - mark {job_id=} as FRACTAL_UNDEFINED and"
+                            " retry later."
+                        )
+                        slurm_statuses.update(
+                            {str(job_id): "FRACTAL_UNDEFINED"}
+                        )
+                    else:
+                        logger.warning(
+                            "[_get_finished_jobs] Non-recoverable `squeue`"
+                            f"error - mark {job_id=} as completed."
+                        )
+                        slurm_statuses.update({str(job_id): "COMPLETED"})
 
         # If a job is not in `squeue` output, mark it as completed.
         finished_jobs = {
@@ -182,33 +224,53 @@ class BaseSlurmRunner(BaseRunner):
     def _mkdir_remote_folder(self, folder: str) -> None:
         raise NotImplementedError("Implement in child class.")
 
-    def _submit_single_sbatch(
+    def _enrich_slurm_config(
         self,
-        *,
-        base_command: str,
-        slurm_job: SlurmJob,
         slurm_config: SlurmConfig,
-    ) -> str:
-        logger.debug("[_submit_single_sbatch] START")
+    ) -> SlurmConfig:
+        """
+        Return an enriched `SlurmConfig` object
 
-        # Include SLURM account in `slurm_config`. Note: we make this change
-        # here, rather than exposing a new argument of `get_slurm_config`,
-        # because it's a backend-specific argument while `get_slurm_config` has
-        # a generic interface.
+        Include `self.account` and `self.common_script_lines` into a
+        `SlurmConfig` object. Extracting this logic into an independent
+        class method is useful to fix issue #2659 (which was due to
+        performing this same operation multiple times rather than once).
+
+        Args:
+            slurm_config: The original `SlurmConfig` object.
+
+        Returns:
+            A new, up-to-date, `SlurmConfig` object.
+        """
+
+        new_slurm_config = slurm_config.model_copy()
+
+        # Include SLURM account in `slurm_config`.
         if self.slurm_account is not None:
-            slurm_config.account = self.slurm_account
+            new_slurm_config.account = self.slurm_account
 
         # Include common_script_lines in extra_lines
         if len(self.common_script_lines) > 0:
             logger.debug(
                 f"Add {self.common_script_lines} to "
-                f"{slurm_config.extra_lines=}."
+                f"{new_slurm_config.extra_lines=}."
             )
-            current_extra_lines = slurm_config.extra_lines or []
-            slurm_config.extra_lines = (
+            current_extra_lines = new_slurm_config.extra_lines or []
+            new_slurm_config.extra_lines = (
                 current_extra_lines + self.common_script_lines
             )
 
+        return new_slurm_config
+
+    def _submit_single_sbatch(
+        self,
+        *,
+        base_command: str,
+        slurm_job: SlurmJob,
+        slurm_config: SlurmConfig,
+    ) -> str:
+        logger.debug("[_submit_single_sbatch] START")
+
         for task in slurm_job.tasks:
             # Write input file
             if self.slurm_runner_type == "ssh":
@@ -508,6 +570,9 @@ class BaseSlurmRunner(BaseRunner):
         user_id: int,
     ) -> tuple[Any, Exception]:
         logger.debug("[submit] START")
+
+        config = self._enrich_slurm_config(config)
+
         try:
             workdir_local = task_files.wftask_subfolder_local
             workdir_remote = task_files.wftask_subfolder_remote
@@ -649,6 +714,8 @@ class BaseSlurmRunner(BaseRunner):
         input images, while for compound tasks these can differ.
         """
 
+        config = self._enrich_slurm_config(config)
+
         logger.debug(f"[multisubmit] START, {len(list_parameters)=}")
         try:
             if self.is_shutdown():

fractal_server/app/runner/executors/slurm_common/get_slurm_config.py

@@ -125,7 +125,14 @@ def get_slurm_config_internal(
             )
             logger.error(error_msg)
             raise SlurmConfigError(error_msg)
-        for key in ["time", "gres", "gpus", "constraint"]:
+        for key in [
+            "time",
+            "gres",
+            "gpus",
+            "constraint",
+            "nodelist",
+            "exclude",
+        ]:
             value = wftask_meta.get(key, None)
             if value is not None:
                 slurm_dict[key] = value

fractal_server/app/runner/executors/slurm_common/remote.py

@@ -1,6 +1,5 @@
 import argparse
 import json
-import logging
 import os
 import sys
 
@@ -32,7 +31,6 @@ def worker(
     # Create output folder, if missing
     out_dir = os.path.dirname(out_fname)
     if not os.path.exists(out_dir):
-        logging.debug(f"_slurm.remote.worker: create {out_dir=}")
         os.mkdir(out_dir)
 
     # Execute the job and capture exceptions
@@ -40,10 +38,8 @@ def worker(
         with open(in_fname) as f:
             input_data = json.load(f)
 
-        server_python_version = input_data["python_version"]
-        server_fractal_server_version = input_data["fractal_server_version"]
-
         # Fractal-server version must be identical
+        server_fractal_server_version = input_data["fractal_server_version"]
         worker_fractal_server_version = __VERSION__
         if worker_fractal_server_version != server_fractal_server_version:
             raise FractalVersionMismatch(
@@ -51,11 +47,16 @@ def worker(
                 f"{worker_fractal_server_version=}"
             )
 
-        # Python version mismatch only raises a warning
-        worker_python_version = tuple(sys.version_info[:3])
+        # Get `worker_python_version` as a `list` since this is the type of
+        # `server_python_version` after a JSON dump/load round trip.
+        worker_python_version = list(sys.version_info[:3])
+
+        # Print a warning for Python version mismatch
+        server_python_version = input_data["python_version"]
         if worker_python_version != server_python_version:
             if worker_python_version[:2] != server_python_version[:2]:
-                logging.warning(
+                print(
+                    "WARNING: "
                     f"{server_python_version=} but {worker_python_version=}."
                 )
 
@@ -116,7 +117,6 @@ if __name__ == "__main__":
         required=True,
     )
     parsed_args = parser.parse_args()
-    logging.debug(f"{parsed_args=}")
 
     kwargs = dict(
         in_fname=parsed_args.input_file,

fractal_server/app/runner/v2/_slurm_ssh.py

@@ -20,7 +20,6 @@ from pathlib import Path
 from ....ssh._fabric import FractalSSH
 from ...models.v2 import DatasetV2
 from ...models.v2 import WorkflowV2
-from ..exceptions import JobExecutionError
 from ..executors.slurm_common.get_slurm_config import get_slurm_config
 from ..executors.slurm_ssh.runner import SlurmSSHRunner
 from ..set_start_and_last_task_index import set_start_and_last_task_index
@@ -64,18 +63,6 @@ def process_workflow(
     if isinstance(worker_init, str):
         worker_init = worker_init.split("\n")
 
-    # Create main remote folder
-    try:
-        fractal_ssh.mkdir(folder=str(workflow_dir_remote))
-        logger.info(f"Created {str(workflow_dir_remote)} via SSH.")
-    except Exception as e:
-        error_msg = (
-            f"Could not create {str(workflow_dir_remote)} via SSH.\n"
-            f"Original error: {str(e)}."
-        )
-        logger.error(error_msg)
-        raise JobExecutionError(info=error_msg)
-
     with SlurmSSHRunner(
         fractal_ssh=fractal_ssh,
         root_dir_local=workflow_dir_local,

fractal_server/migrations/versions/b3ffb095f973_json_to_jsonb.py

@@ -0,0 +1,264 @@
+"""JSON to JSONB
+
+Revision ID: b3ffb095f973
+Revises: b1e7f7a1ff71
+Create Date: 2025-06-19 10:12:06.699107
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "b3ffb095f973"
+down_revision = "b1e7f7a1ff71"
+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.alter_column(
+            "history",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+        batch_op.alter_column(
+            "images",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+
+    with op.batch_alter_table("jobv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "dataset_dump",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+        )
+        batch_op.alter_column(
+            "workflow_dump",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+        )
+        batch_op.alter_column(
+            "project_dump",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+        )
+        batch_op.alter_column(
+            "attribute_filters",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'{}'::json"),
+        )
+        batch_op.alter_column(
+            "type_filters",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'{}'::json"),
+        )
+
+    with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "pinned_package_versions",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=True,
+            existing_server_default=sa.text("'{}'::json"),
+        )
+
+    with op.batch_alter_table("taskv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "input_types",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=True,
+        )
+        batch_op.alter_column(
+            "output_types",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=True,
+        )
+        batch_op.alter_column(
+            "tags",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+
+    with op.batch_alter_table("user_settings", schema=None) as batch_op:
+        batch_op.alter_column(
+            "slurm_accounts",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+
+    with op.batch_alter_table("usergroup", schema=None) as batch_op:
+        batch_op.alter_column(
+            "viewer_paths",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+
+    with op.batch_alter_table("workflowtaskv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "args_parallel",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=True,
+        )
+        batch_op.alter_column(
+            "args_non_parallel",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=True,
+        )
+        batch_op.alter_column(
+            "type_filters",
+            existing_type=postgresql.JSON(astext_type=sa.Text()),
+            type_=postgresql.JSONB(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'{}'::json"),
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("workflowtaskv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "type_filters",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'{}'::json"),
+        )
+        batch_op.alter_column(
+            "args_non_parallel",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=True,
+        )
+        batch_op.alter_column(
+            "args_parallel",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=True,
+        )
+
+    with op.batch_alter_table("usergroup", schema=None) as batch_op:
+        batch_op.alter_column(
+            "viewer_paths",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+
+    with op.batch_alter_table("user_settings", schema=None) as batch_op:
+        batch_op.alter_column(
+            "slurm_accounts",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+
+    with op.batch_alter_table("taskv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "tags",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+        batch_op.alter_column(
+            "output_types",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=True,
+        )
+        batch_op.alter_column(
+            "input_types",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=True,
+        )
+
+    with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "pinned_package_versions",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=True,
+            existing_server_default=sa.text("'{}'::json"),
+        )
+
+    with op.batch_alter_table("jobv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "type_filters",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'{}'::json"),
+        )
+        batch_op.alter_column(
+            "attribute_filters",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'{}'::json"),
+        )
+        batch_op.alter_column(
+            "project_dump",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+        )
+        batch_op.alter_column(
+            "workflow_dump",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+        )
+        batch_op.alter_column(
+            "dataset_dump",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+        )
+
+    with op.batch_alter_table("datasetv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "images",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+        batch_op.alter_column(
+            "history",
+            existing_type=postgresql.JSONB(astext_type=sa.Text()),
+            type_=postgresql.JSON(astext_type=sa.Text()),
+            existing_nullable=False,
+            existing_server_default=sa.text("'[]'::json"),
+        )
+
+    # ### end Alembic commands ###

fractal_server/ssh/_fabric.py

@@ -165,7 +165,11 @@ class FractalSSH:
         raise e
 
     def _run(
-        self, *args, label: str, lock_timeout: float | None = None, **kwargs
+        self,
+        *args,
+        label: str,
+        lock_timeout: float | None = None,
+        **kwargs,
     ) -> Any:
         actual_lock_timeout = self.default_lock_timeout
         if lock_timeout is not None:
@@ -353,6 +357,7 @@ class FractalSSH:
                     label=f"run {cmd}",
                     lock_timeout=actual_lock_timeout,
                     hide=True,
+                    in_stream=False,
                 )
                 t_1 = time.perf_counter()
                 self.logger.info(

fractal_server/tasks/v2/local/collect_pixi.py

@@ -161,7 +161,7 @@ def collect_local_pixi(
 
                 # Make task folder 755
                 source_dir = Path(task_group.path, SOURCE_DIR_NAME).as_posix()
-                command = f"chmod 755 {source_dir} -R"
+                command = f"chmod -R 755 {source_dir}"
                 execute_command_sync(
                     command=command,
                     logger_name=LOGGER_NAME,

fractal_server/tasks/v2/local/reactivate_pixi.py

@@ -145,7 +145,7 @@ def reactivate_local_pixi(
 
                 # Make task folder 755
                 source_dir = Path(task_group.path, SOURCE_DIR_NAME).as_posix()
-                command = f"chmod 755 {source_dir} -R"
+                command = f"chmod -R 755 {source_dir}"
                 execute_command_sync(
                     command=command,
                     logger_name=LOGGER_NAME,

fractal_server/tasks/v2/ssh/collect_pixi.py

@@ -182,19 +182,21 @@ def collect_ssh_pixi(
                     )
 
                     # Run the three pixi-related scripts
-                    _customize_and_run_template(
+                    stdout = _customize_and_run_template(
                         template_filename="pixi_1_extract.sh",
                         replacements=replacements,
                         **common_args,
                     )
+                    logger.debug(f"STDOUT: {stdout}")
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
-                    _customize_and_run_template(
+                    stdout = _customize_and_run_template(
                         template_filename="pixi_2_install.sh",
                         replacements=replacements,
                         **common_args,
                     )
+                    logger.debug(f"STDOUT: {stdout}")
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
@@ -203,6 +205,7 @@ def collect_ssh_pixi(
                         replacements=replacements,
                         **common_args,
                     )
+                    logger.debug(f"STDOUT: {stdout}")
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
@@ -218,7 +221,7 @@ def collect_ssh_pixi(
                     source_dir = Path(
                         task_group.path, SOURCE_DIR_NAME
                     ).as_posix()
-                    fractal_ssh.run_command(cmd=f"chmod 755 {source_dir} -R")
+                    fractal_ssh.run_command(cmd=f"chmod -R 755 {source_dir}")
 
                     # Read and validate remote manifest file
                     manifest_path_remote = (

fractal_server/tasks/v2/ssh/reactivate_pixi.py

@@ -152,11 +152,12 @@ def reactivate_ssh_pixi(
                     )
 
                     # Run script 1 - extract tar.gz into `source_dir`
-                    _customize_and_run_template(
+                    stdout = _customize_and_run_template(
                         template_filename="pixi_1_extract.sh",
                         replacements=replacements,
                         **common_args,
                     )
+                    logger.debug(f"STDOUT: {stdout}")
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
@@ -176,24 +177,26 @@ def reactivate_ssh_pixi(
                     )
 
                     # Run script 2 - run pixi-install command
-                    _customize_and_run_template(
+                    stdout = _customize_and_run_template(
                         template_filename="pixi_2_install.sh",
                         replacements=replacements,
                         **common_args,
                     )
+                    logger.debug(f"STDOUT: {stdout}")
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
                     # Run script 3 - post-install
-                    _customize_and_run_template(
+                    stdout = _customize_and_run_template(
                         template_filename="pixi_3_post_install.sh",
                         replacements=replacements,
                         **common_args,
                     )
+                    logger.debug(f"STDOUT: {stdout}")
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
-                    fractal_ssh.run_command(cmd=f"chmod 755 {source_dir} -R")
+                    fractal_ssh.run_command(cmd=f"chmod -R 755 {source_dir}")
 
                     # Finalize (write metadata to DB)
                     activity.status = TaskGroupActivityStatusV2.OK

fractal_server/tasks/v2/templates/pixi_1_extract.sh

@@ -2,7 +2,7 @@ set -e
 
 write_log(){
     TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-    echo "[collect-task-pixi, ${TIMESTAMP}] ${1}"
+    echo "[extract-tar-gz-pixi, ${TIMESTAMP}] ${1}"
 }
 
 # Replacements

fractal_server/tasks/v2/templates/pixi_2_install.sh

@@ -2,7 +2,7 @@ set -e
 
 write_log(){
     TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-    echo "[collect-task-pixi, ${TIMESTAMP}] ${1}"
+    echo "[install-tasks-pixi, ${TIMESTAMP}] ${1}"
 }
 
 # Replacements
@@ -31,7 +31,7 @@ export TOKIO_WORKER_THREADS="${TOKIO_WORKER_THREADS}"
 
 TIME_START=$(date +%s)
 
-echo "Hostname: $(hostname)"
+write_log "Hostname: $(hostname)"
 
 cd "${PACKAGE_DIR}"
 write_log "Changed working directory to ${PACKAGE_DIR}"

fractal_server/tasks/v2/templates/pixi_3_post_install.sh

@@ -2,7 +2,7 @@ set -e
 
 write_log(){
     TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-    echo "[collect-task-pixi, ${TIMESTAMP}] ${1}"
+    echo "[after-install-pixi, ${TIMESTAMP}] ${1}"
 }
 
 # Replacements

{fractal_server-2.15.0a5.dist-info → fractal_server-2.15.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.15.0a5
+Version: 2.15.2
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin

{fractal_server-2.15.0a5.dist-info → fractal_server-2.15.2.dist-info}/RECORD

@@ -1,36 +1,36 @@
-fractal_server/__init__.py,sha256=EiSBiIGr3J4HykWpwvOxbtsBmNSbQnrB9Kqpelw5XWA,25
+fractal_server/__init__.py,sha256=3aUOEwrozdEb6uIH3H2d1pXz5bTLTWOObIlVGVMgxVc,23
 fractal_server/__main__.py,sha256=rkM8xjY1KeS3l63irB8yCrlVobR-73uDapC4wvrIlxI,6957
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/db/__init__.py,sha256=EFzcf6iKemWlOSRj4vtDT63hAE9HBYWh4abYOdDwzMo,2907
+fractal_server/app/db/__init__.py,sha256=U2gwpNyy79iMsK1lg43LRl9z-MW8wiOaICJ7GGdA4yo,2814
 fractal_server/app/models/__init__.py,sha256=xJWiGAwpXmCpnFMC4c_HTqoUCzMOXrakoGLUH_uMvdA,415
 fractal_server/app/models/linkusergroup.py,sha256=3KkkE4QIUAlTrBAZs_tVy0pGvAxUAq6yOEjflct_z2M,678
 fractal_server/app/models/linkuserproject.py,sha256=hvaxh3Lkiy2uUCwB8gvn8RorCpvxSSdzWdCS_U1GL7g,315
-fractal_server/app/models/security.py,sha256=PVZ3nTZO3TYpOTLiMARNy2mHAET49i6nE7bKxn1H-vQ,3836
-fractal_server/app/models/user_settings.py,sha256=RxzRBGLHF_wc5csrTeHGUSV77Md_X0Lf-SnYVOsEWHc,1263
+fractal_server/app/models/security.py,sha256=NfR0I4dRbOEmCWOKeEHyFO-uqhSJ11dS0B6yWtZRqs4,3852
+fractal_server/app/models/user_settings.py,sha256=WdnrLOP2w8Nqh_3K-4-b-8a7XEC9ILrE6SfbYoTk-7Y,1279
 fractal_server/app/models/v2/__init__.py,sha256=vjHwek7-IXmaZZL9VF0nD30YL9ca4wNc8P4RXJK_kDc,832
 fractal_server/app/models/v2/accounting.py,sha256=i-2TsjqyuclxFQ21C-TeDoss7ZBTRuXdzIJfVr2UxwE,1081
-fractal_server/app/models/v2/dataset.py,sha256=B_bPnYCSLRFN-vBIOc5nJ31JTruQPxLda9mqpPIJmGk,1209
+fractal_server/app/models/v2/dataset.py,sha256=P_zy4dPQAqrCALQ6737VkAFk1SvcgYjnslGUZhPI8sc,1226
 fractal_server/app/models/v2/history.py,sha256=CBN2WVg9vW5pHU1RP8TkB_nnJrwnuifCcxgnd53UtEE,2163
-fractal_server/app/models/v2/job.py,sha256=LfpwAedMVcA_6Ne0Rr4g3tt0asAQkWz3LSPm7IwZhYc,1978
+fractal_server/app/models/v2/job.py,sha256=e3Un_rUgWC-KazGLDQqy17NQK_2ZsL3EmEmDAky_bN0,1998
 fractal_server/app/models/v2/project.py,sha256=RmU5BQR4HD6xifRndUhvPBy30wntml-giBRoEysdWXw,755
-fractal_server/app/models/v2/task.py,sha256=P7nsS5mCmVyzr4WtcjoiedesqkWvkHA2cQPsMbQt-7o,1427
-fractal_server/app/models/v2/task_group.py,sha256=Q78ommMWEG2Sqvg2Y8ICgYA_aGH-N7LdLbnmnDl1l1M,3841
+fractal_server/app/models/v2/task.py,sha256=iBIQB8POQE5MyKvLZhw7jZWlBhbrThzCDzRTcgiAczQ,1493
+fractal_server/app/models/v2/task_group.py,sha256=1cn14RKKOOCCjh42iaT-HyuRrRpCPcYhWRrlMK-Enwc,3857
 fractal_server/app/models/v2/workflow.py,sha256=wuK9SV1TXrlYcieYLYj5fGvV3K3bW7g9jCM1uv9HHjA,1058
-fractal_server/app/models/v2/workflowtask.py,sha256=tph237DXitOnzSv88rk9qgN2VmlI1smWS5fNYHR8jMo,1200
+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=_5lqb6-M8-fZqE1HRMep6pAFYRUKMxrvbZOKs-RXWkw,933
 fractal_server/app/routes/admin/v2/accounting.py,sha256=YPWwCWylXrJpV4bq_dJ3t6Kn5uuveTrFx-5w1wzfETU,3594
 fractal_server/app/routes/admin/v2/impersonate.py,sha256=gc4lshfEPFR6W2asH7aKu6hqE6chzusdhAUVV9p51eU,1131
-fractal_server/app/routes/admin/v2/job.py,sha256=EOnW645RaacyNof55O_NV_4ONyb7ihM9ORTPb0v68xY,7373
+fractal_server/app/routes/admin/v2/job.py,sha256=VcyXHYjieOKnTAi1NsiO_bK3A6UufUwX2lmWCwa4sa0,7585
 fractal_server/app/routes/admin/v2/project.py,sha256=MA_LdoEuSuisSGRO43TapMuJ080y5iaUGSAUgKuuKOg,1188
 fractal_server/app/routes/admin/v2/task.py,sha256=93QIbWZNnqaBhG9R9-RStDX2mpqRNN3G7BIb0KM-jeE,4312
 fractal_server/app/routes/admin/v2/task_group.py,sha256=biibAvMPD2w-267eyTm3wH2s3mITjiS5gYzwCCwmLbI,7099
 fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=2J3M9VXWD_0j9jRTZ5APuUXl9E-aVv0qF8K02vvcO3s,9150
 fractal_server/app/routes/api/__init__.py,sha256=B8l6PSAhR10iZqHEiyTat-_0tkeKdrCigIE6DJGP5b8,638
 fractal_server/app/routes/api/v2/__init__.py,sha256=D3sRRsqkmZO6kBxUjg40q0aRDsnuXI4sOOfn0xF9JsM,2820
-fractal_server/app/routes/api/v2/_aux_functions.py,sha256=P5exwdiNm0ZxtoGw4wxvm_-u8e83gXz8iYEVFuUq_cU,12792
+fractal_server/app/routes/api/v2/_aux_functions.py,sha256=oavMb8HM4lWKMW7_Iyx8Sc9AHKpbmFyyqcPqQLstP_I,13192
 fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=Z23xwvBaVEEQ5B-JsWZJpjj4_QqoXqHYONztnbAH6gw,4425
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=GpKfw9yj01LmOAuNMTOreU1PFkCKpjK5oCt7_wp35-A,6741
 fractal_server/app/routes/api/v2/_aux_functions_task_version_update.py,sha256=WLDOYCnb6fnS5avKflyx6yN24Vo1n5kJk5ZyiKbzb8Y,1175
@@ -51,9 +51,9 @@ fractal_server/app/routes/api/v2/task_collection_pixi.py,sha256=LS5xOYRRvI25TyvP
 fractal_server/app/routes/api/v2/task_group.py,sha256=Wmp5Rt6NQm8_EbdJyi3XOkTXxJTTd4MNIy0ja6K-ifA,9205
 fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=-uS_z8E3__t_twEqhZOzcEcAxZsgnpg-c7Ya9RF3_bs,9998
 fractal_server/app/routes/api/v2/task_version_update.py,sha256=o8W_C0I84X0u8gAMnCvi8ChiVAKrb5WzUBuJLSuujCA,8235
-fractal_server/app/routes/api/v2/workflow.py,sha256=gwMtpfUY_JiTv5_R_q1I9WNkp6nTqEVtYx8jWNJRxcU,10227
+fractal_server/app/routes/api/v2/workflow.py,sha256=SfjegoVO4DaGmDD7OPhWNLkcvZhJKwNX4DTQAcVKk9Q,10699
 fractal_server/app/routes/api/v2/workflow_import.py,sha256=kOGDaCj0jCGK1WSYGbnUjtUg2U1YxUY9UMH-2ilqJg4,9027
-fractal_server/app/routes/api/v2/workflowtask.py,sha256=KQU9rSQNhc6TRFdUYM09zty8Bu150sKvcLGz_tX4Fgo,7548
+fractal_server/app/routes/api/v2/workflowtask.py,sha256=5_SQAG8ztDnaaRXwKalcO69HVpSl-QbrhiI7fCP3YRI,7924
 fractal_server/app/routes/auth/__init__.py,sha256=fao6CS0WiAjHDTvBzgBVV_bSXFpEAeDBF6Z6q7rRkPc,1658
 fractal_server/app/routes/auth/_aux_auth.py,sha256=UZgauY0V6mSqjte_sYI1cBl2h8bcbLaeWzgpl1jdJlk,4883
 fractal_server/app/routes/auth/current_user.py,sha256=EjkwMxUA0l6FLbDJdertHGnuOoSS-HEysmm6l5FkAlY,5903
@@ -80,10 +80,10 @@ fractal_server/app/runner/executors/local/runner.py,sha256=DZK_oVxjIewyo7tjB7HvT
 fractal_server/app/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_common/_batching.py,sha256=gbHZIxt90GjUwhB9_UInwVqpX-KdxRQMDeXzUagdL3U,8816
 fractal_server/app/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
-fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=Zv2l_6X1EfSHGRqcBMj2dbai_kP8hfuMfh-WoIUj0tY,15646
-fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=2F2zgg3DJKAJ5LecFAzMSGLFmsMiM4lMk4Kh9It35F4,35626
-fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=VJNryceLzF5_fx9_lS1nGq85EW8rOQ0KrgtMATcfdQc,7271
-fractal_server/app/runner/executors/slurm_common/remote.py,sha256=xWnI6WktHR_7cxUme72ztIeBb4osnbZNu6J2azWn9K8,3765
+fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=U9BONnnwn8eDqDevwUtFSBcvIsxvNgDHirhcQGJ9t9E,15947
+fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=1Sh56lb7NERVtsBMvVs4K7nVHhMy_KDbwquPl1ub8vE,37937
+fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=jhoFHauWJm55bIC_v7pFylbK8WgcRJemGu2OjUiRbpQ,7377
+fractal_server/app/runner/executors/slurm_common/remote.py,sha256=LHK2Ram8X8q6jNSCxnnwKUwmSJMsyQyRem_VjH53qdw,3811
 fractal_server/app/runner/executors/slurm_common/slurm_job_task_models.py,sha256=K4SdJOKsUWzDlnkb8Ug_UmTx6nBMsTqn9_oKqwE4XDI,3520
 fractal_server/app/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_ssh/run_subprocess.py,sha256=SyW6t4egvbiARph2YkFjc88Hj94fCamZVi50L7ph8VM,996
@@ -98,7 +98,7 @@ fractal_server/app/runner/shutdown.py,sha256=ViSNJyXWU_iWPSDOOMGNh_iQdUFrdPh_jvf
 fractal_server/app/runner/task_files.py,sha256=V_7aZhu6-c6Y-0XUe-5cZVDrdnXEJhp8pQoUMtx6ko0,4041
 fractal_server/app/runner/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/v2/_local.py,sha256=tTJgABK-zAZmmRzoie_MPNTXJx_zBAXiZiiWl1CC2qo,3035
-fractal_server/app/runner/v2/_slurm_ssh.py,sha256=VN89sFwqi139m9wpO1LmExIYIVhmYbEoMgtX7kLAMhE,3302
+fractal_server/app/runner/v2/_slurm_ssh.py,sha256=JlDngsVSOUNqEubDl-5jkIxQQmV4mhTqbMbJVY_rL6M,2840
 fractal_server/app/runner/v2/_slurm_sudo.py,sha256=Gvsh4tUlc1_3KdF3B7zEqs-YIntC_joLtTGSNFbKKSs,2939
 fractal_server/app/runner/v2/db_tools.py,sha256=du5dKhMMFMErQXbGIgu9JvO_vtMensodyPsyDeqz1yQ,3324
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=IVTE4abBU1bUprFTkxrTfYKnvkNTanWQ-KWh_etiT08,645
@@ -171,6 +171,7 @@ fractal_server/migrations/versions/a7f4d6137b53_add_workflow_dump_to_applyworkfl
 fractal_server/migrations/versions/af1ef1c83c9b_add_accounting_tables.py,sha256=BftudWuSGvKGBzIL5AMb3yWkgTAuaKPBGsYcOzp_gLQ,1899
 fractal_server/migrations/versions/af8673379a5c_drop_old_filter_columns.py,sha256=9sLd0F7nO5chHHm7RZ4wBA-9bvWomS-av_odKwODADM,1551
 fractal_server/migrations/versions/b1e7f7a1ff71_task_group_for_pixi.py,sha256=loDrqBB-9U3vqLKePEeJy4gK4EuPs_1F345mdrnoCt0,1293
+fractal_server/migrations/versions/b3ffb095f973_json_to_jsonb.py,sha256=Q01lPlBNQgi3hpoUquWj2QUEF7cTsyQ7uikUhWunzWY,10035
 fractal_server/migrations/versions/c90a7c76e996_job_id_in_history_run.py,sha256=Y1cPwmFOZ4mx3v2XZM6adgu8u0L0VD_R4ADURyMb2ro,1102
 fractal_server/migrations/versions/d256a7379ab8_taskgroup_activity_and_venv_info_to_.py,sha256=HN3_Pk8G81SzdYjg4K1RZAyjKSlsZGvcYE2nWOUbwxQ,3861
 fractal_server/migrations/versions/d4fe3708d309_make_applyworkflow_workflow_dump_non_.py,sha256=6cHEZFuTXiQg9yu32Y3RH1XAl71av141WQ6UMbiITIg,949
@@ -184,7 +185,7 @@ fractal_server/migrations/versions/f384e1c0cf5d_drop_task_default_args_columns.p
 fractal_server/migrations/versions/fbce16ff4e47_new_history_items.py,sha256=TDWCaIoM0Q4SpRWmR9zr_rdp3lJXhCfBPTMhtrP5xYE,3950
 fractal_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/ssh/__init__.py,sha256=sVUmzxf7_DuXG1xoLQ1_00fo5NPhi2LJipSmU5EAkPs,124
-fractal_server/ssh/_fabric.py,sha256=3Q0nlXctEXtRspQvg00wzCOyYK-0fAJlCowQuXEMk9I,25118
+fractal_server/ssh/_fabric.py,sha256=7fCxTYqkAOaTTm67trfYdYQenOsI4EfrRQoG6x3M5kk,25188
 fractal_server/string_tools.py,sha256=qLB5u6-4QxXPiZrUeWn_cEo47axj4OXFzDd47kNTIWw,1847
 fractal_server/syringe.py,sha256=3YJeIALH-wibuJ9R5VMNYUWh7x1-MkWT0SqGcWG5MY8,2795
 fractal_server/tasks/__init__.py,sha256=kadmVUoIghl8s190_Tt-8f-WBqMi8u8oU4Pvw39NHE8,23
@@ -193,28 +194,28 @@ fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 fractal_server/tasks/v2/local/__init__.py,sha256=S842wRersYKBKjc7xbmj0ov8b5i1YuCHa2f_yYuxcaI,312
 fractal_server/tasks/v2/local/_utils.py,sha256=p2KJ4BvEwJxahICpzbvzrc5-ciLCFnLXWPCwdNGi-3Q,2495
 fractal_server/tasks/v2/local/collect.py,sha256=MQncScKbWv3g9lrjF8WOhzuEoTEOOgS02RqOJno5csI,11897
-fractal_server/tasks/v2/local/collect_pixi.py,sha256=i24MS7yxV0_sHkZJ8rd148n8TGqCPo6Zob5LPks3odk,10753
+fractal_server/tasks/v2/local/collect_pixi.py,sha256=coV9SqOf5rz2dgUFG7uVisPFS0xvXEubFwU7rb3QHe8,10753
 fractal_server/tasks/v2/local/deactivate.py,sha256=LoEs2TUoHQOq3JfxufW6zroXD-Xx_b-hLtdigEBi1JU,9732
 fractal_server/tasks/v2/local/deactivate_pixi.py,sha256=_ycvnLIZ8zUFB3fZbCzDlNudh-SSetl4UkyFrClCcUU,3494
 fractal_server/tasks/v2/local/reactivate.py,sha256=Q43DOadNeFyyfgNP67lUqaXmZsS6onv67XwxH_-5ANA,5756
-fractal_server/tasks/v2/local/reactivate_pixi.py,sha256=wF_3gcMWO_8ArJFo4iYh-51LDZDF_1OuYYHrY9eUSL8,7320
+fractal_server/tasks/v2/local/reactivate_pixi.py,sha256=X1gdeuFGPtohjWEZ7OX2v8m6aI7Z93M-y64FqtYjApg,7320
 fractal_server/tasks/v2/ssh/__init__.py,sha256=vX5aIM9Hbn2T_cIP_LrZ5ekRqJzYm_GSfp-4Iv7kqeI,300
 fractal_server/tasks/v2/ssh/_utils.py,sha256=ktVH7psQSAhh353fVUe-BwiBZHzTdgXnR-Xv_vfuX0Y,3857
 fractal_server/tasks/v2/ssh/collect.py,sha256=M9gFD1h9Q1Z-BFQq65dI0vFs6HPCkKQzOkxaLddmChY,14334
-fractal_server/tasks/v2/ssh/collect_pixi.py,sha256=g-dwkVbzV_4dMXAU8Ej_HmgivHmyq7p9sSOfDXNJhR4,13621
+fractal_server/tasks/v2/ssh/collect_pixi.py,sha256=MYxHY5P69P7DdM4uC8FAsAoQBuqr8UJdDti0CPHAn_U,13801
 fractal_server/tasks/v2/ssh/deactivate.py,sha256=XAIy84cLT9MSTMiN67U-wfOjxMm5s7lmrGwhW0qp7BU,12439
 fractal_server/tasks/v2/ssh/deactivate_pixi.py,sha256=K0yK_NPUqhFMj6cp6G_0Kfn0Yo7oQux4kT5dFPulnos,4748
 fractal_server/tasks/v2/ssh/reactivate.py,sha256=NJIgMNFKaXMhbvK0iZOsMwMtsms6Boj9f8N4L01X9Bo,8271
-fractal_server/tasks/v2/ssh/reactivate_pixi.py,sha256=QNlY0cqZvQblsl0eAbKBPBs_QAkN0G233Hy58PpWHxs,9595
+fractal_server/tasks/v2/ssh/reactivate_pixi.py,sha256=Vay6kfsrc5XKx2WJVTu_pLhgpuHZDdnrEB6Er8XchYo,9784
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
 fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=jMJPQJXHKznO6fxOOXtFXKPdCmTf1VLLWj_JL_ZdKxo,1644
 fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V4aI-FnX9ZvVNxgpSOBFc,168
 fractal_server/tasks/v2/templates/4_pip_show.sh,sha256=qm1vPy6AkKhWDjCJGXS8LqCLYO3KsAyRK325ZsFcF6U,1747
 fractal_server/tasks/v2/templates/5_get_venv_size_and_file_number.sh,sha256=q-6ZUvA6w6FDVEoSd9O63LaJ9tKZc7qAFH72SGPrd_k,284
 fractal_server/tasks/v2/templates/6_pip_install_from_freeze.sh,sha256=A2y8RngEjAcRhG-_owA6P7tAdrS_AszFuGXnaeMV8u0,1122
-fractal_server/tasks/v2/templates/pixi_1_extract.sh,sha256=1Z6sd_fTzqQkOfbFswaPZBNLUyv-OrS4euGlcoi8ces,1097
-fractal_server/tasks/v2/templates/pixi_2_install.sh,sha256=BkINfTU34vZ_zCyg_CIDEWvlAME3p6kF1qmxs4UAkPw,1595
-fractal_server/tasks/v2/templates/pixi_3_post_install.sh,sha256=uDCdjXpBMsQcexZ4pvZn3ctJenM4QMsazsWMf5aw7eA,2500
+fractal_server/tasks/v2/templates/pixi_1_extract.sh,sha256=Jdy5OyKo2jxe_qIDB9Zi4a0FL0cMBysxvBPHlUrARQM,1099
+fractal_server/tasks/v2/templates/pixi_2_install.sh,sha256=h6-M101Q1AdAfZNZyPfSUc8AlZ-uS84Hae4vJdDSglY,1601
+fractal_server/tasks/v2/templates/pixi_3_post_install.sh,sha256=99J8KXkNeQk9utuEtUxfAZS6VCThC32X7I7HAp2gdTU,2501
 fractal_server/tasks/v2/utils_background.py,sha256=_4wGETgZ3JdnJXLYKSI0Lns8LwokJL-NEzUOK5SxCJU,4811
 fractal_server/tasks/v2/utils_database.py,sha256=yi7793Uue32O59OBVUgomO42oUrVKdSKXoShBUNDdK0,1807
 fractal_server/tasks/v2/utils_package_names.py,sha256=RDg__xrvQs4ieeVzmVdMcEh95vGQYrv9Hfal-5EDBM8,2393
@@ -229,8 +230,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=Vn35lApt1T1J8nc09sAVqd10Cy0sa3dLipcljI-hkuk,2185
 fractal_server/zip_tools.py,sha256=tqz_8f-vQ9OBRW-4OQfO6xxY-YInHTyHmZxU7U4PqZo,4885
-fractal_server-2.15.0a5.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.15.0a5.dist-info/METADATA,sha256=ItBnov8ODJ4zuzUPJQXjBLs6H5SviOLZ5K6nw1Lfjmw,4245
-fractal_server-2.15.0a5.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.15.0a5.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.15.0a5.dist-info/RECORD,,
+fractal_server-2.15.2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.15.2.dist-info/METADATA,sha256=ey4BDGRNNq1SLK-pmXThhvEbXwbgyB2jWyTOI3ADuC4,4243
+fractal_server-2.15.2.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.15.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.15.2.dist-info/RECORD,,