labnotes 0.0.96__tar.gz → 0.0.98__tar.gz

{labnotes-0.0.96 → labnotes-0.0.98}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.96
+Version: 0.0.98
 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>
@@ -108,14 +108,14 @@ To exclude a run, add `"excluded": true` and an optional `"reason"` to its
 replaces it; both show as columns in `runs`.
 
 In a terminal, `run` shows a live table of runs (status and time) and stays
-open when they finish; `q` quits. Elsewhere, it prints a
+open when they finish; Ctrl-C quits. Elsewhere, it prints a
 line per event instead.
 
 - `--concurrency N` runs N at a time (default 1).
 - `-e PATH` reads another file instead of `experiment.toml`.
-- Ctrl-C stops the running scripts and records their end. A second Ctrl-C
-  kills them. Closing the terminal or sending SIGTERM stops them the same way,
-  then kills any still going 5 seconds later.
+- With runs going, Ctrl-C asks first. Enter (or a second Ctrl-C) leaves them
+  running. `s` stops the running scripts and records their end, then kills any
+  still going 5 seconds later. Escape goes back. SIGTERM stops them like `s`.
 - A second `run` of the same experiment fails while the first holds the lock.
 - It exits 0 even if runs fail; the summary line counts failures. If it can't
   start or reach the daemon, it prints the cause on one line and exits 1.

{labnotes-0.0.96 → labnotes-0.0.98}/README.md

@@ -84,14 +84,14 @@ To exclude a run, add `"excluded": true` and an optional `"reason"` to its
 replaces it; both show as columns in `runs`.
 
 In a terminal, `run` shows a live table of runs (status and time) and stays
-open when they finish; `q` quits. Elsewhere, it prints a
+open when they finish; Ctrl-C quits. Elsewhere, it prints a
 line per event instead.
 
 - `--concurrency N` runs N at a time (default 1).
 - `-e PATH` reads another file instead of `experiment.toml`.
-- Ctrl-C stops the running scripts and records their end. A second Ctrl-C
-  kills them. Closing the terminal or sending SIGTERM stops them the same way,
-  then kills any still going 5 seconds later.
+- With runs going, Ctrl-C asks first. Enter (or a second Ctrl-C) leaves them
+  running. `s` stops the running scripts and records their end, then kills any
+  still going 5 seconds later. Escape goes back. SIGTERM stops them like `s`.
 - A second `run` of the same experiment fails while the first holds the lock.
 - It exits 0 even if runs fail; the summary line counts failures. If it can't
   start or reach the daemon, it prints the cause on one line and exits 1.

{labnotes-0.0.96 → labnotes-0.0.98}/src/labnotes/static/run-output.js

@@ -1,16 +1,24 @@
+import { AnsiUp } from "https://esm.sh/ansi_up@6.0.6";
+
 const output = document.querySelector(".run-output");
 const state = document.querySelector(".run-state");
 const source = new EventSource(output.dataset.url);
 
+let parsers = {};
+
 // The server resends the whole log on each connection, so a reconnect starts clean.
-source.addEventListener("open", () => output.replaceChildren());
+source.addEventListener("open", () => {
+  output.replaceChildren();
+  parsers = {};
+});
 
 source.addEventListener("message", (event) => {
   const { stream, text } = JSON.parse(event.data);
   const following = output.scrollTop + output.clientHeight >= output.scrollHeight - 4;
   const chunk = document.createElement("span");
   chunk.className = stream;
-  chunk.textContent = text;
+  parsers[stream] ??= new AnsiUp();
+  chunk.innerHTML = parsers[stream].ansi_to_html(text);
   output.append(chunk);
   if (following) output.scrollTop = output.scrollHeight;
 });

{labnotes-0.0.96 → labnotes-0.0.98}/src/labnotes/templates/run.html

@@ -15,5 +15,5 @@
   <header><span class="stdout">stdout</span><span class="stderr">stderr</span></header>
   <pre class="run-output" data-url="{{ url_for('output', name=run.experiment, run=run.id) }}"></pre>
 </section>
-<script src="{{ asset('run-output.js') }}" defer></script>
+<script type="module" src="{{ asset('run-output.js') }}"></script>
 {% endblock %}

{labnotes-0.0.96 → labnotes-0.0.98}/src/labnotes/tui/browse_app.py

@@ -8,7 +8,7 @@ from labnotes.tui.experiments_screen import ExperimentsScreen
 
 
 class BrowseApp(App[BaseException | None]):
-    BINDINGS = [Binding("q", "quit", "Quit")]
+    BINDINGS = [Binding("ctrl+c", "quit", "Quit")]
 
     def __init__(self, config: LabnotesConfig, name: str | None) -> None:
         super().__init__()

labnotes-0.0.98/src/labnotes/tui/leave_prompt.py

