fractal-server 2.14.0a14__tar.gz → 2.14.0a15__tar.gz

{fractal_server-2.14.0a14 → fractal_server-2.14.0a15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.14.0a14
+Version: 2.14.0a15
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin

fractal_server-2.14.0a15/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.14.0a15"

{fractal_server-2.14.0a14 → fractal_server-2.14.0a15}/fractal_server/app/routes/api/v2/_aux_functions_history.py

@@ -20,6 +20,10 @@ from fractal_server.app.routes.api.v2._aux_functions import (
 from fractal_server.app.routes.api.v2._aux_functions import (
     _get_workflowtask_or_404,
 )
+from fractal_server.logger import set_logger
+
+
+logger = set_logger(__name__)
 
 
 async def get_history_unit_or_404(
@@ -67,6 +71,10 @@ def read_log_file(
     dataset_id: int,
 ):
     if logfile is None or not Path(logfile).exists():
+        logger.debug(
+            f"Logs for task '{wftask.task.name}' in dataset "
+            f"{dataset_id} are not available ({logfile=})."
+        )
         return (
             f"Logs for task '{wftask.task.name}' in dataset "
             f"{dataset_id} are not available."

{fractal_server-2.14.0a14 → fractal_server-2.14.0a15}/fractal_server/app/routes/api/v2/history.py

@@ -84,11 +84,10 @@ async def get_workflow_tasks_statuses(
             .limit(1)
         )
         latest_history_run = res.scalar_one_or_none()
-        logger.debug(  # FIXME: remove
-            f"Given {dataset_id=} and {wftask.id}, "
-            f"found {latest_history_run=}."
-        )
         if latest_history_run is None:
+            logger.debug(
+                f"No HistoryRun found for {dataset_id=} and {wftask.id=}."
+            )
             response[wftask.id] = None
             continue
         response[wftask.id] = dict(

{fractal_server-2.14.0a14 → fractal_server-2.14.0a15}/fractal_server/app/runner/executors/slurm_common/base_slurm_runner.py

@@ -225,9 +225,9 @@ class BaseSlurmRunner(BaseRunner):
         logger.info(script_lines)
 
         # Always print output of `uname -n` and `pwd`
-        script_lines.append(
-            '"Hostname: `uname -n`; current directory: `pwd`"\n'
-        )
+        script_lines.append("Hostname: $(uname -n)\n")
+        script_lines.append("Current directory : $(pwd)\n")
+        script_lines.append('Start time: $(date + "%Y-%m-%dT%H:%M:%S%z")\n')
 
         # Complete script preamble
         script_lines.append("\n")
@@ -242,6 +242,7 @@ class BaseSlurmRunner(BaseRunner):
             )
         script_lines.append("wait\n")
         script = "\n".join(script_lines)
+        script_lines.append('End time:   $(date + "%Y-%m-%dT%H:%M:%S%z")\n')
 
         # Write submission script
         with open(slurm_job.slurm_submission_script_local, "w") as f:

{fractal_server-2.14.0a14 → fractal_server-2.14.0a15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.14.0a14"
+version = "2.14.0a15"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -95,7 +95,7 @@ filterwarnings = [
 markers = ["container", "ssh"]
 
 [tool.bumpver]
-current_version = "2.14.0a14"
+current_version = "2.14.0a15"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.14.0a14/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.14.0a14"