fractal-server 2.3.10__py3-none-any.whl → 2.3.11__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- __VERSION__ = "2.3.10"
1
+ __VERSION__ = "2.3.11"
@@ -194,15 +194,11 @@ async def submit_workflow(
194
194
  folder=str(WORKFLOW_DIR_REMOTE), user=slurm_user
195
195
  )
196
196
  elif FRACTAL_RUNNER_BACKEND == "slurm_ssh":
197
+ # Folder creation is deferred to _process_workflow
197
198
  WORKFLOW_DIR_REMOTE = (
198
199
  Path(settings.FRACTAL_SLURM_SSH_WORKING_BASE_DIR)
199
200
  / WORKFLOW_DIR_LOCAL.name
200
201
  )
201
- # FIXME SSH: move mkdir to executor, likely within handshake
202
- fractal_ssh.mkdir(
203
- folder=str(WORKFLOW_DIR_REMOTE),
204
- )
205
- logger.info(f"Created {str(WORKFLOW_DIR_REMOTE)} via SSH.")
206
202
  else:
207
203
  logger.error(
208
204
  "Invalid FRACTAL_RUNNER_BACKEND="
@@ -25,10 +25,15 @@ from .....ssh._fabric import FractalSSH
25
25
  from ....models.v2 import DatasetV2
26
26
  from ....models.v2 import WorkflowV2
27
27
  from ...async_wrap import async_wrap
28
+ from ...exceptions import JobExecutionError
28
29
  from ...executors.slurm.ssh.executor import FractalSlurmSSHExecutor
29
30
  from ...set_start_and_last_task_index import set_start_and_last_task_index
30
31
  from ..runner import execute_tasks_v2
31
32
  from ._submit_setup import _slurm_submit_setup
33
+ from fractal_server.logger import set_logger
34
+
35
+
36
+ logger = set_logger(__name__)
32
37
 
33
38
 
34
39
  def _process_workflow(
@@ -60,6 +65,18 @@ def _process_workflow(
60
65
  if isinstance(worker_init, str):
61
66
  worker_init = worker_init.split("\n")
62
67
 
68
+ # Create main remote folder
69
+ try:
70
+ fractal_ssh.mkdir(folder=str(workflow_dir_remote))
71
+ logger.info(f"Created {str(workflow_dir_remote)} via SSH.")
72
+ except Exception as e:
73
+ error_msg = (
74
+ f"Could not create {str(workflow_dir_remote)} via SSH.\n"
75
+ f"Original error: {str(e)}."
76
+ )
77
+ logger.error(error_msg)
78
+ raise JobExecutionError(info=error_msg)
79
+
63
80
  with FractalSlurmSSHExecutor(
64
81
  fractal_ssh=fractal_ssh,
65
82
  workflow_dir_local=workflow_dir_local,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: fractal-server
3
- Version: 2.3.10
3
+ Version: 2.3.11
4
4
  Summary: Server component of the Fractal analytics platform
5
5
  Home-page: https://github.com/fractal-analytics-platform/fractal-server
6
6
  License: BSD-3-Clause
@@ -1,4 +1,4 @@
1
- fractal_server/__init__.py,sha256=eQ4t9Ak1YcHc5P0da0IEITN9Og3jo9sAKVRGq7f9qp0,23
1
+ fractal_server/__init__.py,sha256=XnC28FXELYVd5ZGFyZZAz8ckHNHo1STRoK9q666a8VE,23
2
2
  fractal_server/__main__.py,sha256=CocbzZooX1UtGqPi55GcHGNxnrJXFg5tUU5b3wyFCyo,4958
3
3
  fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
4
4
  fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,7 +90,7 @@ fractal_server/app/runner/v1/_slurm/_submit_setup.py,sha256=KO9c694d318adoPQh9UG
90
90
  fractal_server/app/runner/v1/_slurm/get_slurm_config.py,sha256=6pQNNx997bLIfLp0guF09t_O0ZYRXnbEGLktSAcKnic,5999
91
91
  fractal_server/app/runner/v1/common.py,sha256=_L-vjLnWato80VdlB_BFN4G8P4jSM07u-5cnl1T3S34,3294
92
92
  fractal_server/app/runner/v1/handle_failed_job.py,sha256=bHzScC_aIlU3q-bQxGW6rfWV4xbZ2tho_sktjsAs1no,4684
93
- fractal_server/app/runner/v2/__init__.py,sha256=OYmJRpYTGUCwnbLeIDTms7erZxOQMV8vq5tdJmL0pNo,17368
93
+ fractal_server/app/runner/v2/__init__.py,sha256=gEof2P2PApNM4Ubc8JQg6NEBA8ej55Ar15YMWEdXdgA,17176
94
94
  fractal_server/app/runner/v2/_local/__init__.py,sha256=KTj14K6jH8fXGUi5P7u5_RqEE1zF4aXtgPxCKzw46iw,5971
95
95
  fractal_server/app/runner/v2/_local/_local_config.py,sha256=9oi209Dlp35ANfxb_DISqmMKKc6DPaMsmYVWbZLseME,3630
96
96
  fractal_server/app/runner/v2/_local/_submit_setup.py,sha256=MucNOo8Er0F5ZIwH7CnTeXgnFMc6d3pKPkv563QNVi0,1630
@@ -101,7 +101,7 @@ fractal_server/app/runner/v2/_local_experimental/_submit_setup.py,sha256=we7r-sQ
101
101
  fractal_server/app/runner/v2/_local_experimental/executor.py,sha256=vcBKjireIIyF5WgIQLatD6ojlWEydbTwyIG0bcpIjys,5438
102
102
  fractal_server/app/runner/v2/_slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
103
103
  fractal_server/app/runner/v2/_slurm_common/get_slurm_config.py,sha256=V47uckqA4Vp-7m5esDnTitekc-yabLhaZSlPj4jN_D8,6307
104
- fractal_server/app/runner/v2/_slurm_ssh/__init__.py,sha256=1p6d_ppXBqRNPXPGxM8cmIOffEsfkEPEfvDeT-_90dE,3990
104
+ fractal_server/app/runner/v2/_slurm_ssh/__init__.py,sha256=D0Dnbhnzw0BXwQmjqLmxqpE9oreAtasA-9aOzxC4l_I,4530
105
105
  fractal_server/app/runner/v2/_slurm_ssh/_submit_setup.py,sha256=a5_FDPH_yxYmrjAjMRLgh_Y4DSG3mRslCLQodGM3-t4,2838
106
106
  fractal_server/app/runner/v2/_slurm_sudo/__init__.py,sha256=q2fwiKqtNpXtfs5wUFQjwJxdYqKPPTbCy1ieBhhi-Bw,4316
107
107
  fractal_server/app/runner/v2/_slurm_sudo/_submit_setup.py,sha256=a5_FDPH_yxYmrjAjMRLgh_Y4DSG3mRslCLQodGM3-t4,2838
@@ -194,8 +194,8 @@ fractal_server/tasks/v2/utils.py,sha256=JOyCacb6MNvrwfLNTyLwcz8y79J29YuJeJ2MK5kq
194
194
  fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
195
195
  fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
196
196
  fractal_server/zip_tools.py,sha256=xYpzBshysD2nmxkD5WLYqMzPYUcCRM3kYy-7n9bJL-U,4426
197
- fractal_server-2.3.10.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
198
- fractal_server-2.3.10.dist-info/METADATA,sha256=nM7HELGaWnZRvIUFecLPswW58LsENUTxpt_p-Pt3PvM,4629
199
- fractal_server-2.3.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
200
- fractal_server-2.3.10.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
201
- fractal_server-2.3.10.dist-info/RECORD,,
197
+ fractal_server-2.3.11.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
198
+ fractal_server-2.3.11.dist-info/METADATA,sha256=OTZ6bXsdRBt9122GdJpYhcuq4Jm5gjM6nHlPX-S1Ho8,4629
199
+ fractal_server-2.3.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
200
+ fractal_server-2.3.11.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
201
+ fractal_server-2.3.11.dist-info/RECORD,,