fractal-server 2.18.1__py3-none-any.whl → 2.18.3__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.18.1"
+__VERSION__ = "2.18.3"

fractal_server/app/models/v2/task_group.py

@@ -71,8 +71,6 @@ class TaskGroupV2(SQLModel, table=True):
     )
     env_info: str | None = None
     venv_path: str | None = None
-    venv_size_in_kB: int | None = None
-    venv_file_number: int | None = None
 
     active: bool = True
     timestamp_created: datetime = Field(

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

@@ -17,6 +17,7 @@ from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import HistoryRun
 from fractal_server.app.models.v2 import HistoryUnit
 from fractal_server.app.models.v2 import JobV2
+from fractal_server.app.models.v2.project import ProjectV2
 from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.routes.aux._job import _write_shutdown_file
 from fractal_server.app.routes.aux._runner import _check_shutdown_is_supported
@@ -37,6 +38,7 @@ router = APIRouter()
 @router.get("/", response_model=PaginationResponse[JobRead])
 async def view_job(
     id: int | None = None,
+    resource_id: int | None = None,
     user_id: int | None = None,
     project_id: int | None = None,
     dataset_id: int | None = None,
@@ -84,6 +86,13 @@ async def view_job(
     if id is not None:
         stm = stm.where(JobV2.id == id)
         stm_count = stm_count.where(JobV2.id == id)
+    if resource_id is not None:
+        stm = stm.join(ProjectV2, ProjectV2.id == JobV2.project_id).where(
+            ProjectV2.resource_id == resource_id
+        )
+        stm_count = stm_count.join(
+            ProjectV2, ProjectV2.id == JobV2.project_id
+        ).where(ProjectV2.resource_id == resource_id)
     if user_id is not None:
         stm = (
             stm.join(

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

@@ -19,6 +19,7 @@ from fractal_server.app.routes.api.v2._aux_functions import _get_workflow_or_404
 from fractal_server.app.routes.api.v2._aux_functions import (
     _get_workflowtask_or_404,
 )
+from fractal_server.app.schemas.v2.job import JobStatusType
 from fractal_server.app.schemas.v2.sharing import ProjectPermissions
 from fractal_server.logger import set_logger
 from fractal_server.zip_tools import _read_single_file_from_zip
@@ -70,6 +71,7 @@ def read_log_file(
     dataset_id: int,
     logfile: str,
     job_working_dir: str,
+    job_status: JobStatusType,
 ) -> str:
     """
     Returns the contents of a Job's log file, either directly from the working
@@ -93,12 +95,18 @@ def read_log_file(
             return _read_single_file_from_zip(
                 file_path=relative_logfile, archive_path=archive_path
             )
-
         else:
-            logger.error(
-                f"Error while retrieving logs for {logfile=} and "
-                f"{archive_path=}: both files do not exist."
-            )
+            match job_status:
+                case JobStatusType.SUBMITTED:
+                    logger.info(
+                        f"Neither {logfile=} nor {archive_path=} exist "
+                        "(for submitted job)."
+                    )
+                case _:
+                    logger.warning(
+                        f"Error while retrieving logs for {logfile=} and "
+                        f"{archive_path=}."
+                    )
             return (
                 f"Logs for task '{task_name}' in dataset "
                 f"{dataset_id} are not available."

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

@@ -458,11 +458,11 @@ async def get_image_log(
 
     # Get job.working_dir
     res = await db.execute(
-        select(JobV2.working_dir)
+        select(JobV2.working_dir, JobV2.status)
         .join(HistoryRun, HistoryRun.job_id == JobV2.id)
         .where(HistoryRun.id == history_unit.history_run_id)
     )
-    job_working_dir = res.scalar_one_or_none()
+    job_working_dir, job_status = res.one()
 
     # Get log or placeholder text
     log = read_log_file(
@@ -470,6 +470,7 @@ async def get_image_log(
         task_name=wftask.task.name,
         dataset_id=request_data.dataset_id,
         job_working_dir=job_working_dir,
+        job_status=job_status,
     )
     return JSONResponse(content=log)
 
@@ -525,6 +526,7 @@ async def get_history_unit_log(
         task_name=wftask.task.name,
         dataset_id=dataset_id,
         job_working_dir=job.working_dir,
+        job_status=job.status,
     )
     return JSONResponse(content=log)
 

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

@@ -54,7 +54,8 @@ async def get_user_jobs(
             LinkUserProjectV2, LinkUserProjectV2.project_id == JobV2.project_id
         )
         .where(LinkUserProjectV2.user_id == user.id)
-        .where(LinkUserProjectV2.is_owner.is_(True))
+        .where(LinkUserProjectV2.is_verified.is_(True))
+        .order_by(JobV2.start_timestamp.desc())
     )
     res = await db.execute(stm)
     job_list = res.scalars().all()
@@ -86,8 +87,11 @@ async def get_workflow_jobs(
         required_permissions=ProjectPermissions.READ,
         db=db,
     )
-    stm = select(JobV2).where(JobV2.workflow_id == workflow_id)
-    res = await db.execute(stm)
+    res = await db.execute(
+        select(JobV2)
+        .where(JobV2.workflow_id == workflow_id)
+        .order_by(JobV2.start_timestamp.desc())
+    )
     job_list = res.scalars().all()
     return job_list
 
@@ -212,8 +216,11 @@ async def get_job_list(
         db=db,
     )
 
-    stm = select(JobV2).where(JobV2.project_id == project.id)
-    res = await db.execute(stm)
+    res = await db.execute(
+        select(JobV2)
+        .where(JobV2.project_id == project.id)
+        .order_by(JobV2.start_timestamp.desc())
+    )
     job_list = res.scalars().all()
     await db.close()
     if not log:

fractal_server/app/routes/auth/oauth.py

@@ -3,6 +3,8 @@ from httpx_oauth.clients.github import GitHubOAuth2
 from httpx_oauth.clients.google import GoogleOAuth2
 from httpx_oauth.clients.openid import OpenID
 from httpx_oauth.clients.openid import OpenIDConfigurationError
+from httpx_oauth.exceptions import GetIdEmailError
+from httpx_oauth.exceptions import GetProfileError
 
 from fractal_server.config import OAuthSettings
 from fractal_server.config import get_oauth_settings
@@ -13,6 +15,29 @@ from . import cookie_backend
 from . import fastapi_users
 
 
+class FractalOpenID(OpenID):
+    """
+    Subclass of `httpx_oauth.clients.openid.OpenID` with customizable name for
+    the `"email"` claim.
+    """
+
+    def __init__(self, *, email_claim: str, **kwargs):
+        super().__init__(**kwargs)
+        self.email_claim = email_claim
+
+    # TODO-requires-py312: add `@override` decorator
+    async def get_id_email(self, token: str) -> tuple[str, str | None]:
+        """
+        Identical to the parent-class method (httpx-oauth version 0.16.1),
+        apart from making `"email"` configurable.
+        """
+        try:
+            profile = await self.get_profile(token)
+        except GetProfileError as e:
+            raise GetIdEmailError(response=e.response) from e
+        return str(profile["sub"]), profile.get(self.email_claim)
+
+
 def _create_client_github(cfg: OAuthSettings) -> GitHubOAuth2:
     return GitHubOAuth2(
         client_id=cfg.OAUTH_CLIENT_ID.get_secret_value(),
@@ -29,10 +54,11 @@ def _create_client_google(cfg: OAuthSettings) -> GoogleOAuth2:
 
 def _create_client_oidc(cfg: OAuthSettings) -> OpenID:
     try:
-        open_id = OpenID(
+        open_id = FractalOpenID(
             client_id=cfg.OAUTH_CLIENT_ID.get_secret_value(),
             client_secret=cfg.OAUTH_CLIENT_SECRET.get_secret_value(),
             openid_configuration_endpoint=cfg.OAUTH_OIDC_CONFIG_ENDPOINT.get_secret_value(),  # noqa
+            email_claim=cfg.OAUTH_EMAIL_CLAIM,
         )
     except OpenIDConfigurationError as e:
         OAUTH_OIDC_CONFIG_ENDPOINT = (

fractal_server/app/schemas/v2/task_group.py

@@ -84,9 +84,6 @@ class TaskGroupRead(BaseModel):
     pinned_package_versions_pre: dict[str, str] = Field(default_factory=dict)
     pinned_package_versions_post: dict[str, str] = Field(default_factory=dict)
 
-    venv_size_in_kB: int | None = None
-    venv_file_number: int | None = None
-
     active: bool
     timestamp_created: AwareDatetime
     timestamp_last_used: AwareDatetime

fractal_server/config/_oauth.py

@@ -28,6 +28,11 @@ class OAuthSettings(BaseSettings):
             String to be used as `redirect_url` argument in
             `fastapi_users.get_oauth_router`, and then in
             `httpx_oauth.integrations.fastapi.OAuth2AuthorizeCallback`.
+        OAUTH_EMAIL_CLAIM:
+            Name of the OIDC claim with the user's email address. This is
+            `"email"` by default, but can be customized (e.g. to `"mail"`) to
+            fit with the response from the userinfo endpoint - see
+            https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse
     """
 
     model_config = SettingsConfigDict(**SETTINGS_CONFIG_DICT)
@@ -43,6 +48,7 @@ class OAuthSettings(BaseSettings):
     OAUTH_CLIENT_SECRET: SecretStr | None = None
     OAUTH_OIDC_CONFIG_ENDPOINT: SecretStr | None = None
     OAUTH_REDIRECT_URL: str | None = None
+    OAUTH_EMAIL_CLAIM: str = "email"
 
     @model_validator(mode="after")
     def check_configuration(self: Self) -> Self:

fractal_server/migrations/versions/068496367952_drop_taskgroup_venv_size_and_files_.py

@@ -0,0 +1,48 @@
+"""Drop TaskGroup venv size and files number
+
+Revision ID: 068496367952
+Revises: b7477cc98f45
+Create Date: 2025-12-10 15:24:47.720796
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "068496367952"
+down_revision = "b7477cc98f45"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
+        batch_op.drop_column("venv_size_in_kB")
+        batch_op.drop_column("venv_file_number")
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "venv_file_number",
+                sa.INTEGER(),
+                autoincrement=False,
+                nullable=True,
+            )
+        )
+        batch_op.add_column(
+            sa.Column(
+                "venv_size_in_kB",
+                sa.INTEGER(),
+                autoincrement=False,
+                nullable=True,
+            )
+        )
+
+    # ### end Alembic commands ###

fractal_server/runner/config/_slurm.py

@@ -35,6 +35,7 @@ class SlurmConfigSet(BaseModel):
         extra_lines:
         gpus:
         shebang_line: The shell shebang to use for SLURM jobs.
+        use_mem_per_cpu:
     """
 
     model_config = ConfigDict(extra="forbid")
@@ -51,6 +52,7 @@ class SlurmConfigSet(BaseModel):
     extra_lines: list[NonEmptyStr] = Field(default_factory=list)
     gpus: NonEmptyStr | None = None
     shebang_line: str = "#!/bin/sh"
+    use_mem_per_cpu: bool = False
 
 
 class BatchingConfigSet(BaseModel):

fractal_server/runner/executors/call_command_wrapper.py

@@ -6,6 +6,18 @@ import subprocess  # nosec
 from fractal_server.runner.exceptions import TaskExecutionError
 from fractal_server.string_tools import validate_cmd
 
+MAX_LEN_STDERR = 100_000
+
+
+def placeholder_if_too_long(stderr: str) -> str:
+    """Returns a placeholder if the string is too long"""
+    if len(stderr) > MAX_LEN_STDERR:
+        return (
+            f"Cannot display stderr of length {len(stderr)}. You can find the "
+            "detailed logs by downloading the job-log folder."
+        )
+    return stderr
+
 
 def call_command_wrapper(*, cmd: str, log_path: str) -> None:
     """
@@ -46,6 +58,7 @@ def call_command_wrapper(*, cmd: str, log_path: str) -> None:
         if os.path.isfile(log_path):
             with open(log_path) as fp_stderr:
                 stderr = fp_stderr.read()
+            stderr = placeholder_if_too_long(stderr)
         raise TaskExecutionError(
             f"Task failed with returncode={result.returncode}.\n"
             f"STDERR: {stderr}"

fractal_server/runner/executors/slurm_common/base_slurm_runner.py

@@ -365,7 +365,8 @@ class BaseSlurmRunner(BaseRunner):
 
         # Prepare SLURM preamble based on SlurmConfig object
         script_lines = slurm_config.to_sbatch_preamble(
-            remote_export_dir=self.user_cache_dir
+            remote_export_dir=self.user_cache_dir,
+            use_mem_per_cpu=slurm_config.use_mem_per_cpu,
         )
 
         # Extend SLURM preamble with variable which are not in SlurmConfig, and
@@ -389,11 +390,14 @@ class BaseSlurmRunner(BaseRunner):
         script_lines.append("\n")
 
         # Include command lines
-        mem_per_task_MB = slurm_config.mem_per_task_MB
         for cmd in cmdlines:
+            if slurm_config.use_mem_per_cpu:
+                mem_specific = f"--mem-per-cpu={slurm_config.mem_per_cpu_MB}MB"
+            else:
+                mem_specific = f"--mem={slurm_config.mem_per_task_MB}MB"
             script_lines.append(
                 "srun --ntasks=1 --cpus-per-task=$SLURM_CPUS_PER_TASK "
-                f"--mem={mem_per_task_MB}MB "
+                f"{mem_specific} "
                 f"{cmd} &"
             )
         script_lines.append("wait\n\n")

fractal_server/runner/executors/slurm_common/slurm_config.py

@@ -42,6 +42,9 @@ class SlurmConfig(BaseModel):
         exclude: Corresponds to SLURM option.
         prefix: Prefix of configuration lines in SLURM submission scripts.
         shebang_line: Shebang line for SLURM submission scripts.
+        use_mem_per_cpu:
+            If `True`, use `--mem-per-cpu` rather than `--mem`, both at the job
+            level and for `srun` statements.
         extra_lines: Additional lines to include in SLURM submission scripts.
         tasks_per_job: Number of tasks for each SLURM job.
         parallel_tasks_per_job: Number of tasks to run in parallel for
@@ -70,9 +73,12 @@ class SlurmConfig(BaseModel):
     partition: str
     cpus_per_task: int
     mem_per_task_MB: int
+
     prefix: str = "#SBATCH"
     shebang_line: str = "#!/bin/sh"
 
+    use_mem_per_cpu: bool = False
+
     # Optional SLURM parameters
     job_name: str | None = None
     constraint: str | None = None
@@ -139,6 +145,7 @@ class SlurmConfig(BaseModel):
     def to_sbatch_preamble(
         self,
         remote_export_dir: str,
+        use_mem_per_cpu: bool = False,
     ) -> list[str]:
         """
         Compile `SlurmConfig` object into the preamble of a SLURM submission
@@ -148,6 +155,8 @@ class SlurmConfig(BaseModel):
             remote_export_dir:
                 Base directory for exports defined in
                 `self.user_local_exports`.
+            use_mem_per_cpu:
+                If `True`, use `--mem-per-cpu` rather than `--mem`.
         """
         if self.parallel_tasks_per_job is None:
             raise ValueError(
@@ -157,13 +166,18 @@ class SlurmConfig(BaseModel):
         if len(self.extra_lines) != len(set(self.extra_lines)):
             raise ValueError(f"{self.extra_lines=} contains repetitions")
 
-        mem_per_job_MB = self.parallel_tasks_per_job * self.mem_per_task_MB
+        if use_mem_per_cpu:
+            memory_line = f"{self.prefix} --mem-per-cpu={self.mem_per_cpu_MB}M"
+        else:
+            mem_per_job_MB = self.parallel_tasks_per_job * self.mem_per_task_MB
+            memory_line = f"{self.prefix} --mem={mem_per_job_MB}M"
+
         lines = [
             self.shebang_line,
             f"{self.prefix} --partition={self.partition}",
             f"{self.prefix} --ntasks={self.parallel_tasks_per_job}",
             f"{self.prefix} --cpus-per-task={self.cpus_per_task}",
-            f"{self.prefix} --mem={mem_per_job_MB}M",
+            memory_line,
         ]
         for key in [
             "job_name",
@@ -214,3 +228,7 @@ class SlurmConfig(BaseModel):
     @property
     def batch_size(self) -> int:
         return self.tasks_per_job
+
+    @property
+    def mem_per_cpu_MB(self) -> int:
+        return int(self.mem_per_task_MB / self.cpus_per_task)

fractal_server/tasks/v2/local/collect.py

@@ -174,15 +174,6 @@ def collect_local(
                 activity.log = get_current_log(log_file_path)
                 activity = add_commit_refresh(obj=activity, db=db)
 
-                # Run script 5
-                venv_info = _customize_and_run_template(
-                    template_filename="5_get_venv_size_and_file_number.sh",
-                    **common_args,
-                )
-                venv_size, venv_file_number = venv_info.split()
-                activity.log = get_current_log(log_file_path)
-                activity = add_commit_refresh(obj=activity, db=db)
-
                 pkg_attrs = parse_script_pip_show_stdout(stdout)
                 for key, value in pkg_attrs.items():
                     logger.debug(f"Parsed from pip-show: {key}={value}")
@@ -241,18 +232,10 @@ def collect_local(
                 logger.info("create_db_tasks_and_update_task_group - end")
 
                 # Update task_group data
-                logger.info(
-                    "Add env_info, venv_size and venv_file_number "
-                    "to TaskGroupV2 - start"
-                )
+                logger.info("Add env_info to TaskGroupV2 - start")
                 task_group.env_info = pip_freeze_stdout
-                task_group.venv_size_in_kB = int(venv_size)
-                task_group.venv_file_number = int(venv_file_number)
                 task_group = add_commit_refresh(obj=task_group, db=db)
-                logger.info(
-                    "Add env_info, venv_size and venv_file_number "
-                    "to TaskGroupV2 - end"
-                )
+                logger.info("Add env_info to TaskGroupV2 - end")
 
                 # Finalize (write metadata to DB)
                 logger.info("finalising - START")

fractal_server/tasks/v2/local/collect_pixi.py

@@ -175,8 +175,6 @@ def collect_local_pixi(
                 # Parse stdout
                 parsed_output = parse_collect_stdout(stdout)
                 package_root = parsed_output["package_root"]
-                venv_size = parsed_output["venv_size"]
-                venv_file_number = parsed_output["venv_file_number"]
                 project_python_wrapper = parsed_output["project_python_wrapper"]
 
                 # Make task folder 755
@@ -220,23 +218,15 @@ def collect_local_pixi(
                 logger.info("create_db_tasks_and_update_task_group - end")
 
                 # Update task_group data
-                logger.info(
-                    "Add env_info, venv_size and venv_file_number "
-                    "to TaskGroupV2 - start"
-                )
+                logger.info("Add env_info to TaskGroupV2 - start")
                 with Path(source_dir, "pixi.lock").open() as f:
                     pixi_lock_contents = f.read()
 
                 # NOTE: see issue 2626 about whether to keep `pixi.lock` files
                 # in the database
                 task_group.env_info = pixi_lock_contents
-                task_group.venv_size_in_kB = int(venv_size)
-                task_group.venv_file_number = int(venv_file_number)
                 task_group = add_commit_refresh(obj=task_group, db=db)
-                logger.info(
-                    "Add env_info, venv_size and venv_file_number "
-                    "to TaskGroupV2 - end"
-                )
+                logger.info("Add env_info to TaskGroupV2 - end")
 
                 # Finalize (write metadata to DB)
                 logger.info("finalising - START")

fractal_server/tasks/v2/local/reactivate.py

@@ -121,7 +121,7 @@ def reactivate_local(
 
                 logger.debug("start - install from pip freeze")
                 _customize_and_run_template(
-                    template_filename="6_pip_install_from_freeze.sh",
+                    template_filename="5_pip_install_from_freeze.sh",
                     **common_args,
                 )
                 logger.debug("end - install from pip freeze")

fractal_server/tasks/v2/ssh/collect.py

@@ -211,15 +211,6 @@ def collect_ssh(
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
-                    # Run script 5
-                    venv_info = _customize_and_run_template(
-                        template_filename="5_get_venv_size_and_file_number.sh",
-                        **common_args,
-                    )
-                    venv_size, venv_file_number = venv_info.split()
-                    activity.log = get_current_log(log_file_path)
-                    activity = add_commit_refresh(obj=activity, db=db)
-
                     pkg_attrs = parse_script_pip_show_stdout(stdout)
 
                     for key, value in pkg_attrs.items():
@@ -275,18 +266,10 @@ def collect_ssh(
                     logger.info("create_db_tasks_and_update_task_group - end")
 
                     # Update task_group data
-                    logger.info(
-                        "Add env_info, venv_size and venv_file_number "
-                        "to TaskGroupV2 - start"
-                    )
+                    logger.info("Add env_info to TaskGroupV2 - start")
                     task_group.env_info = pip_freeze_stdout
-                    task_group.venv_size_in_kB = int(venv_size)
-                    task_group.venv_file_number = int(venv_file_number)
                     task_group = add_commit_refresh(obj=task_group, db=db)
-                    logger.info(
-                        "Add env_info, venv_size and venv_file_number "
-                        "to TaskGroupV2 - end"
-                    )
+                    logger.info("Add env_info to TaskGroupV2 - end")
 
                     # Finalize (write metadata to DB)
                     logger.info("finalising - START")

fractal_server/tasks/v2/ssh/collect_pixi.py

@@ -266,8 +266,6 @@ def collect_ssh_pixi(
                     # Parse stdout
                     parsed_output = parse_collect_stdout(stdout)
                     package_root_remote = parsed_output["package_root"]
-                    venv_size = parsed_output["venv_size"]
-                    venv_file_number = parsed_output["venv_file_number"]
                     project_python_wrapper = parsed_output[
                         "project_python_wrapper"
                     ]
@@ -312,18 +310,10 @@ def collect_ssh_pixi(
                     )
 
                     # Update task_group data
-                    logger.info(
-                        "Add env_info, venv_size and venv_file_number "
-                        "to TaskGroupV2 - start"
-                    )
+                    logger.info("Add env_info to TaskGroupV2 - start")
                     task_group.env_info = pixi_lock_contents
-                    task_group.venv_size_in_kB = int(venv_size)
-                    task_group.venv_file_number = int(venv_file_number)
                     task_group = add_commit_refresh(obj=task_group, db=db)
-                    logger.info(
-                        "Add env_info, venv_size and venv_file_number "
-                        "to TaskGroupV2 - end"
-                    )
+                    logger.info("Add env_info to TaskGroupV2 - end")
 
                     # Finalize (write metadata to DB)
                     logger.info("finalising - START")

fractal_server/tasks/v2/ssh/reactivate.py

@@ -167,7 +167,7 @@ def reactivate_ssh(
 
                     logger.info("start - install from pip freeze")
                     _customize_and_run_template(
-                        template_filename="6_pip_install_from_freeze.sh",
+                        template_filename="5_pip_install_from_freeze.sh",
                         **common_args,
                     )
                     logger.info("end - install from pip freeze")

fractal_server/tasks/v2/templates/pixi_3_post_install.sh

@@ -66,12 +66,6 @@ PACKAGE_FOLDER=$(bash "${FIND_PACKAGE_FOLDER_SCRIPT}")
 write_log "Package folder: ${PACKAGE_FOLDER}"
 echo
 
-ENV_DISK_USAGE=$(du -sk "${PACKAGE_DIR}" | cut -f1)
-ENV_FILE_NUMBER=$(find "${PACKAGE_DIR}" -type f | wc -l)
-write_log "Disk usage: ${ENV_DISK_USAGE}"
-write_log "Number of files: ${ENV_FILE_NUMBER}"
-echo
-
 TIME_END=$(date +%s)
 write_log "Elapsed: $((TIME_END - TIME_START)) seconds"
 write_log "All ok, exit."

fractal_server/tasks/v2/utils_pixi.py

@@ -12,8 +12,6 @@ SOURCE_DIR_NAME = "source_dir"
 
 class ParsedOutput(TypedDict):
     package_root: str
-    venv_size: str
-    venv_file_number: str
     project_python_wrapper: str
 
 
@@ -23,8 +21,6 @@ def parse_collect_stdout(stdout: str) -> ParsedOutput:
     """
     searches = [
         ("Package folder:", "package_root"),
-        ("Disk usage:", "venv_size"),
-        ("Number of files:", "venv_file_number"),
         ("Project Python wrapper:", "project_python_wrapper"),
     ]
     stdout_lines = stdout.splitlines()

{fractal_server-2.18.1.dist-info → fractal_server-2.18.3.dist-info}/METADATA

@@ -1,35 +1,29 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.18.1
+Version: 2.18.3
 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>
 License-Expression: BSD-3-Clause
-License-File: LICENSE
-Author: Tommaso Comparin
-Author-email: tommaso.comparin@exact-lab.it
-Requires-Python: >=3.11,<3.15
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: alembic (>=1.13.1,<2.0.0)
-Requires-Dist: fabric (>=3.2.2,<3.3.0)
-Requires-Dist: fastapi (>=0.120.0,<0.121.0)
-Requires-Dist: fastapi-users[oauth] (>=15,<16)
-Requires-Dist: gunicorn (>=23.0,<24.0)
-Requires-Dist: packaging (>=25.0.0,<26.0.0)
-Requires-Dist: psycopg[binary] (>=3.1.0,<4.0.0)
-Requires-Dist: pydantic (>=2.12.0,<2.13.0)
-Requires-Dist: pydantic-settings (==2.11.0)
-Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)
-Requires-Dist: sqlmodel (==0.0.27)
-Requires-Dist: tomli_w (>=1.2.0,<1.3.0)
-Requires-Dist: uvicorn (>=0.38.0,<0.39.0)
-Requires-Dist: uvicorn-worker (==0.4.0)
-Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server
-Project-URL: Homepage, https://github.com/fractal-analytics-platform/fractal-server
-Project-URL: Repository, https://github.com/fractal-analytics-platform/fractal-server
+Requires-Dist: fastapi>=0.120.0,<0.121.0
+Requires-Dist: sqlmodel==0.0.27
+Requires-Dist: sqlalchemy[asyncio]>=2.0.23,<2.1
+Requires-Dist: fastapi-users[oauth]>=15,<16
+Requires-Dist: alembic>=1.13.1,<2.0.0
+Requires-Dist: uvicorn>=0.38.0,<0.39.0
+Requires-Dist: uvicorn-worker==0.4.0
+Requires-Dist: pydantic>=2.12.0,<2.13.0
+Requires-Dist: pydantic-settings==2.11.0
+Requires-Dist: packaging>=25.0.0,<26.0.0
+Requires-Dist: fabric>=3.2.2,<3.3.0
+Requires-Dist: gunicorn>=23.0,<24.0
+Requires-Dist: psycopg[binary]>=3.1.0,<4.0.0
+Requires-Dist: tomli-w>=1.2.0,<1.3.0
+Requires-Python: >=3.11, <3.15
 Project-URL: changelog, https://github.com/fractal-analytics-platform/fractal-server/blob/main/CHANGELOG.md
+Project-URL: documentation, https://fractal-analytics-platform.github.io/fractal-server
+Project-URL: homepage, https://github.com/fractal-analytics-platform/fractal-server
+Project-URL: repository, https://github.com/fractal-analytics-platform/fractal-server
 Description-Content-Type: text/markdown
 
 # Fractal Server
@@ -63,4 +57,3 @@ See https://fractal-analytics-platform.github.io/fractal-server.
 Fractal was conceived in the Liberali Lab at the Friedrich Miescher Institute for Biomedical Research and in the Pelkmans Lab at the University of Zurich by [@jluethi](https://github.com/jluethi) and [@gusqgm](https://github.com/gusqgm). The Fractal project is now developed at the [BioVisionCenter](https://www.biovisioncenter.uzh.ch/en.html) at the University of Zurich and the project lead is with [@jluethi](https://github.com/jluethi). The core development is done under contract by [eXact lab S.r.l.](https://www.exact-lab.it).
 
 Unless otherwise specified, Fractal components are released under the BSD 3-Clause License, and copyright is with the BioVisionCenter at the University of Zurich.
-

{fractal_server-2.18.1.dist-info → fractal_server-2.18.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=BKsIdxrz9PsV9xvr1HmK94dmxX69wjDyrYRY53MjstQ,23
+fractal_server/__init__.py,sha256=OVKju0ZnOyFmUq3SkcNUvcXZUQHwNj9NAn3ucligbaw,23
 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
@@ -16,7 +16,7 @@ fractal_server/app/models/v2/profile.py,sha256=YajSmV4J_-zC4RX917s-A_lJt4mxYdPRV
 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=iBIQB8POQE5MyKvLZhw7jZWlBhbrThzCDzRTcgiAczQ,1493
-fractal_server/app/models/v2/task_group.py,sha256=ud5c_Cncp3hz7_FLiEUvO2VD8h9KtBQljyjR6GQK0D0,4674
+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
@@ -25,7 +25,7 @@ fractal_server/app/routes/admin/v2/__init__.py,sha256=VF4wg09fvz6gVgIFe-r7LoCU9t
 fractal_server/app/routes/admin/v2/_aux_functions.py,sha256=fqA5sUCFuD2iVANQt2WUUfVOEVz5egQA7inzUKYGCw0,1684
 fractal_server/app/routes/admin/v2/accounting.py,sha256=xNXyQYpa0K0bOjd5WNVKfU6zBhvT2-Xgrx2F4vdS9C0,3512
 fractal_server/app/routes/admin/v2/impersonate.py,sha256=ictDjuvBr3iLv3YtwkVRMNQRq5qtPAeAXbbC7STSsEg,1125
-fractal_server/app/routes/admin/v2/job.py,sha256=nishNH472KMmz9Au8_w6xOOAXEN3tqVSUX1IraO1Hr0,10430
+fractal_server/app/routes/admin/v2/job.py,sha256=UaUwD5vsIPslc6KrbUPs2OsGcJOsLd7UeE2a5GRZnD0,10837
 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=x7RtbDPapyENEU_s4-glPoEeEOxxj2VBgduVQ1V7wkE,3796
@@ -35,16 +35,16 @@ fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=LkHSQVXRRUkicp
 fractal_server/app/routes/api/__init__.py,sha256=GaNOm1elJLldHNWZ482qlvETLAXhdJ8u_X6kGxMmwQs,1409
 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=RhKheO2mdSpA0PYGPuDfr8XTaE4e8LkuKeVJlilNtko,5683
+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=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
 fractal_server/app/routes/api/v2/dataset.py,sha256=HZGJezPqzbU1PYlFZfQSOj-ONmhtitCv6I7SDORGiPg,8515
-fractal_server/app/routes/api/v2/history.py,sha256=5IYb6m6vmXjNU7uatEmgdXhehyKdbK98T5wAjQpNH4g,18266
+fractal_server/app/routes/api/v2/history.py,sha256=-aLwLhDLDqwKFy3JrM1vFswyBPdolMXlH3sS7OiQsK8,18339
 fractal_server/app/routes/api/v2/images.py,sha256=k9wd44iwjCtEWSH9j6X6zToBwuOOo6J4FxSW7AGbPHA,8266
-fractal_server/app/routes/api/v2/job.py,sha256=05_uzX11wYWpGZLN159-7CFXGB9gnSDYdeLEvDAefpY,7250
+fractal_server/app/routes/api/v2/job.py,sha256=lhYuUX9plbvIE5Gx1D4uWjmzPrWT9CqiqpHRSBv1-bA,7415
 fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=Cs_ODoRWmkbSJJhlIE7pQh9JuJGXZTAr-EVF6wqKNGA,5215
 fractal_server/app/routes/api/v2/project.py,sha256=z_IMJ7uDpRDXdoNF0qWMpft2lnsX6pfP244cQlyH2CU,5811
 fractal_server/app/routes/api/v2/sharing.py,sha256=MvegcF3xaT9nztVwLiUisp4B8IrKRa2LVlSR2GGTqYk,9398
@@ -65,7 +65,7 @@ fractal_server/app/routes/auth/_aux_auth.py,sha256=gKdYTWUzxcU44Iep787zReWwdAs4k
 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=NxrwOWBGPe7hLPEnD66nfWPGMWzDM80LIrwtmONVw-4,2731
+fractal_server/app/routes/auth/oauth.py,sha256=ocQjyy6OfuEORDYVVzQSgcisSwL-YLZxacq7FuzwJF4,3673
 fractal_server/app/routes/auth/register.py,sha256=IiUJhgY0ZrTs0RlBRRjoTv4wF5Gb3eXTInFV-dXkpsE,615
 fractal_server/app/routes/auth/router.py,sha256=Zip_fw9qJWtoXWjluznschyrCKb2n_rf3xWarSXMkgI,692
 fractal_server/app/routes/auth/users.py,sha256=5BagdH1dz-ZoXdvTgIo9QWBNFPW3p1pIZfY9BBu4eds,7397
@@ -92,7 +92,7 @@ fractal_server/app/schemas/v2/sharing.py,sha256=wHBiEmqhU53NokQ2rmm6xkH3lumBR6Td
 fractal_server/app/schemas/v2/status_legacy.py,sha256=ajLm2p0wNfJ_lQX9Oq3NJn0jxQj50U3eZxuRjOIdOpg,949
 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=HYwgv8KQWr1A8ihdz_FTmKAymlHh4AEPyfmYOhafE24,3472
+fractal_server/app/schemas/v2/task_group.py,sha256=sbg6AkvonU7F_-QC4G9kDxO6YVcz7wUPY3k3n9jYkRY,3392
 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
@@ -103,9 +103,8 @@ fractal_server/config/_data.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 fractal_server/config/_database.py,sha256=0_FvboMkQEKKRxvr9uFdp98oiQwMTFbdCW3loTZNSY0,1846
 fractal_server/config/_email.py,sha256=vMwLHN9-beYp_-up-WkTpeyNUZk4EHwt3N2l6-PYnx4,4364
 fractal_server/config/_main.py,sha256=6splUmAPRD1J9HXkeZ-Vqif7Nw4ljJXIugpvRrcwPeI,2476
-fractal_server/config/_oauth.py,sha256=UTmlFppDZcOQhr3RvkiG5XMqvr54XRAQ_Y-iR0V8N-8,2024
+fractal_server/config/_oauth.py,sha256=kktD0MEZ_NV4QOK6RmOXDK1x8RCrFEkqC6WLY-DzRIY,2390
 fractal_server/config/_settings_config.py,sha256=tsyXQOnn9QKCFJD6hRo_dJXlQQyl70DbqgHMJoZ1xnY,144
-fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/exceptions.py,sha256=l6aZDk_6u_9PwDaQSoIFdI40ekpzqOJaxjx5rhW-HVI,141
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
@@ -118,6 +117,7 @@ fractal_server/main.py,sha256=vCDvUndmLIkxUX8EAtyA4Wu9YiIHGZge5J37Yn2U5R4,6537
 fractal_server/migrations/env.py,sha256=nfyBpMIOT3kny6t-b-tUjyRjZ4k906bb1_wCQ7me1BI,1353
 fractal_server/migrations/naming_convention.py,sha256=bSEMiMZeArmWKrUk-12lhnOw1pAFMg6LEl7yucohPqc,263
 fractal_server/migrations/versions/034a469ec2eb_task_groups.py,sha256=uuf0sJibC4Am1HDb_dX_Jdj2oinptlg2ojiHwCpjDCY,6155
+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/19eca0dd47a9_user_settings_project_dir.py,sha256=5OzcIQjTfwiqh9vK_yLQHJlNtIHxKiEPr-IjZ9iir-Y,961
@@ -177,22 +177,22 @@ fractal_server/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 fractal_server/runner/components.py,sha256=-Ii5l8d_V6f5DFOd-Zsr8VYmOsyqw0Hox9fEFQiuqxY,66
 fractal_server/runner/config/__init__.py,sha256=a-vSrvWBeMVnxTtYoy-f5Ibt_mM8MM3F7jqnPvvjHSY,108
 fractal_server/runner/config/_local.py,sha256=IHWtxpKuJDdsQNpk8Q5bNL4DEJunNkNJkLfetfnwmQM,788
-fractal_server/runner/config/_slurm.py,sha256=eFtfo9mXAoo-MEk-XZIK7OfwD21KjLAtdMzWfSvaypA,3735
+fractal_server/runner/config/_slurm.py,sha256=VPQEqGxdeaXit6LbLGMAyQTDrrN6zG2RiP_ZpI07hvQ,3794
 fractal_server/runner/config/slurm_mem_to_MB.py,sha256=6KmrIC-NymQjb9-bIQjNYQx6mE0OoKoZxdi6WQnWOHw,2003
 fractal_server/runner/exceptions.py,sha256=N8DLn7tuV8zMSdr8xdJN0aIdytPveSCeQ1Y5IoxXW-8,1778
 fractal_server/runner/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/base_runner.py,sha256=h8uE5gr6zFEwpjhasJDc-eNTMIw3RwmQQLYD6U5w8E0,7116
-fractal_server/runner/executors/call_command_wrapper.py,sha256=n6c9haKyIudBlz9-d3GQb19rewBR54qLG8jlrma6okk,1415
+fractal_server/runner/executors/call_command_wrapper.py,sha256=yLFfwkYdfGAp6TSLx0omymW3IxaDNdxV-DDk-3oqNx0,1828
 fractal_server/runner/executors/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/local/get_local_config.py,sha256=oI32JawlG3ixYdjxJDRfT0sreEnoHekhiAHzlejl2aM,1694
 fractal_server/runner/executors/local/runner.py,sha256=0s0u5ONasXdsvS2WD5zxksQgved_XGXtaxCEiBJoAlM,12297
 fractal_server/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/slurm_common/_batching.py,sha256=YQjWRTDI1e6NeLe1R-1QWlt49i42M9ILeExEjdjgy48,8348
 fractal_server/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
-fractal_server/runner/executors/slurm_common/base_slurm_runner.py,sha256=pU2Szcg3tv7vinLJXbzSgYlfEPLY_b0R0YDR-FSYLc8,41873
+fractal_server/runner/executors/slurm_common/base_slurm_runner.py,sha256=NOgf7M1FDfPgKEJvKu8HgU4QYjAk-ZrovOOHMAEr27w,42082
 fractal_server/runner/executors/slurm_common/get_slurm_config.py,sha256=B6EKjob8Y-DiJ8YbXf2CeoY7B8cwvkpKvlW8Ce6bbx0,7115
 fractal_server/runner/executors/slurm_common/remote.py,sha256=8pTMTRp_LjzoUr3FtFTfdvDhuLnqzY6HT-T9pzrVLw4,3845
-fractal_server/runner/executors/slurm_common/slurm_config.py,sha256=JcAV1xNhzBjpZFTRRbQm0EN9Ti4udNOjseGQcFlFnuM,7897
+fractal_server/runner/executors/slurm_common/slurm_config.py,sha256=m65hJ4NJfk74ogKYSbC9l0Y9D3QSkAnMoUdq3loegpw,8498
 fractal_server/runner/executors/slurm_common/slurm_job_task_models.py,sha256=VeX40CvU5fckUpSyXlzb3EDE9xxPXkT2sZKLXq_6Ooc,3493
 fractal_server/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/slurm_ssh/run_subprocess.py,sha256=SyW6t4egvbiARph2YkFjc88Hj94fCamZVi50L7ph8VM,996
@@ -228,36 +228,35 @@ fractal_server/tasks/utils.py,sha256=izZthoEmt5NcnC8ktTmbMtNnrCD8zKir37NyCfPJDX4
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/tasks/v2/local/__init__.py,sha256=2dJqJIwn9UEANg8lPFprxVLk3ug-4xYIb5pvIsqPb5s,353
 fractal_server/tasks/v2/local/_utils.py,sha256=2MerOEGvr9zR4ATUBAV4MSS-ixODqiRpS5S--r2mSMM,3487
-fractal_server/tasks/v2/local/collect.py,sha256=Vu64E_BhP4Pzut8Fhs0tDy91-Z9HB6Ezj1qA57W2KA8,12108
-fractal_server/tasks/v2/local/collect_pixi.py,sha256=uhfXd4U8tfCwItzhIizeY52EAwijbuws4a0Pw5LwuV4,11480
+fractal_server/tasks/v2/local/collect.py,sha256=vjW7QYGUGzxGcf2P4bwWzz4SG_dGL9iFXc0dNtE1l1c,11383
+fractal_server/tasks/v2/local/collect_pixi.py,sha256=1xCEkJ2cHA9EQ7bahVHJhEPovVIDVWxPLnemAR27ZB0,11042
 fractal_server/tasks/v2/local/deactivate.py,sha256=GWB3Krx7-FJTLa2yCUHFyQMq202_MizoPl6wcuc33D8,9946
 fractal_server/tasks/v2/local/deactivate_pixi.py,sha256=VgageDeNHaOsMR7ANpac2QtzMnaagzGzSP9jY2EHY0k,3709
 fractal_server/tasks/v2/local/delete.py,sha256=PeLbAkNEsknClZeM9Dg8rYbemmNetr6wZ7TLGLO8x-k,2941
-fractal_server/tasks/v2/local/reactivate.py,sha256=c8uyAKBJbAhMt2y0-GILe7IIUxbhtihh_HLxytsJr1g,6065
+fractal_server/tasks/v2/local/reactivate.py,sha256=eimn5SIEW8-rGvErCrDruEZbDPriDS53WrdDzb0VS24,6065
 fractal_server/tasks/v2/local/reactivate_pixi.py,sha256=cWLe-lrwQlpQhPtKrMg5ClGVd5LVYzRpgLZQ2aC3PKU,8211
 fractal_server/tasks/v2/ssh/__init__.py,sha256=dPK6BtEZVh1GiFP05j1RKTEnZvjJez8o2KkMC2hWXaw,339
 fractal_server/tasks/v2/ssh/_pixi_slurm_ssh.py,sha256=3iixFaS5Uqhh28qAv_yBSW4YvffqIhE0LK0gQee9qjI,7448
 fractal_server/tasks/v2/ssh/_utils.py,sha256=a2oM8zh68zmcUuRLY_5y_9wA9MNd3NOM-w-P7RgwX2E,6112
-fractal_server/tasks/v2/ssh/collect.py,sha256=1RpAbuUKQodgDCuVOfN-DZC1uhIqHEhaVSSx3v0DwHs,14487
-fractal_server/tasks/v2/ssh/collect_pixi.py,sha256=9Pe-oaCu-Cih8c5vcW2Xpt9GuZYkju6otrnJldXUGfA,15861
+fractal_server/tasks/v2/ssh/collect.py,sha256=LvB5PbiiPRuKL_onNj6Rn2llQ-y0-FEqQjC4TOz3wWw,13698
+fractal_server/tasks/v2/ssh/collect_pixi.py,sha256=hOB4z5HT0ItZqDEQ2p4I1bGH3mWZXNWTmnx2AySQ9ds,15383
 fractal_server/tasks/v2/ssh/deactivate.py,sha256=okNPNKnym8nCE7P_M-92TDUM0nRdD_NZake34R1tHcI,12675
 fractal_server/tasks/v2/ssh/deactivate_pixi.py,sha256=tGuiOs9JXZoSmDqyEg3ZnmMkYwplkK1OkvMuGJpez00,4948
 fractal_server/tasks/v2/ssh/delete.py,sha256=hUOGah3MyeUG-jBbljvkpkwY2KkdXK-i8zV8LK2sBVQ,4459
-fractal_server/tasks/v2/ssh/reactivate.py,sha256=gxsgSDWVOw9reQumP92yC8SwNVcQrd4mvUh-sDoa7Uc,8528
+fractal_server/tasks/v2/ssh/reactivate.py,sha256=SxJEwA8M45az1XRpnoimyjl7qNFlbDcXWwPZ8GPw5m0,8528
 fractal_server/tasks/v2/ssh/reactivate_pixi.py,sha256=7jfODVCsHkqypPaJcQ9kozgUIPVPujmzgYp3gRx8dvs,11889
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=a9viswsex_26lNStFgTjtSM4_K1eiyA2qfSQAwhH1Pw,561
 fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=IS1iXCvFTb6owHAIrvTrnPN1g7UWESkZyTTVdBBLQ3Y,2168
 fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=oxqXMd-ZW8jtHjkwdwchbtWaoW6QHIk2Ksgreygo4no,181
 fractal_server/tasks/v2/templates/4_pip_show.sh,sha256=L4i5MHxFW8vuFOKpTLXKNyXeCZL6RlRgjBv9YfGxTQU,1697
-fractal_server/tasks/v2/templates/5_get_venv_size_and_file_number.sh,sha256=_I3R2pBWCMfs3MZtTKazW1sK17fV2_nRNNXHFPccpCQ,301
-fractal_server/tasks/v2/templates/6_pip_install_from_freeze.sh,sha256=ddF-Pz-MTvAUFoTW9Oq3Vqf1jpUtRXVSrOR_yRS13SM,995
+fractal_server/tasks/v2/templates/5_pip_install_from_freeze.sh,sha256=ddF-Pz-MTvAUFoTW9Oq3Vqf1jpUtRXVSrOR_yRS13SM,995
 fractal_server/tasks/v2/templates/pixi_1_extract.sh,sha256=vRRiBhwdE0NAXxornzG4P8QlZ5vjn-f9lJTtigA_Q_g,1112
 fractal_server/tasks/v2/templates/pixi_2_install.sh,sha256=0vWP7PscdPlGwlukD752eKeQVRis4PwG2f2IhPK_8RA,1614
-fractal_server/tasks/v2/templates/pixi_3_post_install.sh,sha256=eiTcg-eTSo-itmeEBt5am0jSji1-2MvYamm-HqiCfO4,2514
+fractal_server/tasks/v2/templates/pixi_3_post_install.sh,sha256=yN4ernZ2XQ8SBOixTyPJPaF-EV6E5sX7ea0Q5y7-mmI,2309
 fractal_server/tasks/v2/utils_background.py,sha256=w1VVFuPql8KXWdKr64iZWoykUDGtMCQA8VQFHqeObBU,4828
 fractal_server/tasks/v2/utils_database.py,sha256=Kyg-2fN0rx5eKKiFg1FtcJy82-7NAPJHEAGV1TvRkjI,1787
 fractal_server/tasks/v2/utils_package_names.py,sha256=-FAcbwBHsjyvhIK0QKue9_0xJUfRVdKMSIU_-gnLOR0,2381
-fractal_server/tasks/v2/utils_pixi.py,sha256=Z0FnRqVynSvXDDeFL0anz7zwKrBDLGdQxyuJdipt2DI,3411
+fractal_server/tasks/v2/utils_pixi.py,sha256=w0ll5LndB0RTiZEpWokHtgKY6_dE4FKauL173_T_AZA,3278
 fractal_server/tasks/v2/utils_python_interpreter.py,sha256=36AvrMoydr9w6Rm_7hKl5QK8zYI0KIm4Pv8WHANWwjE,658
 fractal_server/tasks/v2/utils_templates.py,sha256=L5GblhIKJwyzUbCORj1et5mh-7mG19nT5kmIpxOEj90,3489
 fractal_server/types/__init__.py,sha256=ENzSmiU4niKK0CLWN0AfdzsbRsTCrUMcFeANRvNZ5aU,3721
@@ -268,8 +267,7 @@ 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.18.1.dist-info/METADATA,sha256=iRsGxaPkJm0dyxgMSpGihfqfAbjZ3l-j3K-LcQR4Qfo,4275
-fractal_server-2.18.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fractal_server-2.18.1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.18.1.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.18.1.dist-info/RECORD,,
+fractal_server-2.18.3.dist-info/WHEEL,sha256=ZyFSCYkV2BrxH6-HRVRg3R9Fo7MALzer9KiPYqNxSbo,79
+fractal_server-2.18.3.dist-info/entry_points.txt,sha256=3TpdcjmETRYWJxFyAh3z-9955EWua9jdkSnBwxES1uE,60
+fractal_server-2.18.3.dist-info/METADATA,sha256=-sxLSpyU_KH3v5FE9LChgUo9IR99hQNrJrxdnof6jpA,4161
+fractal_server-2.18.3.dist-info/RECORD,,

fractal_server-2.18.3.dist-info/WHEEL

@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: uv 0.9.18
+Root-Is-Purelib: true
+Tag: py3-none-any

fractal_server-2.18.3.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+fractalctl = fractal_server.__main__:run
+

fractal_server/data_migrations/README.md

@@ -1,6 +0,0 @@
-Modules in this folder are consumed from the `update_db_data` function in
-`fractal_server/__main__.py`. They must expose a `fix_db` function, and they
-must be named according to `_slugify_version` (e.g. both for versions `1.4.3`
-and `1.4.3a0` the module name is  `1_4_3.py`).
-Modules corresponding to old versions should be moved to the `old` subfolder,
-which is not included in the package wheel.

fractal_server/tasks/v2/templates/5_get_venv_size_and_file_number.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Variables to be filled within fractal-server
-PACKAGE_ENV_DIR=__PACKAGE_ENV_DIR__
-
-# Find memory usage and file number
-ENV_DISK_USAGE=$(du -sk "${PACKAGE_ENV_DIR}" | cut -f1)
-ENV_FILE_NUMBER=$(find "${PACKAGE_ENV_DIR}" -type f | wc -l)
-
-echo "$ENV_DISK_USAGE" "$ENV_FILE_NUMBER"

fractal_server-2.18.1.dist-info/WHEEL

@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: poetry-core 2.2.1
-Root-Is-Purelib: true
-Tag: py3-none-any

fractal_server-2.18.1.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-fractalctl=fractal_server.__main__:run
-

fractal_server-2.18.1.dist-info/licenses/LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright 2022 (C) Friedrich Miescher Institute for Biomedical Research and University of Zurich
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.