labnotes 0.0.81__tar.gz → 0.0.83__tar.gz

{labnotes-0.0.81 → labnotes-0.0.83}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.81
+Version: 0.0.83
 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.81 → labnotes-0.0.83}/src/labnotes/context.md

@@ -58,11 +58,11 @@ and as `display_name` in `experiments`. The folder name stays the key, so
 renaming the experiment means editing `name`.
 Each combination of `[params]` runs `repeats` times (1 if omitted), round-robin, on every
 `run`, whatever is already on disk. That is `mode = "adhoc"`, the default.
-`mode = "fill"` counts what is there: only runs that count fill a combination,
+`mode = "matrix"` counts what is there: only runs that count fill a combination,
 so running again fills in what failed or never ran. `mode` under
 `[experiments]` in `.labnotes.toml` sets it for every experiment that doesn't
 set its own.
-Each run gets a new run folder. In `fill` mode it is named for the UTC time it was planned
+Each run gets a new run folder. In `matrix` mode it is named for the UTC time it was planned
 (`runs/20261020-000429-brave-fox`). In `adhoc` mode a `run` command that plans one run names
 its folder the same way. One that plans more gets one folder named that way, and its runs nest
 inside it (`runs/20261020-000429-brave-fox/quiet-river`); the run id is that path under `runs/`. Either way, folder listings sort by start. `command` runs in a shell from the root, with

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/group_runs.py

@@ -25,7 +25,12 @@ def group_runs(
             "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"]),
+            "failed": sum(
+                1
+                for run in members
+                if not run["labnotes_completed"] and not run["labnotes_unfinished"]
+            ),
+            "unfinished": sum(1 for run in members if run["labnotes_unfinished"]),
         }
         for name, members in sorted(groups.items(), reverse=True)
     ]

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/list_runs.py

@@ -3,6 +3,8 @@ from dirsql import DirSQL
 from labnotes.models import RunView
 from labnotes.sql_quote import quote_identifier, quote_string
 
