fractal-server 2.0.3__tar.gz → 2.0.4__tar.gz

{fractal_server-2.0.3 → fractal_server-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.0.3
+Version: 2.0.4
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause
@@ -39,7 +39,7 @@ Description-Content-Type: text/markdown
 # Fractal Server
 
 [![PyPI version](https://img.shields.io/pypi/v/fractal-server?color=gree)](https://pypi.org/project/fractal-server/)
-[![CI Status](https://github.com/fractal-analytics-platform/fractal-server/actions/workflows/ci.yml/badge.svg)](https://github.com/fractal-analytics-platform/fractal-server/actions/workflows/ci.yml)
+[![CI Status](https://github.com/fractal-analytics-platform/fractal-server/actions/workflows/ci.yml/badge.svg)](https://github.com/fractal-analytics-platform/fractal-server/actions/workflows/ci.yml?query=branch%3Amain)
 [![Coverage](https://raw.githubusercontent.com/fractal-analytics-platform/fractal-server/python-coverage-comment-action-data/badge.svg)](https://htmlpreview.github.io/?https://github.com/fractal-analytics-platform/fractal-server/blob/python-coverage-comment-action-data/htmlcov/index.html)
 [![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 [![Benchmarks](https://img.shields.io/badge/Benchmarks-Done-blue)](https://htmlpreview.github.io/?https://github.com/fractal-analytics-platform/fractal-server/blob/benchmark-api/benchmarks/bench.html)

{fractal_server-2.0.3 → fractal_server-2.0.4}/README.md

@@ -1,7 +1,7 @@
 # Fractal Server
 
 [![PyPI version](https://img.shields.io/pypi/v/fractal-server?color=gree)](https://pypi.org/project/fractal-server/)
-[![CI Status](https://github.com/fractal-analytics-platform/fractal-server/actions/workflows/ci.yml/badge.svg)](https://github.com/fractal-analytics-platform/fractal-server/actions/workflows/ci.yml)
+[![CI Status](https://github.com/fractal-analytics-platform/fractal-server/actions/workflows/ci.yml/badge.svg)](https://github.com/fractal-analytics-platform/fractal-server/actions/workflows/ci.yml?query=branch%3Amain)
 [![Coverage](https://raw.githubusercontent.com/fractal-analytics-platform/fractal-server/python-coverage-comment-action-data/badge.svg)](https://htmlpreview.github.io/?https://github.com/fractal-analytics-platform/fractal-server/blob/python-coverage-comment-action-data/htmlcov/index.html)
 [![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 [![Benchmarks](https://img.shields.io/badge/Benchmarks-Done-blue)](https://htmlpreview.github.io/?https://github.com/fractal-analytics-platform/fractal-server/blob/benchmark-api/benchmarks/bench.html)

fractal_server-2.0.4/fractal_server/__init__.py

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

{fractal_server-2.0.3 → fractal_server-2.0.4}/fractal_server/app/runner/executors/slurm/executor.py

@@ -489,6 +489,10 @@ class FractalSlurmExecutor(SlurmExecutor):
         if len(args_batches) != math.ceil(tot_tasks / tasks_per_job):
             raise RuntimeError("Something wrong here while batching tasks")
 
+        # Fetch configuration variable
+        settings = Inject(get_settings)
+        FRACTAL_SLURM_SBATCH_SLEEP = settings.FRACTAL_SLURM_SBATCH_SLEEP
+
         # Construct list of futures (one per SLURM job, i.e. one per batch)
         fs = []
         current_component_index = 0
@@ -508,6 +512,7 @@ class FractalSlurmExecutor(SlurmExecutor):
                 )
             )
             current_component_index += batch_size
+            time.sleep(FRACTAL_SLURM_SBATCH_SLEEP)
 
         # Yield must be hidden in closure so that the futures are submitted
         # before the first iterator value is required.

{fractal_server-2.0.3 → fractal_server-2.0.4}/fractal_server/config.py

@@ -331,6 +331,12 @@ class Settings(BaseSettings):
     [`clusterfutures`](https://github.com/sampsyo/clusterfutures/blob/master/cfut/__init__.py)).
     """
 
+    FRACTAL_SLURM_SBATCH_SLEEP: int = 0
+    """
+    Interval to wait (in seconds) between two subsequent `sbatch` calls, when
+    running a task that produces multiple SLURM jobs.
+    """
+
     FRACTAL_SLURM_ERROR_HANDLING_INTERVAL: int = 5
     """
     Interval to wait (in seconds) when the SLURM backend does not find an

{fractal_server-2.0.3 → fractal_server-2.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.0.3"
+version = "2.0.4"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -87,7 +87,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.0.3"
+current_version = "2.0.4"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.0.3/fractal_server/__init__.py

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