labnotes 0.2.27__tar.gz → 0.2.29__tar.gz

{labnotes-0.2.27 → labnotes-0.2.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.2.27
+Version: 0.2.29
 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.27 → labnotes-0.2.29}/src/labnotes/experiments.py

@@ -190,6 +190,8 @@ def experiments(
             click.echo(f"Created {path / 'experiment.toml'}")
             return
         case str(), "run":
+            if experiment_config is not None:
+                experiment_config = experiment_config.resolve()
             if run_id is not None and (ctx.args or passthrough is not None):
                 raise click.UsageError(
                     "--run-id uses the run's recorded params and -- ARGS."

{labnotes-0.2.27 → labnotes-0.2.29}/src/labnotes/runner/prepare_experiment.py

@@ -28,6 +28,8 @@ async def prepare_experiment(
     if experiment_config is None:
         folder = config.experiments.replace("{experiment}", name)
         experiment_config = config.root / folder / "experiment.toml"
+    elif not experiment_config.is_absolute():
+        experiment_config = config.root / experiment_config
     source = await file_text(config.root, experiment_config)
     if source is None and not config.defaults:
         raise ValueError(f"No experiment.toml for {name} at {experiment_config}.")

{labnotes-0.2.27 → labnotes-0.2.29}/src/labnotes/tables/read_run.py

@@ -11,8 +11,27 @@ def read_run(
     found = path_pattern(f"{template}/run.json").fullmatch(relative)
     if found is None:
         return []
-    run = json.loads(Path(path).read_text(encoding="utf-8"))
     folder = relative.removesuffix("/run.json")
+    try:
+        run = json.loads(Path(path).read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, UnicodeDecodeError) as error:
+        return [
+            {
+                "experiment": experiment or found["experiment"],
+                "id": found["run"],
+                "folder": folder,
+                "created": None,
+                "ended": None,
+                "exit_code": None,
+                "error": f"Invalid {relative}: {error}",
+                "stdout": f"{folder}/stdout.log",
+                "stderr": f"{folder}/stderr.log",
+                "params": "{}",
+                "meta": None,
+                "command": None,
+                "run": None,
+            }
+        ]
     logs = {"stdout": "stdout.log", "stderr": "stderr.log"}
     match run.get("invocations"):
         case [*_, {"stdout": str() as stdout, "stderr": str() as stderr}]: