fractal-server 2.14.0a14__py3-none-any.whl → 2.14.0a15__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.14.0a14"
1
+ __VERSION__ = "2.14.0a15"
@@ -20,6 +20,10 @@ from fractal_server.app.routes.api.v2._aux_functions import (
20
20
  from fractal_server.app.routes.api.v2._aux_functions import (
21
21
  _get_workflowtask_or_404,
22
22
  )
23
+ from fractal_server.logger import set_logger
24
+
25
+
26
+ logger = set_logger(__name__)
23
27
 
24
28
 
25
29
  async def get_history_unit_or_404(
@@ -67,6 +71,10 @@ def read_log_file(
67
71
  dataset_id: int,
68
72
  ):
69
73
  if logfile is None or not Path(logfile).exists():
74
+ logger.debug(
75
+ f"Logs for task '{wftask.task.name}' in dataset "
76
+ f"{dataset_id} are not available ({logfile=})."
77
+ )
70
78
  return (
71
79
  f"Logs for task '{wftask.task.name}' in dataset "
72
80
  f"{dataset_id} are not available."
@@ -84,11 +84,10 @@ async def get_workflow_tasks_statuses(
84
84
  .limit(1)
85
85
  )
86
86
  latest_history_run = res.scalar_one_or_none()
87
- logger.debug( # FIXME: remove
88
- f"Given {dataset_id=} and {wftask.id}, "
89
- f"found {latest_history_run=}."
90
- )
91
87
  if latest_history_run is None:
88
+ logger.debug(
89
+ f"No HistoryRun found for {dataset_id=} and {wftask.id=}."
90
+ )
92
91
  response[wftask.id] = None
93
92
  continue
94
93
  response[wftask.id] = dict(
@@ -225,9 +225,9 @@ class BaseSlurmRunner(BaseRunner):
225
225
  logger.info(script_lines)
226
226
 
227
227
  # Always print output of `uname -n` and `pwd`
228
- script_lines.append(
229
- '"Hostname: `uname -n`; current directory: `pwd`"\n'
230
- )
228
+ script_lines.append("Hostname: $(uname -n)\n")
229
+ script_lines.append("Current directory : $(pwd)\n")
230
+ script_lines.append('Start time: $(date + "%Y-%m-%dT%H:%M:%S%z")\n')
231
231
 
232
232
  # Complete script preamble
233
233
  script_lines.append("\n")
@@ -242,6 +242,7 @@ class BaseSlurmRunner(BaseRunner):
242
242
  )
243
243
  script_lines.append("wait\n")
244
244
  script = "\n".join(script_lines)
245
+ script_lines.append('End time: $(date + "%Y-%m-%dT%H:%M:%S%z")\n')
245
246
 
246
247
  # Write submission script
247
248
  with open(slurm_job.slurm_submission_script_local, "w") as f:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: fractal-server
3
- Version: 2.14.0a14
3
+ Version: 2.14.0a15
4
4
  Summary: Backend component of the Fractal analytics platform
5
5
  License: BSD-3-Clause
6
6
  Author: Tommaso Comparin
@@ -1,4 +1,4 @@
1
- fractal_server/__init__.py,sha256=Gb3phryDeQDKZ3Kk3X0VTqNP6DSo0hqX3pN7X5bNJRE,26
1
+ fractal_server/__init__.py,sha256=RTgktqJdR_QVcUPwuSBCYyBhAT7xsBxkixaJXZsTluc,26
2
2
  fractal_server/__main__.py,sha256=rkM8xjY1KeS3l63irB8yCrlVobR-73uDapC4wvrIlxI,6957
3
3
  fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
4
4
  fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,11 +32,11 @@ fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=0e0ZJ_k75TVHaT
32
32
  fractal_server/app/routes/api/__init__.py,sha256=B8l6PSAhR10iZqHEiyTat-_0tkeKdrCigIE6DJGP5b8,638
33
33
  fractal_server/app/routes/api/v2/__init__.py,sha256=9o9zxTU2IJrC_JQ8GUMft3niiBZ39YLvODUeraiRRdQ,2465
34
34
  fractal_server/app/routes/api/v2/_aux_functions.py,sha256=eE-TdEMI_UX3LBDUGwjG5NyUcihDVaHYlG15NlTJ9DI,12872
35
- fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=nWO4jBoL3MWuMMwS-6TwxlTHzgRr8Xed30RSeetLvP8,4199
35
+ fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=ZlI6nwzB5r9AiY0C8TzJS_EQOTPKgkRYl3GpxFAu2bg,4430
36
36
  fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=qdXCb6IP8-qPEAxGZKljtjIqNzIAyRaAsQSRi5VqFHM,6773
37
37
  fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=uhNSs-jcS7ndIUFKiOC1yrDiViw3uvKEXi9UL04BMks,11642
38
38
  fractal_server/app/routes/api/v2/dataset.py,sha256=h5AhE0sdhQ20ZlIbEJsFnHIOUW0S1VHFpoflpBkVScs,8936
39
- fractal_server/app/routes/api/v2/history.py,sha256=Vph3SuMsg38Gt6KiaOXgdhXA0z01pu4eNQqy1CI69Kc,15957
39
+ fractal_server/app/routes/api/v2/history.py,sha256=BuXVCDUCIYG5YF49D4b_CsqQrx6uFH6WB4TgkrdS2zo,15926
40
40
  fractal_server/app/routes/api/v2/images.py,sha256=BGpO94gVd8BTpCN6Mun2RXmjrPmfkIp73m8RN7uiGW4,8361
41
41
  fractal_server/app/routes/api/v2/job.py,sha256=MU1sHIKk_89WrD0TD44d4ufzqnywot7On_W71KjyUbQ,6500
42
42
  fractal_server/app/routes/api/v2/project.py,sha256=uAZgATiHcOvbnRX-vv1D3HoaEUvLUd7vzVmGcqOP8ZY,4602
@@ -79,7 +79,7 @@ fractal_server/app/runner/executors/slurm_common/_batching.py,sha256=ZY020JZlDS5
79
79
  fractal_server/app/runner/executors/slurm_common/_handle_exception_proxy.py,sha256=jU2N4vMafdcDPqVXwSApu4zxskCqhHmsXF3hBpOAAFA,577
80
80
  fractal_server/app/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
81
81
  fractal_server/app/runner/executors/slurm_common/_slurm_config.py,sha256=fZaFUUXqDH0p3DndCFUpFqTqyD2tMVCuSYgYLAycpVw,15897
82
- fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=3IZ31YxRKt1AluSnmYs6rk3pOxi9W3bkLSgtjrW5zC8,25667
82
+ fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py,sha256=y9FDJtgqLT8BA6vaxdpM-49bzNMOeTdul4zZJkv288A,25832
83
83
  fractal_server/app/runner/executors/slurm_common/get_slurm_config.py,sha256=-fAX1DZMB5RZnyYanIJD72mWOJAPkh21jd4loDXKJw4,5994
84
84
  fractal_server/app/runner/executors/slurm_common/remote.py,sha256=iXLu4d-bWzn7qmDaOjKFkcuaSHLjPESAMSLcg6c99fc,5852
85
85
  fractal_server/app/runner/executors/slurm_common/slurm_job_task_models.py,sha256=YGgzTspkK9ItSMzwuYv_1tY7_1g89Qpeny5Auinxk1E,2708
@@ -208,8 +208,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=Kc_nSzdlV6KIsO0CQSPs1w70zLyENP
208
208
  fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
209
209
  fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
210
210
  fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
211
- fractal_server-2.14.0a14.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
212
- fractal_server-2.14.0a14.dist-info/METADATA,sha256=pDj7SRAY3ffZmDbLIDJoIC-rOL9_KKe5QFjurq5543Y,4563
213
- fractal_server-2.14.0a14.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
214
- fractal_server-2.14.0a14.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
215
- fractal_server-2.14.0a14.dist-info/RECORD,,
211
+ fractal_server-2.14.0a15.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
212
+ fractal_server-2.14.0a15.dist-info/METADATA,sha256=HRQC8Dsp32xLGZ_ThsguhcO2XvKgLuHwo0ZDUEGBLu8,4563
213
+ fractal_server-2.14.0a15.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
214
+ fractal_server-2.14.0a15.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
215
+ fractal_server-2.14.0a15.dist-info/RECORD,,