+UNFINISHED = "(ended IS NULL AND exit_code IS NULL AND error IS NULL)"
+
 
 async def list_runs(
     runs: DirSQL, source: str, completed_run: str, view: RunView
@@ -30,6 +32,7 @@ async def list_runs(
     else:
         order = "created DESC, id DESC"
     return await runs.query(
-        f"SELECT ({completed_run}) AS labnotes_completed, * FROM {source}"
+        f"SELECT ({completed_run}) AS labnotes_completed, {UNFINISHED} AS labnotes_unfinished,"
+        f" * FROM {source}"
         f"{filtered} ORDER BY {order}"
     )

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/load_experiment.py

@@ -8,6 +8,7 @@ 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.daemon.daemon_running import daemon_running
 from labnotes.experiment_notes import experiment_notes
 from labnotes.experiment_runs import experiment_runs
 from labnotes.format_value import format_value
@@ -82,6 +83,7 @@ async def load_experiment(
             for note in notes
         ],
         "runs_list": runs,
+        "runs_live": await daemon_running(root),
         "run_groups": groups,
         "run_columns": shown,
         "run_view": view,

labnotes-0.0.83/src/labnotes/modes.py

@@ -0,0 +1,2 @@
+MODES = ("matrix", "adhoc")
+DEFAULT_MODE = "adhoc"

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/read_config.py

@@ -24,7 +24,7 @@ def read_config(path: Path) -> LabnotesConfig:
     experiments = values.get("experiments", {})
     mode = experiments.get("mode", DEFAULT_MODE)
     if mode not in MODES:
-        raise ValueError(f"{path}: [experiments] mode must be fill or adhoc")
+        raise ValueError(f"{path}: [experiments] mode must be matrix or adhoc")
     concurrency = experiments.get("concurrency", 1)
     if not is_positive_int(concurrency):
         raise ValueError(

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/runner/read_experiment_config.py

@@ -44,7 +44,7 @@ def read_experiment_config(
         raise ValueError(f"{path}: counts must be a SQL condition")
     mode = values.get("mode", mode)
     if mode not in MODES:
-        raise ValueError(f"{path}: mode must be fill or adhoc")
+        raise ValueError(f"{path}: mode must be matrix or adhoc")
     concurrency = values.get("concurrency", concurrency)
     if not is_positive_int(concurrency):
         raise ValueError(f"{path}: concurrency must be a positive integer")

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/runner/run_experiment.py

@@ -37,7 +37,7 @@ async def run_experiment(
     existing = await experiment_run_ids(tables, name)
     finished: list[dict[str, object]] = []
     match experiment.mode:
-        case "fill":
+        case "matrix":
             counted = await list_experiment_runs(tables, name, experiment.counts)
             finished = [json.loads(str(r["params"])) for r in counted if r["counted"]]
     planned: set[str] = set()

labnotes-0.0.83/src/labnotes/static/elapsed.js

@@ -0,0 +1,18 @@
+const format = (seconds) => {
+  const minutes = Math.floor(seconds / 60);
+  const hours = Math.floor(minutes / 60);
+  const pad = (n) => String(n).padStart(2, "0");
+  if (hours) return `${hours}h ${pad(minutes % 60)}m`;
+  if (minutes) return `${minutes}m ${pad(seconds % 60)}s`;
+  return `${seconds}s`;
+};
+
+const tick = () => {
+  for (const cell of document.querySelectorAll(".elapsed[data-since]")) {
+    const seconds = Math.max(0, Math.floor((Date.now() - Date.parse(cell.dataset.since)) / 1000));
+    cell.textContent = format(seconds);
+  }
+};
+
+tick();
+setInterval(tick, 1000);

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/static/labnotes.css

@@ -359,6 +359,8 @@ h3 {
 .status { font-size: 0.8rem; font-weight: 700; }
 .status.good { color: var(--good); }
 .status.bad { color: var(--bad); }
+.status.interrupted, .group-row .interrupted { color: var(--ink-3); }
+.status.running, .group-row .running { color: var(--accent); }
 .counts-error { color: var(--bad); }
 
 /* Index view toggle */

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/summarize_config.py

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

{labnotes-0.0.81 → labnotes-0.0.83}/src/labnotes/templates/experiment.html

@@ -82,8 +82,8 @@
     </thead>
     {% macro run_rows(run) %}
       <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' %}<td class="mono"><a class="run-link" href="{{ url_for('run', name=e.name, run=run.id) }}">{{ run.id.partition('/')[2] or run.id if nested else run.id }}</a></td>{% if nested %}<td></td>{% endif %}{% else %}<td class="{{ 'mono' if loop.first }}{{ 'num' if column == 'duration' }}">{{ run[column] | duration if column == 'duration' else (run[column] | started if column == 'started' else run[column] | value) }}</td>{% endif %}{% endfor %}
+        <td>{% if run.labnotes_unfinished and e.runs_live %}<span class="status running" title="running">◐</span>{% elif run.labnotes_unfinished %}<span class="status interrupted" title="interrupted">–</span>{% else %}<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>{% endif %}</td>
+        {% for column in e.run_columns %}{% if column == 'id' %}<td class="mono"><a class="run-link" href="{{ url_for('run', name=e.name, run=run.id) }}">{{ run.id.partition('/')[2] or run.id if nested else run.id }}</a></td>{% if nested %}<td></td>{% endif %}{% else %}<td class="{{ 'mono' if loop.first }}{{ 'num' if column == 'duration' }}">{% if column == 'duration' and run.labnotes_unfinished and e.runs_live %}<span class="elapsed" data-since="{{ run.created }}">—</span>{% else %}{{ run[column] | duration if column == 'duration' else (run[column] | started if column == 'started' else run[column] | value) }}{% endif %}</td>{% endif %}{% endfor %}
       </tr>
     {% endmacro %}
     {% if nested %}
@@ -93,7 +93,7 @@
     {% else %}
     <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="num" title="{{ group.passed }} passed, {{ group.failed }} failed{% if group.unfinished %}, {{ group.unfinished }} {{ 'running' if e.runs_live else 'interrupted' }}{% endif %}"><span class="good">{{ group.passed }}✓</span> <span class="bad">{{ group.failed }}✕</span>{% if group.unfinished %} <span class="{{ 'running' if e.runs_live else 'interrupted' }}">{{ group.unfinished }}{{ '◐' if e.runs_live else '–' }}</span>{% endif %}</td>
         <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 %}
@@ -122,4 +122,5 @@
 <script src="{{ asset('experiment.js') }}" defer></script>
 <script src="{{ asset('local-time.js') }}" defer></script>
 <script src="{{ asset('row-link.js') }}" defer></script>
+<script src="{{ asset('elapsed.js') }}" defer></script>
 {% endblock %}

{labnotes-0.0.81 → labnotes-0.0.83}/testing-conventions.toml

@@ -14,13 +14,13 @@ reason = "last_stream is always the same str object taken from STREAMS, so is no
 path = "src/labnotes/runner/run_experiment.py"
 rules = ["mutation"]
 lines = [47]
-reason = "mode is validated to fill or adhoc; \"fill\" <= \"adhoc\" is false like ==, and both are interned literals so is equals =="
+reason = "mode is validated to matrix or adhoc; \"matrix\" <= \"adhoc\" is false like ==, and both are interned literals so is equals =="
 
 [[python.exempt]]
 path = "src/labnotes/load_experiment.py"
 rules = ["mutation"]
 lines = [59]
-reason = "summarize_config returns mode fill or adhoc; \"fill\" <= \"adhoc\" is false like ==, and both are interned literals so is equals =="
+reason = "summarize_config returns mode matrix or adhoc; \"matrix\" <= \"adhoc\" is false like ==, and both are interned literals so is equals =="
 
 [[python.exempt]]
 path = "src/labnotes/daemon/exit_when_idle.py"

{labnotes-0.0.81 → labnotes-0.0.83}/tests/integration/conftest.py

@@ -10,8 +10,10 @@ from pathlib import Path
 import pytest
 from playwright.async_api import Page, async_playwright
 
+from labnotes.daemon.socket_path import socket_path
+
 CONFIG = (
-    'name = "Alpha study"\ncommand = "go"\nrepeats = 2\nmode = "fill"\n'
+    'name = "Alpha study"\ncommand = "go"\nrepeats = 2\nmode = "matrix"\n'
     '[params]\nsource-language = ["en", "fr"]\n'
 )
 
@@ -43,6 +45,24 @@ def free_port() -> int:
         return int(sock.getsockname()[1])
 
 
+def daemon(root: Path) -> Iterator[None]:
+    labnotes = Path(sys.executable).parent / "labnotes"
+    process = subprocess.Popen(
+        [labnotes, "-c", root / ".labnotes.toml", "daemon"],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+    try:
+        for _ in range(100):
+            if socket_path(root).exists():
+                break
+            time.sleep(0.1)
+        yield
+    finally:
+        process.terminate()
+        process.wait()
+
+
 def serve(root: Path) -> Iterator[str]:
     port = free_port()
     labnotes = Path(sys.executable).parent / "labnotes"

labnotes-0.0.81/src/labnotes/modes.py

@@ -1,2 +0,0 @@
-MODES = ("fill", "adhoc")
-DEFAULT_MODE = "adhoc"