labnotes 0.0.79__tar.gz → 0.0.81__tar.gz

{labnotes-0.0.79 → labnotes-0.0.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.79
+Version: 0.0.81
 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>
@@ -113,7 +113,8 @@ line per event instead.
   kills them. Closing the terminal or sending SIGTERM stops them the same way,
   then kills any still going 5 seconds later.
 - A second `run` of the same experiment fails while the first holds the lock.
-- It exits 0 even if runs fail; the summary line counts failures.
+- It exits 0 even if runs fail; the summary line counts failures. If it can't
+  start or reach the daemon, it prints the cause on one line and exits 1.
 
 `labnotes server` serves a local site at http://127.0.0.1:8000 from the same
 `.labnotes.toml`: a table of experiments, and a page per experiment with its

{labnotes-0.0.79 → labnotes-0.0.81}/README.md

@@ -89,7 +89,8 @@ line per event instead.
   kills them. Closing the terminal or sending SIGTERM stops them the same way,
   then kills any still going 5 seconds later.
 - A second `run` of the same experiment fails while the first holds the lock.
-- It exits 0 even if runs fail; the summary line counts failures.
+- It exits 0 even if runs fail; the summary line counts failures. If it can't
+  start or reach the daemon, it prints the cause on one line and exits 1.
 
 `labnotes server` serves a local site at http://127.0.0.1:8000 from the same
 `.labnotes.toml`: a table of experiments, and a page per experiment with its

{labnotes-0.0.79 → labnotes-0.0.81}/src/labnotes/context.md

@@ -63,9 +63,9 @@ so running again fills in what failed or never ran. `mode` under
 `[experiments]` in `.labnotes.toml` sets it for every experiment that doesn't
 set its own.
 Each run gets a new run folder. In `fill` mode it is named for the UTC time it was planned
-(`runs/20261020-000429-brave-fox`). In `adhoc` mode each `run` command gets one folder named
-that way, and its runs nest inside it (`runs/20261020-000429-brave-fox/quiet-river`); the run id
-is that path under `runs/`. Either way, folder listings sort by start. `command` runs in a shell from the root, with
+(`runs/20261020-000429-brave-fox`). In `adhoc` mode a `run` command that plans one run names
+its folder the same way. One that plans more gets one folder named that way, and its runs nest
+inside it (`runs/20261020-000429-brave-fox/quiet-river`); the run id is that path under `runs/`. Either way, folder listings sort by start. `command` runs in a shell from the root, with
 `{run_dir}` replaced by the run folder's absolute path. Pass it to the
 script so it writes its outputs there.
 Each param is appended as `--name value`, with the name as written (use
@@ -130,6 +130,7 @@ going. Elsewhere, it prints a line per event instead.
   running experiment: `kill`, `retry`, `run_next` or `toggle` a run,
   `set_concurrency` to a number, `interrupt` or `finish`.
 - A second `run` of the same experiment fails while the first is going.
-- It exits 0 even if runs fail; the summary line counts failures.
+- It exits 0 even if runs fail; the summary line counts failures. If it can't
+  start or reach the daemon, it prints the cause on one line and exits 1.
 
 `uvx labnotes server` serves the experiments, their markdown files and their runs as a local site, read from the same `.labnotes.toml`. An experiment's page shows its `experiment.toml` on one line, then a Runs tab with a table of its runs and a Notebooks tab with one tab per markdown file. Clicking a run opens its `stdout.log` and `stderr.log` together, followed as they're written until the run ends.

{labnotes-0.0.79 → labnotes-0.0.81}/src/labnotes/daemon/remote_start.py

@@ -17,6 +17,13 @@ def remote_start(
     concurrency: int | None,
 ) -> Start:
     async def start(report: Report, listen: Listen) -> list[dict[str, object]]:
+        try:
+            return await follow(report, listen)
+        except (OSError, httpx2.TransportError) as error:
+            cause = str(error) or type(error).__name__
+            raise ValueError(f"Can't reach the labnotes daemon: {cause}") from error
+
+    async def follow(report: Report, listen: Listen) -> list[dict[str, object]]:
         await ensure_daemon(config)
         sending: set[asyncio.Task[httpx2.Response]] = set()
         results: list[dict[str, object]] = []
@@ -25,7 +32,10 @@ def remote_start(
             client.stream("GET", "/events") as response,
         ):
             events = aiter(httpx2.EventSource(response))
-            connected: dict[str, object] = (await anext(events)).json()  # type: ignore[assignment]
+            first = await anext(events, None)
+            if first is None:
+                raise ValueError("Lost the labnotes daemon.")
+            connected: dict[str, object] = first.json()  # type: ignore[assignment]
             reply = await client.post(
                 f"/experiments/{name}/run",
                 json={

{labnotes-0.0.79 → labnotes-0.0.81}/src/labnotes/group_runs.py

@@ -10,11 +10,16 @@ def group_runs(
     totals: Mapping[str, int],
 ) -> list[dict[str, object]]:
     groups: dict[str, list[dict[str, object]]] = {}
+    flat: set[str] = set()
     for run in runs:
-        groups.setdefault(str(run["id"]).partition("/")[0], []).append(run)
+        name, nested, _ = str(run["id"]).partition("/")
+        groups.setdefault(name, []).append(run)
+        if not nested:
+            flat.add(name)
     return [
         {
             "name": name,
+            "flat": name in flat,
             "started": invocation_started(name),
             "runs": members,
             "total": totals.get(name, len(members)),

{labnotes-0.0.79 → labnotes-0.0.81}/src/labnotes/runner/run_experiment.py

@@ -45,7 +45,11 @@ async def run_experiment(
     def taken(run: str) -> bool:
         return run in planned or run in existing
 
-    group = new_stamped_run_id(taken) if experiment.mode == "adhoc" else None
+    cells = plan_runs(param_grid(experiment.params), experiment.repeats, finished)
+    group = None
+    match experiment.mode:
+        case "adhoc" if len(cells) > 1:
+            group = new_stamped_run_id(taken)
 
     def new_id(params: dict[str, object]) -> str:
         if group is None:
@@ -55,9 +59,7 @@ async def run_experiment(
         )
 
     plan: list[Entry] = []
-    for params in plan_runs(
-        param_grid(experiment.params), experiment.repeats, finished
-    ):
+    for params in cells:
         run = new_id(params)
         planned.add(run)
         plan.append((run, params))

{labnotes-0.0.79 → labnotes-0.0.81}/src/labnotes/static/labnotes.css

@@ -295,6 +295,7 @@ h3 {
 .group-toggle[aria-expanded="true"]::before { content: "▾"; }
 .group:not(.open) > :not(.group-row) { display: none; }
 .group.open .run-row td:nth-child(2) { padding-left: 2rem; }
+.lone .run-row td:nth-child(2) { padding-left: 1.75rem; }
 .run-row { cursor: pointer; }
 .run-link { text-decoration: none; }
 

{labnotes-0.0.79 → labnotes-0.0.81}/src/labnotes/templates/experiment.html

@@ -88,6 +88,9 @@
     {% endmacro %}
     {% if nested %}
     {% for group in e.run_groups %}
+    {% if group.flat %}
+    <tbody class="lone">{{ run_rows(group.runs[0]) }}</tbody>
+    {% else %}
     <tbody class="group{{ ' open' if narrowed }}" data-name="{{ group.name }}">
       <tr class="group-row">
         <td class="num" title="{{ group.passed }} passed, {{ group.failed }} failed"><span class="good">{{ group.passed }}✓</span> <span class="bad">{{ group.failed }}✕</span></td>
@@ -97,6 +100,7 @@
       </tr>
       {% for run in group.runs %}{{ run_rows(run) }}{% endfor %}
     </tbody>
+    {% endif %}
     {% else %}
     <tbody><tr><td class="empty" colspan="{{ width }}">No runs match these filters.</td></tr></tbody>
     {% endfor %}

{labnotes-0.0.79 → labnotes-0.0.81}/src/labnotes/tui/run_app.py

@@ -47,6 +47,7 @@ class RunApp(App[None]):
         self.start = start
         self.title = title
         self.results: list[dict[str, object]] = []
+        self.error: Exception | None = None
         self.controls = Controls(
             lambda: None,
             lambda run: None,
@@ -100,7 +101,10 @@ class RunApp(App[None]):
         self.run_worker(self.drive())
 
     async def drive(self) -> None:
-        self.results = await self.start(self.show_event, self.listen)
+        try:
+            self.results = await self.start(self.show_event, self.listen)
+        except Exception as error:
+            self.error = error
         self.exit()
 
     def listen(self, controls: Controls) -> None:

{labnotes-0.0.79 → labnotes-0.0.81}/src/labnotes/tui/run_tui.py

@@ -5,4 +5,6 @@ from labnotes.tui.run_app import RunApp
 def run_tui(start: Start, title: str) -> list[dict[str, object]]:
     app = RunApp(start, title)
     app.run()
+    if app.error is not None:
+        raise app.error
     return app.results

{labnotes-0.0.79 → labnotes-0.0.81}/testing-conventions.toml

@@ -37,7 +37,7 @@ reason = "start answers 202, 400, 409 or 500, so every status but 202 is above i
 [[python.exempt]]
 path = "src/labnotes/daemon/remote_start.py"
 rules = ["mutation"]
-lines = [39]
+lines = [49]
 reason = "the daemon answers a run with 202, 400, 409 or 500, so every status but 202 is above it: != equals >"
 
 [[python.exempt]]

{labnotes-0.0.79 → labnotes-0.0.81}/tests/integration/conftest.py

@@ -83,6 +83,20 @@ def browse(
     asyncio.run(drive())
 
 
+@pytest.fixture
+def tmp_path(tmp_path: Path) -> Path:
+    # Real project roots run long; pytest's short default hides path-length
+    # limits such as the 107-byte AF_UNIX socket path.
+    deep = (
+        tmp_path
+        / "a-fairly-long-folder-name-for-research"
+        / "and-another-nested-one"
+        / "experiments-and-their-notes-live-here"
+    )
+    deep.mkdir(parents=True)
+    return deep
+
+
 @pytest.fixture
 def site(tmp_path: Path) -> Iterator[str]:
     yield from serve(project(tmp_path))