labnotes 0.0.75__tar.gz → 0.0.76__tar.gz

{labnotes-0.0.75 → labnotes-0.0.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.75
+Version: 0.0.76
 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.76/src/labnotes/count_groups.py

@@ -0,0 +1,13 @@
+from dirsql import DirSQL
+
+INVOCATION = (
+    "CASE WHEN instr(id, '/') > 0 THEN substr(id, 1, instr(id, '/') - 1) ELSE id END"
+)
+
+
+async def count_groups(runs: DirSQL, source: str) -> dict[str, int]:
+    found = await runs.query(
+        f"SELECT {INVOCATION} AS invocation, COUNT(*) AS runs"
+        f" FROM {source} GROUP BY invocation"
+    )
+    return {str(row["invocation"]): int(str(row["runs"])) for row in found}

{labnotes-0.0.75 → labnotes-0.0.76}/src/labnotes/group_runs.py

@@ -1,7 +1,14 @@
+from collections.abc import Mapping, Sequence
+
 from labnotes.invocation_started import invocation_started
+from labnotes.shared_params import shared_params
 
 
-def group_runs(runs: list[dict[str, object]]) -> list[dict[str, object]]:
+def group_runs(
+    runs: list[dict[str, object]],
+    params: Sequence[str],
+    totals: Mapping[str, int],
+) -> list[dict[str, object]]:
     groups: dict[str, list[dict[str, object]]] = {}
     for run in runs:
         groups.setdefault(str(run["id"]).partition("/")[0], []).append(run)
@@ -10,6 +17,8 @@ def group_runs(runs: list[dict[str, object]]) -> list[dict[str, object]]:
             "name": name,
             "started": invocation_started(name),
             "runs": members,
+            "total": totals.get(name, len(members)),
+            "shared": shared_params(members, params),
             "passed": sum(1 for run in members if run["labnotes_completed"]),
             "failed": sum(1 for run in members if not run["labnotes_completed"]),
         }

{labnotes-0.0.75 → labnotes-0.0.76}/src/labnotes/load_experiment.py

@@ -6,6 +6,7 @@ from typing import cast
 from dirsql import DirSQL
 
 from labnotes.check_counts import check_counts
+from labnotes.count_groups import count_groups
 from labnotes.count_runs import count_runs
 from labnotes.experiment_notes import experiment_notes
 from labnotes.experiment_runs import experiment_runs
@@ -57,6 +58,11 @@ async def load_experiment(
     notes = await experiment_notes(tables, root, name)
     runs = await list_runs(tables, source, str(summary["completed_run"]), view)
     nested = summary["mode"] == "adhoc" and await nests_runs(tables, source)
+    groups = (
+        group_runs(runs, list(choices), await count_groups(tables, source))
+        if nested
+        else None
+    )
     return {
         "name": row["name"],
         "display_name": row["display_name"],
@@ -76,7 +82,7 @@ async def load_experiment(
             for note in notes
         ],
         "runs_list": runs,
-        "run_groups": group_runs(runs) if nested else None,
+        "run_groups": groups,
         "run_columns": shown,
         "run_view": view,
         "run_choices": choices,

labnotes-0.0.76/src/labnotes/shared_params.py

@@ -0,0 +1,10 @@
+from collections.abc import Sequence
+
+
+def shared_params(
+    runs: list[dict[str, object]], params: Sequence[str]
+) -> dict[str, object]:
+    first, *rest = runs
+    return {
+        key: first[key] for key in params if all(run[key] == first[key] for run in rest)
+    }

{labnotes-0.0.75 → labnotes-0.0.76}/src/labnotes/static/experiment.js

@@ -16,9 +16,15 @@ const expand = (group, open) => {
   group.querySelector(".group-toggle").setAttribute("aria-expanded", String(open));
 };
 
+const opened = new Set();
+
 document.addEventListener("click", (event) => {
-  const header = event.target.closest(".group-row");
-  if (header) expand(header.parentElement, !header.parentElement.classList.contains("open"));
+  const group = event.target.closest(".group-row")?.parentElement;
+  if (!group) return;
+  const opening = !group.classList.contains("open");
+  expand(group, opening);
+  if (opening) opened.add(group.dataset.name);
+  else opened.delete(group.dataset.name);
 });
 
 const filters = document.querySelector("#run-filters");
@@ -49,7 +55,6 @@ if (filters) {
     for (const input of filters.querySelectorAll("input[type=hidden]")) input.remove();
     filters.prepend(...fresh.querySelectorAll("#run-filters input[type=hidden]"));
     const table = runs.querySelector("table");
-    const opened = new Set([...table.querySelectorAll(".group.open")].map((group) => group.dataset.name));
     for (const body of table.querySelectorAll("tbody")) body.remove();
     for (const body of fresh.querySelectorAll("tbody")) {
       table.append(body);

{labnotes-0.0.75 → labnotes-0.0.76}/src/labnotes/templates/experiment.html

@@ -88,12 +88,12 @@
     {% endmacro %}
     {% if nested %}
     {% for group in e.run_groups %}
-    <tbody class="group" data-name="{{ group.name }}">
+    <tbody class="group{{ ' open' if narrowed }}" data-name="{{ group.name }}">
       <tr class="group-row">
         <td class="num" title="{{ group.passed }} passed, {{ group.failed }} failed"><span class="good">{{ group.passed }}✓</span> <span class="bad">{{ group.failed }}✕</span></td>
-        <td class="mono"><button type="button" class="group-toggle" aria-expanded="false">{{ group.name }}</button></td>
-        <td class="num">{{ group.runs | length }}</td>
-        {% for column in e.run_columns[1:] %}<td>{{ group.started | started if column == 'started' and group.started }}</td>{% endfor %}
+        <td class="mono"><button type="button" class="group-toggle" aria-expanded="{{ 'true' if narrowed else 'false' }}">{{ group.name }}</button></td>
+        <td class="num">{{ group.runs | length }}{% if narrowed %} of {{ group.total }}{% endif %}</td>
+        {% for column in e.run_columns[1:] %}<td>{% if column == 'started' %}{{ group.started | started if group.started }}{% elif column in group.shared %}{{ group.shared[column] | value }}{% endif %}</td>{% endfor %}
       </tr>
       {% for run in group.runs %}{{ run_rows(run) }}{% endfor %}
     </tbody>