@@ -0,0 +1,28 @@
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.screen import ModalScreen
+from textual.widgets import Static
+
+
+class LeavePrompt(ModalScreen[str | None]):
+    CSS = """
+    LeavePrompt { align: center middle; }
+    #prompt { width: auto; padding: 1 2; border: round $accent; }
+    """
+    BINDINGS = [
+        Binding("enter,ctrl+c", "dismiss('leave')", "Leave running"),
+        Binding("s", "dismiss('stop')", "Stop them"),
+        Binding("escape", "dismiss", "Cancel"),
+    ]
+
+    def __init__(self, count: int) -> None:
+        super().__init__()
+        self.count = count
+
+    def compose(self) -> ComposeResult:
+        runs = "run" if self.count == 1 else "runs"
+        yield Static(
+            f"{self.count} {runs} still going. "
+            "Leave them running (enter) / stop them (s) / cancel (esc).",
+            id="prompt",
+        )

{labnotes-0.0.96 → labnotes-0.0.98}/src/labnotes/tui/run_app.py

@@ -10,10 +10,11 @@ from textual.widgets import DataTable, Footer, Header, Input, Static
 
 from labnotes.models import Controls, Start
 from labnotes.runner.describe_event import describe_event
-from labnotes.runner.stop_then_kill import stop_then_kill
+from labnotes.runner.stop_then_kill import GRACE_SECONDS, stop_then_kill
 from labnotes.runner.param_args import param_args
 from labnotes.tui.dim import dim
 from labnotes.tui.format_elapsed import format_elapsed
+from labnotes.tui.leave_prompt import LeavePrompt
 from labnotes.tui.run_output import RunOutput
 from labnotes.tui.runs_table import RunsTable
 
@@ -29,7 +30,7 @@ GRABBING_ACTIONS = {*GRABBED_ACTIONS, "grab", "quit", "interrupt", "command_pale
 class RunApp(App[None]):
     CSS = "#concurrency { dock: right; width: auto; padding: 0 1; }"
     BINDINGS = [
-        Binding("ctrl+c", "interrupt", "Stop runs"),
+        Binding("ctrl+c", "interrupt", "Quit"),
         Binding("n", "run_next", "Run next"),
         Binding("m", "grab", "Move"),
         Binding("j,down", "shift(1)", priority=True),
@@ -45,7 +46,6 @@ class RunApp(App[None]):
         Binding("escape", "leave", "Back"),
         Binding("plus,equals_sign", "concurrency(1)", "More at once", key_display="+"),
         Binding("minus", "concurrency(-1)", "Fewer at once", key_display="-"),
-        Binding("q", "quit", "Quit"),
     ]
 
     def __init__(self, start: Start, title: str) -> None:
@@ -111,7 +111,7 @@ class RunApp(App[None]):
 
     def listen(self, controls: Controls) -> None:
         self.controls = controls
-        stop_then_kill(self.action_interrupt, signal.SIGTERM)
+        stop_then_kill(self.stop_runs, signal.SIGTERM)
         asyncio.get_running_loop().add_signal_handler(signal.SIGHUP, self.exit)
 
     def show_event(self, event: dict[str, object]) -> None:
@@ -200,7 +200,7 @@ class RunApp(App[None]):
     def show_summary(self) -> None:
         failed = len(self.failed)
         passed = len(self.ended) - failed
-        self.show(f"{passed} passed, {failed} failed. q to quit.")
+        self.show(f"{passed} passed, {failed} failed. Ctrl-C to quit.")
 
     def reposition(self, event: dict[str, object], run: str) -> None:
         table = self.query_one(DataTable)
@@ -231,6 +231,8 @@ class RunApp(App[None]):
             table.update_cell(run, column, cell, update_width=True)
 
     def check_action(self, action: str, parameters: tuple[object, ...]) -> bool:
+        if isinstance(self.screen, LeavePrompt):
+            return False
         if self.grabbed is not None:
             return action in GRABBING_ACTIONS
         if action in GRABBED_ACTIONS:
@@ -254,18 +256,30 @@ class RunApp(App[None]):
         self.next_run = None
         self.query_one("#status", Static).update(text)
 
-    def action_interrupt(self) -> None:
+    def stop_runs(self) -> None:
         if self.idle:
             self.controls.finish()
         else:
             self.controls.interrupt()
 
-    async def action_quit(self) -> None:
-        if self.idle:
+    def action_interrupt(self) -> None:
+        if self.started:
+            self.push_screen(LeavePrompt(len(self.started)), self.answer)
+        elif self.idle:
             self.controls.finish()
         else:
             self.exit()
 
+    async def action_quit(self) -> None:
+        self.action_interrupt()
+
+    def answer(self, choice: str | None) -> None:
+        if choice == "leave":
+            self.exit()
+        elif choice == "stop":
+            self.controls.interrupt()
+            self.set_timer(GRACE_SECONDS, self.controls.interrupt)
+
     def cursor_run(self) -> str | None:
         table = self.query_one(DataTable)
         if not table.row_count: