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

fractal_server/__init__.py

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

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/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/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/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/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.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.18.1
+Version: 2.18.2
 Summary: Backend component of the Fractal analytics platform
 License-Expression: BSD-3-Clause
 License-File: LICENSE

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

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=BKsIdxrz9PsV9xvr1HmK94dmxX69wjDyrYRY53MjstQ,23
+fractal_server/__init__.py,sha256=SYVCzme8G5fCPQcTLY-LEETzoVBgUiF6qN26Eofya8M,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
@@ -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
@@ -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
@@ -118,6 +118,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
@@ -228,36 +229,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 +268,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=zt
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=-rjg8QTXQcKweXjn0NcmETFs1_uM9PGnbl0Q7c4ERPM,2181
 fractal_server/zip_tools.py,sha256=Uhn-ax4_9g1PJ32BdyaX30hFpAeVOv2tZYTUK-zVn1E,5719
-fractal_server-2.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.2.dist-info/METADATA,sha256=3N5kI9DAFqLXBpWAwI_OmNluYRiksN-dD3PFYB4NPe4,4275
+fractal_server-2.18.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.18.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.18.2.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.18.2.dist-info/RECORD,,

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"