labnotes 0.0.68__tar.gz → 0.0.69__tar.gz

{labnotes-0.0.68 → labnotes-0.0.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.68
+Version: 0.0.69
 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.68 → labnotes-0.0.69}/src/labnotes/runner/read_experiment_config.py

@@ -10,10 +10,11 @@ from labnotes.modes import MODES
 SETTINGS = {"name", "command", "repeats", "params", "counts", "mode", "concurrency"}
 
 
-def read_experiment_config(path: Path, mode: str, concurrency: int) -> ExperimentConfig:
+def read_experiment_config(
+    path: Path, source: str, mode: str, concurrency: int
+) -> ExperimentConfig:
     try:
-        with path.open("rb") as file:
-            values = tomllib.load(file)
+        values = tomllib.loads(source)
     except tomllib.TOMLDecodeError as error:
         raise ValueError(f"{path}: {error}") from error
     unknown = sorted(values.keys() - SETTINGS)

{labnotes-0.0.68 → labnotes-0.0.69}/src/labnotes/runner/run_experiment.py

@@ -17,6 +17,7 @@ from labnotes.runner.new_stamped_run_id import new_stamped_run_id
 from labnotes.runner.param_grid import param_grid
 from labnotes.runner.plan_runs import plan_runs
 from labnotes.runner.run_folder import run_folder
+from labnotes.tables.experiment_run_ids import experiment_run_ids
 from labnotes.tables.list_experiment_runs import list_experiment_runs
 from labnotes.tables.open_tables import open_tables
 
@@ -31,18 +32,17 @@ async def run_experiment(
     report: Report,
     listen: Listen,
 ) -> list[dict[str, object]]:
+    tables = open_tables(config)
+    existing = await experiment_run_ids(tables, name)
     finished: list[dict[str, object]] = []
     match experiment.mode:
         case "fill":
-            tables = open_tables(config)
-            existing = await list_experiment_runs(tables, name, experiment.counts)
-            finished = [json.loads(str(r["params"])) for r in existing if r["counted"]]
+            counted = await list_experiment_runs(tables, name, experiment.counts)
+            finished = [json.loads(str(r["params"])) for r in counted if r["counted"]]
     planned: set[str] = set()
 
     def taken(run: str) -> bool:
-        return (
-            run in planned or run_folder(config.root, config.runs, name, run).exists()
-        )
+        return run in planned or run in existing
 
     group = new_stamped_run_id(taken) if experiment.mode == "adhoc" else None
 

{labnotes-0.0.68 → labnotes-0.0.69}/src/labnotes/runner/start_experiment.py

@@ -1,3 +1,4 @@
+import asyncio
 from collections.abc import Callable
 from functools import partial
 from pathlib import Path
@@ -7,6 +8,7 @@ from labnotes.runner.hold_folder import hold_folder
 from labnotes.runner.read_experiment_config import read_experiment_config
 from labnotes.runner.run_experiment import run_experiment
 from labnotes.runner.runs_parent import runs_parent
+from labnotes.tables.file_text import file_text
 
 
 def start_experiment(
@@ -19,10 +21,11 @@ def start_experiment(
     if experiment_config is None:
         folder = config.experiments.replace("{experiment}", name)
         experiment_config = config.root / folder / "experiment.toml"
-    if not experiment_config.is_file():
+    source = asyncio.run(file_text(config.root, experiment_config))
+    if source is None:
         raise ValueError(f"No experiment.toml for {name} at {experiment_config}.")
     experiment = read_experiment_config(
-        experiment_config, config.mode, config.concurrency
+        experiment_config, source, config.mode, config.concurrency
     )
     if concurrency is None:
         concurrency = experiment.concurrency

labnotes-0.0.69/src/labnotes/tables/experiment_run_ids.py

@@ -0,0 +1,11 @@
+from dirsql import DirSQL
+
+from labnotes.sql_quote import quote_string
+
+
+async def experiment_run_ids(tables: DirSQL, name: str) -> set[str]:
+    rows = await tables.query(
+        f"SELECT id FROM runs WHERE experiment = {quote_string(name)}"
+    )
+    ids = {str(row["id"]) for row in rows}
+    return ids | {run.split("/")[0] for run in ids}

labnotes-0.0.69/src/labnotes/tables/file_text.py

@@ -0,0 +1,12 @@
+from pathlib import Path
+
+from dirsql import DirSQL
+
+from labnotes.sql_quote import quote_string
+
+
+async def file_text(root: Path, path: Path) -> str | None:
+    rows = await DirSQL(str(root), tables=[], no_ignore=True).query(
+        f"SELECT content FROM {quote_string(str(path))}"
+    )
+    return next((str(row["content"] or "") for row in rows), None)