labnotes 0.2.0__tar.gz → 0.2.2__tar.gz

{labnotes-0.2.0 → labnotes-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.2.0
+Version: 0.2.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>

labnotes-0.2.2/src/labnotes/runner/check_args.py

@@ -0,0 +1,19 @@
+from collections import Counter
+
+from labnotes.runner.command_flags import command_flags
+from labnotes.runner.group_args import group_args
+
+
+def check_args(params: dict[str, list[object]], command: str, args: list[str]) -> None:
+    taken = Counter(flag.name for flag in command_flags(command))
+    given: set[str] = set()
+    for name in (arg.name for arg in group_args(args) if arg.name is not None):
+        if name in params:
+            raise ValueError(f"--{name} is a param. Pick it with --{name}=VALUE.")
+        if taken[name] > 1:
+            raise ValueError(
+                f"--{name} is in the command more than once, so -- can't override it."
+            )
+        if taken[name] and name in given:
+            raise ValueError(f"--{name} is in -- ARGS more than once.")
+        given.add(name)

labnotes-0.2.2/src/labnotes/runner/command_flags.py

@@ -0,0 +1,35 @@
+import re
+from itertools import zip_longest
+from typing import NamedTuple
+
+from labnotes.runner.flag_name import flag_name
+
+OPERATOR = ";&|<>()"
+WORD = re.compile(
+    rf"""[{OPERATOR}]+|(?:[^\s{OPERATOR}'"\\]|\\.|'[^']*'|"(?:[^"\\]|\\.)*")+""",
+    re.DOTALL,
+)
+
+
+class CommandFlag(NamedTuple):
+    name: str
+    start: int
+    end: int
+    joined: bool
+
+
+def command_flags(command: str) -> list[CommandFlag]:
+    words = list(WORD.finditer(command))
+    flags: list[CommandFlag] = []
+    for word, after in zip_longest(words, words[1:]):
+        name = flag_name(word[0])
+        if name is None:
+            continue
+        joined = "=" in word[0]
+        end = word.end()
+        if not joined and after is not None:
+            value = after[0]
+            if value[0] not in OPERATOR and not value.startswith("-"):
+                end = after.end()
+        flags.append(CommandFlag(name, word.start(), end, joined))
+    return flags

labnotes-0.2.2/src/labnotes/runner/group_args.py

@@ -0,0 +1,33 @@
+from typing import NamedTuple
+
+from labnotes.runner.flag_name import flag_name
+
+
+class Arg(NamedTuple):
+    name: str | None
+    value: str | None
+    tokens: list[str]
+
+
+def group_args(args: list[str]) -> list[Arg]:
+    grouped: list[Arg] = []
+    values = {
+        index + 1
+        for index, token in enumerate(args[:-1])
+        if flag_name(token) is not None
+        and "=" not in token
+        and not args[index + 1].startswith("-")
+    }
+    for index, token in enumerate(args):
+        name = flag_name(token)
+        if index in values:
+            continue
+        if name is None:
+            grouped.append(Arg(None, None, [token]))
+        elif "=" in token:
+            grouped.append(Arg(name, token.partition("=")[2], [token]))
+        elif index + 1 in values:
+            grouped.append(Arg(name, args[index + 1], [token, args[index + 1]]))
+        else:
+            grouped.append(Arg(name, None, [token]))
+    return grouped

labnotes-0.2.2/src/labnotes/runner/override_flags.py

@@ -0,0 +1,21 @@
+import shlex
+
+from labnotes.runner.command_flags import command_flags
+from labnotes.runner.group_args import group_args
+
+
+def override_flags(command: str, args: list[str]) -> tuple[str, list[str]]:
+    flags = {flag.name: flag for flag in command_flags(command)}
+    replaced: list[tuple[int, int, str]] = []
+    rest: list[str] = []
+    for arg in group_args(args):
+        flag = flags.get(arg.name) if arg.name is not None else None
+        if flag is None:
+            rest += arg.tokens
+        elif arg.value is not None:
+            separator = "=" if flag.joined else " "
+            text = f"--{arg.name}{separator}{shlex.quote(arg.value)}"
+            replaced.append((flag.start, flag.end, text))
+    for start, end, text in sorted(replaced, reverse=True):
+        command = command[:start] + text + command[end:]
+    return command, rest

{labnotes-0.2.0 → labnotes-0.2.2}/src/labnotes/runner/project_snapshot.py

@@ -35,19 +35,21 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
 
     try:
         sha = git(root, "rev-parse", "HEAD").decode("ascii").strip()
-        diff = git(root, "diff", "HEAD")
+        repo_root = Path(git(root, "rev-parse", "--show-toplevel").decode().strip())
+        project_prefix = root.resolve().relative_to(repo_root.resolve())
+        diff = git(repo_root, "diff", "HEAD")
     except (OSError, subprocess.SubprocessError):
         logging.warning("Project has no readable Git HEAD; running from the live tree")
         yield ProjectSnapshot(root)
         return
     files = filter(
-        None, git(root, "ls-files", "-co", "--exclude-standard", "-z").split(b"\0")
+        None, git(repo_root, "ls-files", "-co", "--exclude-standard", "-z").split(b"\0")
     )
     ignored = filter(
         None,
-        git(root, "ls-files", "-oi", "--exclude-standard", "--directory", "-z").split(
-            b"\0"
-        ),
+        git(
+            repo_root, "ls-files", "-oi", "--exclude-standard", "--directory", "-z"
+        ).split(b"\0"),
     )
     with TemporaryDirectory(prefix="labnotes-") as directory:
         snapshot = Path(directory)
@@ -73,14 +75,14 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
                     "--quiet",
                     "--shared",
                     "--no-checkout",
-                    str(root),
+                    str(repo_root),
                     str(snapshot),
                 ],
                 check=True,
             )
             for raw in files:
                 relative = Path(raw.decode())
