labnotes 0.0.39__tar.gz → 0.0.41__tar.gz

{labnotes-0.0.39 → labnotes-0.0.41}/PKG-INFO

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

@@ -56,12 +56,11 @@ effort = ["low", "high"]
 `name` is optional: a display name for the experiment, shown in the live view
 and as `display_name` in `experiments`. The folder name stays the key, so
 renaming the experiment means editing `name`.
-Each combination of `[params]` runs `repeats` times, round-robin. Only runs
-that count fill a combination, so running again fills in what failed or never
-ran.
-`mode = "adhoc"` skips that: every `run` runs each combination `repeats` times
-again, whatever is already on disk. The default is `mode = "fill"`.
-Each run gets a new run folder. `command` runs in a shell from the root, with
+Each combination of `[params]` runs `repeats` times, round-robin, on every
+`run`, whatever is already on disk. That is `mode = "adhoc"`, the default.
+`mode = "fill"` counts what is there: only runs that count fill a combination,
+so running again fills in what failed or never ran.
+Each run gets a new run folder, named for the UTC time it was planned (`20261020-000429-brave-fox`), so 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

{labnotes-0.0.39 → labnotes-0.0.41}/src/labnotes/models.py

@@ -47,4 +47,4 @@ class ExperimentConfig:
     params: dict[str, list[object]]
     name: str | None = None
     counts: str = DEFAULT_COUNTS
-    mode: str = "fill"
+    mode: str = "adhoc"

labnotes-0.0.41/src/labnotes/runner/new_stamped_run_id.py

@@ -0,0 +1,9 @@
+from collections.abc import Callable
+from datetime import UTC, datetime
+
+from labnotes.runner.new_run_id import new_run_id
+
+
+def new_stamped_run_id(taken: Callable[[str], bool]) -> str:
+    stamp = datetime.now(UTC).strftime("%Y%m%d-%H%M%S")
+    return f"{stamp}-" + new_run_id(lambda name: taken(f"{stamp}-{name}"))

{labnotes-0.0.39 → labnotes-0.0.41}/src/labnotes/runner/read_experiment_config.py

@@ -40,7 +40,7 @@ def read_experiment_config(path: Path) -> ExperimentConfig:
     counts = values.get("counts", DEFAULT_COUNTS)
     if not isinstance(counts, str) or not counts.strip():
         raise ValueError(f"{path}: counts must be a SQL condition")
-    mode = values.get("mode", "fill")
+    mode = values.get("mode", "adhoc")
     if mode not in MODES:
         raise ValueError(f"{path}: mode must be fill or adhoc")
     return ExperimentConfig(command, repeats, params, name, counts, mode)

{labnotes-0.0.39 → labnotes-0.0.41}/src/labnotes/runner/run_experiment.py

@@ -13,7 +13,7 @@ from labnotes.models import (
 )
 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.new_stamped_run_id import new_stamped_run_id
 from labnotes.runner.param_grid import param_grid
 from labnotes.runner.plan_runs import plan_runs
 from labnotes.runner.run_folder import run_folder
@@ -49,7 +49,7 @@ async def run_experiment(
     for params in plan_runs(
         param_grid(experiment.params), experiment.repeats, finished
     ):
-        run = new_run_id(taken)
+        run = new_stamped_run_id(taken)
         planned.add(run)
         plan.append((run, params))
     runs = [{"run": run, "params": params} for run, params in plan]
@@ -131,7 +131,7 @@ async def run_experiment(
     def retry(run: str) -> None:
         if stopping.is_set() or run not in ended:
             return
-        again = new_run_id(taken)
+        again = new_stamped_run_id(taken)
         planned.add(again)
         plan.append((again, ended[run]))
         report({"event": "retried", "run": run, "retry": again, "params": ended[run]})

{labnotes-0.0.39 → labnotes-0.0.41}/src/labnotes/summarize_config.py

@@ -15,14 +15,14 @@ def summarize_config(config: dict[str, object] | None) -> dict[str, object]:
     cells = prod(len(values) for values in varies.values())
     command = config.get("command")
     counts = config.get("counts")
-    adhoc = config.get("mode") == "adhoc"
+    fill = config.get("mode") == "fill"
     return {
         "fixed": {},
         "varies": varies,
         "cell_count": cells,
         "runs_per_cell": repeats,
-        "target": cells * repeats if repeats is not None and not adhoc else None,
+        "target": cells * repeats if repeats is not None and fill else None,
         "completed_run": counts if isinstance(counts, str) else DEFAULT_COUNTS,
-        "mode": "adhoc" if adhoc else "fill",
+        "mode": "fill" if fill else "adhoc",
         "other": {} if command is None else {"command": command},
     }