labnotes 0.0.34__tar.gz → 0.0.35__tar.gz

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

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

@@ -59,6 +59,8 @@ 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
 `{run_dir}` replaced by the run folder's absolute path. Pass it to the
 script so it writes its outputs there.

{labnotes-0.0.34 → labnotes-0.0.35}/src/labnotes/models.py

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

{labnotes-0.0.34 → labnotes-0.0.35}/src/labnotes/runner/read_experiment_config.py

@@ -5,7 +5,8 @@ from pathlib import Path
 from labnotes.default_counts import DEFAULT_COUNTS
 from labnotes.models import ExperimentConfig
 
-SETTINGS = {"name", "command", "repeats", "params", "counts"}
+SETTINGS = {"name", "command", "repeats", "params", "counts", "mode"}
+MODES = ("fill", "adhoc")
 
 
 def read_experiment_config(path: Path) -> ExperimentConfig:
@@ -39,4 +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")
-    return ExperimentConfig(command, repeats, params, name, counts)
+    mode = values.get("mode", "fill")
+    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.34 → labnotes-0.0.35}/src/labnotes/runner/run_experiment.py

@@ -31,8 +31,12 @@ async def run_experiment(
     report: Report,
     listen: Listen,
 ) -> list[dict[str, object]]:
-    existing = await list_experiment_runs(open_tables(config), name, experiment.counts)
-    finished = [json.loads(str(run["params"])) for run in existing if run["counted"]]
+    finished: list[dict[str, object]] = []
+    match experiment.mode:
+        case "fill":
+            tables = open_tables(config)
+            existing = await list_experiment_runs(tables, name, experiment.counts)
+            finished = [json.loads(str(r["params"])) for r in existing if r["counted"]]
     planned: set[str] = set()
 
     def taken(run: str) -> bool: