labnotes 0.0.76__tar.gz → 0.0.78__tar.gz

{labnotes-0.0.76 → labnotes-0.0.78}/PKG-INFO

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

@@ -113,8 +113,8 @@ going. Elsewhere, it prints a line per event instead.
   `.labnotes.toml`, then 1.
 - `-e PATH` reads another file instead of `experiment.toml`.
 - `run` hands its runs to the project's labnotes daemon, starting it if
-  needed, and shows or waits for them. The daemon listens on `.labnotes.sock`
-  in the project folder and exits once nothing is running and no client has
+  needed, and shows or waits for them. The daemon listens on a socket in
+  `/tmp/labnotes-<uid>/` and exits once nothing is running and no client has
   been connected for 15 seconds. Runs belong to the daemon, so quitting the
   live view, closing its terminal, or killing `run` outright leaves them going.
 - Ctrl-C stops the running scripts and records their end. A second Ctrl-C
@@ -129,4 +129,4 @@ going. Elsewhere, it prints a line per event instead.
 - A second `run` of the same experiment fails while the first is going.
 - It exits 0 even if runs fail; the summary line counts failures.
 
-`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.
+`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. Clicking a run opens its `stdout.log` and `stderr.log` together, followed as they're written until the run ends.

{labnotes-0.0.76 → labnotes-0.0.78}/src/labnotes/create_app.py

@@ -28,11 +28,13 @@ from labnotes.format_started import format_started
 from labnotes.format_value import format_value
 from labnotes.list_experiments import list_experiments
 from labnotes.load_experiment import load_experiment
+from labnotes.load_run import load_run
 from labnotes.models import LabnotesConfig
 from labnotes.note_path import note_path
 from labnotes.notebook_kernel import NotebookKernel
 from labnotes.python_blocks import python_blocks
 from labnotes.render_markdown import render_markdown
+from labnotes.run_output import run_output
 from labnotes.save_conflict_copy import save_conflict_copy
 from labnotes.save_note import save_note
 from labnotes.saved_outputs import saved_outputs
@@ -84,6 +86,32 @@ def create_app(config: LabnotesConfig) -> Starlette:
             request, "experiment.html", {"experiment": loaded}
         )
 
+    async def find_run(request: Request) -> dict[str, object]:
+        found = await load_run(
+            request.app.state.tables,
+            request.path_params["name"],
+            request.path_params["run"],
+        )
+        if found is None:
+            raise HTTPException(404, "No such run")
+        return found
+
+    async def run(request: Request) -> Response:
+        found = await find_run(request)
+        return templates.TemplateResponse(request, "run.html", {"run": found})
+
+    async def output(request: Request) -> Response:
+        await find_run(request)
+        return StreamingResponse(
+            run_output(
+                request.app.state.tables,
+                config.root,
+                request.path_params["name"],
+                request.path_params["run"],
+            ),
+            media_type="text/event-stream",
+        )
+
     async def read_note(request: Request) -> dict[str, str]:
         name = request.path_params["name"]
         note = request.path_params["note"]
@@ -191,6 +219,8 @@ def create_app(config: LabnotesConfig) -> Starlette:
             Route("/", index),
             Route("/experiments/{name}", experiment),
             Route("/experiments/{name}/changes", changes),
+            Route("/experiments/{name}/runs/{run:path}", run),
+            Route("/experiments/{name}/output/{run:path}", output),
             Route("/experiments/{name}/notes", post_note, methods=["POST"]),
             Route("/experiments/{name}/notes/{note:path}", get_note),
             Route("/experiments/{name}/notes/{note:path}", put_note, methods=["PUT"]),

labnotes-0.0.78/src/labnotes/daemon/socket_path.py