-                source = root / relative
+                source = repo_root / relative
                 if not source.exists() and not source.is_symlink():
                     continue
                 target = snapshot / relative
@@ -100,7 +102,7 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
                     continue
                 if any((snapshot / parent).is_symlink() for parent in relative.parents):
                     continue
-                source = root / relative
+                source = repo_root / relative
                 if source.is_dir() and (source / "pyvenv.cfg").exists():
                     skipped.add(relative)
                     continue
@@ -115,4 +117,4 @@ def project_snapshot(root: Path) -> Iterator[ProjectSnapshot]:
         finally:
             for number, handler in previous.items():
                 signal.signal(number, handler)
-        yield ProjectSnapshot(snapshot, sha, diff)
+        yield ProjectSnapshot(snapshot / project_prefix, sha, diff)

{labnotes-0.2.0 → labnotes-0.2.2}/src/labnotes/runner/shell_command.py

@@ -2,6 +2,7 @@ import shlex
 from collections.abc import Sequence
 from pathlib import Path
 
+from labnotes.runner.override_flags import override_flags
 from labnotes.runner.param_args import param_args
 
 
@@ -9,4 +10,5 @@ def shell_command(
     command: str, folder: Path, params: dict[str, object], args: Sequence[str] = ()
 ) -> str:
     filled = command.replace("{run_dir}", shlex.quote(str(folder)))
-    return f"{filled} {shlex.join([*param_args(params), *args])}".rstrip()
+    overridden, rest = override_flags(filled, list(args))
+    return f"{overridden} {shlex.join([*param_args(params), *rest])}".rstrip()

labnotes-0.2.0/src/labnotes/runner/check_args.py

@@ -1,15 +0,0 @@
-import shlex
-
-from labnotes.runner.flag_name import flag_name
-
-
-def check_args(params: dict[str, list[object]], command: str, args: list[str]) -> None:
-    taken = {flag_name(token) for token in shlex.split(command)}
-    for arg in args:
-        name = flag_name(arg)
-        if name is None:
-            continue
-        if name in params:
-            raise ValueError(f"--{name} is a param. Pick it with --{name}=VALUE.")
-        if name in taken:
-            raise ValueError(f"--{name} is already in the command.")