labnotes 0.0.82__tar.gz → 0.0.83__tar.gz

{labnotes-0.0.82 → labnotes-0.0.83}/PKG-INFO

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

@@ -58,11 +58,11 @@ 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 (1 if omitted), 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,
+`mode = "matrix"` counts what is there: only runs that count fill a combination,
 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
+Each run gets a new run folder. In `matrix` mode it is named for the UTC time it was planned
 (`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

labnotes-0.0.83/src/labnotes/modes.py

@@ -0,0 +1,2 @@
+MODES = ("matrix", "adhoc")
+DEFAULT_MODE = "adhoc"

{labnotes-0.0.82 → labnotes-0.0.83}/src/labnotes/read_config.py

@@ -24,7 +24,7 @@ def read_config(path: Path) -> LabnotesConfig:
     experiments = values.get("experiments", {})
     mode = experiments.get("mode", DEFAULT_MODE)
     if mode not in MODES:
-        raise ValueError(f"{path}: [experiments] mode must be fill or adhoc")
+        raise ValueError(f"{path}: [experiments] mode must be matrix or adhoc")
     concurrency = experiments.get("concurrency", 1)
     if not is_positive_int(concurrency):
         raise ValueError(

{labnotes-0.0.82 → labnotes-0.0.83}/src/labnotes/runner/read_experiment_config.py

@@ -44,7 +44,7 @@ def read_experiment_config(
         raise ValueError(f"{path}: counts must be a SQL condition")
     mode = values.get("mode", mode)
     if mode not in MODES:
-        raise ValueError(f"{path}: mode must be fill or adhoc")
+        raise ValueError(f"{path}: mode must be matrix or adhoc")
     concurrency = values.get("concurrency", concurrency)
     if not is_positive_int(concurrency):
         raise ValueError(f"{path}: concurrency must be a positive integer")

{labnotes-0.0.82 → labnotes-0.0.83}/src/labnotes/runner/run_experiment.py

@@ -37,7 +37,7 @@ async def run_experiment(
     existing = await experiment_run_ids(tables, name)
     finished: list[dict[str, object]] = []
     match experiment.mode:
-        case "fill":
+        case "matrix":
             counted = await list_experiment_runs(tables, name, experiment.counts)
             finished = [json.loads(str(r["params"])) for r in counted if r["counted"]]
     planned: set[str] = set()

{labnotes-0.0.82 → labnotes-0.0.83}/src/labnotes/summarize_config.py

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

{labnotes-0.0.82 → labnotes-0.0.83}/testing-conventions.toml

@@ -14,13 +14,13 @@ reason = "last_stream is always the same str object taken from STREAMS, so is no
 path = "src/labnotes/runner/run_experiment.py"
 rules = ["mutation"]
 lines = [47]
-reason = "mode is validated to fill or adhoc; \"fill\" <= \"adhoc\" is false like ==, and both are interned literals so is equals =="
+reason = "mode is validated to matrix or adhoc; \"matrix\" <= \"adhoc\" is false like ==, and both are interned literals so is equals =="
 
 [[python.exempt]]
 path = "src/labnotes/load_experiment.py"
 rules = ["mutation"]
 lines = [59]
-reason = "summarize_config returns mode fill or adhoc; \"fill\" <= \"adhoc\" is false like ==, and both are interned literals so is equals =="
+reason = "summarize_config returns mode matrix or adhoc; \"matrix\" <= \"adhoc\" is false like ==, and both are interned literals so is equals =="
 
 [[python.exempt]]
 path = "src/labnotes/daemon/exit_when_idle.py"

{labnotes-0.0.82 → labnotes-0.0.83}/tests/integration/conftest.py

@@ -13,7 +13,7 @@ from playwright.async_api import Page, async_playwright
 from labnotes.daemon.socket_path import socket_path
 
 CONFIG = (
-    'name = "Alpha study"\ncommand = "go"\nrepeats = 2\nmode = "fill"\n'
+    'name = "Alpha study"\ncommand = "go"\nrepeats = 2\nmode = "matrix"\n'
     '[params]\nsource-language = ["en", "fr"]\n'
 )
 

labnotes-0.0.82/src/labnotes/modes.py

@@ -1,2 +0,0 @@
-MODES = ("fill", "adhoc")
-DEFAULT_MODE = "adhoc"