fractal-server 2.16.2__py3-none-any.whl → 2.16.3__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.16.2"
+__VERSION__ = "2.16.3"

fractal_server/tasks/v2/ssh/_pixi_slurm_ssh.py

@@ -31,6 +31,36 @@ STATES_FINISHED = {
 }
 
 
+def _get_workdir_remote(script_paths: list[str]) -> str:
+    """
+    Check that there is one and only one `workdir`, and return it.
+
+    Note: The `is_absolute` check is to filter out a `chmod` command.
+    """
+    workdirs = [
+        Path(script_path).parent.as_posix()
+        for script_path in script_paths
+        if Path(script_path).is_absolute()
+    ]
+    if not len(set(workdirs)) == 1:
+        raise ValueError(f"Invalid {script_paths=}.")
+    return workdirs[0]
+
+
+def _read_file_if_exists(
+    *,
+    fractal_ssh: FractalSSH,
+    path: str,
+) -> str:
+    """
+    Read a remote file if it exists, or return an empty string.
+    """
+    if fractal_ssh.remote_exists(path=path):
+        return fractal_ssh.read_remote_text_file(path)
+    else:
+        return ""
+
+
 def _log_change_of_job_state(
     *,
     old_state: str | None,
@@ -99,15 +129,18 @@ def _verify_success_file_exists(
         logger = get_logger(logger_name=logger_name)
         error_msg = f"{success_file_remote=} missing."
         logger.info(error_msg)
-        if fractal_ssh.remote_exists(stderr_remote):
-            stderr = fractal_ssh.read_remote_text_file(stderr_remote)
+
+        stderr = _read_file_if_exists(
+            fractal_ssh=fractal_ssh, path=stderr_remote
+        )
+        if stderr:
             logger.info(f"SLURM-job stderr:\n{stderr}")
         raise RuntimeError(error_msg)
 
 
 def run_script_on_remote_slurm(
     *,
-    script_path: str,
+    script_paths: list[str],
     slurm_config: PixiSLURMConfig,
     fractal_ssh: FractalSSH,
     logger_name: str,
@@ -127,7 +160,7 @@ def run_script_on_remote_slurm(
     settings = Inject(get_settings)
 
     # (1) Prepare remote submission script
-    workdir_remote = Path(script_path).parent.as_posix()
+    workdir_remote = _get_workdir_remote(script_paths)
     submission_script_remote = os.path.join(
         workdir_remote, f"{prefix}-submit.sh"
     )
@@ -144,10 +177,11 @@ def run_script_on_remote_slurm(
         f"#SBATCH --out={stdout_remote}",
         f"#SBATCH -D {workdir_remote}",
         "",
-        f"bash {script_path}",
-        f"touch {success_file_remote}",
-        "",
     ]
+    for script_path in script_paths:
+        script_lines.append(f"bash {script_path}")
+    script_lines.append(f"touch {success_file_remote}")
+
     script_contents = "\n".join(script_lines)
     fractal_ssh.write_remote_file(
         path=submission_script_remote,
@@ -209,6 +243,13 @@ def run_script_on_remote_slurm(
         stderr_remote=stderr_remote,
     )
 
+    stdout = _read_file_if_exists(
+        fractal_ssh=fractal_ssh,
+        path=stdout_remote,
+    )
+
     logger.info("SLURM-job execution completed successfully, continue.")
     activity.log = get_current_log(log_file_path)
     activity = add_commit_refresh(obj=activity, db=db)
+
+    return stdout

fractal_server/tasks/v2/ssh/collect_pixi.py

@@ -203,12 +203,21 @@ def collect_ssh_pixi(
                         pyproject_toml_path=pyproject_toml_path,
                     )
 
-                    # Run script 2 - run pixi-install command
+                    # Prepare scripts 2 and 3
                     remote_script2_path = _customize_and_send_template(
                         template_filename="pixi_2_install.sh",
                         replacements=replacements,
                         **common_args,
                     )
+                    remote_script3_path = _customize_and_send_template(
+                        template_filename="pixi_3_post_install.sh",
+                        replacements=replacements,
+                        **common_args,
+                    )
+                    logger.debug(
+                        "Post-installation script written to "
+                        f"{remote_script3_path=}."
+                    )
                     logger.debug(
                         "Installation script written to "
                         f"{remote_script2_path=}."
@@ -216,8 +225,13 @@ def collect_ssh_pixi(
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
-                    run_script_on_remote_slurm(
-                        script_path=remote_script2_path,
+                    # Run scripts 2 and 3
+                    stdout = run_script_on_remote_slurm(
+                        script_paths=[
+                            remote_script2_path,
+                            remote_script3_path,
+                            f"chmod -R 755 {source_dir}",
+                        ],
                         slurm_config=settings.pixi.SLURM_CONFIG,
                         fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,
@@ -229,16 +243,6 @@ def collect_ssh_pixi(
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
-                    # Run script 3 - post-install
-                    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)
-
                     # Parse stdout
                     parsed_output = parse_collect_stdout(stdout)
                     package_root_remote = parsed_output["package_root"]
@@ -248,8 +252,6 @@ def collect_ssh_pixi(
                         "project_python_wrapper"
                     ]
 
-                    fractal_ssh.run_command(cmd=f"chmod -R 755 {source_dir}")
-
                     # Read and validate remote manifest file
                     manifest_path_remote = (
                         f"{package_root_remote}/__FRACTAL_MANIFEST__.json"

fractal_server/tasks/v2/ssh/reactivate_pixi.py

@@ -188,12 +188,21 @@ def reactivate_ssh_pixi(
                         remote=pixi_lock_remote,
                     )
 
-                    # Run script 2 - run pixi-install command
+                    # Prepare scripts 2 and 3
                     remote_script2_path = _customize_and_send_template(
                         template_filename="pixi_2_install.sh",
                         replacements=replacements,
                         **common_args,
                     )
+                    remote_script3_path = _customize_and_send_template(
+                        template_filename="pixi_3_post_install.sh",
+                        replacements=replacements,
+                        **common_args,
+                    )
+                    logger.debug(
+                        "Post-installation script written to "
+                        f"{remote_script3_path=}."
+                    )
                     logger.debug(
                         "Installation script written to "
                         f"{remote_script2_path=}."
@@ -201,8 +210,13 @@ def reactivate_ssh_pixi(
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
-                    run_script_on_remote_slurm(
-                        script_path=remote_script2_path,
+                    # Run scripts 2 and 3
+                    stdout = run_script_on_remote_slurm(
+                        script_paths=[
+                            remote_script2_path,
+                            remote_script3_path,
+                            f"chmod -R 755 {source_dir}",
+                        ],
                         slurm_config=settings.pixi.SLURM_CONFIG,
                         fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,
@@ -214,18 +228,6 @@ def reactivate_ssh_pixi(
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
-                    # Run script 3 - post-install
-                    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 -R 755 {source_dir}")
-
                     # Finalize (write metadata to DB)
                     activity.status = TaskGroupActivityStatusV2.OK
                     activity.timestamp_ended = get_timestamp()

{fractal_server-2.16.2.dist-info → fractal_server-2.16.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.16.2
+Version: 2.16.3
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alembic (>=1.13.1,<2.0.0)
-Requires-Dist: cryptography (>=45.0.3,<45.1.0)
+Requires-Dist: cryptography (>=46.0.0,<47.0.0)
 Requires-Dist: fabric (>=3.2.2,<3.3.0)
 Requires-Dist: fastapi (>=0.116.0,<0.117.0)
 Requires-Dist: fastapi-users[oauth] (>=14,<15)

{fractal_server-2.16.2.dist-info → fractal_server-2.16.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=4kmWit_5SMjK3FA49cLisJxqg2JTjE1FTm94k5TFawg,23
+fractal_server/__init__.py,sha256=XhckXI3NQgXzQFmbqjMIwxfxShIlVm8JhcoaOhWWvyY,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
@@ -204,15 +204,15 @@ fractal_server/tasks/v2/local/delete.py,sha256=TbNcg0IhbJNXzXsO2Vgv6Dq4jWmFUVtSu
 fractal_server/tasks/v2/local/reactivate.py,sha256=Q43DOadNeFyyfgNP67lUqaXmZsS6onv67XwxH_-5ANA,5756
 fractal_server/tasks/v2/local/reactivate_pixi.py,sha256=IuxDRaj8i6Rc582TIbc9HVKQ9pOvR4IepyXSaJx2PfQ,7565
 fractal_server/tasks/v2/ssh/__init__.py,sha256=dPK6BtEZVh1GiFP05j1RKTEnZvjJez8o2KkMC2hWXaw,339
-fractal_server/tasks/v2/ssh/_pixi_slurm_ssh.py,sha256=l1mBuzD0eGG1tvLzAIDuy3JlZjzVx9RtXLY5IjxLHjc,6508
+fractal_server/tasks/v2/ssh/_pixi_slurm_ssh.py,sha256=24BX64KbnBr4Wd3k9KmSNz4WHzvLf9AF7Hh1-FDlC9w,7472
 fractal_server/tasks/v2/ssh/_utils.py,sha256=AjbH4o6-ENe-ZiHvE_pGe_yw8e2lapGMYtLX7VuBkA8,6111
 fractal_server/tasks/v2/ssh/collect.py,sha256=WesUBtNaax9ST7CtgqAD2qd-ZII4t1JFPzRzltEOuM8,14333
-fractal_server/tasks/v2/ssh/collect_pixi.py,sha256=oRz5hp1vkZ1MbVzTPAKZBhNVD4rgHwI-MDvUCJr_jeo,15147
+fractal_server/tasks/v2/ssh/collect_pixi.py,sha256=i7_xqAy9kkF19AHHGSAmvs-QUEQIkPJvVxXUiau1WhU,15210
 fractal_server/tasks/v2/ssh/deactivate.py,sha256=7gJ2mOah0wKwUnK0S9QpaXg08_WE95P0rC-oExAGhLE,12438
 fractal_server/tasks/v2/ssh/deactivate_pixi.py,sha256=K0yK_NPUqhFMj6cp6G_0Kfn0Yo7oQux4kT5dFPulnos,4748
 fractal_server/tasks/v2/ssh/delete.py,sha256=9DCe5QXZ14pY8NRb_FCqpIr31r5Gboz6bnFrS8Oa044,4277
 fractal_server/tasks/v2/ssh/reactivate.py,sha256=NJIgMNFKaXMhbvK0iZOsMwMtsms6Boj9f8N4L01X9Bo,8271
-fractal_server/tasks/v2/ssh/reactivate_pixi.py,sha256=O0f9f4KKPFrzDZ8sNCPlH4rvRf79b2bUNOeZDUdVcrQ,11147
+fractal_server/tasks/v2/ssh/reactivate_pixi.py,sha256=yRoq7xTCpKgx8Fxc5RTpEwQI-L0-9Tjq7vnX_v3v7JE,11210
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
 fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=vN9DX-eucJjB-XCuQuZmkuATGBzL4FlDQJTQdVewJG8,2155
 fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V4aI-FnX9ZvVNxgpSOBFc,168
@@ -236,8 +236,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=H0w7wS5yE4ebj7hw1_77YQ959dl2c-L0WX6J_ro1TY4,4884
-fractal_server-2.16.2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.16.2.dist-info/METADATA,sha256=RAX6WeXcABoEtBkQElrkFwqEOZF4cX8rp1expG65Dec,4334
-fractal_server-2.16.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-fractal_server-2.16.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.16.2.dist-info/RECORD,,
+fractal_server-2.16.3.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.16.3.dist-info/METADATA,sha256=pw_mNLXMPEkIRXLZGpIG5a4T_S4ehtX1HAuqTkKZrXQ,4334
+fractal_server-2.16.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+fractal_server-2.16.3.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.16.3.dist-info/RECORD,,