labnotes 0.0.46__tar.gz → 0.0.48__tar.gz

{labnotes-0.0.46 → labnotes-0.0.48}/PKG-INFO

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

@@ -35,6 +35,7 @@ dev = [
     "curtaincall>=0.3.0",
     "httpx2>=2.13.1",
     "mypy>=2.4.0",
+    "playwright>=1.64.0",
     "pytest>=8.0",
     "ruff==0.8.4",
 ]

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/context.md

@@ -62,14 +62,16 @@ Each combination of `[params]` runs `repeats` times (1 if omitted), round-robin,
 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
+Each run gets a new run folder. In `fill` mode it is named for the UTC time it was planned
+(`runs/20261020-000429-brave-fox`). In `adhoc` mode each `run` command gets one folder named
+that way, and its runs nest inside it (`runs/20261020-000429-brave-fox/quiet-river`); the run id
+is that path under `runs/`. Either way, 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
 `source-language` for a `--source-language` flag), booleans as 0 or 1, and lists
 and tables as JSON. labnotes writes `run.json` (params, created, ended, exit
-code, and `invocation_id`, shared by every run one `run` command started;
-query it as `run ->> 'invocation_id'`), `stdout.log` and `stderr.log` to the
+code), `stdout.log` and `stderr.log` to the
 run folder.
 A run counts when it exited 0 and its `run.json` doesn't hold
 `"excluded": true`, so excluding a run by hand means adding that key; the next
