labnotes 0.0.49__tar.gz → 0.0.51__tar.gz

{labnotes-0.0.49 → labnotes-0.0.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.49
+Version: 0.0.51
 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.49 → labnotes-0.0.51}/src/labnotes/create_app.py

@@ -14,6 +14,7 @@ from starlette.templating import Jinja2Templates
 from labnotes.asset_url import asset_url
 from labnotes.drain_watch import drain_watch
 from labnotes.experiment_notes import experiment_notes
+from labnotes.format_duration import format_duration
 from labnotes.format_value import format_value
 from labnotes.list_experiments import list_experiments
 from labnotes.load_experiment import load_experiment
@@ -27,6 +28,7 @@ from labnotes.tables.open_tables import open_tables
 HERE = Path(__file__).parent
 templates = Jinja2Templates(directory=HERE / "templates")
 templates.env.filters["value"] = format_value
+templates.env.filters["duration"] = format_duration
 templates.env.globals["asset"] = asset_url
 
 

{labnotes-0.0.49 → labnotes-0.0.51}/src/labnotes/experiment_runs.py

@@ -1,5 +1,8 @@
 from labnotes.sql_quote import quote_identifier, quote_string
 
+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:
     columns = "".join(
@@ -8,6 +11,6 @@ def experiment_runs(experiment: str, params: list[str]) -> str:
         for key in params
     )
     return (
-        f"(SELECT *{columns} FROM runs"
+        f"(SELECT *{columns}, {STARTED} AS started, {DURATION} AS duration FROM runs"
         f" WHERE experiment = {quote_string(experiment)})"
     )

labnotes-0.0.51/src/labnotes/format_duration.py

@@ -0,0 +1,5 @@
+from labnotes.tui.format_elapsed import format_elapsed
+
+
+def format_duration(seconds: int | None) -> str:
+    return "—" if seconds is None else format_elapsed(seconds)

{labnotes-0.0.49 → labnotes-0.0.51}/src/labnotes/load_experiment.py

