labnotes 0.0.64__tar.gz → 0.0.65__tar.gz

{labnotes-0.0.64 → labnotes-0.0.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.64
+Version: 0.0.65
 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.64 → labnotes-0.0.65}/src/labnotes/list_experiments.py

@@ -4,7 +4,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.count_runs import count_runs
 from labnotes.experiment_runs import experiment_runs
 from labnotes.summarize_config import summarize_config
 
@@ -21,8 +21,8 @@ async def list_experiments(tables: DirSQL, mode: str) -> list[dict[str, object]]
         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)
+        [totals] = await count_runs(tables, source, str(summary["completed_run"]))
         listed.append(
-            {"name": name, "display_name": row["display_name"], **summary, **progress}
+            {"name": name, "display_name": row["display_name"], **summary, **totals}
         )
     return listed

{labnotes-0.0.64 → labnotes-0.0.65}/src/labnotes/static/experiment.js

@@ -19,11 +19,6 @@ const expand = (group, open) => {
 document.addEventListener("click", (event) => {
   const header = event.target.closest(".group-row");
   if (header) expand(header.parentElement, !header.parentElement.classList.contains("open"));
-  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");

{labnotes-0.0.64 → labnotes-0.0.65}/src/labnotes/static/labnotes.css

@@ -54,8 +54,6 @@ code, pre, .mono { font-family: var(--mono); font-size: 0.86em; }
 code { background: var(--chip); padding: 0.1em 0.35em; border-radius: 4px; }
 
 .num { font-variant-numeric: tabular-nums; }
-.muted { color: var(--ink-3); }
-.of { color: var(--ink-3); }
 
 .masthead {
   display: flex;
@@ -120,24 +118,6 @@ h3 {
   background: var(--surface);
 }
 
-/* Meter: one hue, track drawn from the same ramp. */
-.meter {
-  display: block;
-  position: relative;
-  height: 4px;
-  min-width: 3rem;
-  border-radius: 2px;
-  background: var(--track);
-  overflow: hidden;
-}
-.meter-fill {
-  position: absolute;
-  inset: 0 auto 0 0;
-  width: calc(var(--share) * 100%);
-  border-radius: 2px;
-  background: var(--accent);
-}
-
 /* Index ledger */
 .ledger {
   width: 100%;
@@ -167,15 +147,6 @@ h3 {
 .title-link { font-family: var(--serif); font-size: 1.15rem; text-decoration: none; white-space: nowrap; }
 .ledger .study { white-space: nowrap; }
 
-.design { color: var(--ink-2); font-size: 0.88rem; }
-.factor { white-space: nowrap; line-height: 1.9; }
-.factor b { font-weight: 600; color: var(--ink); font-variant-numeric: tabular-nums; }
-.times { color: var(--ink-3); margin-left: 0.45rem; }
-
-.progress-col { width: 30%; }
-.progress-line { display: grid; grid-template-columns: 1fr auto 3rem; align-items: center; gap: 0.9rem; }
-.progress-line .num { text-align: right; }
-.pct { color: var(--ink-2); }
 
 .chip {
   font-family: var(--mono);
@@ -313,11 +284,8 @@ h3 {
 .runs-table .filters .pick input { width: auto; }
 .runs-table .filters input:focus, .runs-table .filters select:focus { outline: none; border-color: var(--accent); }
 .runs-table tbody tr:last-child td { border-bottom: 0; }
-.run-row { cursor: pointer; }
 .run-row td { max-width: 24rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .run-row:hover { background: color-mix(in srgb, var(--accent) 4%, transparent); }
-.run-row[aria-expanded="true"] { background: color-mix(in srgb, var(--accent) 6%, transparent); }
-.record-row td { background: var(--paper); }
 .group-row { cursor: pointer; background: var(--paper); }
 .group-row td { font-weight: 600; white-space: nowrap; }
 .group-row .good { color: var(--good); }
@@ -379,18 +347,6 @@ h3 {
 .status.bad { color: var(--bad); }
 .counts-error { color: var(--bad); }
 
-.record {
-  display: grid;
-  grid-template-columns: max-content minmax(0, 1fr);
-  gap: 0.45rem 1.5rem;
-  margin: 0;
-  padding: 0.5rem 0 0.75rem 2.25rem;
-}
-.record dt { font-family: var(--mono); font-size: 0.78rem; color: var(--ink-3); }
-.record dd { margin: 0; min-width: 0; }
-.record code { background: none; padding: 0; word-break: break-word; }
-.record pre { margin: 0; white-space: pre-wrap; word-break: break-word; max-height: 22rem; overflow: auto; font-size: 0.78rem; color: var(--ink-2); }
-
 /* Index view toggle */
 .view-toggle {
   float: right;
@@ -431,14 +387,11 @@ h3 {
 }
 .ledger[data-view="cards"] tbody tr:hover { background: var(--surface); border-color: var(--accent); }
 .ledger[data-view="cards"] td { display: block; padding: 0; border: 0; text-align: left; }
-.ledger[data-view="cards"] .progress-col { width: auto; }
 .ledger[data-view="cards"] td[data-label]::before { content: attr(data-label) " "; color: var(--ink-3); font-size: 0.82rem; }
 
 @media (max-width: 52rem) {
   main, .masthead { padding-left: 1.1rem; padding-right: 1.1rem; }
   h1 { font-size: 2rem; }
-  .ledger .design { display: none; }
-  .progress-col { width: auto; }
 }
 
 /* Runnable python blocks in notes */

{labnotes-0.0.64 → labnotes-0.0.65}/src/labnotes/summarize_config.py

@@ -21,7 +21,6 @@ def summarize_config(config: dict[str, object] | None, mode: str) -> dict[str, o
         "varies": varies,
         "cell_count": cells,
         "runs_per_cell": repeats,
-        "target": cells * repeats if repeats is not None and fill else None,
         "completed_run": counts if isinstance(counts, str) else DEFAULT_COUNTS,
         "mode": "fill" if fill else "adhoc",
         "other": {} if command is None else {"command": command},

{labnotes-0.0.64 → labnotes-0.0.65}/src/labnotes/templates/experiment.html

@@ -86,21 +86,10 @@
       </tr>
     </thead>
     {% macro run_rows(run) %}
-      <tr class="run-row" aria-expanded="false">
+      <tr class="run-row">
         <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 %}{% if column == 'id' and nested %}<td class="mono">{{ run.id.partition('/')[2] or run.id }}</td><td></td>{% else %}<td class="{{ 'mono' if loop.first }}{{ 'num' if column == 'duration' }}">{{ run[column] | duration if column == 'duration' else run[column] | value }}</td>{% endif %}{% endfor %}
       </tr>
-      <tr class="record-row" hidden>
-        <td colspan="{{ width }}">
-          <dl class="record">
-            {% for key, value in run.items() if key != 'labnotes_completed' %}
-            <dt>{{ key }}</dt>
-            {% set shown = value | value %}
-            <dd>{% if shown | length > 80 %}<pre>{{ shown }}</pre>{% else %}<code>{{ shown }}</code>{% endif %}</dd>
-            {% endfor %}
-          </dl>
-        </td>
-      </tr>
     {% endmacro %}
     {% if nested %}
     {% for group in e.run_groups %}

{labnotes-0.0.64 → labnotes-0.0.65}/src/labnotes/templates/index.html

@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% from "macros.html" import meter, percent %}
 {% block crumbs %}<span class="crumb">{{ folder }}</span>{% endblock %}
 {% block main %}
 <section class="intro">
@@ -19,9 +18,7 @@
   <thead>
     <tr>
       <th scope="col">Experiment</th>
-      <th scope="col">Design</th>
       <th scope="col" class="num">Runs</th>
-      <th scope="col" class="progress-col">Grid filled</th>
     </tr>
   </thead>
   <tbody>
@@ -30,23 +27,9 @@
       <td>
         <a class="title-link" href="{{ url_for('experiment', name=experiment.name) }}">{{ experiment.display_name }}</a>
         {% if experiment.display_name != experiment.name %}<div class="study">{{ experiment.name }}</div>{% endif %}
-      </td>
-      <td class="design">
-        {% for key, values in experiment.varies.items() %}<span class="factor">{{ key }} <b>{{ values | length }}</b>{% if not loop.last or experiment.runs_per_cell %}<span class="times">×</span>{% endif %}</span> {% endfor %}
-        {% if experiment.runs_per_cell %}<span class="factor">runs <b>{{ experiment.runs_per_cell }}</b></span>{% endif %}
+        {% if experiment.counts_error %}<div class="counts-error" title="{{ experiment.counts_error }}">counts rule doesn't work</div>{% endif %}
       </td>
       <td class="num" data-label="Runs">{{ experiment.runs }}</td>
-      <td class="progress-col">
-        {% 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>
-          <span class="pct num">{{ percent(experiment.filled, experiment.target) }}</span>
-        </div>
-        {% else %}<span class="muted">—</span>{% endif %}
-      </td>
     </tr>
     {% endfor %}
   </tbody>

labnotes-0.0.64/src/labnotes/cell_progress.py

@@ -1,22 +0,0 @@
-from itertools import product
-
-
-def _key(value: object) -> object:
-    return int(value) if isinstance(value, bool) else value
-
-
-def cell_progress(
-    varies: dict[str, list[object]], counts: list[dict[str, object]]
-) -> list[dict[str, object]]:
-    by_cell = {tuple(_key(row[key]) for key in varies): row for row in counts}
-    cells = []
-    for values in product(*varies.values()):
-        row = by_cell.get(tuple(_key(value) for value in values), {})
-        cells.append(
-            {
-                "values": dict(zip(varies, values)),
-                "runs": row.get("runs", 0),
-                "completed": row.get("completed", 0),
-            }
-        )
-    return cells

labnotes-0.0.64/src/labnotes/experiment_progress.py

@@ -1,27 +0,0 @@
-from typing import cast
-
-from dirsql import DirSQL
-
-from labnotes.cell_progress import cell_progress
-from labnotes.count_runs import count_runs
-
-
-async def experiment_progress(
-    tables: DirSQL, source: str, summary: dict[str, object]
-) -> dict[str, object]:
-    varies = cast(dict[str, list[object]], summary["varies"])
-    completed_run = str(summary["completed_run"])
-    runs_per_cell = summary["runs_per_cell"]
-    [totals] = await count_runs(tables, source, completed_run)
-    progress: dict[str, object] = {**totals, "filled": None, "cells": []}
-    if runs_per_cell is None:
-        return progress
-    grouped = await count_runs(tables, source, completed_run, group_by=list(varies))
-    cells = cell_progress(varies, grouped)
-    progress["cells"] = cells
-    if summary["target"] is None:
-        return progress
-    progress["filled"] = sum(
-        min(cast(int, cell["completed"]), cast(int, runs_per_cell)) for cell in cells
-    )
-    return progress

labnotes-0.0.64/src/labnotes/templates/macros.html

@@ -1,10 +0,0 @@
-{% macro meter(value, total) -%}
-{%- set share = [value / total, 1] | min if total else 0 -%}
-<span class="meter" role="meter" aria-valuemin="0" aria-valuemax="{{ total }}" aria-valuenow="{{ value }}">
-  <span class="meter-fill" style="--share: {{ '%.4f' | format(share) }}"></span>
-</span>
-{%- endmacro %}
-
-{% macro percent(value, total) -%}
-{{ '%.0f' | format(100 * value / total) if total else '—' }}%
-{%- endmacro %}