labnotes 0.0.78__tar.gz → 0.0.80__tar.gz

{labnotes-0.0.78 → labnotes-0.0.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.78
+Version: 0.0.80
 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.78 → labnotes-0.0.80}/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
@@ -126,6 +126,9 @@ going. Elsewhere, it prints a line per event instead.
   far plus the latest line each running run logged. `-f` keeps following, and
   waits for a daemon when none is up. `--json` prints one JSON object per line.
   Following doesn't keep the daemon up.
+- `labnotes run control NAME ACTION [ARG]` sends one live-view control to a
+  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.
 

labnotes-0.0.80/src/labnotes/daemon/control_run.py

@@ -0,0 +1,16 @@
+from pathlib import Path
+
+from labnotes.daemon.daemon_client import daemon_client
+from labnotes.daemon.daemon_running import daemon_running
+
+
+async def control_run(
+    root: Path, name: str, action: str, args: list[object]
+) -> str | None:
+    if not await daemon_running(root):
+        return "Nothing is running."
+    async with daemon_client(root) as client:
+        reply = await client.post(f"/experiments/{name}/{action}", json={"args": args})
+    if reply.is_success:
+        return None
+    return str(reply.json()["error"])

{labnotes-0.0.78 → labnotes-0.0.80}/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.78 → labnotes-0.0.80}/src/labnotes/run_command.py

@@ -6,6 +6,7 @@ from labnotes.daemon.stop_runs import stop_runs
 from labnotes.load_config import load_config
 from labnotes.read_config import CONFIG_FILE
 from labnotes.run_status import run_status
+from labnotes.run_control import run_control
 
 
 @click.group(name="run", help="Control the runs going in this project.")
@@ -28,3 +29,4 @@ def stop(ctx: click.Context) -> None:
 
 
 run_command.add_command(run_status)
+run_command.add_command(run_control)

labnotes-0.0.80/src/labnotes/run_control.py

@@ -0,0 +1,46 @@
+import asyncio
+import typing
+
+import click
+
+from labnotes.daemon.control_run import control_run
+from labnotes.load_config import load_config
+from labnotes.models import Controls
+from labnotes.read_config import CONFIG_FILE
+
+PARAMS = {
+    action: typing.get_args(hint)[0]
+    for action, hint in typing.get_type_hints(Controls).items()
+}
+
+
+@click.command(
+    name="control",
+    help=(
+        "Send one control to an experiment's runs, as the live view's keys do. "
+        "kill, retry, run_next and toggle take a run; set_concurrency a number; "
+        "interrupt and finish nothing."
+    ),
+)
+@click.argument("name")
+@click.argument("action", type=click.Choice(list(PARAMS)))
+@click.argument("args", nargs=-1)
+@click.pass_context
+def run_control(
+    ctx: click.Context, name: str, action: str, args: tuple[str, ...]
+) -> None:
+    config = load_config(ctx)
+    if config is None:
+        raise click.ClickException(
+            f"No {CONFIG_FILE} here. Run labnotes init, or pass -c PATH."
+        )
+    kinds = PARAMS[action]
+    if len(args) != len(kinds):
+        raise click.UsageError(f"{action} takes {len(kinds)} argument(s).")
+    try:
+        values = [kind(args[i]) for i, kind in enumerate(kinds)]
+    except ValueError:
+        raise click.UsageError(f"{action} takes a number.") from None
+    refused = asyncio.run(control_run(config.root, name, action, values))
+    if refused is not None:
+        raise click.ClickException(refused)

{labnotes-0.0.78 → labnotes-0.0.80}/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.78 → labnotes-0.0.80}/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.78 → labnotes-0.0.80}/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.78 → labnotes-0.0.80}/testing-conventions.toml

@@ -39,3 +39,9 @@ path = "src/labnotes/daemon/remote_start.py"
 rules = ["mutation"]
 lines = [39]
 reason = "the daemon answers a run with 202, 400, 409 or 500, so every status but 202 is above it: != equals >"
+
+[[python.exempt]]
+path = "src/labnotes/run_control.py"
+rules = ["mutation"]
+lines = [38]
+reason = "argument counts are small ints, which CPython caches, so is not equals !="

{labnotes-0.0.78 → labnotes-0.0.80}/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))