labnotes 0.0.32__tar.gz → 0.0.34__tar.gz

{labnotes-0.0.32 → labnotes-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.32
+Version: 0.0.34
 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>
@@ -8,7 +8,6 @@ License-Expression: MIT
 Requires-Python: >=3.12
 Requires-Dist: click>=8.5.0
 Requires-Dist: dirsql>=0.4.110
-Requires-Dist: filelock>=4.2.0
 Requires-Dist: haikunator>=2.1.0
 Requires-Dist: ipykernel>=7.4.0
 Requires-Dist: jinja2>=3.1.6

{labnotes-0.0.32 → labnotes-0.0.34}/pyproject.toml

@@ -13,7 +13,6 @@ authors = [{ name = "Kevin Scott", email = "me@thekevinscott.com" }]
 dependencies = [
     "click>=8.5.0",
     "dirsql>=0.4.110",
-    "filelock>=4.2.0",
     "haikunator>=2.1.0",
     "ipykernel>=7.4.0",
     "jinja2>=3.1.6",

{labnotes-0.0.32 → labnotes-0.0.34}/src/labnotes/context.md

@@ -65,7 +65,9 @@ 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), `stdout.log` and `stderr.log` to the run folder.
+code, and `invocation_id`, shared by every run one `run` command started;
+query it as `run ->> 'invocation_id'`), `stdout.log` and `stderr.log` to the
+run folder.
 A run counts when it exited 0 and its `run.json` doesn't hold
 `"excluded": true`, so excluding a run by hand means adding that key; the next
 `run` replaces it. Other keys you add to `run.json` are kept and show in `run`.

{labnotes-0.0.32 → labnotes-0.0.34}/src/labnotes/runner/execute_run.py

