labnotes 0.0.110__tar.gz → 0.0.111__tar.gz

{labnotes-0.0.110 → labnotes-0.0.111}/PKG-INFO

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

@@ -25,8 +25,8 @@ When `experiment.toml` sits next to `.labnotes.toml`, the root is the one experi
 - `files`: `experiment`, `filename`, `path`, `ctime`, `mtime`.
 - `runs`: `experiment`, `id`, `folder`, `created`, `ended`, `exit_code`,
   `error`, `stdout`, `stderr`, `params` as JSON, `meta` as JSON (null without
-  a `meta` command), and `run`, the whole `run.json` as JSON, read from each run
-  folder's `run.json`.
+  a `meta` command), `command`, and `run`, the whole `run.json` as JSON, read
+  from each run folder's `run.json`.
 
 Keys come from folder names, so renaming a folder renames its rows on the next
 read. Paths are relative to the root, and times are UTC ISO 8601.
@@ -75,9 +75,11 @@ inside it (`runs/20261020-000429-brave-fox/quiet-river`); the run id is that pat
 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, `ended_by`, `signal`), `stdout.log` and `stderr.log` to the
-run folder. `ended_by` is `"timeout"`, `"stop"` (labnotes stopped it),
+and tables as JSON. labnotes writes `run.json` (params, `command`, created,
+ended, exit code, `ended_by`, `signal`), `stdout.log` and `stderr.log` to the
+run folder. `command` is the shell command the run executed, with `{run_dir}`
+and the params filled in, written before the run starts, so a killed run has it
+and a later edit to `experiment.toml` doesn't hide what a run did. `ended_by` is `"timeout"`, `"stop"` (labnotes stopped it),
 `"signal"` (a signal labnotes didn't send, like the out-of-memory killer),
 `"lost"` (its process died unseen; the daemon marks these when it starts, with
 `ended` set and `exit_code` null) or null (the script exited itself). `signal` is the signal number read from the

{labnotes-0.0.110 → labnotes-0.0.111}/src/labnotes/runner/execute_run.py

@@ -31,8 +31,10 @@ async def execute_run(
     stopped: Callable[[], bool] = lambda: False,
     meta: dict[str, object] | None = None,
 ) -> dict[str, object]:
+    resolved = shell_command(command, folder, params)
     run: dict[str, object] = {
         "params": params,
+        "command": resolved,
         "created": iso_time(time.time()),
         "ended": None,
         "exit_code": None,
@@ -51,7 +53,7 @@ async def execute_run(
     ):
         try:
             process = await asyncio.create_subprocess_shell(
-                shell_command(command, folder, params),
+                resolved,
                 cwd=root,
                 env={
                     "FORCE_COLOR": "1",

{labnotes-0.0.110 → labnotes-0.0.111}/src/labnotes/tables/open_tables.py

@@ -22,7 +22,7 @@ RUNS = """
 CREATE TABLE runs (
   experiment TEXT, id TEXT, folder TEXT, created TEXT, ended TEXT,
   exit_code INTEGER, error TEXT,
-  stdout TEXT, stderr TEXT, params TEXT, meta TEXT, run TEXT,
+  stdout TEXT, stderr TEXT, params TEXT, meta TEXT, command TEXT, run TEXT,
   PRIMARY KEY (experiment, id)
 )
 """

{labnotes-0.0.110 → labnotes-0.0.111}/src/labnotes/tables/read_run.py

@@ -26,6 +26,7 @@ def read_run(
             "stderr": f"{folder}/stderr.log",
             "params": json.dumps(run.get("params", {})),
             "meta": None if (meta := run.get("meta")) is None else json.dumps(meta),
+            "command": run.get("command"),
             "run": json.dumps(run),
         }
     ]