labnotes 0.0.37__tar.gz → 0.0.39__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.37
+Version: 0.0.39
 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.39}/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.39}/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.39}/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>

{labnotes-0.0.37 → labnotes-0.0.39}/src/labnotes/tui/run_app.py

@@ -17,6 +17,8 @@ from labnotes.tui.format_elapsed import format_elapsed
 
 COLUMNS = ("run", "params", "status", "time")
 OTHER_STREAM = {"stdout": "stderr", "stderr": "stdout"}
+PENDING, RUNNING, PASSED, FAILED = "○", "◐", "✓", "✗"
+SKIPPED, DESELECTED = "–", "⊘"
 
 
 class RunApp(App[None]):
@@ -101,7 +103,7 @@ class RunApp(App[None]):
             case "planned":
                 for planned in event["runs"]:  # type: ignore[attr-defined]
                     args = " ".join(param_args(planned["params"]))
-                    cells = (planned["run"], args, "pending", "")
+                    cells = (planned["run"], args, PENDING, "")
                     self.cells[planned["run"]] = [*map(dim, cells)]
                     self.pending.add(planned["run"])
                 self.redraw(table.cursor_row)
@@ -118,13 +120,16 @@ class RunApp(App[None]):
                 if run == self.next_run:
                     self.show("")
                 args = " ".join(param_args(event["params"]))  # type: ignore[arg-type]
-                cells = (run, args, "running", format_elapsed(0))
+                cells = (run, args, RUNNING, format_elapsed(0))
                 for column, cell in zip(COLUMNS, cells):
                     self.set_cell(run, column, cell)
             case "ended":
-                outcome = event["error"] or f"exited {event['exit_code']}"
-                style = "red" if event["error"] or event["exit_code"] else ""
-                if style:
+                outcome = PASSED
+                style = ""
+                if event["error"] or event["exit_code"]:
+                    reason = event["error"] or f"exited {event['exit_code']}"
+                    outcome = f"{FAILED} {reason}"
+                    style = "red"
                     self.failed.add(run)
                 self.ended.add(run)
                 self.set_cell(run, "status", Text(str(outcome), style=style))
@@ -138,18 +143,18 @@ class RunApp(App[None]):
                 self.next_run = run
             case "deselected":
                 self.pending.discard(run)
-                self.set_cell(run, "status", dim("deselected"))
+                self.set_cell(run, "status", dim(DESELECTED))
                 self.reorder(event, table.cursor_row)
                 self.show(describe_event(event))
             case "reselected":
                 self.pending.add(run)
-                self.set_cell(run, "status", dim("pending"))
+                self.set_cell(run, "status", dim(PENDING))
                 self.reorder(event, table.cursor_row)
                 self.show(describe_event(event))
             case "retried":
                 again = str(event["retry"])
                 args = " ".join(param_args(event["params"]))  # type: ignore[arg-type]
-                self.cells[again] = [*map(dim, (again, args, "pending", ""))]
+                self.cells[again] = [*map(dim, (again, args, PENDING, ""))]
                 self.pending.add(again)
                 self.redraw(table.cursor_row)
                 self.show(describe_event(event))
@@ -161,7 +166,7 @@ class RunApp(App[None]):
                 self.show(describe_event(event))
             case "stopping":
                 for pending in self.pending:
-                    self.set_cell(pending, "status", dim("skipped"))
+                    self.set_cell(pending, "status", dim(SKIPPED))
                 self.show(describe_event(event))
             case _:
                 self.show(describe_event(event))