@@ -15,9 +15,11 @@ async def execute_run(
     params: dict[str, object],
     running: set[asyncio.subprocess.Process],
     stopping: asyncio.Event,
+    invocation: str,
 ) -> dict[str, object]:
     run: dict[str, object] = {
         "params": params,
+        "invocation_id": invocation,
         "created": iso_time(time.time()),
         "ended": None,
         "exit_code": None,

labnotes-0.0.34/src/labnotes/runner/hold_folder.py

@@ -0,0 +1,15 @@
+import fcntl
+import os
+from collections.abc import Iterator
+from contextlib import contextmanager
+from pathlib import Path
+
+
+@contextmanager
+def hold_folder(folder: Path) -> Iterator[None]:
+    descriptor = os.open(folder, os.O_RDONLY)
+    try:
+        fcntl.flock(descriptor, fcntl.LOCK_EX | fcntl.LOCK_NB)
+        yield
+    finally:
+        os.close(descriptor)

labnotes-0.0.34/src/labnotes/runner/new_invocation_id.py

@@ -0,0 +1,6 @@
+import hashlib
+import time
+
+
+def new_invocation_id() -> str:
+    return hashlib.sha256(str(time.time_ns()).encode()).hexdigest()[:8]

{labnotes-0.0.32 → labnotes-0.0.34}/src/labnotes/runner/run_experiment.py

@@ -12,6 +12,7 @@ from labnotes.models import (
     Report,
 )
 from labnotes.runner.execute_run import execute_run
+from labnotes.runner.new_invocation_id import new_invocation_id
 from labnotes.runner.new_run_id import new_run_id
 from labnotes.runner.param_grid import param_grid
 from labnotes.runner.plan_runs import plan_runs
@@ -39,6 +40,7 @@ async def run_experiment(
             run in planned or run_folder(config.root, config.runs, name, run).exists()
         )
 
+    invocation = new_invocation_id()
     plan: list[Entry] = []
     for params in plan_runs(
         param_grid(experiment.params), experiment.repeats, finished
@@ -163,7 +165,13 @@ async def run_experiment(
         report({"event": "started", "run": run, "params": params})
         running[run] = set()
         result = await execute_run(
-            config.root, folder, experiment.command, params, running[run], stopping
+            config.root,
+            folder,
+            experiment.command,
+            params,
+            running[run],
+            stopping,
+            invocation,
         )
         del running[run]
         report({"event": "ended", "run": run, **result})

labnotes-0.0.34/src/labnotes/runner/runs_parent.py

@@ -0,0 +1,7 @@
+import posixpath
+from pathlib import Path
+
+
+def runs_parent(root: Path, template: str, experiment: str) -> Path:
+    head = template.replace("{experiment}", experiment).split("{run}")[0]
+    return root / posixpath.dirname(head)

{labnotes-0.0.32 → labnotes-0.0.34}/src/labnotes/runner/start_experiment.py

@@ -2,12 +2,11 @@ from collections.abc import Callable
 from functools import partial
 from pathlib import Path
 
-from filelock import FileLock, Timeout
-
 from labnotes.models import LabnotesConfig, Start
-from labnotes.runner.lock_path import lock_path
+from labnotes.runner.hold_folder import hold_folder
 from labnotes.runner.read_experiment_config import read_experiment_config
 from labnotes.runner.run_experiment import run_experiment
+from labnotes.runner.runs_parent import runs_parent
 
 
 def start_experiment(
@@ -23,11 +22,11 @@ def start_experiment(
     if not experiment_config.is_file():
         raise ValueError(f"No experiment.toml for {name} at {experiment_config}.")
     experiment = read_experiment_config(experiment_config)
-    lock = lock_path(config.root, config.runs, name)
-    lock.parent.mkdir(parents=True, exist_ok=True)
+    runs = runs_parent(config.root, config.runs, name)
+    runs.mkdir(parents=True, exist_ok=True)
     try:
-        with FileLock(lock, blocking=False):
+        with hold_folder(runs):
             start = partial(run_experiment, config, name, experiment, concurrency)
             return drive(start, experiment.name or name)
-    except Timeout as error:
-        raise ValueError(f"{name} is already running ({lock} is held).") from error
+    except BlockingIOError as error:
+        raise ValueError(f"{name} is already running ({runs} is held).") from error

{labnotes-0.0.32 → labnotes-0.0.34}/src/labnotes/tui/run_app.py

@@ -48,6 +48,7 @@ class RunApp(App[None]):
         )
         self.concurrency = 1
         self.idle = False
+        self.next_run: str | None = None
         self.ended: set[str] = set()
         self.started: dict[str, float] = {}
         self.pending: set[str] = set()
@@ -98,6 +99,8 @@ class RunApp(App[None]):
                 self.idle = False
                 self.pending.discard(run)
                 self.started[run] = time.monotonic()
+                if run == self.next_run:
+                    self.show("")
                 args = " ".join(param_args(event["params"]))  # type: ignore[arg-type]
                 cells = (run, args, "running", format_elapsed(0))
                 for column, cell in zip(COLUMNS, cells):
@@ -116,6 +119,7 @@ class RunApp(App[None]):
                 self.reorder(event, table.cursor_row)
                 table.move_cursor(row=table.get_row_index(run))
                 self.show(describe_event(event))
+                self.next_run = run
             case "deselected":
                 self.pending.discard(run)
                 self.set_cell(run, "status", dim("deselected"))
@@ -178,6 +182,7 @@ class RunApp(App[None]):
             self.set_cell(run, "time", format_elapsed(time.monotonic() - began))
 
     def show(self, text: str) -> None:
+        self.next_run = None
         self.query_one("#status", Static).update(text)
 
     def action_interrupt(self) -> None:

labnotes-0.0.34/testing-conventions.toml

@@ -0,0 +1,5 @@
+[[python.exempt]]
+path = "src/labnotes/runner/hold_folder.py"
+rules = ["mutation"]
+lines = [12]
+reason = "LOCK_EX and LOCK_NB are disjoint bits, so | equals + and ^"

{labnotes-0.0.32 → labnotes-0.0.34}/uv.lock

@@ -273,15 +273,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/4d/dd/8bc67e7d5ffc1d88aa5af511189dfb76dc4e1e5b808fab186146ef2663e5/executing-2.3.0-py3-none-any.whl", hash = "sha256:736e859c9f8701f11fcf516856f26f562e04776387824b43a35a1dfe21c84122", size = 29393, upload-time = "2026-10-10T14:06:02.777Z" },
 ]
 
-[[package]]
-name = "filelock"
-version = "4.2.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f4/a9/1af41b37c3279712b22cdc63aac78a52432202b6fe1f9666a2a3d2831fb4/filelock-4.2.0.tar.gz", hash = "sha256:7a60906c75227cf04d0c273afadc8219400f11aeb13cc69591d4f6cdc6c8036e", size = 569667, upload-time = "2026-10-14T20:57:13.11Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/8e/a3/9bc26acff301fe1aaea1cc3d82a1d57e0a34df3e1cadbfa91ac2dbcdde5c/filelock-4.2.0-py3-none-any.whl", hash = "sha256:2ff5690882e8cdb00ef31fb3d01a3094c29f30985426c59495afb1733f3b7238", size = 135032, upload-time = "2026-10-14T20:57:11.349Z" },
-]
-
 [[package]]
 name = "h11"
 version = "0.16.0"
@@ -473,7 +464,6 @@ source = { editable = "." }
 dependencies = [
     { name = "click" },
     { name = "dirsql" },
-    { name = "filelock" },
     { name = "haikunator" },
     { name = "ipykernel" },
     { name = "jinja2" },
@@ -497,7 +487,6 @@ dev = [
 requires-dist = [
     { name = "click", specifier = ">=8.5.0" },
     { name = "dirsql", specifier = ">=0.4.110" },
-    { name = "filelock", specifier = ">=4.2.0" },
     { name = "haikunator", specifier = ">=2.1.0" },
     { name = "ipykernel", specifier = ">=7.4.0" },
     { name = "jinja2", specifier = ">=3.1.6" },

labnotes-0.0.32/src/labnotes/runner/lock_path.py

@@ -1,7 +0,0 @@
-import posixpath
-from pathlib import Path
-
-
-def lock_path(root: Path, template: str, experiment: str) -> Path:
-    head = template.replace("{experiment}", experiment).split("{run}")[0]
-    return root / posixpath.dirname(head) / ".labnotes.lock"