fractal-server 2.3.6__tar.gz → 2.3.7__tar.gz

{fractal_server-2.3.6 → fractal_server-2.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.3.6
+Version: 2.3.7
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.3.7/fractal_server/__init__.py

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

{fractal_server-2.3.6 → fractal_server-2.3.7}/fractal_server/app/runner/executors/slurm/ssh/_executor_wait_thread.py

@@ -7,6 +7,7 @@ from typing import Callable
 from cfut import FileWaitThread
 
 from ......logger import set_logger
+from fractal_server.app.runner.exceptions import JobExecutionError
 
 logger = set_logger(__name__)
 
@@ -48,6 +49,10 @@ class FractalSlurmWaitThread(FileWaitThread):
 
         This method is executed on the main thread.
         """
+        if self.shutdown:
+            error_msg = "Cannot call `wait` method after executor shutdown."
+            logger.warning(error_msg)
+            raise JobExecutionError(info=error_msg)
         with self.lock:
             self.active_job_ids.append(job_id)
 

{fractal_server-2.3.6 → fractal_server-2.3.7}/fractal_server/app/runner/executors/slurm/ssh/executor.py

@@ -353,6 +353,12 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
             Future representing the execution of the current SLURM job.
         """
 
+        # Do not continue if auxiliary thread was shut down
+        if self.wait_thread.shutdown:
+            error_msg = "Cannot call `submit` method after executor shutdown"
+            logger.warning(error_msg)
+            raise JobExecutionError(info=error_msg)
+
         # Set defaults, if needed
         if slurm_config is None:
             slurm_config = get_default_slurm_config()
@@ -436,6 +442,12 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
 
         """
 
+        # Do not continue if auxiliary thread was shut down
+        if self.wait_thread.shutdown:
+            error_msg = "Cannot call `map` method after executor shutdown"
+            logger.warning(error_msg)
+            raise JobExecutionError(info=error_msg)
+
         def _result_or_cancel(fut):
             """
             This function is based on the Python Standard Library 3.11.
@@ -867,6 +879,14 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
             job: The `SlurmJob` object to submit.
         """
 
+        # Prevent calling sbatch if auxiliary thread was shut down
+        if self.wait_thread.shutdown:
+            error_msg = (
+                "Cannot call `_submit_job` method after executor shutdown"
+            )
+            logger.warning(error_msg)
+            raise JobExecutionError(info=error_msg)
+
         # Submit job to SLURM, and get jobid
         sbatch_command = f"sbatch --parsable {job.slurm_script_remote}"
         pre_submission_cmds = job.slurm_config.pre_submission_commands
@@ -1336,6 +1356,9 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
         the self.wait_thread thread, see _completion.
         """
 
+        # Redudantly set thread shutdown attribute to True
+        self.wait_thread.shutdown = True
+
         logger.debug("Executor shutdown: start")
 
         # Handle all job futures

{fractal_server-2.3.6 → fractal_server-2.3.7}/fractal_server/config.py

@@ -553,6 +553,11 @@ class Settings(BaseSettings):
     Whether to include the v1 API.
     """
 
+    FRACTAL_MAX_PIP_VERSION: str = "24.0"
+    """
+    Maximum value at which to update `pip` before performing task collection.
+    """
+
     ###########################################################################
     # BUSINESS LOGIC
     ###########################################################################

{fractal_server-2.3.6 → fractal_server-2.3.7}/fractal_server/tasks/v2/_venv_pip.py

@@ -2,7 +2,9 @@ from pathlib import Path
 from typing import Optional
 
 from ..utils import COLLECTION_FREEZE_FILENAME
+from fractal_server.config import get_settings
 from fractal_server.logger import get_logger
+from fractal_server.syringe import Inject
 from fractal_server.tasks.v2._TaskCollectPip import _TaskCollectPip
 from fractal_server.tasks.v2.utils import get_python_interpreter_v2
 from fractal_server.utils import execute_command
@@ -24,6 +26,7 @@ async def _pip_install(
     Returns:
         The location of the package.
     """
+    settings = Inject(get_settings)
 
     logger = get_logger(logger_name)
 
@@ -41,7 +44,10 @@ async def _pip_install(
 
     await execute_command(
         cwd=venv_path,
-        command=f"{pip} install --upgrade pip",
+        command=(
+            f"{pip} install --upgrade "
+            f"'pip<={settings.FRACTAL_MAX_PIP_VERSION}'"
+        ),
         logger_name=logger_name,
     )
     await execute_command(

{fractal_server-2.3.6 → fractal_server-2.3.7}/fractal_server/tasks/v2/background_operations_ssh.py

@@ -174,6 +174,10 @@ def background_collect_pip_ssh(
                     ("__PACKAGE__", task_pkg.package),
                     ("__PYTHON__", python_bin),
                     ("__INSTALL_STRING__", install_string),
+                    (
+                        "__FRACTAL_MAX_PIP_VERSION__",
+                        settings.FRACTAL_MAX_PIP_VERSION,
+                    ),
                 ]
 
                 common_args = dict(

{fractal_server-2.3.6 → fractal_server-2.3.7}/fractal_server/tasks/v2/templates/_2_upgrade_pip.sh

@@ -14,7 +14,7 @@ VENVPYTHON=${PACKAGE_ENV_DIR}/bin/python
 
 # Upgrade pip
 write_log "START upgrade pip"
-"$VENVPYTHON" -m pip install pip --upgrade
+"$VENVPYTHON" -m pip install "pip<=__FRACTAL_MAX_PIP_VERSION__" --upgrade
 write_log "END   upgrade pip"
 echo
 

{fractal_server-2.3.6 → fractal_server-2.3.7}/fractal_server/tasks/v2/templates/_4_pip_freeze.sh

@@ -12,4 +12,4 @@ PACKAGE_ENV_DIR=__PACKAGE_ENV_DIR__
 
 VENVPYTHON=${PACKAGE_ENV_DIR}/bin/python
 
-"$VENVPYTHON" -m pip freeze
+"$VENVPYTHON" -m pip freeze --all

{fractal_server-2.3.6 → fractal_server-2.3.7}/pyproject.toml

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

fractal_server-2.3.6/fractal_server/__init__.py

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