@@ -42,7 +42,7 @@ async def load_experiment(
     varies = cast(dict[str, list[object]], summary["varies"])
     source = experiment_runs(name, list(varies))
     summary = await check_counts(tables, source, summary)
-    shown = ["id", *(key for key in varies if key != "id")]
+    shown = ["id", *(key for key in varies if key != "id"), "started", "duration"]
     view = parse_run_view(params, shown)
     [totals] = await count_runs(tables, source, str(summary["completed_run"]))
     notes = await experiment_notes(tables, root, name)

labnotes-0.0.51/src/labnotes/static/experiment.js

@@ -0,0 +1,61 @@
+const summary = document.querySelector(".config-summary");
+const open = document.querySelector(".config-open");
+const dialog = document.querySelector(".config-file");
+
+if (summary) {
+  const fit = () => {
+    open.hidden = summary.scrollWidth <= summary.clientWidth;
+  };
+  new ResizeObserver(fit).observe(summary);
+  open.addEventListener("click", () => dialog.showModal());
+  dialog.querySelector(".config-close").addEventListener("click", () => dialog.close());
+}
+
+document.addEventListener("click", (event) => {
+  const row = event.target.closest(".run-row");
+  if (!row || getSelection().toString()) return;
+  const record = row.nextElementSibling;
+  record.hidden = !record.hidden;
+  row.setAttribute("aria-expanded", String(!record.hidden));
+});
+
+const filters = document.querySelector("#run-filters");
+
+if (filters) {
+  const runs = document.querySelector("#runs");
+  let pending;
+  let latest;
+
+  const refresh = async () => {
+    clearTimeout(pending);
+    const params = new URLSearchParams();
+    for (const [key, value] of new FormData(filters)) {
+      if (value) params.append(key, value);
+    }
+    const url = new URL(location.href);
+    url.search = params;
+    latest = url.href;
+    const response = await fetch(url);
+    if (latest !== url.href) return;
+    const fresh = new DOMParser()
+      .parseFromString(await response.text(), "text/html")
+      .querySelector("#runs");
+    runs.querySelector(".narrowed")?.remove();
+    const narrowed = fresh.querySelector(".narrowed");
+    if (narrowed) runs.prepend(narrowed);
+    for (const part of ["thead tr:first-child", "tbody"]) {
+      runs.querySelector(part).replaceWith(fresh.querySelector(part));
+    }
+    history.replaceState(null, "", url);
+  };
+
+  filters.addEventListener("submit", (event) => {
+    event.preventDefault();
+    refresh();
+  });
+  document.addEventListener("input", (event) => {
+    if (event.target.form !== filters || event.target.type !== "search") return;
+    clearTimeout(pending);
+    pending = setTimeout(refresh, 250);
+  });
+}

{labnotes-0.0.49 → labnotes-0.0.51}/src/labnotes/templates/experiment.html

@@ -78,7 +78,7 @@
       {% for run in e.runs_list %}
       <tr class="run-row" aria-expanded="false">
         <td><span class="status {{ 'good' if run.labnotes_completed else 'bad' }}" title="{{ 'complete' if run.labnotes_completed else 'not complete' }}">{{ '✓' if run.labnotes_completed else '✕' }}</span></td>
-        {% for column in e.run_columns %}<td class="{{ 'mono' if loop.first }}">{{ run[column] | value }}</td>{% endfor %}
+        {% for column in e.run_columns %}<td class="{{ 'mono' if loop.first }}{{ 'num' if column == 'duration' }}">{{ run[column] | duration if column == 'duration' else run[column] | value }}</td>{% endfor %}
       </tr>
       <tr class="record-row" hidden>
         <td colspan="{{ e.run_columns | length + 1 }}">

{labnotes-0.0.49 → labnotes-0.0.51}/src/labnotes/tui/run_app.py

@@ -21,6 +21,7 @@ STREAMS = ("stdout", "stderr")
 PENDING, PASSED, FAILED = "○", "✓", "✗"
 SPINNER = "|/-\\"
 SKIPPED, DESELECTED = "–", "⊘"
+VIEWING_ACTIONS = {"leave", "quit", "interrupt", "command_palette"}
 
 
 class RunApp(App[None]):
@@ -206,6 +207,9 @@ class RunApp(App[None]):
         if run in table.rows:
             table.update_cell(run, column, cell, update_width=True)
 
+    def check_action(self, action: str, parameters: tuple[object, ...]) -> bool:
+        return self.viewing is None or action in VIEWING_ACTIONS
+
     def show_concurrency(self, event: dict[str, object]) -> None:
         self.concurrency = int(event["concurrency"])  # type: ignore[call-overload]
         self.sub_title = f"{self.concurrency} at a time"
@@ -290,7 +294,9 @@ class RunApp(App[None]):
         self.query_one(Log).clear()
         self.query_one(DataTable).display = False
         self.query_one(Log).display = True
-        self.show(f"{run} stdout and stderr. Escape goes back.")
+        self.sub_title = run
+        self.show("")
+        self.refresh_bindings()
         self.follow()
 
     def follow(self) -> None:
@@ -319,6 +325,8 @@ class RunApp(App[None]):
             self.viewing = None
             self.query_one(Log).display = False
             self.query_one(DataTable).display = True
+            self.sub_title = f"{self.concurrency} at a time"
+            self.refresh_bindings()
             if self.idle:
                 self.show_summary()
             else:

labnotes-0.0.49/src/labnotes/static/experiment.js

@@ -1,21 +0,0 @@
-const summary = document.querySelector(".config-summary");
-const open = document.querySelector(".config-open");
-const dialog = document.querySelector(".config-file");
-
-if (summary) {
-  const fit = () => {
-    open.hidden = summary.scrollWidth <= summary.clientWidth;
-  };
-  new ResizeObserver(fit).observe(summary);
-  open.addEventListener("click", () => dialog.showModal());
-  dialog.querySelector(".config-close").addEventListener("click", () => dialog.close());
-}
-
-for (const row of document.querySelectorAll(".run-row")) {
-  row.addEventListener("click", () => {
-    if (getSelection().toString()) return;
-    const record = row.nextElementSibling;
-    record.hidden = !record.hidden;
-    row.setAttribute("aria-expanded", String(!record.hidden));
-  });
-}