labnotes 0.0.31__tar.gz → 0.0.33__tar.gz

{labnotes-0.0.31 → labnotes-0.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.31
+Version: 0.0.33
 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.33/src/labnotes/check_counts.py

@@ -0,0 +1,17 @@
+from dirsql import DirSQL
+
+
+async def check_counts(
+    tables: DirSQL, source: str, summary: dict[str, object]
+) -> dict[str, object]:
+    rule = str(summary["completed_run"])
+    try:
+        await tables.query(f"SELECT ({rule}) FROM {source} LIMIT 0")
+    except RuntimeError as error:
+        # A broken rule counts nothing, so the pages still render and say why.
+        return {
+            **summary,
+            "completed_run": "0",
+            "counts_error": f"{rule} doesn't work: {error}",
+        }
+    return summary

{labnotes-0.0.31 → labnotes-0.0.33}/src/labnotes/list_experiments.py

@@ -3,6 +3,7 @@ from typing import cast
 
 from dirsql import DirSQL
 
+from labnotes.check_counts import check_counts
 from labnotes.experiment_progress import experiment_progress
 from labnotes.experiment_runs import experiment_runs
 from labnotes.summarize_config import summarize_config
@@ -19,6 +20,7 @@ async def list_experiments(tables: DirSQL) -> list[dict[str, object]]:
         summary = summarize_config(config)
         varies = cast(dict[str, list[object]], summary["varies"])
         source = experiment_runs(name, list(varies))
+        summary = await check_counts(tables, source, summary)
         progress = await experiment_progress(tables, source, summary)
         listed.append(
             {"name": name, "display_name": row["display_name"], **summary, **progress}

{labnotes-0.0.31 → labnotes-0.0.33}/src/labnotes/load_experiment.py

@@ -6,6 +6,7 @@ from typing import cast
 from dirsql import DirSQL
 
 from labnotes.experiment_notes import experiment_notes
+from labnotes.check_counts import check_counts
 from labnotes.experiment_progress import experiment_progress
 from labnotes.experiment_runs import experiment_runs
 from labnotes.list_runs import list_runs
@@ -39,6 +40,7 @@ async def load_experiment(
     summary = summarize_config(config)
     varies = cast(dict[str, list[object]], summary["varies"])
     source = experiment_runs(name, list(varies))
+    summary = await check_counts(tables, source, summary)
     progress = await experiment_progress(tables, source, summary)
     shown = ["id", *(key for key in varies if key != "id")]
     view = parse_run_view(params, shown)

{labnotes-0.0.31 → labnotes-0.0.33}/src/labnotes/static/labnotes.css

@@ -341,6 +341,7 @@ h2 .clear { font-family: var(--sans); font-size: 0.82rem; margin-left: 0.8rem; c
 .status { font-size: 0.8rem; font-weight: 700; }
 .status.good { color: var(--good); }
 .status.bad { color: var(--bad); }
+.counts-error { color: var(--bad); }
 
 .record {
   display: grid;

{labnotes-0.0.31 → labnotes-0.0.33}/src/labnotes/templates/experiment.html

@@ -66,7 +66,7 @@
     {% for key, value in e.other.items() %}
     <dt>{{ key }}</dt><dd><code>{{ value | value }}</code></dd>
     {% endfor %}
-    <dt>complete when</dt><dd><code>{{ e.completed_run }}</code></dd>
+    <dt>complete when</dt>{% if e.counts_error %}<dd class="counts-error">{{ e.counts_error }}</dd>{% else %}<dd><code>{{ e.completed_run }}</code></dd>{% endif %}
   </dl>
 </section>
 

{labnotes-0.0.31 → labnotes-0.0.33}/src/labnotes/templates/index.html

@@ -37,7 +37,9 @@
       </td>
       <td class="num" data-label="Runs">{{ experiment.runs }}</td>
       <td class="progress-col">
-        {% if experiment.filled is not none and experiment.target %}
+        {% if experiment.counts_error %}
+        <span class="counts-error" title="{{ experiment.counts_error }}">counts rule doesn't work</span>
+        {% elif experiment.filled is not none and experiment.target %}
         <div class="progress-line">
           {{ meter(experiment.filled, experiment.target) }}
           <span class="num">{{ experiment.filled }}<span class="of">/{{ experiment.target }}</span></span>

{labnotes-0.0.31 → labnotes-0.0.33}/src/labnotes/tui/run_app.py

@@ -48,6 +48,7 @@ class RunApp(App[None]):
         )
         self.concurrency = 1
         self.idle = False
+        self.next_run: str | None = None
         self.ended: set[str] = set()
         self.started: dict[str, float] = {}
         self.pending: set[str] = set()
@@ -98,6 +99,8 @@ class RunApp(App[None]):
                 self.idle = False
                 self.pending.discard(run)
                 self.started[run] = time.monotonic()
+                if run == self.next_run:
+                    self.show("")
                 args = " ".join(param_args(event["params"]))  # type: ignore[arg-type]
                 cells = (run, args, "running", format_elapsed(0))
                 for column, cell in zip(COLUMNS, cells):
@@ -116,6 +119,7 @@ class RunApp(App[None]):
                 self.reorder(event, table.cursor_row)
                 table.move_cursor(row=table.get_row_index(run))
                 self.show(describe_event(event))
+                self.next_run = run
             case "deselected":
                 self.pending.discard(run)
                 self.set_cell(run, "status", dim("deselected"))
@@ -178,6 +182,7 @@ class RunApp(App[None]):
             self.set_cell(run, "time", format_elapsed(time.monotonic() - began))
 
     def show(self, text: str) -> None:
+        self.next_run = None
         self.query_one("#status", Static).update(text)
 
     def action_interrupt(self) -> None: