labnotes 0.0.93__tar.gz → 0.0.95__tar.gz

{labnotes-0.0.93 → labnotes-0.0.95}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.93
+Version: 0.0.95
 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.95/src/labnotes/__init__.py

@@ -0,0 +1,3 @@
+from labnotes.log import log
+
+__all__ = ["log"]

labnotes-0.0.95/src/labnotes/log.py

@@ -0,0 +1,23 @@
+import json
+from datetime import UTC, datetime
+
+from labnotes.log_path import log_path
+
+
+def now() -> str:
+    return datetime.now(UTC).isoformat(timespec="milliseconds").replace("+00:00", "Z")
+
+
+def log(block: dict[str, object]) -> None:
+    """Write a block to the run's log, or print its content outside a run.
+
+    Scripts import this, so the module stays standard-library only.
+    """
+    path = log_path()
+    if path is None:
+        if "content" in block:
+            print(block["content"])
+        return
+    line = json.dumps({**block, "timestamp": now()})
+    with path.open("a", encoding="utf-8") as file:
+        file.write(f"{line}\n")

labnotes-0.0.95/src/labnotes/log_path.py

@@ -0,0 +1,10 @@
+import os
+from pathlib import Path
+
+# The one env contract between runner and script; config is otherwise never env.
+LOG_ENV = "LABNOTES_LOG"
+
+
+def log_path() -> Path | None:
+    value = os.environ.get(LOG_ENV)
+    return Path(value) if value else None

{labnotes-0.0.93 → labnotes-0.0.95}/src/labnotes/runner/execute_run.py

@@ -1,9 +1,11 @@
 import asyncio
+import os
 import time
 from pathlib import Path
 
 import psutil
 
+from labnotes.log_path import LOG_ENV
 from labnotes.runner.shell_command import shell_command
 from labnotes.runner.wait_for_tree import wait_for_tree
 from labnotes.runner.write_run_json import write_run_json
@@ -35,6 +37,12 @@ async def execute_run(
             process = await asyncio.create_subprocess_shell(
                 shell_command(command, folder, params),
                 cwd=root,
+                env={
+                    "FORCE_COLOR": "1",
+                    "CLICOLOR_FORCE": "1",
+                    **os.environ,
+                    LOG_ENV: str(folder / "log.jsonl"),
+                },
                 stdout=stdout,
                 stderr=stderr,
             )

{labnotes-0.0.93 → labnotes-0.0.95}/src/labnotes/tui/group_cells.py

@@ -7,7 +7,7 @@ from labnotes.format_value import format_value
 
 
 def group_cells(
-    group: Mapping[str, Any], columns: Sequence[str], live: bool
+    group: Mapping[str, Any], columns: Sequence[str], live: bool, opened: bool
 ) -> list[object]:
     status = Text.assemble(
         (f"{group['passed']}✓", "green"), " ", (f"{group['failed']}✕", "red")
@@ -15,7 +15,8 @@ def group_cells(
     if group["unfinished"]:
         mark, style = ("◐", "yellow") if live else ("–", "dim")
         status.append(f" {group['unfinished']}{mark}", style=style)
-    cells: list[object] = [status, group["name"], str(len(group["runs"]))]
+    marker = "▾" if opened else "▸"
+    cells: list[object] = [status, f"{marker} {group['name']}", str(len(group["runs"]))]
     for column in columns[1:]:
         if column == "started":
             cells.append(group["started"] or "")

{labnotes-0.0.93 → labnotes-0.0.95}/src/labnotes/tui/invocation_rows.py

@@ -22,8 +22,9 @@ def invocation_rows(
             [run, *_] = group["runs"]
             rows.append((str(run["id"]), run_cells(run, columns, True, live)))
             continue
-        rows.append((group["name"], group_cells(group, columns, live)))
-        if group["name"] in opened:
+        is_open = group["name"] in opened
+        rows.append((group["name"], group_cells(group, columns, live, is_open)))
+        if is_open:
             rows += [
                 (str(run["id"]), run_cells(run, columns, True, live))
                 for run in group["runs"]