labnotes 0.0.99__tar.gz → 0.0.100__tar.gz

{labnotes-0.0.99 → labnotes-0.0.100}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.99
+Version: 0.0.100
 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.99 → labnotes-0.0.100}/src/labnotes/run_output.py

@@ -43,8 +43,30 @@ async def run_output(
             last, mid_line = stream, not text.endswith("\n")
             yield f"data: {json.dumps({'stream': stream, 'text': text})}\n\n"
 
+    blocks_read = 0
+
+    def read_blocks() -> Iterator[str]:
+        nonlocal blocks_read
+        path = folder / "log.jsonl"
+        if not path.exists():
+            return
+        with path.open("rb") as log:
+            log.seek(blocks_read)
+            data = log.read()
+        whole = data[: data.rfind(b"\n") + 1]
+        blocks_read += len(whole)
+        for line in whole.splitlines():
+            try:
+                record = json.loads(line)
+            except json.JSONDecodeError:
+                continue
+            if isinstance(record, dict):
+                yield f"event: block\ndata: {json.dumps(record)}\n\n"
+
     for message in read(STREAMS):
         yield message
+    for message in read_blocks():
+        yield message
     exit_code = run["exit_code"]
     if run["ended"] is None:
         async for event in events:
@@ -54,6 +76,9 @@ async def run_output(
             if event.table == "logs" and row["run"] == run_id:
                 for message in read([row["stream"]]):
                     yield message
+            elif event.table == "blocks" and row["run"] == run_id:
+                for message in read_blocks():
+                    yield message
             elif (
                 event.table == "runs"
                 and row["id"] == run_id
@@ -63,4 +88,6 @@ async def run_output(
                 break
         for message in read(STREAMS):
             yield message
+        for message in read_blocks():
+            yield message
     yield f"event: end\ndata: {json.dumps(exit_code)}\n\n"

{labnotes-0.0.99 → labnotes-0.0.100}/src/labnotes/static/labnotes.css

@@ -302,6 +302,13 @@ h3 {
 /* Run output */
 .run-state.good { color: var(--good); }
 .run-state.bad { color: var(--bad); }
+.run-blocks { background: var(--surface); border: 1px solid var(--rule); border-radius: 6px; margin-bottom: 1rem; padding: 0.5rem 0; max-height: 50vh; overflow: auto; }
+.run-blocks[hidden] { display: none; }
+.log-block { display: block; width: 100%; padding: 0.2rem 1.25rem; border: 0; background: none; color: inherit; font: inherit; font-family: var(--mono); font-size: 0.82rem; text-align: left; cursor: pointer; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.log-block::before { content: "▸ "; color: var(--ink-3); }
+.log-block[aria-expanded="true"] { white-space: pre-wrap; overflow-wrap: anywhere; }
+.log-block[aria-expanded="true"]::before { content: "▾ "; }
+.log-block:hover { background: color-mix(in srgb, var(--accent) 4%, transparent); }
 .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: "■ "; }

{labnotes-0.0.99 → labnotes-0.0.100}/src/labnotes/static/run-output.js

@@ -4,12 +4,41 @@ const output = document.querySelector(".run-output");
 const state = document.querySelector(".run-state");
 const source = new EventSource(output.dataset.url);
 
+const blocks = document.querySelector(".run-blocks");
+
 let parsers = {};
+let streaming = new Map();
 
 // The server resends the whole log on each connection, so a reconnect starts clean.
 source.addEventListener("open", () => {
   output.replaceChildren();
   parsers = {};
+  blocks.replaceChildren();
+  blocks.hidden = true;
+  streaming = new Map();
+});
+
+source.addEventListener("block", (event) => {
+  const { id, phase, content = "" } = JSON.parse(event.data);
+  const open = streaming.get(id);
+  if (open && (phase === "delta" || phase === "stop")) {
+    open.textContent += content;
+    if (phase === "stop") streaming.delete(id);
+    return;
+  }
+  if (phase === "stop") return;
+  const line = document.createElement("button");
+  line.type = "button";
+  line.className = "log-block";
+  line.setAttribute("aria-expanded", "false");
+  line.textContent = content;
+  line.addEventListener("click", () => {
+    const expanded = line.getAttribute("aria-expanded") === "true";
+    line.setAttribute("aria-expanded", String(!expanded));
+  });
+  if (phase === "start" || phase === "delta") streaming.set(id, line);
+  blocks.append(line);
+  blocks.hidden = false;
 });
 
 source.addEventListener("message", (event) => {

{labnotes-0.0.99 → labnotes-0.0.100}/src/labnotes/tables/open_tables.py

@@ -4,6 +4,7 @@ from dirsql import DirSQL, Table
 
 from labnotes.models import LabnotesConfig
 from labnotes.tables.path_glob import path_glob
+from labnotes.tables.read_blocks import read_blocks
 from labnotes.tables.read_experiment import read_experiment
 from labnotes.tables.read_file import read_file
 from labnotes.tables.read_log import read_log
@@ -48,6 +49,12 @@ CREATE TABLE logs (
   PRIMARY KEY (experiment, run, stream)
 )
 """
+BLOCKS = """
+CREATE TABLE blocks (
+  experiment TEXT, run TEXT, size INTEGER,
+  PRIMARY KEY (experiment, run)
+)
+"""
 
 
 def open_tables(config: LabnotesConfig) -> DirSQL:
@@ -73,6 +80,12 @@ def open_tables(config: LabnotesConfig) -> DirSQL:
                 glob=path_glob(f"{config.runs}/std*.log"),
                 on_file=partial(read_log, root, config.runs),
             ),
+            Table(
+                name="blocks",
+                ddl=BLOCKS,
+                glob=path_glob(f"{config.runs}/log.jsonl"),
+                on_file=partial(read_blocks, root, config.runs),
+            ),
             Table(
                 name="experiment_configs",
                 ddl=EXPERIMENTS,

labnotes-0.0.100/src/labnotes/tables/read_blocks.py

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

{labnotes-0.0.99 → labnotes-0.0.100}/src/labnotes/templates/run.html

@@ -11,6 +11,8 @@
   </p>
 </section>
 
+<section class="run-blocks" hidden></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>

labnotes-0.0.100/src/labnotes/tui/log_block.py

@@ -0,0 +1,31 @@
+from rich.text import Text
+from textual.events import Click
+from textual.widgets import Static
+
+
+class LogBlock(Static):
+    DEFAULT_CSS = """
+    LogBlock { height: auto; }
+    LogBlock.-collapsed { height: 1; text-wrap: nowrap; text-overflow: ellipsis; }
+    """
+
+    def __init__(self, body: str) -> None:
+        super().__init__(classes="-collapsed")
+        self.body = body
+        self.expanded = False
+        self.show()
+
+    def extend(self, text: str) -> None:
+        self.body += text
+        self.show()
+
+    def on_click(self, _: Click) -> None:
+        self.expanded = not self.expanded
+        self.set_class(not self.expanded, "-collapsed")
+        self.show()
+
+    def show(self) -> None:
+        if self.expanded:
+            self.update(Text(f"▾ {self.body}"))
+        else:
+            self.update(Text(f"▸ {self.body}".replace("\n", " ")))

labnotes-0.0.100/src/labnotes/tui/log_blocks.py

@@ -0,0 +1,55 @@
+import json
+from pathlib import Path
+
+from textual.containers import VerticalScroll
+
+from labnotes.tui.log_block import LogBlock
+
+STREAMING = ("start", "delta")
+
+
+class LogBlocks(VerticalScroll):
+    DEFAULT_CSS = "LogBlocks { height: auto; max-height: 50%; }"
+
+    def __init__(self, id: str | None = None) -> None:
+        super().__init__(id=id)
+        self.reset()
+
+    def reset(self) -> None:
+        self.read_to = 0
+        self.streaming: dict[object, LogBlock] = {}
+        self.remove_children()
+        self.display = False
+
+    def follow(self, folder: Path) -> None:
+        path = folder / "log.jsonl"
+        if not path.exists():
+            return
+        with path.open("rb") as log:
+            log.seek(self.read_to)
+            data = log.read()
+        complete = data[: data.rfind(b"\n") + 1]
+        self.read_to += len(complete)
+        for line in complete.splitlines():
+            try:
+                record = json.loads(line)
+            except json.JSONDecodeError:
+                continue
+            if isinstance(record, dict):
+                self.add(record)
+
+    def add(self, record: dict[str, object]) -> None:
+        phase, key = record.get("phase"), record.get("id")
+        body = str(record.get("content", ""))
+        if phase == "delta" and key in self.streaming:
+            self.streaming[key].extend(body)
+            return
+        if phase == "stop":
+            if key in self.streaming:
+                self.streaming.pop(key).extend(body)
+            return
+        block = LogBlock(body)
+        if phase in STREAMING:
+            self.streaming[key] = block
+        self.mount(block)
+        self.display = True

{labnotes-0.0.99 → labnotes-0.0.100}/src/labnotes/tui/run_app.py

@@ -15,6 +15,7 @@ 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.log_blocks import LogBlocks
 from labnotes.tui.run_output import RunOutput
 from labnotes.tui.runs_table import RunsTable
 
@@ -83,6 +84,7 @@ class RunApp(App[None]):
     def compose(self) -> ComposeResult:
         yield Header()
         yield RunsTable(id="runs", cursor_type="row")
+        yield LogBlocks(id="blocks")
         yield RunOutput(id="output")
         yield Input(id="filter", placeholder="Filter params")
         yield Static(id="status")
@@ -379,6 +381,7 @@ class RunApp(App[None]):
 
     def view(self, run: str) -> None:
         self.viewing = run
+        self.query_one(LogBlocks).reset()
         self.query_one(RunOutput).reset()
         self.query_one(DataTable).display = False
         self.query_one(RunOutput).display = True
@@ -389,11 +392,13 @@ class RunApp(App[None]):
 
     def follow(self) -> None:
         if self.viewing in self.folders:
+            self.query_one(LogBlocks).follow(self.folders[self.viewing])
             self.query_one(RunOutput).follow(self.folders[self.viewing])
 
     def action_leave(self) -> None:
         if self.viewing is not None:
             self.viewing = None
+            self.query_one(LogBlocks).display = False
             self.query_one(RunOutput).display = False
             self.query_one(DataTable).display = True
             self.sub_title = ""

{labnotes-0.0.99 → labnotes-0.0.100}/src/labnotes/tui/run_screen.py

@@ -5,6 +5,7 @@ from textual.binding import Binding
 from textual.screen import Screen
 from textual.widgets import Footer, Header
 
+from labnotes.tui.log_blocks import LogBlocks
 from labnotes.tui.run_output import RunOutput
 
 
@@ -18,6 +19,7 @@ class RunScreen(Screen[None]):
 
     def compose(self) -> ComposeResult:
         yield Header()
+        yield LogBlocks(id="blocks")
         yield RunOutput(id="output")
         yield Footer()
 
@@ -27,4 +29,5 @@ class RunScreen(Screen[None]):
         self.set_interval(0.25, self.follow)
 
     def follow(self) -> None:
+        self.query_one(LogBlocks).follow(self.folder)
         self.query_one(RunOutput).follow(self.folder)