labnotes 0.0.42__tar.gz → 0.0.44__tar.gz

{labnotes-0.0.42 → labnotes-0.0.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.42
+Version: 0.0.44
 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.42 → labnotes-0.0.44}/pyproject.toml

@@ -32,6 +32,7 @@ labnotes = "labnotes.cli:main"
 
 [dependency-groups]
 dev = [
+    "curtaincall>=0.3.0",
     "httpx2>=2.13.1",
     "mypy>=2.4.0",
     "pytest>=8.0",

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/context.md

@@ -59,7 +59,9 @@ renaming the experiment means editing `name`.
 Each combination of `[params]` runs `repeats` times (1 if omitted), round-robin, on every
 `run`, whatever is already on disk. That is `mode = "adhoc"`, the default.
 `mode = "fill"` counts what is there: only runs that count fill a combination,
-so running again fills in what failed or never ran.
+so running again fills in what failed or never ran. `mode` under
+`[experiments]` in `.labnotes.toml` sets it for every experiment that doesn't
+set its own.
 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.
@@ -90,13 +92,14 @@ 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. Failed runs show their status in red; `h` hides or shows them, and `r` on one
-runs it again under a new id. Runs not started yet show grayed as `pending`, and as
+open when they finish. Failed runs show their status in red; `f` hides or shows them, and `r` on one
+runs it again under a new id. `j` and `k` move the cursor, `g` and `G` jump to the
+first and last row. 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
+next. Space deselects a pending run so it won't run; Space 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. `k` stops the
-running run under the cursor; `k` again kills it. `+` and
+Escape clears it. `D` deselects every pending run the filter shows. `x` stops the
+running run under the cursor; `x` again kills it. `+` and
 `-` change how many run at once; lowering it lets running runs
 finish. Enter on a run follows its `stdout.log`; `e` switches to
 `stderr.log` and back, and Escape returns to the table. An `adhoc` experiment that

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/create_app.py

@@ -50,7 +50,7 @@ def create_app(config: LabnotesConfig, kernel_idle_minutes: float) -> Starlette:
             await kernel.stop()
 
     async def index(request: Request) -> Response:
-        experiments = await list_experiments(request.app.state.tables)
+        experiments = await list_experiments(request.app.state.tables, config.mode)
         return templates.TemplateResponse(
             request,
             "index.html",
@@ -62,6 +62,7 @@ def create_app(config: LabnotesConfig, kernel_idle_minutes: float) -> Starlette:
         loaded = await load_experiment(
             request.app.state.tables,
             config.root,
+            config.mode,
             name,
             request.query_params,
             lambda note, content: saved_outputs(kernels.get((name, note)), content),

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/list_experiments.py

@@ -9,7 +9,7 @@ from labnotes.experiment_runs import experiment_runs
 from labnotes.summarize_config import summarize_config
 
 
-async def list_experiments(tables: DirSQL) -> list[dict[str, object]]:
+async def list_experiments(tables: DirSQL, mode: str) -> list[dict[str, object]]:
     rows = await tables.query(
         "SELECT name, display_name, config FROM experiments ORDER BY name"
     )
@@ -17,7 +17,7 @@ async def list_experiments(tables: DirSQL) -> list[dict[str, object]]:
     for row in rows:
         name = str(row["name"])
         config = None if row["config"] is None else json.loads(str(row["config"]))
-        summary = summarize_config(config)
+        summary = summarize_config(config, mode)
         varies = cast(dict[str, list[object]], summary["varies"])
         source = experiment_runs(name, list(varies))
         summary = await check_counts(tables, source, summary)

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/load_experiment.py

@@ -25,6 +25,7 @@ def _no_outputs(note: str, content: str) -> Sequence[str]:
 async def load_experiment(
     tables: DirSQL,
     root: Path,
+    mode: str,
     name: str,
     params: Mapping[str, str],
     outputs_for: Callable[[str, str], Sequence[str]] = _no_outputs,
@@ -37,7 +38,7 @@ async def load_experiment(
         return None
     [row] = found
     config = None if row["config"] is None else json.loads(str(row["config"]))
-    summary = summarize_config(config)
+    summary = summarize_config(config, mode)
     varies = cast(dict[str, list[object]], summary["varies"])
     source = experiment_runs(name, list(varies))
     summary = await check_counts(tables, source, summary)

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/models.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from typing import Any
 
 from labnotes.default_counts import DEFAULT_COUNTS
+from labnotes.modes import DEFAULT_MODE
 
 Report = Callable[[dict[str, object]], None]
 
@@ -38,6 +39,7 @@ class LabnotesConfig:
     experiments: str
     files: str
     runs: str
+    mode: str = DEFAULT_MODE
 
 
 @dataclass(frozen=True)
@@ -47,4 +49,4 @@ class ExperimentConfig:
     params: dict[str, list[object]]
     name: str | None = None
     counts: str = DEFAULT_COUNTS
-    mode: str = "adhoc"
+    mode: str = DEFAULT_MODE

labnotes-0.0.44/src/labnotes/modes.py

@@ -0,0 +1,2 @@
+MODES = ("fill", "adhoc")
+DEFAULT_MODE = "adhoc"

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/read_config.py

@@ -2,6 +2,7 @@ import tomllib
 from pathlib import Path
 
 from labnotes.models import LabnotesConfig
+from labnotes.modes import DEFAULT_MODE, MODES
 from labnotes.read_path import DEFAULT_PATHS, read_path
 
 CONFIG_FILE = ".labnotes.toml"
@@ -16,12 +17,11 @@ def read_config(path: Path) -> LabnotesConfig:
     unknown = sorted(values.keys() - DEFAULT_PATHS.keys())
     if unknown:
         raise ValueError(f"{path}: unknown tables {', '.join(unknown)}")
+    paths = {
+        table: read_path(path, table, values.get(table, {})) for table in DEFAULT_PATHS
+    }
+    mode = values.get("experiments", {}).get("mode", DEFAULT_MODE)
+    if mode not in MODES:
+        raise ValueError(f"{path}: [experiments] mode must be fill or adhoc")
     path = path.resolve()
-    return LabnotesConfig(
-        path,
-        path.parent,
-        **{
-            table: read_path(path, table, values.get(table, {}))
-            for table in DEFAULT_PATHS
-        },
-    )
+    return LabnotesConfig(path, path.parent, **paths, mode=mode)

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/read_path.py

@@ -11,13 +11,15 @@ PLACEHOLDERS = {
     "files": {"experiment"},
     "runs": {"experiment", "run"},
 }
+# Keys other readers own, so the path check lets them through.
+OTHER_KEYS = {"experiments": {"mode"}}
 PLACEHOLDER = re.compile(r"\{([^}]*)\}")
 
 
 def read_path(config: Path, table: str, section: object) -> str:
     if not isinstance(section, dict):
         raise ValueError(f"{config}: {table} must be a table, like [{table}]")
-    unknown = sorted(section.keys() - {"path"})
+    unknown = sorted(section.keys() - {"path", *OTHER_KEYS.get(table, ())})
     if unknown:
         raise ValueError(f"{config}: unknown keys in [{table}]: {', '.join(unknown)}")
     template = section.get("path", DEFAULT_PATHS[table])

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/runner/read_experiment_config.py

@@ -4,12 +4,12 @@ from pathlib import Path
 
 from labnotes.default_counts import DEFAULT_COUNTS
 from labnotes.models import ExperimentConfig
+from labnotes.modes import MODES
 
 SETTINGS = {"name", "command", "repeats", "params", "counts", "mode"}
-MODES = ("fill", "adhoc")
 
 
-def read_experiment_config(path: Path) -> ExperimentConfig:
+def read_experiment_config(path: Path, mode: str) -> ExperimentConfig:
     try:
         with path.open("rb") as file:
             values = tomllib.load(file)
@@ -40,7 +40,7 @@ def read_experiment_config(path: Path) -> ExperimentConfig:
     counts = values.get("counts", DEFAULT_COUNTS)
     if not isinstance(counts, str) or not counts.strip():
         raise ValueError(f"{path}: counts must be a SQL condition")
-    mode = values.get("mode", "adhoc")
+    mode = values.get("mode", mode)
     if mode not in MODES:
         raise ValueError(f"{path}: mode must be fill or adhoc")
     return ExperimentConfig(command, repeats, params, name, counts, mode)

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/runner/start_experiment.py

@@ -21,7 +21,7 @@ def start_experiment(
         experiment_config = config.root / folder / "experiment.toml"
     if not experiment_config.is_file():
         raise ValueError(f"No experiment.toml for {name} at {experiment_config}.")
-    experiment = read_experiment_config(experiment_config)
+    experiment = read_experiment_config(experiment_config, config.mode)
     runs = runs_parent(config.root, config.runs, name)
     runs.mkdir(parents=True, exist_ok=True)
     try:

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/summarize_config.py

@@ -3,7 +3,7 @@ from math import prod
 from labnotes.default_counts import DEFAULT_COUNTS
 
 
-def summarize_config(config: dict[str, object] | None) -> dict[str, object]:
+def summarize_config(config: dict[str, object] | None, mode: str) -> dict[str, object]:
     config = config or {}
     params = config.get("params")
     varies = {
@@ -15,7 +15,7 @@ def summarize_config(config: dict[str, object] | None) -> dict[str, object]:
     cells = prod(len(values) for values in varies.values())
     command = config.get("command")
     counts = config.get("counts")
-    fill = config.get("mode") == "fill"
+    fill = config.get("mode", mode) == "fill"
     return {
         "fixed": {},
         "varies": varies,

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/tables/experiment_rows.py

@@ -18,7 +18,9 @@ async def experiment_rows(
         case str(), "runs":
             [row] = rows
             stored = row["config"]
-            summary = summarize_config(json.loads(str(stored)) if stored else None)
+            summary = summarize_config(
+                json.loads(str(stored)) if stored else None, config.mode
+            )
             return await list_experiment_runs(
                 tables, name, str(summary["completed_run"])
             )

{labnotes-0.0.42 → labnotes-0.0.44}/src/labnotes/tui/run_app.py

@@ -14,10 +14,12 @@ from labnotes.runner.stop_then_kill import 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.runs_table import RunsTable
 
 COLUMNS = ("run", "params", "status", "time")
 OTHER_STREAM = {"stdout": "stderr", "stderr": "stdout"}
-PENDING, RUNNING, PASSED, FAILED = "○", "◐", "✓", "✗"
+PENDING, PASSED, FAILED = "○", "✓", "✗"
+SPINNER = "|/-\\"
 SKIPPED, DESELECTED = "–", "⊘"
 
 
@@ -25,10 +27,10 @@ class RunApp(App[None]):
     BINDINGS = [
         Binding("ctrl+c", "interrupt", "Stop runs"),
         Binding("n", "run_next", "Run next"),
-        Binding("d", "toggle_run", "Deselect"),
+        Binding("space", "toggle_run", "Deselect"),
         Binding("D", "deselect_shown", "Deselect shown"),
-        Binding("k", "kill_run", "Stop run"),
-        Binding("h", "hide_failed", "Hide failed"),
+        Binding("x", "kill_run", "Stop run"),
+        Binding("f", "hide_failed", "Hide failed"),
         Binding("r", "retry", "Retry"),
         Binding("slash", "filter", "Filter", key_display="/"),
         Binding("e", "switch_output", "stdout/stderr"),
@@ -56,6 +58,7 @@ class RunApp(App[None]):
         self.idle = False
         self.next_run: str | None = None
         self.ended: set[str] = set()
+        self.frame = 0
         self.started: dict[str, float] = {}
         self.pending: set[str] = set()
         self.cells: dict[str, list[object]] = {}
@@ -70,7 +73,7 @@ class RunApp(App[None]):
 
     def compose(self) -> ComposeResult:
         yield Header()
-        yield DataTable(id="runs", cursor_type="row")
+        yield RunsTable(id="runs", cursor_type="row")
         yield Log(id="output")
         yield Input(id="filter", placeholder="Filter params")
         yield Static(id="status")
@@ -82,6 +85,7 @@ class RunApp(App[None]):
             table.add_column(column, key=column)
         self.query_one(Input).display = False
         self.query_one(Log).display = False
+        table.set_interval(0.1, self.spin)
 
     def on_ready(self) -> None:
         self.set_interval(1, self.tick)
@@ -120,7 +124,7 @@ 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, SPINNER[self.frame], format_elapsed(0))
                 for column, cell in zip(COLUMNS, cells):
                     self.set_cell(run, column, cell)
             case "ended":
@@ -205,6 +209,11 @@ class RunApp(App[None]):
         for run, began in self.started.items():
             self.set_cell(run, "time", format_elapsed(time.monotonic() - began))
 
+    def spin(self) -> None:
+        self.frame = (self.frame + 1) % len(SPINNER)
+        for run in self.started:
+            self.set_cell(run, "status", SPINNER[self.frame])
+
     def show(self, text: str) -> None:
         self.next_run = None
         self.query_one("#status", Static).update(text)

labnotes-0.0.44/src/labnotes/tui/runs_table.py

@@ -0,0 +1,11 @@
+from textual.binding import Binding
+from textual.widgets import DataTable
+
+
+class RunsTable(DataTable[object]):
+    BINDINGS = [
+        Binding("j", "cursor_down", show=False),
+        Binding("k", "cursor_up", show=False),
+        Binding("g", "scroll_top", show=False),
+        Binding("G", "scroll_bottom", show=False),
+    ]

{labnotes-0.0.42 → labnotes-0.0.44}/uv.lock

@@ -223,6 +223,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/60/97/891a0971e1e4a8c5d2b20bbe0e524dc04548d2307fee33cdeba148fd4fc7/comm-0.2.3-py3-none-any.whl", hash = "sha256:c615d91d75f7f04f095b30d1c1711babd43bdc6419c1be9886a85f2f4e489417", size = 7294, upload-time = "2025-07-25T14:02:02.896Z" },
 ]
 
+[[package]]
+name = "curtaincall"
+version = "0.3.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pexpect" },
+    { name = "pyte" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ca/12/056a3c89fcbc135b15a7cef872472a73bdad3594ddfccbe11b9a028b2f5f/curtaincall-0.3.0.tar.gz", hash = "sha256:afc9e9ce00a256982d69a737976527d38217082ca79fcafcf381fa2cd2bba041", size = 68784, upload-time = "2026-02-16T01:44:39.874Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f8/52/1092ca83246b88a880f2fe35e38919b9e069c0ce97708880c4234ab72c32/curtaincall-0.3.0-py3-none-any.whl", hash = "sha256:4a754fa4a8ad726a00ec24ebb545f8f5a34a0f8d159936845d125bfeb2dfb652", size = 21504, upload-time = "2026-02-16T01:44:38.567Z" },
+]
+
 [[package]]
 name = "debugpy"
 version = "1.8.22"
@@ -477,6 +490,7 @@ dependencies = [
 
 [package.dev-dependencies]
 dev = [
+    { name = "curtaincall" },
     { name = "httpx2" },
     { name = "mypy" },
     { name = "pytest" },
@@ -500,6 +514,7 @@ requires-dist = [
 
 [package.metadata.requires-dev]
 dev = [
+    { name = "curtaincall", specifier = ">=0.3.0" },
     { name = "httpx2", specifier = ">=2.13.1" },
     { name = "mypy", specifier = ">=2.4.0" },
     { name = "pytest", specifier = ">=8.0" },
@@ -984,6 +999,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/71/46/17f022dd3e953bf20a04a028a21ec746d942f8d2af30fa0f124fa0e6a684/pygments-2.21.0-py3-none-any.whl", hash = "sha256:2363c69b61c4a97c838da3b130dcd6468f4848992b21a82f2a63ec34377137d9", size = 1250147, upload-time = "2026-08-17T08:02:44.912Z" },
 ]
 
+[[package]]
+name = "pyte"
+version = "0.8.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "wcwidth" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ab/ab/b599762933eba04de7dc5b31ae083112a6c9a9db15b01d3109ad797559d9/pyte-0.8.2.tar.gz", hash = "sha256:5af970e843fa96a97149d64e170c984721f20e52227a2f57f0a54207f08f083f", size = 92301, upload-time = "2023-11-12T09:33:43.217Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/59/d0/bb522283b90853afbf506cd5b71c650cf708829914efd0003d615cf426cd/pyte-0.8.2-py3-none-any.whl", hash = "sha256:85db42a35798a5aafa96ac4d8da78b090b2c933248819157fc0e6f78876a0135", size = 31627, upload-time = "2023-11-12T09:33:41.096Z" },
+]
+
 [[package]]
 name = "pytest"
 version = "9.1.1"