labnotes 0.0.136__tar.gz → 0.0.137__tar.gz

{labnotes-0.0.136 → labnotes-0.0.137}/PKG-INFO

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

@@ -207,6 +207,11 @@ going. Elsewhere, it prints a line per event instead.
   `/tmp/labnotes-<uid>/` and exits once nothing is running and no client has
   been connected for 15 seconds. Runs belong to the daemon, so quitting the
   live view, closing its terminal, or killing `run` outright leaves them going.
+- Each labnotes version starts its own daemon. After an upgrade, new runs go
+  to the new version's daemon while an older one finishes its runs and exits.
+  `run status`, `run stop` and `run control` reach only the daemon of the
+  version you call them with. Each `run` reads `.labnotes.toml` as it is on
+  disk, even when the daemon is already up.
 - Ctrl-C stops the running scripts and records their end. A second Ctrl-C
   kills them. SIGTERM stops them the same way, then kills any still going 5
   seconds later. Once the runs are done, either one closes the live view.
@@ -220,7 +225,8 @@ going. Elsewhere, it prints a line per event instead.
 - `labnotes run control NAME ACTION [ARG]` sends one live-view control to a
   running experiment: `kill` a run, `set_concurrency` to a number,
   `interrupt` or `finish`.
-- A second `run` of the same experiment fails while the first is going.
+- A second `run` of the same experiment fails while the first is going on
+  the same daemon.
 - It exits 0 even if runs fail; the summary line counts failures. A run that
   was retried counts as retried, not failed. If it can't
   start or reach the daemon, it prints the cause on one line and exits 1.

{labnotes-0.0.136 → labnotes-0.0.137}/src/labnotes/daemon/daemon_app.py

@@ -11,6 +11,7 @@ from starlette.responses import JSONResponse, Response, StreamingResponse
 from starlette.routing import Route
 
 from labnotes.models import Controls, LabnotesConfig
+from labnotes.read_config import read_config
 from labnotes.runner.prepare_experiment import prepare_experiment
 from labnotes.runner.run_experiment import run_experiment
 from labnotes.runner.stop_then_kill import GRACE_SECONDS
@@ -73,8 +74,9 @@ def daemon_app(config: LabnotesConfig) -> Starlette:
     async def start(name: str, body: dict[str, object]) -> Response:
         path = body.get("experiment_config")
         try:
+            current = read_config(config.path)
             experiment, concurrency = await prepare_experiment(
-                config,
+                current,
                 name,
                 None if path is None else Path(str(path)),
                 body.get("concurrency"),  # type: ignore[arg-type]
@@ -100,7 +102,7 @@ def daemon_app(config: LabnotesConfig) -> Starlette:
             error = None
             try:
                 await run_experiment(
-                    config,
+                    current,
                     name,
                     experiment,
                     concurrency,

{labnotes-0.0.136 → labnotes-0.0.137}/src/labnotes/daemon/serve_daemon.py

@@ -2,15 +2,19 @@ import asyncio
 import contextlib
 
 from labnotes.daemon.run_daemon import run_daemon
+from labnotes.daemon.socket_path import socket_path
 from labnotes.models import LabnotesConfig
 from labnotes.runner.hold_folder import hold_folder
 
 
 def serve_daemon(config: LabnotesConfig) -> None:
+    # Labnotes 0.0.136 and older lock the project folder itself.
+    path = socket_path(config.root).with_suffix(".lock")
+    path.touch()
     lock = contextlib.ExitStack()
     try:
-        lock.enter_context(hold_folder(config.root))
+        lock.enter_context(hold_folder(path))
     except BlockingIOError:
-        return  # Another daemon already serves this project.
+        return  # Another daemon of this version already serves this project.
     with lock:
         asyncio.run(run_daemon(config))

{labnotes-0.0.136 → labnotes-0.0.137}/src/labnotes/daemon/socket_path.py

@@ -1,13 +1,15 @@
 import hashlib
 import os
+from importlib.metadata import version
 from pathlib import Path
 
 
 # Unix socket paths cap at 107 bytes, so the socket can't live in a deep project.
 # A fixed folder, not XDG_RUNTIME_DIR or TMPDIR, so every shell finds the daemon.
+# Each version gets its own daemon, so an upgrade never runs on an older one.
 def socket_path(root: Path) -> Path:
     folder = Path("/tmp") / f"labnotes-{os.getuid()}"
     folder.mkdir(exist_ok=True)
     folder.chmod(0o700)
     digest = hashlib.sha256(str(root.resolve()).encode()).hexdigest()[:16]
-    return folder / f"{digest}.sock"
+    return folder / f"{digest}-{version('labnotes')}.sock"