@@ -0,0 +1,13 @@
+import hashlib
+import os
+from pathlib import Path
+
+
+# Unix socket paths cap at 107 bytes, so the socket can't live in a deep project.
+# A fixed folder, not XDG_RUNTIME_DIR or TMPDIR, so every shell finds the daemon.
+def socket_path(root: Path) -> Path:
+    folder = Path("/tmp") / f"labnotes-{os.getuid()}"
+    folder.mkdir(exist_ok=True)
+    folder.chmod(0o700)
+    digest = hashlib.sha256(str(root.resolve()).encode()).hexdigest()[:16]
+    return folder / f"{digest}.sock"

labnotes-0.0.78/src/labnotes/load_run.py

@@ -0,0 +1,21 @@
+import json
+
+from dirsql import DirSQL
+
+from labnotes.sql_quote import quote_string
+
+
+async def load_run(
+    tables: DirSQL, experiment: str, run: str
+) -> dict[str, object] | None:
+    rows = await tables.query(
+        "SELECT runs.experiment, experiments.display_name, runs.id, runs.folder,"
+        " runs.created, runs.ended, runs.exit_code, runs.params"
+        " FROM runs JOIN experiments ON experiments.name = runs.experiment"
+        f" WHERE runs.experiment = {quote_string(experiment)}"
+        f" AND runs.id = {quote_string(run)}"
+    )
+    if not rows:
+        return None
+    [row] = rows
+    return {**row, "params": json.loads(str(row["params"]))}

labnotes-0.0.78/src/labnotes/run_output.py

@@ -0,0 +1,66 @@
+import codecs
+import json
+from collections.abc import AsyncIterator, Iterable, Iterator
+from pathlib import Path
+
+from dirsql import DirSQL
+
+from labnotes.load_run import load_run
+from labnotes.tables.read_log import STREAMS
+
+
+async def run_output(
+    tables: DirSQL, root: Path, experiment: str, run_id: str
+) -> AsyncIterator[str]:
+    # Watch before reading, so nothing written in between is missed.
+    events = tables.watch()
+    run = await load_run(tables, experiment, run_id)
+    if run is None:
+        return
+    folder = root / str(run["folder"])
+    offsets = dict.fromkeys(STREAMS, 0)
+    decoders = {
+        stream: codecs.getincrementaldecoder("utf-8")("replace") for stream in STREAMS
+    }
+    last: str | None = None
+    mid_line = False
+
+    def read(streams: Iterable[str]) -> Iterator[str]:
+        nonlocal last, mid_line
+        for stream in streams:
+            path = folder / f"{stream}.log"
+            if not path.exists():
+                continue
+            with path.open("rb") as log:
+                log.seek(offsets[stream])
+                data = log.read()
+            offsets[stream] += len(data)
+            text = decoders[stream].decode(data)
+            if not text:
+                continue
+            if mid_line and stream != last:
+                text = "\n" + text
+            last, mid_line = stream, not text.endswith("\n")
+            yield f"data: {json.dumps({'stream': stream, 'text': text})}\n\n"
+
+    for message in read(STREAMS):
+        yield message
+    exit_code = run["exit_code"]
+    if run["ended"] is None:
+        async for event in events:
+            row = event.row
+            if row is None or row["experiment"] != experiment:
+                continue
+            if event.table == "logs" and row["run"] == run_id:
+                for message in read([row["stream"]]):
+                    yield message
+            elif (
+                event.table == "runs"
+                and row["id"] == run_id
+                and row["ended"] is not None
+            ):
+                exit_code = row["exit_code"]
+                break
+        for message in read(STREAMS):
+            yield message
+    yield f"event: end\ndata: {json.dumps(exit_code)}\n\n"

{labnotes-0.0.76 → labnotes-0.0.78}/src/labnotes/static/labnotes.css

