labnotes 0.1.0__tar.gz → 0.1.2__tar.gz

{labnotes-0.1.0 → labnotes-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.1.0
+Version: 0.1.2
 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>
@@ -121,7 +121,8 @@ line per event instead.
 - `--concurrency N` runs N at a time (default 1).
 - `-e PATH` reads another file instead of `experiment.toml`.
 - `--PARAM=VALUE` runs only the cells where that param has that value, like
-  `--model=small`.
+  `--model=small`. Repeat a param to run several values:
+  `--model=small --model=large`.
 - With runs going, Ctrl-C asks first. Enter (or a second Ctrl-C) stops the running scripts and records their end,
   then kills any still going 5 seconds later. Escape goes back. SIGTERM and
   SIGHUP stop them the same way.

{labnotes-0.1.0 → labnotes-0.1.2}/README.md

@@ -96,7 +96,8 @@ line per event instead.
 - `--concurrency N` runs N at a time (default 1).
 - `-e PATH` reads another file instead of `experiment.toml`.
 - `--PARAM=VALUE` runs only the cells where that param has that value, like
-  `--model=small`.
+  `--model=small`. Repeat a param to run several values:
+  `--model=small --model=large`.
 - With runs going, Ctrl-C asks first. Enter (or a second Ctrl-C) stops the running scripts and records their end,
   then kills any still going 5 seconds later. Escape goes back. SIGTERM and
   SIGHUP stop them the same way.

{labnotes-0.1.0 → labnotes-0.1.2}/src/labnotes/context.md

@@ -192,8 +192,10 @@ going. Elsewhere, it prints a line per event instead.
 - `--PARAM=VALUE` runs only the cells where that param has that value, e.g.
   `labnotes experiments NAME run --model=small`. PARAM must be a key in
   `[params]` and VALUE one of its values, written as it shows in `runs`
-  (`true`, `2`); anything else is an error. One value per param; give several
-  params to narrow further (`--model=small --lang=en`). It changes only what
+  (`true`, `2`); anything else is an error. Repeat a param to run any of
+  several values (`--model=small --model=large`); give several params to
+  narrow further (`--model=small --lang=en`). Values are never split on
+  commas. It changes only what
   this `run` starts: counts, progress and `repeats` still cover the full
   matrix, so a later plain `run` fills in the rest. Use it instead of editing
   `experiment.toml` to run a slice.

{labnotes-0.1.0 → labnotes-0.1.2}/src/labnotes/experiments.py

@@ -33,7 +33,8 @@ class PassthroughCommand(click.Command):
     cls=PassthroughCommand,
     help="List experiments, show one, list its runs, or run it."
     " `new [NAME]` creates one. With run, --PARAM=VALUE runs only the"
-    " matrix cells where that param has that value, and anything after --"
+    " matrix cells where that param has that value (repeat it for several"
+    " values), and anything after --"
     " is appended to every run's command and recorded in run.json, so never"
     " pass secrets there.",
     context_settings={"ignore_unknown_options": True, "allow_extra_args": True},

{labnotes-0.1.0 → labnotes-0.1.2}/src/labnotes/parse_subset.py

@@ -1,10 +1,8 @@
-def parse_subset(args: list[str]) -> dict[str, str]:
-    only: dict[str, str] = {}
+def parse_subset(args: list[str]) -> dict[str, list[str]]:
+    only: dict[str, list[str]] = {}
     for arg in args:
         param, equals, value = arg.removeprefix("--").partition("=")
         if not arg.startswith("--") or not equals or not param:
             raise ValueError(f"Unexpected {arg}. Pick params with --PARAM=VALUE.")
-        if param in only:
-            raise ValueError(f"--{param} given twice. Pass one value per param.")
-        only[param] = value
+        only.setdefault(param, []).append(value)
     return only

{labnotes-0.1.0 → labnotes-0.1.2}/src/labnotes/runner/check_subset.py

@@ -1,13 +1,14 @@
 from labnotes.format_value import format_value
 
 
-def check_subset(params: dict[str, list[object]], only: dict[str, str]) -> None:
-    for param, value in only.items():
+def check_subset(params: dict[str, list[object]], only: dict[str, list[str]]) -> None:
+    for param, wanted in only.items():
         if param not in params:
             declared = ", ".join(params) or "none"
             raise ValueError(f"No param {param}. Params: {declared}.")
         values = [format_value(option) for option in params[param]]
-        if value not in values:
-            raise ValueError(
-                f"No value {value} for {param}. Values: {', '.join(values)}."
-            )
+        for value in wanted:
+            if value not in values:
+                raise ValueError(
+                    f"No value {value} for {param}. Values: {', '.join(values)}."
+                )

{labnotes-0.1.0 → labnotes-0.1.2}/src/labnotes/runner/fill_experiment_env.py

@@ -1,6 +1,7 @@
 from collections.abc import Mapping
 
 from labnotes.runner.fill_dirs import fill_dirs
+from labnotes.runner.placeholders import HOOK_PLACEHOLDERS, PLACEHOLDERS
 
 
 def fill_experiment_env(
@@ -20,12 +21,11 @@ def fill_experiment_env(
     for key, value in configured.items():
         if key in caller:
             continue
-        if hook is not None and "{run_dir}" in value:
-            raise ValueError(
-                f"{hook} env.{key} uses {{run_dir}}; use {{invocation_dir}} instead."
-            )
-        for name in ("run_dir", "invocation_dir"):
-            if f"{{{name}}}" in value and name not in dirs:
+        used = [name for name in PLACEHOLDERS if f"{{{name}}}" in value]
+        if hook is not None and any(name not in HOOK_PLACEHOLDERS for name in used):
+            continue
+        for name in used:
+            if name not in dirs:
                 raise ValueError(
                     f"{hook} env.{key} uses {{{name}}}, but this invocation plans "
                     f"{runs} runs. {{{name}}} needs exactly one run in this mode."

labnotes-0.1.2/src/labnotes/runner/in_subset.py

@@ -0,0 +1,5 @@
+from labnotes.format_value import format_value
+
+
+def in_subset(cell: dict[str, object], only: dict[str, list[str]]) -> bool:
+    return all(format_value(cell[param]) in values for param, values in only.items())

labnotes-0.1.2/src/labnotes/runner/placeholders.py

@@ -0,0 +1,2 @@
+PLACEHOLDERS = ("run_dir", "invocation_dir")
+HOOK_PLACEHOLDERS = ("invocation_dir",)

{labnotes-0.1.0 → labnotes-0.1.2}/src/labnotes/runner/prepare_experiment.py

@@ -13,7 +13,7 @@ async def prepare_experiment(
     name: str,
     experiment_config: Path | None,
     concurrency: int | None,
-    only: dict[str, str] | None = None,
+    only: dict[str, list[str]] | None = None,
     args: list[str] | None = None,
     setup: str | None = None,
     teardown: str | None = None,

{labnotes-0.1.0 → labnotes-0.1.2}/src/labnotes/runner/run_experiment.py

@@ -47,7 +47,7 @@ async def run_experiment(
     listen: Listen,
     timeout: float | None = None,
     retry_seconds: float = RETRY_SECONDS,
-    only: dict[str, str] | None = None,
+    only: dict[str, list[str]] | None = None,
     args: list[str] | None = None,
     environment: dict[str, str] | None = None,
     snapshot: ProjectSnapshot | None = None,

{labnotes-0.1.0 → labnotes-0.1.2}/src/labnotes/runner/start_experiment.py

@@ -13,7 +13,7 @@ def start_experiment(
     experiment_config: Path | None,
     concurrency: int | None,
     timeout: int | None,
-    only: dict[str, str] | None,
+    only: dict[str, list[str]] | None,
     args: list[str] | None,
     setup: str | None,
     teardown: str | None,

labnotes-0.1.0/src/labnotes/runner/in_subset.py

@@ -1,5 +0,0 @@
-from labnotes.format_value import format_value
-
-
-def in_subset(cell: dict[str, object], only: dict[str, str]) -> bool:
-    return all(format_value(cell[param]) == value for param, value in only.items())