labnotes 0.0.58__tar.gz → 0.0.60__tar.gz

{labnotes-0.0.58 → labnotes-0.0.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.58
+Version: 0.0.60
 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.60/src/labnotes/runner/new_param_run_id.py

@@ -0,0 +1,18 @@
+import secrets
+from collections.abc import Callable
+
+from labnotes.runner.new_run_id import new_run_id
+from labnotes.runner.param_run_name import param_run_name
+
+
+def new_param_run_id(
+    params: dict[str, object],
+    choices: dict[str, list[object]],
+    taken: Callable[[str], bool],
+) -> str:
+    name = param_run_name(params, choices)
+    if not name:
+        return new_run_id(taken)
+    while taken(candidate := f"{name}-{secrets.token_hex(2)}"):
+        pass
+    return candidate

labnotes-0.0.60/src/labnotes/runner/param_run_name.py

@@ -0,0 +1,17 @@
+import os
+import re
+
+UNSAFE = re.compile(r"[^A-Za-z0-9]+")
+LIMIT = 60
+
+
+def param_run_name(params: dict[str, object], choices: dict[str, list[object]]) -> str:
+    parts = []
+    for name, values in choices.items():
+        if len(values) < 2:
+            continue
+        shared = os.path.commonprefix([str(value) for value in values])
+        cut = re.match(r".*[^A-Za-z0-9]", shared)
+        value = str(params[name])[cut.end() if cut else 0 :]
+        parts.append(UNSAFE.sub("-", value).strip("-"))
+    return "-".join(part for part in parts if part)[:LIMIT].strip("-")

{labnotes-0.0.58 → labnotes-0.0.60}/src/labnotes/runner/run_experiment.py

@@ -12,7 +12,7 @@ from labnotes.models import (
     Report,
 )
 from labnotes.runner.execute_run import execute_run
-from labnotes.runner.new_run_id import new_run_id
+from labnotes.runner.new_param_run_id import new_param_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
@@ -46,16 +46,18 @@ async def run_experiment(
 
     group = new_stamped_run_id(taken) if experiment.mode == "adhoc" else None
 
-    def new_id() -> str:
+    def new_id(params: dict[str, object]) -> str:
         if group is None:
             return new_stamped_run_id(taken)
-        return f"{group}/" + new_run_id(lambda run: taken(f"{group}/{run}"))
+        return f"{group}/" + new_param_run_id(
+            params, experiment.params, lambda run: taken(f"{group}/{run}")
+        )
 
     plan: list[Entry] = []
     for params in plan_runs(
         param_grid(experiment.params), experiment.repeats, finished
     ):
-        run = new_id()
+        run = new_id(params)
         planned.add(run)
         plan.append((run, params))
     runs = [{"run": run, "params": params} for run, params in plan]
@@ -137,7 +139,7 @@ async def run_experiment(
     def retry(run: str) -> None:
         if stopping.is_set() or run not in ended:
             return
-        again = new_id()
+        again = new_id(ended[run])
         planned.add(again)
         plan.append((again, ended[run]))
         report({"event": "retried", "run": run, "retry": again, "params": ended[run]})

{labnotes-0.0.58 → labnotes-0.0.60}/src/labnotes/static/note-edit.js

@@ -4,6 +4,7 @@ if (note) {
   const prose = note.querySelector(".prose");
   const status = note.querySelector(".edit-status");
   const editor = import(note.dataset.editor);
+  const source = JSON.parse(note.querySelector(".note-source").textContent);
   let editing = null;
 
   editor.then(
@@ -25,7 +26,13 @@ if (note) {
 
   new EventSource(note.dataset.changesUrl).addEventListener("message", (event) => {
     if (JSON.parse(event.data) !== note.dataset.note) return;
-    if (editing) editing.pull();
-    else location.reload();
+    if (editing) return editing.pull();
+    // A touch or a duplicate event leaves the text alone, and reloading then
+    // would swallow a click that is opening the editor.
+    fetch(note.dataset.saveUrl, { cache: "no-store" })
+      .then((response) => response.text())
+      .then((text) => {
+        if (text !== source) location.reload();
+      });
   });
 }

{labnotes-0.0.58 → labnotes-0.0.60}/src/labnotes/tui/run_app.py

@@ -25,6 +25,7 @@ VIEWING_ACTIONS = {"leave", "quit", "interrupt", "command_palette"}
 
 
 class RunApp(App[None]):
+    CSS = "#concurrency { dock: right; width: auto; padding: 0 1; }"
     BINDINGS = [
         Binding("ctrl+c", "interrupt", "Stop runs"),
         Binding("n", "run_next", "Run next"),
@@ -89,6 +90,7 @@ class RunApp(App[None]):
             table.add_column(column, key=column)
         self.query_one(Input).display = False
         self.query_one(Log).display = False
+        self.query_one(Header).mount(Static(id="concurrency"))
         table.set_interval(0.1, self.spin)
 
     def on_ready(self) -> None:
@@ -116,7 +118,6 @@ class RunApp(App[None]):
                     self.pending.add(planned["run"])
                 self.redraw(table.cursor_row)
                 self.show_concurrency(event)
-                self.show(describe_event(event))
                 match event["mode"], event["runs"]:
                     case "adhoc", [only]:
                         self.view(only["run"])  # type: ignore[index]
@@ -178,7 +179,6 @@ class RunApp(App[None]):
                 self.show_summary()
             case "concurrency":
                 self.show_concurrency(event)
-                self.show(describe_event(event))
             case "stopping":
                 for pending in self.pending:
                     self.set_cell(pending, "status", dim(SKIPPED))
@@ -217,7 +217,7 @@ class RunApp(App[None]):
 
     def show_concurrency(self, event: dict[str, object]) -> None:
         self.concurrency = int(event["concurrency"])  # type: ignore[call-overload]
-        self.sub_title = f"{self.concurrency} at a time"
+        self.query_one("#concurrency", Static).update(f"{self.concurrency} at a time")
 
     def tick(self) -> None:
         for run, began in self.started.items():
@@ -330,7 +330,7 @@ class RunApp(App[None]):
             self.viewing = None
             self.query_one(Log).display = False
             self.query_one(DataTable).display = True
-            self.sub_title = f"{self.concurrency} at a time"
+            self.sub_title = ""
             self.refresh_bindings()
             if self.idle:
                 self.show_summary()