@@ -295,6 +295,19 @@ h3 {
 .group-toggle[aria-expanded="true"]::before { content: "▾"; }
 .group:not(.open) > :not(.group-row) { display: none; }
 .group.open .run-row td:nth-child(2) { padding-left: 2rem; }
+.run-row { cursor: pointer; }
+.run-link { text-decoration: none; }
+
+/* Run output */
+.run-state.good { color: var(--good); }
+.run-state.bad { color: var(--bad); }
+.run-log { background: var(--surface); border: 1px solid var(--rule); border-radius: 6px; }
+.run-log header { display: flex; gap: 1rem; padding: 0.4rem 1.25rem; border-bottom: 1px solid var(--rule); font-family: var(--mono); font-size: 0.75rem; color: var(--ink-3); }
+.run-log header span::before { content: "■ "; }
+.run-output { margin: 0; padding: 1rem 1.25rem; max-height: 70vh; overflow: auto; font-size: 0.82rem; white-space: pre-wrap; overflow-wrap: anywhere; }
+.run-output:empty::before { content: "No output yet."; color: var(--ink-3); }
+.run-output .stderr, .run-log header .stderr::before { color: var(--bad); }
+.run-log header .stdout::before { color: var(--ink-2); }
 
 /* Notes */
 .note {

labnotes-0.0.78/src/labnotes/static/row-link.js

@@ -0,0 +1,8 @@
+// Safari ignores position: relative on <tr>, so a stretched ::after link covers the whole page.
+// Delegated, so rows the runs filter swaps in stay clickable.
+document.addEventListener("click", (event) => {
+  const link = event.target.closest(".ledger tbody tr, .run-row")?.querySelector(".title-link, .run-link");
+  if (!link || event.target.closest("a") || getSelection().toString()) return;
+  if (event.metaKey || event.ctrlKey) window.open(link.href, "_blank");
+  else location.href = link.href;
+});

labnotes-0.0.78/src/labnotes/static/run-output.js

@@ -0,0 +1,24 @@
+const output = document.querySelector(".run-output");
+const state = document.querySelector(".run-state");
+const source = new EventSource(output.dataset.url);
+
+// The server resends the whole log on each connection, so a reconnect starts clean.
+source.addEventListener("open", () => output.replaceChildren());
+
+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;
+  output.append(chunk);
+  if (following) output.scrollTop = output.scrollHeight;
+});
+
+source.addEventListener("end", (event) => {
+  source.close();
+  const code = JSON.parse(event.data);
+  state.textContent = code === null ? "ended" : `exit ${code}`;
+  state.classList.add(code === 0 ? "good" : "bad");
+  output.dataset.ended = "";
+});

{labnotes-0.0.76 → labnotes-0.0.78}/src/labnotes/tables/open_tables.py

@@ -6,6 +6,7 @@ from labnotes.models import LabnotesConfig
 from labnotes.tables.path_glob import path_glob
 from labnotes.tables.read_experiment import read_experiment
 from labnotes.tables.read_file import read_file
+from labnotes.tables.read_log import read_log
 from labnotes.tables.read_run import read_run
 
 # experiments is a view, so files and runs can't declare a foreign key to it.
