labnotes 0.1.0__tar.gz → 0.1.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.1.0
+Version: 0.1.1
 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.1.0 → labnotes-0.1.1}/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.1/src/labnotes/runner/placeholders.py

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