labnotes 0.0.44__tar.gz → 0.0.46__tar.gz

{labnotes-0.0.44 → labnotes-0.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.44
+Version: 0.0.46
 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.44 → labnotes-0.0.46}/pyproject.toml

@@ -53,7 +53,7 @@ exclude = ["*_test.py"]
 packages = ["src/labnotes"]
 
 [tool.pytest.ini_options]
-testpaths = ["src/labnotes", "tests"]
+testpaths = ["src/labnotes"]
 python_files = "*_test.py"
 
 [tool.ruff.lint]

{labnotes-0.0.44 → labnotes-0.0.46}/src/labnotes/context.md

@@ -106,7 +106,9 @@ finish. Enter on a run follows its `stdout.log`; `e` switches to
 plans a single run opens straight on its output. `q` quits. Elsewhere, or with `--no-tui`, it prints a
 line per event instead.
 
-- `--concurrency N` runs N at a time to start with (default 1).
+- `--concurrency N` runs N at a time to start with. Without it, `concurrency`
+  in `experiment.toml` sets it, then `concurrency` under `[experiments]` in
+  `.labnotes.toml`, then 1.
 - `-e PATH` reads another file instead of `experiment.toml`.
 - Ctrl-C stops the running scripts and records their end. A second Ctrl-C
   kills them. Closing the terminal or sending SIGTERM stops them the same way,

{labnotes-0.0.44 → labnotes-0.0.46}/src/labnotes/experiments.py

@@ -30,9 +30,8 @@ from labnotes.tui.run_tui import run_tui
 @click.option(
     "--concurrency",
     type=click.IntRange(min=1),
-    default=1,
-    show_default=True,
-    help="With run: how many runs at once.",
+    help="With run: how many runs at once. Overrides experiment.toml and"
+    " .labnotes.toml; 1 if none sets it.",
 )
 @click.option(
     "-e",
@@ -51,7 +50,7 @@ def experiments(
     name: str | None,
     action: str | None,
     output_format: str,
-    concurrency: int,
+    concurrency: int | None,
     experiment_config: Path | None,
     no_tui: bool,
 ) -> None:

labnotes-0.0.46/src/labnotes/is_positive_int.py

@@ -0,0 +1,2 @@
+def is_positive_int(value: object) -> bool:
+    return isinstance(value, int) and not isinstance(value, bool) and value > 0

{labnotes-0.0.44 → labnotes-0.0.46}/src/labnotes/models.py

@@ -40,6 +40,7 @@ class LabnotesConfig:
     files: str
     runs: str
     mode: str = DEFAULT_MODE
+    concurrency: int = 1
 
 
 @dataclass(frozen=True)
@@ -50,3 +51,4 @@ class ExperimentConfig:
     name: str | None = None
     counts: str = DEFAULT_COUNTS
     mode: str = DEFAULT_MODE
+    concurrency: int = 1

{labnotes-0.0.44 → labnotes-0.0.46}/src/labnotes/read_config.py

@@ -2,6 +2,7 @@ import tomllib
 from pathlib import Path
 
 from labnotes.models import LabnotesConfig
+from labnotes.is_positive_int import is_positive_int
 from labnotes.modes import DEFAULT_MODE, MODES
 from labnotes.read_path import DEFAULT_PATHS, read_path
 
@@ -20,8 +21,16 @@ def read_config(path: Path) -> LabnotesConfig:
     paths = {
         table: read_path(path, table, values.get(table, {})) for table in DEFAULT_PATHS
     }
-    mode = values.get("experiments", {}).get("mode", DEFAULT_MODE)
+    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")
+    concurrency = experiments.get("concurrency", 1)
+    if not is_positive_int(concurrency):
+        raise ValueError(
+            f"{path}: [experiments] concurrency must be a positive integer"
+        )
     path = path.resolve()
-    return LabnotesConfig(path, path.parent, **paths, mode=mode)
+    return LabnotesConfig(
+        path, path.parent, **paths, mode=mode, concurrency=concurrency
+    )

{labnotes-0.0.44 → labnotes-0.0.46}/src/labnotes/read_path.py

@@ -12,7 +12,7 @@ PLACEHOLDERS = {
     "runs": {"experiment", "run"},
 }
 # Keys other readers own, so the path check lets them through.
-OTHER_KEYS = {"experiments": {"mode"}}
+OTHER_KEYS = {"experiments": {"mode", "concurrency"}}
 PLACEHOLDER = re.compile(r"\{([^}]*)\}")
 
 

{labnotes-0.0.44 → labnotes-0.0.46}/src/labnotes/runner/read_experiment_config.py

@@ -4,12 +4,13 @@ from pathlib import Path
 
 from labnotes.default_counts import DEFAULT_COUNTS
 from labnotes.models import ExperimentConfig
+from labnotes.is_positive_int import is_positive_int
 from labnotes.modes import MODES
 
-SETTINGS = {"name", "command", "repeats", "params", "counts", "mode"}
+SETTINGS = {"name", "command", "repeats", "params", "counts", "mode", "concurrency"}
 
 
-def read_experiment_config(path: Path, mode: str) -> ExperimentConfig:
+def read_experiment_config(path: Path, mode: str, concurrency: int) -> ExperimentConfig:
     try:
         with path.open("rb") as file:
             values = tomllib.load(file)
@@ -25,7 +26,7 @@ def read_experiment_config(path: Path, mode: str) -> ExperimentConfig:
     if not isinstance(command, str) or not command.strip():
         raise ValueError(f"{path}: command must be a string")
     repeats = values.get("repeats", 1)
-    if isinstance(repeats, bool) or not isinstance(repeats, int) or repeats < 1:
+    if not is_positive_int(repeats):
         raise ValueError(f"{path}: repeats must be a positive integer")
     params = values.get("params", {})
     if not isinstance(params, dict):
@@ -43,4 +44,7 @@ def read_experiment_config(path: Path, mode: str) -> ExperimentConfig:
     mode = values.get("mode", mode)
     if mode not in MODES:
         raise ValueError(f"{path}: mode must be fill or adhoc")
-    return ExperimentConfig(command, repeats, params, name, counts, mode)
+    concurrency = values.get("concurrency", concurrency)
+    if not is_positive_int(concurrency):
+        raise ValueError(f"{path}: concurrency must be a positive integer")
+    return ExperimentConfig(command, repeats, params, name, counts, mode, concurrency)

{labnotes-0.0.44 → labnotes-0.0.46}/src/labnotes/runner/start_experiment.py

@@ -13,7 +13,7 @@ def start_experiment(
     config: LabnotesConfig,
     name: str,
     experiment_config: Path | None,
-    concurrency: int,
+    concurrency: int | None,
     drive: Callable[[Start, str], list[dict[str, object]]],
 ) -> list[dict[str, object]]:
     if experiment_config is None:
@@ -21,7 +21,11 @@ def start_experiment(
         experiment_config = config.root / folder / "experiment.toml"
     if not experiment_config.is_file():
         raise ValueError(f"No experiment.toml for {name} at {experiment_config}.")
-    experiment = read_experiment_config(experiment_config, config.mode)
+    experiment = read_experiment_config(
+        experiment_config, config.mode, config.concurrency
+    )
+    if concurrency is None:
+        concurrency = experiment.concurrency
     runs = runs_parent(config.root, config.runs, name)
     runs.mkdir(parents=True, exist_ok=True)
     try: