labnotes 0.0.37__tar.gz → 0.0.38__tar.gz

{labnotes-0.0.37 → labnotes-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.37
+Version: 0.0.38
 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.37 → labnotes-0.0.38}/src/labnotes/experiment_progress.py

@@ -19,6 +19,8 @@ async def experiment_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
     )

{labnotes-0.0.37 → labnotes-0.0.38}/src/labnotes/summarize_config.py

@@ -15,12 +15,14 @@ def summarize_config(config: dict[str, object] | None) -> dict[str, object]:
     cells = prod(len(values) for values in varies.values())
     command = config.get("command")
     counts = config.get("counts")
+    adhoc = config.get("mode") == "adhoc"
     return {
         "fixed": {},
         "varies": varies,
         "cell_count": cells,
         "runs_per_cell": repeats,
-        "target": cells * repeats if repeats is not None else None,
+        "target": cells * repeats if repeats is not None and not adhoc else None,
         "completed_run": counts if isinstance(counts, str) else DEFAULT_COUNTS,
+        "mode": "adhoc" if adhoc else "fill",
         "other": {} if command is None else {"command": command},
     }

{labnotes-0.0.37 → labnotes-0.0.38}/src/labnotes/templates/experiment.html

@@ -32,7 +32,7 @@
   <div class="figure">
     <div class="figure-label">Cells</div>
     <div class="figure-value">{{ e.cell_count }}</div>
-    <div class="figure-note">{% if e.runs_per_cell %}<span class="num">{{ e.runs_per_cell }}</span> runs each{% else %}no experiment.toml{% endif %}</div>
+    <div class="figure-note">{% if e.mode == "adhoc" %}ad-hoc, <span class="num">{{ e.runs_per_cell }}</span> runs each time{% elif e.runs_per_cell %}<span class="num">{{ e.runs_per_cell }}</span> runs each{% else %}no experiment.toml{% endif %}</div>
   </div>
 </section>
 
@@ -90,10 +90,11 @@
       <tr>
         {% for label in row.labels %}<th scope="row" class="label">{{ label | value }}</th>{% endfor %}
         {% for cell in row.cells %}
-        {% set done = e.runs_per_cell and cell.completed >= e.runs_per_cell %}
+        {% set goal = e.runs_per_cell if e.mode == "fill" %}
+        {% set done = goal and cell.completed >= goal %}
         <td class="cell{{ ' done' if done }}{{ ' empty' if not cell.runs }}" title="{{ cell['values'].items() | map('join', ' = ') | join(', ') }}: {{ cell.completed }} complete of {{ cell.runs }} recorded">
-          <span class="num">{{ cell.completed }}{% if e.runs_per_cell %}<span class="of">/{{ e.runs_per_cell }}</span>{% endif %}</span>
-          {% if e.runs_per_cell %}{{ meter(cell.completed, e.runs_per_cell) }}{% endif %}
+          <span class="num">{{ cell.completed }}{% if goal %}<span class="of">/{{ goal }}</span>{% endif %}</span>
+          {% if goal %}{{ meter(cell.completed, goal) }}{% endif %}
         </td>
         {% endfor %}
       </tr>