fractal-server 2.3.10__tar.gz → 2.3.11__tar.gz

{fractal_server-2.3.10 → fractal_server-2.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.3.10
+Version: 2.3.11
 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.11/fractal_server/__init__.py

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

{fractal_server-2.3.10 → fractal_server-2.3.11}/fractal_server/app/runner/v2/__init__.py

@@ -194,15 +194,11 @@ async def submit_workflow(
                     folder=str(WORKFLOW_DIR_REMOTE), user=slurm_user
                 )
             elif FRACTAL_RUNNER_BACKEND == "slurm_ssh":
+                # Folder creation is deferred to _process_workflow
                 WORKFLOW_DIR_REMOTE = (
                     Path(settings.FRACTAL_SLURM_SSH_WORKING_BASE_DIR)
                     / WORKFLOW_DIR_LOCAL.name
                 )
-                # FIXME SSH: move mkdir to executor, likely within handshake
-                fractal_ssh.mkdir(
-                    folder=str(WORKFLOW_DIR_REMOTE),
-                )
-                logger.info(f"Created {str(WORKFLOW_DIR_REMOTE)} via SSH.")
             else:
                 logger.error(
                     "Invalid FRACTAL_RUNNER_BACKEND="

{fractal_server-2.3.10 → fractal_server-2.3.11}/fractal_server/app/runner/v2/_slurm_ssh/__init__.py

@@ -25,10 +25,15 @@ from .....ssh._fabric import FractalSSH
 from ....models.v2 import DatasetV2
 from ....models.v2 import WorkflowV2
 from ...async_wrap import async_wrap
+from ...exceptions import JobExecutionError
 from ...executors.slurm.ssh.executor import FractalSlurmSSHExecutor
 from ...set_start_and_last_task_index import set_start_and_last_task_index
 from ..runner import execute_tasks_v2
 from ._submit_setup import _slurm_submit_setup
+from fractal_server.logger import set_logger
+
+
+logger = set_logger(__name__)
 
 
 def _process_workflow(
@@ -60,6 +65,18 @@ def _process_workflow(
     if isinstance(worker_init, str):
         worker_init = worker_init.split("\n")
 
+    # Create main remote folder
+    try:
+        fractal_ssh.mkdir(folder=str(workflow_dir_remote))
+        logger.info(f"Created {str(workflow_dir_remote)} via SSH.")
+    except Exception as e:
+        error_msg = (
+            f"Could not create {str(workflow_dir_remote)} via SSH.\n"
+            f"Original error: {str(e)}."
+        )
+        logger.error(error_msg)
+        raise JobExecutionError(info=error_msg)
+
     with FractalSlurmSSHExecutor(
         fractal_ssh=fractal_ssh,
         workflow_dir_local=workflow_dir_local,

{fractal_server-2.3.10 → fractal_server-2.3.11}/pyproject.toml

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

fractal_server-2.3.10/fractal_server/__init__.py

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