labnotes 0.0.114__tar.gz → 0.0.115__tar.gz

{labnotes-0.0.114 → labnotes-0.0.115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.114
+Version: 0.0.115
 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.114 → labnotes-0.0.115}/src/labnotes/experiment_runs.py

@@ -1,14 +1,26 @@
+import warnings
+
 from labnotes.sql_quote import quote_identifier, quote_string
+from labnotes.tables.runs_columns import runs_columns
 
 STARTED = "strftime('%Y-%m-%d %H:%M:%S', created)"
 DURATION = "CAST(round((julianday(ended) - julianday(created)) * 86400) AS INTEGER)"
 
 
 def experiment_runs(experiment: str, params: list[str]) -> str:
+    taken = {*runs_columns(), "started", "duration"}
+    clashes = [key for key in params if key in taken]
+    if clashes:
+        warnings.warn(
+            f"Params {', '.join(clashes)} clash with runs columns;"
+            " the runs column wins. Read them from params instead.",
+            stacklevel=2,
+        )
     columns = "".join(
         f", params ->> {quote_string(f'$.{quote_identifier(key)}')}"
         f" AS {quote_identifier(key)}"
         for key in params
+        if key not in taken
     )
     return (
         f"(SELECT *{columns}, {STARTED} AS started, {DURATION} AS duration FROM runs"

labnotes-0.0.115/src/labnotes/tables/runs_columns.py

@@ -0,0 +1,11 @@
+import sqlite3
+from functools import cache
+
+from labnotes.tables.open_tables import RUNS
+
+
+@cache
+def runs_columns() -> tuple[str, ...]:
+    with sqlite3.connect(":memory:") as db:
+        db.execute(RUNS)
+        return tuple(row[1] for row in db.execute("PRAGMA table_info(runs)"))