fractal-server 2.14.6__py3-none-any.whl → 2.14.7__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.6"
+__VERSION__ = "2.14.7"

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

@@ -73,6 +73,7 @@ class BaseSlurmRunner(BaseRunner):
     jobs: dict[str, SlurmJob]
     python_worker_interpreter: str
     slurm_runner_type: Literal["ssh", "sudo"]
+    slurm_account: str | None = None
 
     def __init__(
         self,
@@ -83,6 +84,7 @@ class BaseSlurmRunner(BaseRunner):
         common_script_lines: list[str] | None = None,
         user_cache_dir: str | None = None,
         poll_interval: int | None = None,
+        slurm_account: str | None = None,
     ):
         self.slurm_runner_type = slurm_runner_type
         self.root_dir_local = root_dir_local
@@ -91,6 +93,7 @@ class BaseSlurmRunner(BaseRunner):
         self._check_slurm_account()
         self.user_cache_dir = user_cache_dir
         self.python_worker_interpreter = python_worker_interpreter
+        self.slurm_account = slurm_account
 
         settings = Inject(get_settings)
 
@@ -185,6 +188,24 @@ class BaseSlurmRunner(BaseRunner):
     ) -> str:
         logger.debug("[_submit_single_sbatch] START")
 
+        # Include SLURM account in `slurm_config`. Note: we make this change
+        # here, rather than exposing a new argument of `get_slurm_config`,
+        # because it's a backend-specific argument while `get_slurm_config` has
+        # a generic interface.
+        if self.slurm_account is not None:
+            slurm_config.account = self.slurm_account
+
+        # Include common_script_lines in extra_lines
+        if len(self.common_script_lines) > 0:
+            logger.debug(
+                f"Add {self.common_script_lines} to "
+                f"{slurm_config.extra_lines=}."
+            )
+            current_extra_lines = slurm_config.extra_lines or []
+            slurm_config.extra_lines = (
+                current_extra_lines + self.common_script_lines
+            )
+
         for task in slurm_job.tasks:
             # Write input file
             if self.slurm_runner_type == "ssh":

fractal_server/app/runner/executors/slurm_ssh/runner.py

@@ -30,6 +30,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         user_cache_dir: str | None = None,
         poll_interval: int | None = None,
         # Specific
+        slurm_account: str | None = None,
         fractal_ssh: FractalSSH,
     ) -> None:
         """
@@ -49,6 +50,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
             user_cache_dir=user_cache_dir,
             poll_interval=poll_interval,
             python_worker_interpreter=settings.FRACTAL_SLURM_WORKER_PYTHON,
+            slurm_account=slurm_account,
         )
 
     def _mkdir_local_folder(self, folder: str) -> None:

fractal_server/app/runner/executors/slurm_sudo/runner.py

@@ -63,7 +63,6 @@ class SudoSlurmRunner(BaseSlurmRunner):
         """
 
         self.slurm_user = slurm_user
-        self.slurm_account = slurm_account
         settings = Inject(get_settings)
 
         super().__init__(
@@ -76,6 +75,7 @@ class SudoSlurmRunner(BaseSlurmRunner):
             python_worker_interpreter=(
                 settings.FRACTAL_SLURM_WORKER_PYTHON or sys.executable
             ),
+            slurm_account=slurm_account,
         )
 
     def _mkdir_local_folder(self, folder: str) -> None:

fractal_server/app/runner/v2/_slurm_ssh.py