@@ -40,6 +41,13 @@ CREATE TABLE runs (
   PRIMARY KEY (experiment, id)
 )
 """
+# Sizes only: the server reads log text from disk, the row change is the signal.
+LOGS = """
+CREATE TABLE logs (
+  experiment TEXT, run TEXT, stream TEXT, size INTEGER,
+  PRIMARY KEY (experiment, run, stream)
+)
+"""
 
 
 def open_tables(config: LabnotesConfig) -> DirSQL:
@@ -59,6 +67,12 @@ def open_tables(config: LabnotesConfig) -> DirSQL:
                 glob=path_glob(f"{config.runs}/run.json"),
                 on_file=partial(read_run, root, config.runs),
             ),
+            Table(
+                name="logs",
+                ddl=LOGS,
+                glob=path_glob(f"{config.runs}/std*.log"),
+                on_file=partial(read_log, root, config.runs),
+            ),
             Table(
                 name="experiment_configs",
                 ddl=EXPERIMENTS,

labnotes-0.0.78/src/labnotes/tables/read_log.py

@@ -0,0 +1,20 @@
+from pathlib import Path
+
+from labnotes.tables.path_pattern import path_pattern
+
+STREAMS = ("stdout", "stderr")
+
+
+def read_log(root: Path, template: str, path: str) -> list[dict[str, object]]:
+    relative = Path(path).relative_to(root).as_posix()
+    found = path_pattern(f"{template}/{{stream}}.log").fullmatch(relative)
+    if found is None or found["stream"] not in STREAMS:
+        return []
+    return [
+        {
+            "experiment": found["experiment"],
+            "run": found["run"],
+            "stream": found["stream"],
+            "size": Path(path).stat().st_size,
+        }
+    ]

{labnotes-0.0.76 → labnotes-0.0.78}/src/labnotes/templates/experiment.html

@@ -83,7 +83,7 @@
     {% macro run_rows(run) %}
       <tr class="run-row">
         <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 %}{% if column == 'id' and nested %}<td class="mono">{{ run.id.partition('/')[2] or run.id }}</td><td></td>{% else %}<td class="{{ 'mono' if loop.first }}{{ 'num' if column == 'duration' }}">{{ run[column] | duration if column == 'duration' else (run[column] | started if column == 'started' else run[column] | value) }}</td>{% endif %}{% endfor %}
+        {% for column in e.run_columns %}{% if column == 'id' %}<td class="mono"><a class="run-link" href="{{ url_for('run', name=e.name, run=run.id) }}">{{ run.id.partition('/')[2] or run.id if nested else run.id }}</a></td>{% if nested %}<td></td>{% endif %}{% else %}<td class="{{ 'mono' if loop.first }}{{ 'num' if column == 'duration' }}">{{ run[column] | duration if column == 'duration' else (run[column] | started if column == 'started' else run[column] | value) }}</td>{% endif %}{% endfor %}
       </tr>
     {% endmacro %}
     {% if nested %}
@@ -117,4 +117,5 @@
 {% endif %}
 <script src="{{ asset('experiment.js') }}" defer></script>
 <script src="{{ asset('local-time.js') }}" defer></script>
+<script src="{{ asset('row-link.js') }}" defer></script>
 {% endblock %}

labnotes-0.0.78/src/labnotes/templates/run.html

@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% block title %}{{ run.id }} · {{ run.display_name }} · labnotes{% endblock %}
+{% block crumbs %}<span class="crumb"><a href="{{ url_for('index') }}">Experiments</a></span><span class="crumb"><a href="{{ url_for('experiment', name=run.experiment) }}">{{ run.display_name }}</a></span><span class="crumb mono">{{ run.id }}</span>{% endblock %}
+{% block main %}
+<section class="intro">
+  <h1 class="mono">{{ run.id }}</h1>
+  <p class="config-summary">
+    {% if run.ended is none %}<span class="chip run-state">running</span>{% elif run.exit_code is none %}<span class="chip run-state bad">ended</span>{% else %}<span class="chip run-state {{ 'good' if run.exit_code == 0 else 'bad' }}">exit {{ run.exit_code }}</span>{% endif %}
+    {% if run.created %}<span class="setting">started <code>{{ run.created }}</code></span>{% endif %}
+    {% for key, value in run.params.items() %}<span class="setting">{{ key }} <code>{{ value | value }}</code></span>{% endfor %}
+  </p>
+</section>
+
+<section class="run-log">
+  <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>
+{% endblock %}

labnotes-0.0.76/src/labnotes/daemon/socket_path.py

@@ -1,7 +0,0 @@
-from pathlib import Path
-
-SOCKET_NAME = ".labnotes.sock"
-
-
-def socket_path(root: Path) -> Path:
-    return root / SOCKET_NAME

labnotes-0.0.76/src/labnotes/static/row-link.js

@@ -1,9 +0,0 @@
-// Safari ignores position: relative on <tr>, so a stretched ::after link covers the whole page.
-for (const row of document.querySelectorAll(".ledger tbody tr")) {
-  const link = row.querySelector(".title-link");
-  row.addEventListener("click", (event) => {
-    if (event.target.closest("a") || getSelection().toString()) return;
-    if (event.metaKey || event.ctrlKey) window.open(link.href, "_blank");
-    else location.href = link.href;
-  });
-}