fractal-server 2.14.2__py3-none-any.whl → 2.14.3__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.2"
+__VERSION__ = "2.14.3"

fractal_server/app/runner/compress_folder.py

@@ -16,67 +16,9 @@ import time
 from pathlib import Path
 
 from fractal_server.app.runner.run_subprocess import run_subprocess
-from fractal_server.logger import get_logger
 from fractal_server.logger import set_logger
 
 
-def _copy_subfolder(src: Path, dest: Path, logger_name: str):
-    t_start = time.perf_counter()
-    cmd_cp = f"cp -r {src.as_posix()} {dest.as_posix()}"
-    logger = get_logger(logger_name=logger_name)
-    logger.debug(f"{cmd_cp=}")
-    res = run_subprocess(cmd=cmd_cp, logger_name=logger_name)
-    elapsed = time.perf_counter() - t_start
-    logger.debug(f"[_copy_subfolder] END {elapsed=} s ({dest.as_posix()})")
-    return res
-
-
-def _create_tar_archive(
-    tarfile_path: str,
-    subfolder_path_tmp_copy: Path,
-    logger_name: str,
-    filelist_path: str | None,
-):
-    logger = get_logger(logger_name)
-    logger.debug(f"[_create_tar_archive] START ({tarfile_path})")
-    t_start = time.perf_counter()
-
-    if filelist_path is None:
-        cmd_tar = (
-            f"tar -c -z -f {tarfile_path} "
-            f"--directory={subfolder_path_tmp_copy.as_posix()} "
-            "."
-        )
-    else:
-        cmd_tar = (
-            f"tar -c -z -f {tarfile_path} "
-            f"--directory={subfolder_path_tmp_copy.as_posix()} "
-            f"--files-from={filelist_path} --ignore-failed-read"
-        )
-
-    logger.debug(f"cmd tar:\n{cmd_tar}")
-
-    run_subprocess(cmd=cmd_tar, logger_name=logger_name, allow_char="*")
-    elapsed = time.perf_counter() - t_start
-    logger.debug(f"[_create_tar_archive] END {elapsed=} s ({tarfile_path})")
-
-
-def _remove_temp_subfolder(subfolder_path_tmp_copy: Path, logger_name: str):
-    logger = get_logger(logger_name)
-    t_start = time.perf_counter()
-    try:
-        cmd_rm = f"rm -rf {subfolder_path_tmp_copy}"
-        logger.debug(f"cmd rm:\n{cmd_rm}")
-        run_subprocess(cmd=cmd_rm, logger_name=logger_name, allow_char="*")
-    except Exception as e:
-        logger.debug(f"ERROR during {cmd_rm}: {e}")
-    elapsed = time.perf_counter() - t_start
-    logger.debug(
-        f"[_remove_temp_subfolder] END {elapsed=} s "
-        f"({subfolder_path_tmp_copy=})"
-    )
-
-
 def compress_folder(
     subfolder_path: Path,
     filelist_path: str | None,
@@ -97,44 +39,55 @@ def compress_folder(
         Absolute path to the tar.gz archive.
     """
 
-    logger_name = "compress_folder"
+    # Assign an almost-unique label to the logger name, to simplify grepping
+    # logs when several `compress_folder` functions are run concurrently
+    label = round(time.time(), 2)
+    logger_name = f"compress_folder_{label}"
     logger = set_logger(
         logger_name,
         default_logging_level=default_logging_level,
     )
-
     logger.debug("START")
-    logger.debug(f"{subfolder_path=}")
-    parent_dir = subfolder_path.parent
+    t_start = time.perf_counter()
+
     subfolder_name = subfolder_path.name
-    tarfile_path = (parent_dir / f"{subfolder_name}.tar.gz").as_posix()
+    tarfile_path = (
+        subfolder_path.parent / f"{subfolder_name}.tar.gz"
+    ).as_posix()
+
+    logger.debug(f"{subfolder_path=}")
     logger.debug(f"{tarfile_path=}")
 
-    subfolder_path_tmp_copy = (
-        subfolder_path.parent / f"{subfolder_path.name}_copy"
-    )
-    try:
-        _copy_subfolder(
-            subfolder_path,
-            subfolder_path_tmp_copy,
-            logger_name=logger_name,
+    if filelist_path is None:
+        cmd_tar = (
+            f"tar -c -z -f {tarfile_path} "
+            f"--directory={subfolder_path.as_posix()} "
+            "."
         )
-        _create_tar_archive(
-            tarfile_path,
-            subfolder_path_tmp_copy,
-            logger_name=logger_name,
-            filelist_path=filelist_path,
+    else:
+        cmd_tar = (
+            f"tar -c -z -f {tarfile_path} "
+            f"--directory={subfolder_path.as_posix()} "
+            f"--files-from={filelist_path} --ignore-failed-read"
         )
-        return tarfile_path
+    logger.debug(f"{cmd_tar=}")
 
+    try:
+        run_subprocess(cmd=cmd_tar, logger_name=logger_name)
+        elapsed = time.perf_counter() - t_start
+        logger.debug(f"END {elapsed=} s ({tarfile_path})")
+        return tarfile_path
     except Exception as e:
-        logger.debug(f"ERROR: {e}")
-        sys.exit(1)
+        logger.debug(f"ERROR: {str(e)}")
+        cmd_rm = f"rm {tarfile_path}"
+        try:
+            run_subprocess(cmd=cmd_rm, logger_name=logger_name)
+        except Exception as e_rm:
+            logger.error(
+                f"Running {cmd_rm=} failed, original error: {str(e_rm)}."
+            )
 
-    finally:
-        _remove_temp_subfolder(
-            subfolder_path_tmp_copy, logger_name=logger_name
-        )
+        sys.exit(1)
 
 
 def main(

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

@@ -18,7 +18,6 @@ import logging
 import os
 import sys
 from typing import Literal
-from typing import Optional
 from typing import Union
 
 import cloudpickle
@@ -91,7 +90,6 @@ def worker(
     *,
     in_fname: str,
     out_fname: str,
-    extra_import_paths: Optional[str] = None,
 ) -> None:
     """
     Execute a job, possibly on a remote node.
@@ -99,7 +97,6 @@ def worker(
     Arguments:
         in_fname: Absolute path to the input pickle file (must be readable).
         out_fname: Absolute path of the output pickle file (must be writeable).
-        extra_import_paths: Additional import paths
     """
 
     # Create output folder, if missing
@@ -108,10 +105,6 @@ def worker(
         logging.debug(f"_slurm.remote.worker: create {out_dir=}")
         os.mkdir(out_dir)
 
-    if extra_import_paths:
-        _extra_import_paths = extra_import_paths.split(":")
-        sys.path[:0] = _extra_import_paths
-
     # Execute the job and capture exceptions
     try:
         with open(in_fname, "rb") as f:
@@ -167,18 +160,11 @@ if __name__ == "__main__":
         help="Path of output pickle file",
         required=True,
     )
-    parser.add_argument(
-        "--extra-import-paths",
-        type=str,
-        help="Extra import paths",
-        required=False,
-    )
     parsed_args = parser.parse_args()
     logging.debug(f"{parsed_args=}")
 
     kwargs = dict(
-        in_fname=parsed_args.input_file, out_fname=parsed_args.output_file
+        in_fname=parsed_args.input_file,
+        out_fname=parsed_args.output_file,
     )
-    if parsed_args.extra_import_paths:
-        kwargs["extra_import_paths"] = parsed_args.extra_import_paths
     worker(**kwargs)

{fractal_server-2.14.2.dist-info → fractal_server-2.14.3.dist-info}/METADATA

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

{fractal_server-2.14.2.dist-info → fractal_server-2.14.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=6Uu9b8c6XWTG60V3XHQPdFjCGQfgYX4y4FTD3DmRFXk,23
+fractal_server/__init__.py,sha256=20SgG8fPO0eewuM_dSHcBRp5Xaupoj5yomTxw0STcSI,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
@@ -67,7 +67,7 @@ fractal_server/app/routes/aux/validate_user_settings.py,sha256=FLVi__8YFcm_6c_K5
 fractal_server/app/routes/pagination.py,sha256=L8F5JqekF39qz-LpeScdlhb57MQnSRXjK4ZEtsZqYLk,1210
 fractal_server/app/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/components.py,sha256=-Ii5l8d_V6f5DFOd-Zsr8VYmOsyqw0Hox9fEFQiuqxY,66
-fractal_server/app/runner/compress_folder.py,sha256=PpamheggkacuAFhSiHkuW76x9zwawouqNySPBDyAuRI,5245
+fractal_server/app/runner/compress_folder.py,sha256=3X8eyC5sdTJqOgWiMKCu-1wI658gVMXRuHKBcqHpFWo,3811
 fractal_server/app/runner/exceptions.py,sha256=JC5ufHyeA1hYD_rkZUscI30DD8D903ncag7Z3AArmUY,4215
 fractal_server/app/runner/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/base_runner.py,sha256=4xxMpYycIeAOz5niaJj2xtVW_Cq-shCxP1qk4g-KwOM,5137
@@ -80,7 +80,7 @@ fractal_server/app/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38
 fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=_feRRnVVnvQa3AsOQqfULfOgaoj2o6Ze0-fwXwic8p4,15795
 fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=bqFD9uZfwXqmVXsScrgANp09zvbuc_LSGCDAmBV0wqo,33379
 fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=BW6fDpPyB0VH5leVxvwzkVH3r3hC7DuSyoWmRzHITWg,7305
-fractal_server/app/runner/executors/slurm_common/remote.py,sha256=WdzVSLYKOxLb9NmrvwZu0voXRPTO1gyKTUUuRJwu9Lc,5861
+fractal_server/app/runner/executors/slurm_common/remote.py,sha256=Z7cnAlhYi9Orgeq6UGCl3cnWq9DX_sPrc6X1p40hVFE,5364
 fractal_server/app/runner/executors/slurm_common/slurm_job_task_models.py,sha256=RoxHLKOn0_wGjnY0Sv0a9nDSiqxYZHKRoMkT3p9_G1E,3607
 fractal_server/app/runner/executors/slurm_common/utils_executors.py,sha256=naPyJI0I3lD-sYHbSXbMFGUBK4h_SggA5V91Z1Ch1Xg,1416
 fractal_server/app/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -209,8 +209,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=Kc_nSzdlV6KIsO0CQSPs1w70zLyENP
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.14.2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.2.dist-info/METADATA,sha256=LQDnOxlZL14XsZXYcQ42N-JR0NSMBfxN4qOP2raSiG4,4560
-fractal_server-2.14.2.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.2.dist-info/RECORD,,
+fractal_server-2.14.3.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.3.dist-info/METADATA,sha256=jWGz8N3CZga8UzjSeagUSYuLxxqDbZSBnkZnd15zrTo,4560
+fractal_server-2.14.3.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.3.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.3.dist-info/RECORD,,