labnotes 0.0.114__tar.gz → 0.0.116__tar.gz

{labnotes-0.0.114 → labnotes-0.0.116}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.114
+Version: 0.0.116
 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>
@@ -15,6 +15,7 @@ Requires-Dist: jinja2>=3.1.6
 Requires-Dist: jupyter-client>=8.10.0
 Requires-Dist: markdown-it-py>=4.2.0
 Requires-Dist: markupsafe>=3.0.4
+Requires-Dist: posix-tools>=0.0.4
 Requires-Dist: psutil>=7.2.2
 Requires-Dist: rich>=14
 Requires-Dist: starlette>=1.8.0

{labnotes-0.0.114 → labnotes-0.0.116}/pyproject.toml

@@ -20,6 +20,7 @@ dependencies = [
     "jupyter-client>=8.10.0",
     "markdown-it-py>=4.2.0",
     "markupsafe>=3.0.4",
+    "posix-tools>=0.0.4",
     "psutil>=7.2.2",
     "rich>=14",
     "starlette>=1.8.0",

{labnotes-0.0.114 → labnotes-0.0.116}/src/labnotes/daemon/describe_status.py

@@ -10,6 +10,8 @@ def describe_status(event: dict[str, object]) -> str:
             memory = format_bytes(event["memory"]) or "?"  # type: ignore[arg-type]
             size = format_bytes(event["size"]) or "?"  # type: ignore[arg-type]
             said = f"{event['run']} uses {memory} of memory, {size} on disk."
+        case {"event": "ended", "last_stderr": str(line)}:
+            said = f"{describe_event(event)}: {line}"
         case {"event": "done", "error": None}:
             said = "Done."
         case {"event": "done"}:

labnotes-0.0.116/src/labnotes/daemon/last_stderr.py

@@ -0,0 +1,15 @@
+from pathlib import Path
+
+from posix_tools import tail
+
+
+async def last_stderr(folder: Path) -> str | None:
+    try:
+        lines = await tail(folder / "stderr.log", n=50)
+    except FileNotFoundError:
+        return None
+    for line in reversed(lines):
+        shown = line.rstrip(b"\r\n").rsplit(b"\r")[-1]
+        if text := shown.decode(errors="replace").strip():
+            return text
+    return None

{labnotes-0.0.114 → labnotes-0.0.116}/src/labnotes/daemon/watch_daemon.py

@@ -5,6 +5,7 @@ from pathlib import Path
 import httpx2
 
 from labnotes.daemon.daemon_client import daemon_client
+from labnotes.daemon.last_stderr import last_stderr
 from labnotes.daemon.run_logs import RunLogs
 from labnotes.utils.run_usage import run_usage
 
@@ -61,6 +62,11 @@ async def watch_daemon(root: Path, follow: bool, emit: Callable[[Event], None])
                         logs.add(name, run, Path(str(event["folder"])))
                     case {"event": "ended", "experiment": str(name), "run": str(run)}:
                         tail()
+                        folder = logs.folders.get((name, run))
+                        if event.get("exit_code") != 0 and folder is not None:
+                            line = await last_stderr(folder)
+                            if line is not None:
+                                event = {**event, "last_stderr": line}
                         logs.drop(name, run)
                 emit(event)
     except httpx2.TransportError:

{labnotes-0.0.114 → labnotes-0.0.116}/src/labnotes/experiment_runs.py

@@ -1,14 +1,26 @@
+import warnings
+
 from labnotes.sql_quote import quote_identifier, quote_string
+from labnotes.tables.runs_columns import runs_columns
 
 STARTED = "strftime('%Y-%m-%d %H:%M:%S', created)"
 DURATION = "CAST(round((julianday(ended) - julianday(created)) * 86400) AS INTEGER)"
 
 
 def experiment_runs(experiment: str, params: list[str]) -> str:
+    taken = {*runs_columns(), "started", "duration"}
+    clashes = [key for key in params if key in taken]
+    if clashes:
+        warnings.warn(
+            f"Params {', '.join(clashes)} clash with runs columns;"
+            " the runs column wins. Read them from params instead.",
+            stacklevel=2,
+        )
     columns = "".join(
         f", params ->> {quote_string(f'$.{quote_identifier(key)}')}"
         f" AS {quote_identifier(key)}"
         for key in params
+        if key not in taken
     )
     return (
         f"(SELECT *{columns}, {STARTED} AS started, {DURATION} AS duration FROM runs"

labnotes-0.0.116/src/labnotes/tables/runs_columns.py

@@ -0,0 +1,11 @@
+import sqlite3
+from functools import cache
+
+from labnotes.tables.open_tables import RUNS
+
+
+@cache
+def runs_columns() -> tuple[str, ...]:
+    with sqlite3.connect(":memory:") as db:
+        db.execute(RUNS)
+        return tuple(row[1] for row in db.execute("PRAGMA table_info(runs)"))

{labnotes-0.0.114 → labnotes-0.0.116}/uv.lock

@@ -18,6 +18,7 @@ curtaincall = false
 dirsql = false
 labnotes = false
 lamp-the-djinn = false
+posix-tools = false
 pyskillet = false
 repo-name-checker = false
 
@@ -562,6 +563,7 @@ dependencies = [
     { name = "jupyter-client" },
     { name = "markdown-it-py" },
     { name = "markupsafe" },
+    { name = "posix-tools" },
     { name = "psutil" },
     { name = "rich" },
     { name = "starlette" },
@@ -590,6 +592,7 @@ requires-dist = [
     { name = "jupyter-client", specifier = ">=8.10.0" },
     { name = "markdown-it-py", specifier = ">=4.2.0" },
     { name = "markupsafe", specifier = ">=3.0.4" },
+    { name = "posix-tools", specifier = ">=0.0.4" },
     { name = "psutil", specifier = ">=7.2.2" },
     { name = "rich", specifier = ">=14" },
     { name = "starlette", specifier = ">=1.8.0" },
@@ -1028,6 +1031,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" },
 ]
 
+[[package]]
+name = "posix-tools"
+version = "0.0.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/fd/dd/94ade35bdcac09894b189e3d5b26051ff9836736fc1a6e4b924915948689/posix_tools-0.0.4.tar.gz", hash = "sha256:9f0fc2ff886a21c0aae7e93c77e07d84d079d0d7332889c9bde260ed39f5b9c2", size = 29985, upload-time = "2026-10-25T20:09:10.72Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/58/42/6db531e3bc3ea59909bbacc5f0e814f6b1ce7e6feaf0d8cc124da9e8b222/posix_tools-0.0.4-py3-none-any.whl", hash = "sha256:159519be82a630dbb60ea68b8cd61da9d1af3f134652c39d628b117fb2667d2d", size = 9014, upload-time = "2026-10-25T20:09:09.508Z" },
+]
+
 [[package]]
 name = "prompt-toolkit"
 version = "3.0.53"