@@ -43,10 +43,11 @@ def process_workflow(
     logger_name: str,
     job_attribute_filters: AttributeFilters,
     job_type_filters: dict[str, bool],
+    user_id: int,
+    # SLURM-ssh-specific
     fractal_ssh: FractalSSH,
+    slurm_account: str | None = None,
     worker_init: str | None = None,
-    user_id: int,
-    **kwargs,  # not used
 ) -> None:
     """
     Process workflow (SLURM backend public interface)
@@ -79,6 +80,7 @@ def process_workflow(
         fractal_ssh=fractal_ssh,
         root_dir_local=workflow_dir_local,
         root_dir_remote=workflow_dir_remote,
+        slurm_account=slurm_account,
         common_script_lines=worker_init,
     ) as runner:
         execute_tasks_v2(

fractal_server/app/runner/v2/_slurm_sudo.py

@@ -39,7 +39,7 @@ def process_workflow(
     job_attribute_filters: AttributeFilters,
     job_type_filters: dict[str, bool],
     user_id: int,
-    # Slurm-specific
+    # SLURM-sudo-specific
     user_cache_dir: str | None = None,
     slurm_user: str | None = None,
     slurm_account: str | None = None,

fractal_server/app/runner/v2/submit_workflow.py

@@ -236,6 +236,7 @@ def submit_workflow(
         elif FRACTAL_RUNNER_BACKEND == "slurm_ssh":
             logger.debug(f"ssh_user: {user_settings.ssh_username}")
             logger.debug(f"base dir: {user_settings.ssh_tasks_dir}")
+            logger.debug(f"slurm_account: {job.slurm_account}")
             logger.debug(f"worker_init: {worker_init}")
         logger.debug(f"job.id: {job.id}")
         logger.debug(f"job.working_dir: {job.working_dir}")
@@ -257,7 +258,10 @@ def submit_workflow(
             )
         elif FRACTAL_RUNNER_BACKEND == "slurm_ssh":
             process_workflow = slurm_ssh_process_workflow
-            backend_specific_kwargs = dict(fractal_ssh=fractal_ssh)
+            backend_specific_kwargs = dict(
+                fractal_ssh=fractal_ssh,
+                slurm_account=job.slurm_account,
+            )
         else:
             raise RuntimeError(
                 f"Invalid runner backend {FRACTAL_RUNNER_BACKEND=}"

{fractal_server-2.14.6.dist-info → fractal_server-2.14.7.dist-info}/METADATA

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

{fractal_server-2.14.6.dist-info → fractal_server-2.14.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=Y4F5A7tpr8d-jbgWoc3vHmF2XHiIkBcCq_YeYImhJyU,23
+fractal_server/__init__.py,sha256=QNdgEt2dlH38r7d-Aic7OiWBBWoFztVFsxx5rckKHWU,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
@@ -78,31 +78,31 @@ fractal_server/app/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa
 fractal_server/app/runner/executors/slurm_common/_batching.py,sha256=gbHZIxt90GjUwhB9_UInwVqpX-KdxRQMDeXzUagdL3U,8816
 fractal_server/app/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
 fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=Zv2l_6X1EfSHGRqcBMj2dbai_kP8hfuMfh-WoIUj0tY,15646
-fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=i-vU_Edxv2at9Pwai5T2pfZhl-_LSdKG3LbCcAdEDOA,34625
+fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=-xGJb_wc_99o-JweRr1f-ho8hSczNTWdj00jCfE1KPc,35533
 fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=VJNryceLzF5_fx9_lS1nGq85EW8rOQ0KrgtMATcfdQc,7271
 fractal_server/app/runner/executors/slurm_common/remote.py,sha256=xWnI6WktHR_7cxUme72ztIeBb4osnbZNu6J2azWn9K8,3765
 fractal_server/app/runner/executors/slurm_common/slurm_job_task_models.py,sha256=K4SdJOKsUWzDlnkb8Ug_UmTx6nBMsTqn9_oKqwE4XDI,3520
 fractal_server/app/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_ssh/run_subprocess.py,sha256=SyW6t4egvbiARph2YkFjc88Hj94fCamZVi50L7ph8VM,996
-fractal_server/app/runner/executors/slurm_ssh/runner.py,sha256=uInDpY2kRxgXl7qBTbzYvH8YXBNRndkOfaMJSDsamYk,7789
+fractal_server/app/runner/executors/slurm_ssh/runner.py,sha256=fCovzTP5jrun5yRh4O67gtw3D4g2hMynQziu8pu1mk4,7872
 fractal_server/app/runner/executors/slurm_ssh/tar_commands.py,sha256=g173siyv7qtjov5i-CjTVRT8d19ibK8re3RVWbsdHYA,1845
 fractal_server/app/runner/executors/slurm_sudo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/executors/slurm_sudo/_subprocess_run_as_user.py,sha256=W-FxnVcHxMGpv4zGgJVttVQoweyGgR4uBxO22QIZkp0,2576
-fractal_server/app/runner/executors/slurm_sudo/runner.py,sha256=9uymtD94XlJLPEowTPfpxYDKDWhBCkgkC9uyTuECgbU,5861
+fractal_server/app/runner/executors/slurm_sudo/runner.py,sha256=TGH6B1eRHgHjYjqN86F1V-WNAB_kp-nPo5TJ0FHwigY,5859
 fractal_server/app/runner/filenames.py,sha256=lPnxKHtdRizr6FqG3zOdjDPyWA7GoaJGTtiuJV0gA8E,70
 fractal_server/app/runner/set_start_and_last_task_index.py,sha256=NsioSzfEpGyo9ZKrV5KsbxeI7d5V3tE678Y3IAo5rHM,1218
 fractal_server/app/runner/shutdown.py,sha256=ViSNJyXWU_iWPSDOOMGNh_iQdUFrdPh_jvf8vVKLpAo,1950
 fractal_server/app/runner/task_files.py,sha256=V_7aZhu6-c6Y-0XUe-5cZVDrdnXEJhp8pQoUMtx6ko0,4041
 fractal_server/app/runner/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/v2/_local.py,sha256=tTJgABK-zAZmmRzoie_MPNTXJx_zBAXiZiiWl1CC2qo,3035
-fractal_server/app/runner/v2/_slurm_ssh.py,sha256=PYRbQ7Z3cNT84nQX2lciLP42m2U1ow39BxO2-594yIo,3228
-fractal_server/app/runner/v2/_slurm_sudo.py,sha256=Dms_N06kTpqHLyHsjUSYcbwXO63j0IYKxOa6duWyb20,2934
+fractal_server/app/runner/v2/_slurm_ssh.py,sha256=VN89sFwqi139m9wpO1LmExIYIVhmYbEoMgtX7kLAMhE,3302
+fractal_server/app/runner/v2/_slurm_sudo.py,sha256=Gvsh4tUlc1_3KdF3B7zEqs-YIntC_joLtTGSNFbKKSs,2939
 fractal_server/app/runner/v2/db_tools.py,sha256=du5dKhMMFMErQXbGIgu9JvO_vtMensodyPsyDeqz1yQ,3324
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=IVTE4abBU1bUprFTkxrTfYKnvkNTanWQ-KWh_etiT08,645
 fractal_server/app/runner/v2/merge_outputs.py,sha256=D1L4Taieq9i71SPQyNc1kMokgHh-sV_MqF3bv7QMDBc,907
 fractal_server/app/runner/v2/runner.py,sha256=_34aVmm0jCaXWvixoMrY477p4c2ctwtvITIhIX0VccM,17673
 fractal_server/app/runner/v2/runner_functions.py,sha256=Q9AVIR2NEBfRpfqW1wtQTTQfks_R1TnwRFBRro2fvjQ,18837
-fractal_server/app/runner/v2/submit_workflow.py,sha256=3dYY6MvOJPoG_lxyhGPQlps0SSoJ7twfka_39OTmx-s,12996
+fractal_server/app/runner/v2/submit_workflow.py,sha256=AMnXdozwIGlXD55ch0_SNAG-ntKBO-QRhkbInrvsShU,13140
 fractal_server/app/runner/v2/task_interface.py,sha256=V2TWBK6tbhycyMrJvFaoJ9IpuKlrLrvmjJbfNMsBBXo,2527
 fractal_server/app/runner/versions.py,sha256=4BW-8Et8RVgILgpFoUJLWkEnZz53pv8hv_2ucG480ns,398
 fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMoqWc3orFyI,135
@@ -210,8 +210,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=FCY6HUsRnnbsWkT2kwQ2izijiHuCrCD3Kh50G0QudxE,3531
 fractal_server/zip_tools.py,sha256=tqz_8f-vQ9OBRW-4OQfO6xxY-YInHTyHmZxU7U4PqZo,4885
-fractal_server-2.14.6.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.6.dist-info/METADATA,sha256=dtKBiEFNhzkhtKXjX9rpnv2AJz_u41tiF6sBGP2fvEo,4243
-fractal_server-2.14.6.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.6.dist-info/RECORD,,
+fractal_server-2.14.7.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.7.dist-info/METADATA,sha256=OuchiBpi477koEa1037Mif2_oDWNHdRneyBs7_Jjwuk,4243
+fractal_server-2.14.7.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.7.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.7.dist-info/RECORD,,