fractal-server 2.14.6__tar.gz → 2.14.7__tar.gz

{fractal_server-2.14.6 → fractal_server-2.14.7}/PKG-INFO

@@ -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.7/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.14.7"

{fractal_server-2.14.6 → fractal_server-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-2.14.6 → fractal_server-2.14.7}/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-2.14.6 → fractal_server-2.14.7}/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-2.14.6 → fractal_server-2.14.7}/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-2.14.6 → fractal_server-2.14.7}/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-2.14.6 → fractal_server-2.14.7}/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 → fractal_server-2.14.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.14.6"
+version = "2.14.7"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -94,7 +94,7 @@ filterwarnings = [
 markers = ["container", "ssh"]
 
 [tool.bumpver]
-current_version = "2.14.6"
+current_version = "2.14.7"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.14.6/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.14.6"