@@ -101,8 +103,8 @@ 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. `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
+finish. Enter on a run follows its `stdout.log` and `stderr.log` together, as
+they're written, and Escape returns to the table. An `adhoc` experiment that
 plans a single run opens straight on its output. `q` quits. Elsewhere, or with `--no-tui`, it prints a
 line per event instead.
 
@@ -117,4 +119,4 @@ line per event instead.
 - A second `run` of the same experiment fails while the first holds the lock.
 - It exits 1 if any run failed.
 
-`uvx labnotes server` serves the experiments, their markdown files and their runs as a local site, read from the same `.labnotes.toml`. A grid cell is full once it has `repeats` runs that count.
+`uvx labnotes server` serves the experiments, their markdown files and their runs as a local site, read from the same `.labnotes.toml`. An experiment's page shows its `experiment.toml` on one line, then a Runs tab with a table of its runs and a Notebooks tab with one tab per markdown file.

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/create_app.py

@@ -2,7 +2,6 @@ import asyncio
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
 from pathlib import Path
-from typing import cast
 
 from starlette.applications import Starlette
 from starlette.exceptions import HTTPException
@@ -20,7 +19,6 @@ from labnotes.list_experiments import list_experiments
 from labnotes.load_experiment import load_experiment
 from labnotes.models import LabnotesConfig
 from labnotes.notebook_kernel import NotebookKernel
-from labnotes.pivot_cells import pivot_cells
 from labnotes.python_blocks import python_blocks
 from labnotes.saved_outputs import saved_outputs
 from labnotes.stop_idle_kernels import stop_idle_kernels
@@ -69,12 +67,8 @@ def create_app(config: LabnotesConfig, kernel_idle_minutes: float) -> Starlette:
         )
         if loaded is None:
             raise HTTPException(404, "No such experiment")
-        varies = cast(dict[str, list[object]], loaded["varies"])
-        cells = cast(list[dict[str, object]], loaded["cells"])
         return templates.TemplateResponse(
-            request,
-            "experiment.html",
-            {"experiment": loaded, "pivot": pivot_cells(varies, cells)},
+            request, "experiment.html", {"experiment": loaded}
         )
 
     async def note_content(request: Request) -> str:

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/load_experiment.py

@@ -5,9 +5,9 @@ from typing import cast
 
 from dirsql import DirSQL
 
-from labnotes.experiment_notes import experiment_notes
 from labnotes.check_counts import check_counts
-from labnotes.experiment_progress import experiment_progress
+from labnotes.count_runs import count_runs
+from labnotes.experiment_notes import experiment_notes
 from labnotes.experiment_runs import experiment_runs
 from labnotes.list_runs import list_runs
 from labnotes.parse_run_view import parse_run_view
@@ -31,7 +31,7 @@ async def load_experiment(
     outputs_for: Callable[[str, str], Sequence[str]] = _no_outputs,
 ) -> dict[str, object] | None:
     found = await tables.query(
-        "SELECT name, display_name, config FROM experiments"
+        "SELECT name, display_name, config, source FROM experiments"
         f" WHERE name = {quote_string(name)}"
     )
     if not found:
@@ -42,15 +42,17 @@ async def load_experiment(
     varies = cast(dict[str, list[object]], summary["varies"])
     source = experiment_runs(name, list(varies))
     summary = await check_counts(tables, source, summary)
-    progress = await experiment_progress(tables, source, summary)
     shown = ["id", *(key for key in varies if key != "id")]
     view = parse_run_view(params, shown)
+    [totals] = await count_runs(tables, source, str(summary["completed_run"]))
     notes = await experiment_notes(tables, root, name)
     return {
         "name": row["name"],
         "display_name": row["display_name"],
+        "config_source": row["source"],
+        "counts_set": "counts" in (config or {}),
         **summary,
-        **progress,
+        **totals,
         "notes": [
             {
                 "name": note["name"],

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/runner/execute_run.py

@@ -15,11 +15,9 @@ async def execute_run(
     params: dict[str, object],
     running: set[asyncio.subprocess.Process],
     stopping: asyncio.Event,
-    invocation: str,
 ) -> dict[str, object]:
     run: dict[str, object] = {
         "params": params,
-        "invocation_id": invocation,
         "created": iso_time(time.time()),
         "ended": None,
         "exit_code": None,

{labnotes-0.0.46 → labnotes-0.0.48}/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_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
@@ -44,12 +44,18 @@ async def run_experiment(
             run in planned or run_folder(config.root, config.runs, name, run).exists()
         )
 
-    invocation = new_invocation_id()
+    group = new_stamped_run_id(taken) if experiment.mode == "adhoc" else None
+
+    def new_id() -> str:
+        if group is None:
+            return new_stamped_run_id(taken)
+        return f"{group}/" + new_run_id(lambda run: taken(f"{group}/{run}"))
+
     plan: list[Entry] = []
     for params in plan_runs(
         param_grid(experiment.params), experiment.repeats, finished
     ):
-        run = new_stamped_run_id(taken)
+        run = new_id()
         planned.add(run)
         plan.append((run, params))
     runs = [{"run": run, "params": params} for run, params in plan]
@@ -131,7 +137,7 @@ async def run_experiment(
     def retry(run: str) -> None:
         if stopping.is_set() or run not in ended:
             return
-        again = new_stamped_run_id(taken)
+        again = new_id()
         planned.add(again)
         plan.append((again, ended[run]))
         report({"event": "retried", "run": run, "retry": again, "params": ended[run]})
@@ -182,7 +188,6 @@ async def run_experiment(
             params,
             running[run],
             stopping,
-            invocation,
         )
         del running[run]
         report({"event": "ended", "run": run, **result})

labnotes-0.0.48/src/labnotes/static/experiment.js

@@ -0,0 +1,21 @@
+const summary = document.querySelector(".config-summary");
+const open = document.querySelector(".config-open");
+const dialog = document.querySelector(".config-file");
+
+if (summary) {
+  const fit = () => {
+    open.hidden = summary.scrollWidth <= summary.clientWidth;
+  };
+  new ResizeObserver(fit).observe(summary);
+  open.addEventListener("click", () => dialog.showModal());
+  dialog.querySelector(".config-close").addEventListener("click", () => dialog.close());
+}
+
+for (const row of document.querySelectorAll(".run-row")) {
+  row.addEventListener("click", () => {
+    if (getSelection().toString()) return;
+    const record = row.nextElementSibling;
+    record.hidden = !record.hidden;
+    row.setAttribute("aria-expanded", String(!record.hidden));
+  });
+}

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/static/labnotes.css

@@ -112,10 +112,6 @@ h3 {
 .study { font-family: var(--mono); font-size: 0.82rem; color: var(--ink-3); margin: 0.35rem 0 0; }
 .intro .study { font-size: 0.9rem; margin-top: 0.6rem; }
 
-.toc { display: flex; gap: 1.4rem; margin-top: 1.4rem; font-size: 0.88rem; }
-.toc a { color: var(--ink-2); text-decoration: none; }
-.toc a:hover { color: var(--accent); }
-
 .empty, .notice { color: var(--ink-2); }
 .notice {
   margin-top: 1.25rem;
@@ -181,31 +177,6 @@ h3 {
 .progress-line .num { text-align: right; }
 .pct { color: var(--ink-2); }
 
-/* Headline figures */
-.figures {
-  display: grid;
-  grid-template-columns: 2fr 1fr 1fr;
-  gap: 1px;
-  background: var(--rule);
-  border: 1px solid var(--rule);
-  border-radius: 10px;
-  overflow: hidden;
-  margin-bottom: 3.5rem;
-}
-.figure { background: var(--surface); padding: 1.3rem 1.5rem 1.4rem; }
-.figure-label { font-size: 0.72rem; font-weight: 600; letter-spacing: 0.08em; text-transform: uppercase; color: var(--ink-3); }
-.figure-value { font-size: 2.4rem; font-weight: 500; letter-spacing: -0.03em; line-height: 1.15; margin: 0.35rem 0 0.6rem; font-variant-numeric: tabular-nums; }
-.figure .meter { height: 6px; border-radius: 3px; margin-bottom: 0.7rem; }
-.figure-note { color: var(--ink-2); font-size: 0.86rem; }
-
-.block { margin-bottom: 3.5rem; }
-
-/* Design */
-.design-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr)); gap: 2.5rem; margin-bottom: 1.75rem; }
-.factors { display: grid; grid-template-columns: max-content 1fr; gap: 0.6rem 1.25rem; margin: 0; align-items: baseline; }
-.factors dt { font-family: var(--mono); font-size: 0.82rem; color: var(--ink-2); }
-.factors dd { margin: 0; display: flex; flex-wrap: wrap; gap: 0.35rem; }
-
 .chip {
   font-family: var(--mono);
   font-size: 0.8rem;
@@ -217,30 +188,100 @@ h3 {
 }
 .chip.quiet { background: var(--chip); border-color: var(--rule); }
 
-.facts { display: grid; grid-template-columns: max-content 1fr; gap: 0.5rem 1.25rem; margin: 0; padding-top: 1.25rem; border-top: 1px dashed var(--rule); font-size: 0.88rem; }
-.facts dt { color: var(--ink-3); }
-.facts dd { margin: 0; }
-
-/* Progress grid */
-.scroll { overflow-x: auto; }
-.grid { border-collapse: separate; border-spacing: 2px; font-size: 0.86rem; }
-.grid th { font-weight: 500; text-align: left; white-space: nowrap; }
-.grid thead th { font-family: var(--mono); font-size: 0.78rem; color: var(--ink-2); padding: 0 0.75rem 0.5rem; vertical-align: bottom; }
-.grid thead th.label { color: var(--ink-3); }
-.grid thead th.axis { font-family: var(--sans); font-size: 0.66rem; font-weight: 600; letter-spacing: 0.08em; text-transform: uppercase; color: var(--ink-3); padding-bottom: 0.15rem; border-bottom: 1px solid var(--rule); }
-.grid .axis-row + tr th { padding-top: 0.45rem; }
-.grid tbody th { font-family: var(--mono); font-size: 0.8rem; color: var(--ink-2); padding: 0 1rem 0 0.75rem; }
-.grid tbody tr + tr th { border-top: 1px solid transparent; }
-.cell {
-  min-width: 6.5rem;
-  padding: 0.55rem 0.75rem 0.65rem;
+/* experiment.toml line */
+.config-line { display: flex; align-items: baseline; gap: 0.75rem; margin-top: 1.1rem; }
+.config-summary {
+  flex: 1;
+  min-width: 0;
+  margin: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: 0.88rem;
+  color: var(--ink-3);
+}
+.setting { margin-left: 1.1rem; }
+.setting b { font-weight: 600; color: var(--ink); }
+.config-open, .config-close {
+  font: inherit;
+  font-family: var(--mono);
+  font-size: 0.75rem;
+  padding: 0.15rem 0.6rem;
+  border: 1px solid var(--rule-strong);
+  border-radius: 5px;
+  background: var(--surface);
+  color: var(--ink-2);
+  cursor: pointer;
+  white-space: nowrap;
+}
+.config-open:hover, .config-close:hover { color: var(--accent); border-color: var(--accent); }
+.config-file {
+  width: min(48rem, 90vw);
+  padding: 0;
+  border: 1px solid var(--rule);
+  border-radius: 10px;
+  background: var(--surface);
+  color: var(--ink);
+}
+.config-file::backdrop { background: color-mix(in srgb, var(--ink) 30%, transparent); }
+.config-file header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0.6rem 1.25rem;
+  border-bottom: 1px solid var(--rule);
+  font-family: var(--mono);
+  font-size: 0.78rem;
+  color: var(--ink-3);
+}
+.config-file pre { margin: 0; padding: 1rem 1.25rem; max-height: 70vh; overflow: auto; font-size: 0.82rem; }
+
+/* Tabs */
+.tabs { display: flex; gap: 1.6rem; border-bottom: 1px solid var(--rule); margin-bottom: 1.75rem; font-size: 0.95rem; }
+.tabs a { color: var(--ink-2); text-decoration: none; padding: 0.5rem 0; margin-bottom: -1px; border-bottom: 2px solid transparent; }
+.tabs a:hover { color: var(--ink); }
+.tabs a[aria-current="page"] { color: var(--ink); border-bottom-color: var(--accent); }
+.tabs .count { font-size: 0.8rem; color: var(--ink-3); margin-left: 0.3rem; }
+.tabs.sub { gap: 1.2rem; margin-top: -1rem; font-family: var(--mono); font-size: 0.8rem; }
+
+/* Runs table */
+.narrowed { color: var(--ink-2); font-size: 0.88rem; margin: 0 0 0.75rem; }
+.narrowed .clear { margin-left: 0.8rem; color: var(--ink-3); }
+.runs-table {
+  width: 100%;
+  border-collapse: separate;
+  border-spacing: 0;
   background: var(--surface);
   border: 1px solid var(--rule);
-  border-radius: 6px;
+  border-radius: 10px;
+  font-size: 0.86rem;
 }
-.cell .num { display: block; margin-bottom: 0.4rem; }
-.cell.empty .num { color: var(--ink-3); }
-.cell.done { border-color: color-mix(in srgb, var(--accent) 35%, var(--rule)); }
+.runs-table th, .runs-table td { padding: 0.55rem 1rem; text-align: left; border-bottom: 1px solid var(--rule); }
+.runs-table th { font-size: 0.72rem; font-weight: 600; letter-spacing: 0.08em; text-transform: uppercase; color: var(--ink-3); white-space: nowrap; }
+.runs-table th:first-child, .runs-table .run-row td:first-child { width: 4rem; }
+.runs-table .sort { color: inherit; text-decoration: none; }
+.runs-table .sort:hover, .runs-table .sorted { color: var(--ink); }
+.runs-table .arrow { margin-left: 0.3rem; color: var(--accent); }
+.runs-table .filters td { padding-top: 0.4rem; padding-bottom: 0.4rem; background: var(--paper); }
+.runs-table .filters input, .runs-table .filters select {
+  width: 100%;
+  min-width: 0;
+  font: inherit;
+  font-size: 0.82rem;
+  padding: 0.2rem 0.45rem;
+  color: var(--ink);
+  background: var(--surface);
+  border: 1px solid var(--rule);
+  border-radius: 5px;
+}
+.runs-table .filters select { padding: 0.2rem 0; }
+.runs-table .filters input:focus, .runs-table .filters select:focus { outline: none; border-color: var(--accent); }
+.runs-table tbody tr:last-child td { border-bottom: 0; }
+.run-row { cursor: pointer; }
+.run-row td { max-width: 24rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.run-row:hover { background: color-mix(in srgb, var(--accent) 4%, transparent); }
+.run-row[aria-expanded="true"] { background: color-mix(in srgb, var(--accent) 6%, transparent); }
+.record-row td { background: var(--paper); }
 
 /* Notes */
 .note {
@@ -288,56 +329,6 @@ h3 {
 .prose th { font-weight: 600; border-bottom-color: var(--rule-strong); }
 .prose hr { border: 0; border-top: 1px solid var(--rule); margin: 2em 0; }
 
-/* Runs */
-.runs {
-  --row: 2.75rem repeat(var(--columns), minmax(0, 1fr));
-  background: var(--surface);
-  border: 1px solid var(--rule);
-  border-radius: 10px;
-  overflow: hidden;
-  font-size: 0.86rem;
-}
-.run-head, .run summary, .run-filters {
-  display: grid;
-  grid-template-columns: var(--row);
-  gap: 1rem;
-  padding: 0.6rem 1.25rem;
-  align-items: center;
-}
-.run-head {
-  font-size: 0.72rem;
-  font-weight: 600;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-  color: var(--ink-3);
-  border-bottom: 1px solid var(--rule);
-}
-.run-head .sort { color: inherit; text-decoration: none; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-.run-head .sort:hover, .run-head .sorted { color: var(--ink); }
-.run-head .arrow { margin-left: 0.3rem; color: var(--accent); }
-.run-filters { padding-top: 0.5rem; padding-bottom: 0.5rem; border-bottom: 1px solid var(--rule); background: var(--paper); }
-.run-filters input, .run-filters select {
-  width: 100%;
-  min-width: 0;
-  font: inherit;
-  font-size: 0.82rem;
-  padding: 0.2rem 0.45rem;
-  color: var(--ink);
-  background: var(--surface);
-  border: 1px solid var(--rule);
-  border-radius: 5px;
-}
-.run-filters select { padding: 0.2rem 0; }
-.run-filters input:focus, .run-filters select:focus { outline: none; border-color: var(--accent); }
-.run-empty { margin: 0; padding: 1rem 1.25rem; }
-h2 .clear { font-family: var(--sans); font-size: 0.82rem; margin-left: 0.8rem; color: var(--ink-3); }
-.run { border-bottom: 1px solid var(--rule); }
-.run:last-child { border-bottom: 0; }
-.run summary { cursor: pointer; list-style: none; }
-.run summary::-webkit-details-marker { display: none; }
-.run summary span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.run summary:hover { background: color-mix(in srgb, var(--accent) 4%, transparent); }
-.run[open] summary { background: color-mix(in srgb, var(--accent) 6%, transparent); }
 .status { font-size: 0.8rem; font-weight: 700; }
 .status.good { color: var(--good); }
 .status.bad { color: var(--bad); }
@@ -348,9 +339,7 @@ h2 .clear { font-family: var(--sans); font-size: 0.82rem; margin-left: 0.8rem; c
   grid-template-columns: max-content minmax(0, 1fr);
   gap: 0.45rem 1.5rem;
   margin: 0;
-  padding: 1rem 1.25rem 1.25rem 3.75rem;
-  border-top: 1px dashed var(--rule);
-  background: var(--paper);
+  padding: 0.5rem 0 0.75rem 2.25rem;
 }
 .record dt { font-family: var(--mono); font-size: 0.78rem; color: var(--ink-3); }
 .record dd { margin: 0; min-width: 0; }
@@ -403,7 +392,6 @@ h2 .clear { font-family: var(--sans); font-size: 0.82rem; margin-left: 0.8rem; c
 @media (max-width: 52rem) {
   main, .masthead { padding-left: 1.1rem; padding-right: 1.1rem; }
   h1 { font-size: 2rem; }
-  .figures { grid-template-columns: 1fr; }
   .ledger .design { display: none; }
   .progress-col { width: auto; }
 }
@@ -429,7 +417,7 @@ h2 .clear { font-family: var(--sans); font-size: 0.82rem; margin-left: 0.8rem; c
 }
 .cell .run:hover, .note-name .restart:hover { color: var(--accent); border-color: var(--accent); }
 .cell .run:disabled, .note-name .restart:disabled { cursor: progress; opacity: 0.6; }
-.note-name:has(.restart) { display: flex; align-items: center; justify-content: space-between; padding-top: 0.45rem; padding-bottom: 0.45rem; }
+.note-name:has(.restart) { display: flex; align-items: center; justify-content: flex-end; padding-top: 0.45rem; padding-bottom: 0.45rem; }
 .cell-output { display: block; }
 .cell-output:not(:empty) { margin-top: 0.4rem; padding-left: 0.9rem; border-left: 2px solid var(--accent-soft); overflow-x: auto; }
 .cell-output pre { background: none; border: 0; padding: 0.3rem 0; }

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/tables/open_tables.py

@@ -10,12 +10,15 @@ from labnotes.tables.read_run import read_run
 
 # experiments is a view, so files and runs can't declare a foreign key to it.
 EXPERIMENTS = """
-CREATE TABLE experiment_configs (experiment TEXT PRIMARY KEY, config TEXT);
+CREATE TABLE experiment_configs (
+  experiment TEXT PRIMARY KEY, config TEXT, source TEXT
+);
 CREATE VIEW experiments AS
   SELECT
     names.name,
     coalesce(experiment_configs.config ->> 'name', names.name) AS display_name,
-    experiment_configs.config
+    experiment_configs.config,
+    experiment_configs.source
   FROM (
     SELECT experiment AS name FROM experiment_configs
     UNION SELECT experiment FROM files

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/tables/path_glob.py

@@ -4,5 +4,5 @@ PLACEHOLDER = re.compile(r"\{[^}]*\}")
 
 
 def path_glob(template: str) -> str:
-    glob = PLACEHOLDER.sub("*", template)
+    glob = PLACEHOLDER.sub("*", template.replace("{run}", "**"))
     return f"{glob}**" if glob.endswith("/") else glob

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/tables/path_pattern.py

@@ -6,6 +6,9 @@ TOKEN = re.compile(r"\{([^}]*)\}|\*\*|\*|\?|[^{*?]+")
 def path_pattern(template: str) -> re.Pattern[str]:
     parts = []
     for found in TOKEN.finditer(template):
+        if found.group(1) == "run":
+            parts.append("(?P<run>[^/]+(?:/[^/]+)?)")
+            continue
         if found.group(1) is not None:
             parts.append(f"(?P<{found.group(1)}>[^/]+)")
             continue

{labnotes-0.0.46 → labnotes-0.0.48}/src/labnotes/tables/read_experiment.py

@@ -10,6 +10,12 @@ def read_experiment(root: Path, template: str, path: str) -> list[dict[str, obje
     found = path_pattern(f"{template}/experiment.toml").fullmatch(relative)
     if found is None:
         return []
-    with Path(path).open("rb") as file:
-        config = tomllib.load(file)
-    return [{"experiment": found["experiment"], "config": json.dumps(config)}]
+    source = Path(path).read_text(encoding="utf-8")
+    config = tomllib.loads(source)
+    return [
+        {
+            "experiment": found["experiment"],
+            "config": json.dumps(config),
+            "source": source,
+        }
+    ]

labnotes-0.0.48/src/labnotes/templates/experiment.html

@@ -0,0 +1,106 @@
+{% extends "base.html" %}
+{% set e = experiment %}
+{% set tab = 'notebooks' if request.query_params.get('tab') == 'notebooks' else 'runs' %}
+{% block title %}{{ e.display_name }} · labnotes{% endblock %}
+{% block crumbs %}<span class="crumb"><a href="{{ url_for('index') }}">Experiments</a></span><span class="crumb">{{ e.display_name }}</span>{% endblock %}
+{% block main %}
+<section class="intro">
+  <h1>{{ e.display_name }}</h1>
+  {% if e.display_name != e.name %}<p class="study">{{ e.name }}</p>{% endif %}
+  {% if e.config_source is not none %}
+  <div class="config-line">
+    <p class="config-summary">
+      <span class="chip quiet">{{ e.mode }}</span>
+      {% for key, value in e.other.items() %}<span class="setting">{{ key }} <code>{{ value | value }}</code></span>{% endfor %}
+      {% if e.runs_per_cell %}<span class="setting">repeats <b class="num">{{ e.runs_per_cell }}</b></span>{% endif %}
+      {% for key, values in e.varies.items() %}<span class="setting">{{ key }}{% for value in values %} <span class="chip">{{ value | value }}</span>{% endfor %}</span>{% endfor %}
+      {% if e.counts_error %}<span class="setting counts-error">{{ e.counts_error }}</span>{% elif e.counts_set %}<span class="setting">counts <code>{{ e.completed_run }}</code></span>{% endif %}
+    </p>
+    <button type="button" class="config-open">experiment.toml</button>
+  </div>
+  <dialog class="config-file">
+    <header>experiment.toml<button type="button" class="config-close">Close</button></header>
+    <pre>{{ e.config_source }}</pre>
+  </dialog>
+  {% endif %}
+</section>
+
+<nav class="tabs">
+  <a href="?"{% if tab == 'runs' %} aria-current="page"{% endif %}>Runs <span class="count num">{{ e.runs }}</span></a>
+  <a href="?tab=notebooks"{% if tab == 'notebooks' %} aria-current="page"{% endif %}>Notebooks <span class="count num">{{ e.notes | length }}</span></a>
+</nav>
+
+{% if tab == 'notebooks' %}
+{% set chosen = request.query_params.get('note') %}
+{% set note = (e.notes | selectattr('name', 'equalto', chosen) | first) or (e.notes | first) %}
+{% if note %}
+<nav class="tabs sub">
+  {% for each in e.notes %}<a href="?tab=notebooks&amp;note={{ each.name | urlencode }}"{% if each.name == note.name %} aria-current="page"{% endif %}>{{ each.name }}</a>{% endfor %}
+</nav>
+<article class="note" data-run-url="{{ url_for('run_block', name=e.name, note=note.name) }}" data-restart-url="{{ url_for('restart_kernel', name=e.name, note=note.name) }}">
+  {% if note.runnable %}<header class="note-name"><button type="button" class="restart" title="Stop this note's Python kernel. The next Run starts a fresh one.">Restart</button></header>{% endif %}
+  <div class="prose">{{ note.html | safe }}</div>
+</article>
+<script src="{{ asset('run-cell.js') }}" defer></script>
+{% else %}
+<p class="empty">No notebooks yet.</p>
+{% endif %}
+{% else %}
+<section id="runs">
+  {% set view = e.run_view %}
+  {% set narrowed = view.status or view.filters %}
+  {% if narrowed %}<p class="narrowed"><span class="num">{{ e.runs_list | length }}</span> of <span class="num">{{ e.runs }}</span> <a class="clear" href="{{ '?sort=' ~ (view.sort | urlencode) ~ ('&order=desc' if view.descending else '') if view.sort else '?' }}#runs">Clear filters</a></p>{% endif %}
+  {% if e.runs %}
+  <form id="run-filters" method="get" action="#runs">
+    {% if view.sort %}<input type="hidden" name="sort" value="{{ view.sort }}">{% endif %}
+    {% if view.descending %}<input type="hidden" name="order" value="desc">{% endif %}
+    <button type="submit" hidden>Filter</button>
+  </form>
+  <div class="scroll">
+  <table class="runs-table">
+    <thead>
+      <tr>
+        {% for column in ['status'] + e.run_columns %}
+        {% set sorted = view.sort == column %}
+        <th scope="col"{% if sorted %} aria-sort="{{ 'descending' if view.descending else 'ascending' }}"{% endif %}><a class="sort{{ ' sorted' if sorted }}" href="{{ e.sort_hrefs[column] }}" title="Sort by {{ column }}">{{ '' if column == 'status' else column }}{% if sorted %}<span class="arrow">{{ '↓' if view.descending else '↑' }}</span>{% endif %}</a></th>
+        {% endfor %}
+      </tr>
+      <tr class="filters">
+        <td><select form="run-filters" name="status" aria-label="Filter by status" onchange="this.form.requestSubmit()">
+          <option value=""{{ ' selected' if not view.status }}>all</option>
+          <option value="complete"{{ ' selected' if view.status == 'complete' }}>✓</option>
+          <option value="incomplete"{{ ' selected' if view.status == 'incomplete' }}>✕</option>
+        </select></td>
+        {% for column in e.run_columns %}<td><input form="run-filters" type="search" name="f.{{ column }}" value="{{ view.filters.get(column, '') }}" placeholder="filter" aria-label="Filter {{ column }}"></td>{% endfor %}
+      </tr>
+    </thead>
+    <tbody>
+      {% for run in e.runs_list %}
+      <tr class="run-row" aria-expanded="false">
+        <td><span class="status {{ 'good' if run.labnotes_completed else 'bad' }}" title="{{ 'complete' if run.labnotes_completed else 'not complete' }}">{{ '✓' if run.labnotes_completed else '✕' }}</span></td>
+        {% for column in e.run_columns %}<td class="{{ 'mono' if loop.first }}">{{ run[column] | value }}</td>{% endfor %}
+      </tr>
+      <tr class="record-row" hidden>
+        <td colspan="{{ e.run_columns | length + 1 }}">
+          <dl class="record">
+            {% for key, value in run.items() if key != 'labnotes_completed' %}
+            <dt>{{ key }}</dt>
+            {% set shown = value | value %}
+            <dd>{% if shown | length > 80 %}<pre>{{ shown }}</pre>{% else %}<code>{{ shown }}</code>{% endif %}</dd>
+            {% endfor %}
+          </dl>
+        </td>
+      </tr>
+      {% else %}
+      <tr><td class="empty" colspan="{{ e.run_columns | length + 1 }}">No runs match these filters.</td></tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  </div>
+  {% else %}
+  <p class="empty">No runs recorded yet.</p>
+  {% endif %}
+</section>
+{% endif %}
+<script src="{{ asset('experiment.js') }}" defer></script>
+{% endblock %}