labnotes 0.0.28__tar.gz → 0.0.30__tar.gz

{labnotes-0.0.28 → labnotes-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.28
+Version: 0.0.30
 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.28 → labnotes-0.0.30}/src/labnotes/context.md

@@ -86,11 +86,12 @@ A script run by labnotes should:
 Runs can take a long time. Start `run` in the background, then check on it with `labnotes experiments foo runs`; a run with no `ended` is still going.
 
 In a terminal, `run` shows a live table of runs (status and time) and stays
-open when they finish. Runs not started yet show grayed as `pending`, and as
+open when they finish. Failed runs show their status in red. Runs not started yet show grayed as `pending`, and as
 `skipped` once stopped. Move the cursor to a pending run and press `n` to run it
 next. `d` deselects a pending run so it won't run; `d` again puts it back at
 the end of the queue. `/` filters rows by params text; Enter keeps the filter,
-Escape clears it. `D` deselects every pending run the filter shows. `+` and
+Escape clears it. `D` deselects every pending run the filter shows. `k` stops the
+running run under the cursor; `k` again kills it. `+` and
 `-` change how many run at once; lowering it lets running runs
 finish; `q` quits. Elsewhere, or with `--no-tui`, it prints a
 line per event instead.

{labnotes-0.0.28 → labnotes-0.0.30}/src/labnotes/models.py

@@ -14,6 +14,7 @@ class Controls:
     run_next: Callable[[str], None]
     set_concurrency: Callable[[int], None]
     toggle: Callable[[str], None]
+    kill: Callable[[str], None]
 
 
 Listen = Callable[[Controls], None]

{labnotes-0.0.28 → labnotes-0.0.30}/src/labnotes/runner/describe_event.py

@@ -18,6 +18,10 @@ def describe_event(event: dict[str, object]) -> str:
             return f"{event['run']} deselected."
         case "reselected":
             return f"{event['run']} back in the queue."
+        case "stopping run":
+            return f"Stopping {event['run']}."
+        case "killing run":
+            return f"Killing {event['run']}."
         case "concurrency":
             return f"{event['concurrency']} at a time."
         case "stopping":

{labnotes-0.0.28 → labnotes-0.0.30}/src/labnotes/runner/run_experiment.py

@@ -48,25 +48,41 @@ async def run_experiment(
         plan.append((run, params))
     runs = [{"run": run, "params": params} for run, params in plan]
     report({"event": "planned", "runs": runs, "concurrency": concurrency})
-    running: set[asyncio.subprocess.Process] = set()
+    running: dict[str, set[asyncio.subprocess.Process]] = {}
+    stopped: set[str] = set()
     results: list[dict[str, object]] = []
     stopping = asyncio.Event()
 
-    def signal_runs(signal_number: int) -> None:
-        for process in running:
+    def signal_run(run: str, signal_number: int) -> None:
+        for process in running[run]:
             with contextlib.suppress(ProcessLookupError):
                 os.killpg(process.pid, signal_number)
 
+    def signal_runs(signal_number: int) -> None:
+        for run in running:
+            signal_run(run, signal_number)
+
     def interrupt() -> None:
         plan.clear()
         if not stopping.is_set():
             stopping.set()
             report({"event": "stopping"})
             signal_runs(signal.SIGTERM)
-        elif running:
+        elif any(running.values()):
             report({"event": "killing"})
             signal_runs(signal.SIGKILL)
 
+    def kill(run: str) -> None:
+        if not running.get(run):
+            return
+        if run in stopped:
+            report({"event": "killing run", "run": run})
+            signal_run(run, signal.SIGKILL)
+        else:
+            stopped.add(run)
+            report({"event": "stopping run", "run": run})
+            signal_run(run, signal.SIGTERM)
+
     held: list[Entry] = []
 
     def find(entries: list[Entry], run: str) -> Entry | None:
@@ -125,13 +141,15 @@ async def run_experiment(
         folder = run_folder(config.root, config.runs, name, run)
         folder.mkdir(parents=True)
         report({"event": "started", "run": run, "params": params})
+        running[run] = set()
         result = await execute_run(
-            config.root, folder, experiment.command, params, running, stopping
+            config.root, folder, experiment.command, params, running[run], stopping
         )
+        del running[run]
         report({"event": "ended", "run": run, **result})
         results.append(result)
 
-    listen(Controls(interrupt, run_next, set_concurrency, toggle))
+    listen(Controls(interrupt, run_next, set_concurrency, toggle, kill))
     fill()
     await idle.wait()
     await asyncio.gather(*started)

{labnotes-0.0.28 → labnotes-0.0.30}/src/labnotes/tui/run_app.py

@@ -1,6 +1,7 @@
 import signal
 import time
 
+from rich.text import Text
 from textual.app import App, ComposeResult
 from textual.binding import Binding
 from textual.widgets import DataTable, Footer, Header, Input, Static
@@ -21,6 +22,7 @@ class RunApp(App[None]):
         Binding("n", "run_next", "Run next"),
         Binding("d", "toggle_run", "Deselect"),
         Binding("D", "deselect_shown", "Deselect shown"),
+        Binding("k", "kill_run", "Stop run"),
         Binding("slash", "filter", "Filter", key_display="/"),
         Binding("escape", "clear_filter", "Clear filter"),
         Binding("plus,equals_sign", "concurrency(1)", "More at once", key_display="+"),
@@ -34,7 +36,11 @@ class RunApp(App[None]):
         self.title = title
         self.results: list[dict[str, object]] = []
         self.controls = Controls(
-            lambda: None, lambda run: None, lambda count: None, lambda run: None
+            lambda: None,
+            lambda run: None,
+            lambda count: None,
+            lambda run: None,
+            lambda run: None,
         )
         self.concurrency = 1
         self.done = False
@@ -93,7 +99,8 @@ class RunApp(App[None]):
                     self.set_cell(run, column, cell)
             case "ended":
                 outcome = event["error"] or f"exited {event['exit_code']}"
-                self.set_cell(run, "status", outcome)
+                style = "red" if event["error"] or event["exit_code"] else ""
+                self.set_cell(run, "status", Text(str(outcome), style=style))
                 self.tick()
                 del self.started[run]
             case "queued":
@@ -178,6 +185,10 @@ class RunApp(App[None]):
         if (run := self.cursor_run()) is not None:
             self.controls.toggle(run)
 
+    def action_kill_run(self) -> None:
+        if (run := self.cursor_run()) is not None:
+            self.controls.kill(run)
+
     def action_deselect_shown(self) -> None:
         shown = [str(key.value) for key in self.query_one(DataTable).rows]
         for run in shown: