labnotes 0.0.38__tar.gz → 0.0.40__tar.gz

{labnotes-0.0.38 → labnotes-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.38
+Version: 0.0.40
 Summary: Browse experiment designs, notes, and run data from a folder.
 Project-URL: Repository, https://github.com/thekevinscott/labnotes
 Author-email: Kevin Scott <me@thekevinscott.com>

{labnotes-0.0.38 → labnotes-0.0.40}/src/labnotes/context.md

@@ -61,7 +61,7 @@ that count fill a combination, so running again fills in what failed or never
 ran.
 `mode = "adhoc"` skips that: every `run` runs each combination `repeats` times
 again, whatever is already on disk. The default is `mode = "fill"`.
-Each run gets a new run folder. `command` runs in a shell from the root, with
+Each run gets a new run folder, named for the UTC time it was planned (`20261020-000429-brave-fox`), so folder listings sort by start. `command` runs in a shell from the root, with
 `{run_dir}` replaced by the run folder's absolute path. Pass it to the
 script so it writes its outputs there.
 Each param is appended as `--name value`, with the name as written (use

labnotes-0.0.40/src/labnotes/runner/new_stamped_run_id.py

@@ -0,0 +1,9 @@
+from collections.abc import Callable
+from datetime import UTC, datetime
+
+from labnotes.runner.new_run_id import new_run_id
+
+
+def new_stamped_run_id(taken: Callable[[str], bool]) -> str:
+    stamp = datetime.now(UTC).strftime("%Y%m%d-%H%M%S")
+    return f"{stamp}-" + new_run_id(lambda name: taken(f"{stamp}-{name}"))

{labnotes-0.0.38 → labnotes-0.0.40}/src/labnotes/runner/run_experiment.py

@@ -13,7 +13,7 @@ from labnotes.models import (
 )
 from labnotes.runner.execute_run import execute_run
 from labnotes.runner.new_invocation_id import new_invocation_id
-from labnotes.runner.new_run_id import new_run_id
+from labnotes.runner.new_stamped_run_id import new_stamped_run_id
 from labnotes.runner.param_grid import param_grid
 from labnotes.runner.plan_runs import plan_runs
 from labnotes.runner.run_folder import run_folder
@@ -49,7 +49,7 @@ async def run_experiment(
     for params in plan_runs(
         param_grid(experiment.params), experiment.repeats, finished
     ):
-        run = new_run_id(taken)
+        run = new_stamped_run_id(taken)
         planned.add(run)
         plan.append((run, params))
     runs = [{"run": run, "params": params} for run, params in plan]
@@ -131,7 +131,7 @@ async def run_experiment(
     def retry(run: str) -> None:
         if stopping.is_set() or run not in ended:
             return
-        again = new_run_id(taken)
+        again = new_stamped_run_id(taken)
         planned.add(again)
         plan.append((again, ended[run]))
         report({"event": "retried", "run": run, "retry": again, "params": ended[run]})

{labnotes-0.0.38 → labnotes-0.0.40}/src/labnotes/tui/run_app.py

@@ -17,6 +17,8 @@ from labnotes.tui.format_elapsed import format_elapsed
 
 COLUMNS = ("run", "params", "status", "time")
 OTHER_STREAM = {"stdout": "stderr", "stderr": "stdout"}
+PENDING, RUNNING, PASSED, FAILED = "○", "◐", "✓", "✗"
+SKIPPED, DESELECTED = "–", "⊘"
 
 
 class RunApp(App[None]):
@@ -101,7 +103,7 @@ class RunApp(App[None]):
             case "planned":
                 for planned in event["runs"]:  # type: ignore[attr-defined]
                     args = " ".join(param_args(planned["params"]))
-                    cells = (planned["run"], args, "pending", "")
+                    cells = (planned["run"], args, PENDING, "")
                     self.cells[planned["run"]] = [*map(dim, cells)]
                     self.pending.add(planned["run"])
                 self.redraw(table.cursor_row)
@@ -118,13 +120,16 @@ class RunApp(App[None]):
                 if run == self.next_run:
                     self.show("")
                 args = " ".join(param_args(event["params"]))  # type: ignore[arg-type]
-                cells = (run, args, "running", format_elapsed(0))
+                cells = (run, args, RUNNING, format_elapsed(0))
                 for column, cell in zip(COLUMNS, cells):
                     self.set_cell(run, column, cell)
             case "ended":
-                outcome = event["error"] or f"exited {event['exit_code']}"
-                style = "red" if event["error"] or event["exit_code"] else ""
-                if style:
+                outcome = PASSED
+                style = ""
+                if event["error"] or event["exit_code"]:
+                    reason = event["error"] or f"exited {event['exit_code']}"
+                    outcome = f"{FAILED} {reason}"
+                    style = "red"
                     self.failed.add(run)
                 self.ended.add(run)
                 self.set_cell(run, "status", Text(str(outcome), style=style))
@@ -138,18 +143,18 @@ class RunApp(App[None]):
                 self.next_run = run
             case "deselected":
                 self.pending.discard(run)
-                self.set_cell(run, "status", dim("deselected"))
+                self.set_cell(run, "status", dim(DESELECTED))
                 self.reorder(event, table.cursor_row)
                 self.show(describe_event(event))
             case "reselected":
                 self.pending.add(run)
-                self.set_cell(run, "status", dim("pending"))
+                self.set_cell(run, "status", dim(PENDING))
                 self.reorder(event, table.cursor_row)
                 self.show(describe_event(event))
             case "retried":
                 again = str(event["retry"])
                 args = " ".join(param_args(event["params"]))  # type: ignore[arg-type]
-                self.cells[again] = [*map(dim, (again, args, "pending", ""))]
+                self.cells[again] = [*map(dim, (again, args, PENDING, ""))]
                 self.pending.add(again)
                 self.redraw(table.cursor_row)
                 self.show(describe_event(event))
@@ -161,7 +166,7 @@ class RunApp(App[None]):
                 self.show(describe_event(event))
             case "stopping":
                 for pending in self.pending:
-                    self.set_cell(pending, "status", dim("skipped"))
+                    self.set_cell(pending, "status", dim(SKIPPED))
                 self.show(describe_event(event))
             case _:
                 self.show(describe_event(event))