labnotes 0.2.23__tar.gz → 0.2.25__tar.gz

{labnotes-0.2.23 → labnotes-0.2.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.2.23
+Version: 0.2.25
 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.2.23 → labnotes-0.2.25}/src/labnotes/daemon/server.py

@@ -62,6 +62,7 @@ class ExperimentDaemon:
             cast(str | None, options.get("command_line")),
             cast(str | None, options.get("run_id")),
             cast(int | None, options.get("retries")),
+            cast(float | None, options.get("retry_wait")),
             bool(options.get("replace_capped")),
         )
         path = str(selected.run_state.path)

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/experiments.py

@@ -71,6 +71,14 @@ class PassthroughCommand(click.Command):
     " with continues, by a later run. Overrides experiment.toml and"
     " .labnotes.toml; 3 if none sets it.",
 )
+@click.option(
+    "--retry-wait",
+    type=click.FloatRange(min=0),
+    metavar="SECONDS",
+    help="With run: seconds before the first retry of an exit 75; each later"
+    " retry waits twice as long. Overrides experiment.toml and .labnotes.toml;"
+    " 30 if none sets it.",
+)
 @click.option(
     "--replace-capped",
     is_flag=True,
@@ -141,6 +149,7 @@ def experiments(
     concurrency: int | None,
     run_id: str | None,
     retries: int | None,
+    retry_wait: float | None,
     replace_capped: bool,
     headless: bool,
     experiment_config: Path | None,
@@ -210,6 +219,7 @@ def experiments(
                                 "command_line": ctx.meta.get(COMMAND_LINE),
                                 "run_id": run_id,
                                 "retries": retries,
+                                "retry_wait": retry_wait,
                                 "replace_capped": replace_capped,
                             },
                         },
@@ -241,6 +251,7 @@ def experiments(
                             ctx.meta.get(COMMAND_LINE),
                             run_id,
                             retries,
+                            retry_wait,
                             replace_capped,
                         )
                     )
@@ -262,6 +273,7 @@ def experiments(
                 or concurrency is not None
                 or run_id is not None
                 or retries is not None
+                or retry_wait is not None
                 or replace_capped
                 or experiment_config is not None
                 or timeout is not None
@@ -287,6 +299,8 @@ def experiments(
         raise click.UsageError("--run-id needs run.")
     if retries is not None:
         raise click.UsageError("--retries needs run.")
+    if retry_wait is not None:
+        raise click.UsageError("--retry-wait needs run.")
     if replace_capped:
         raise click.UsageError("--replace-capped needs run.")
     if ctx.args:

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/models.py

@@ -5,7 +5,7 @@ from typing import Any, Protocol
 
 from labnotes.default_counts import DEFAULT_COUNTS
 from labnotes.memory_interval import DEFAULT_MEMORY_INTERVAL
-from labnotes.retries import DEFAULT_RETRIES
+from labnotes.retries import DEFAULT_RETRIES, RETRY_SECONDS
 
 Report = Callable[[dict[str, object]], None]
 
@@ -44,6 +44,7 @@ class LabnotesConfig:
     runs: str
     concurrency: int = 1
     retries: int = DEFAULT_RETRIES
+    retry_wait: float = RETRY_SECONDS
     # Set when the config's folder is itself the one experiment.
     experiment: str | None = None
     # [experiment] in .labnotes.toml, under each experiment.toml.
@@ -59,6 +60,7 @@ class ExperimentConfig:
     counts: str = DEFAULT_COUNTS
     concurrency: int = 1
     retries: int = DEFAULT_RETRIES
+    retry_wait: float = RETRY_SECONDS
     meta: str | None = None
     memory_interval: float = DEFAULT_MEMORY_INTERVAL
     setup: str | None = None

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/read_config.py

@@ -3,11 +3,12 @@ from pathlib import Path
 
 from labnotes.models import LabnotesConfig
 from labnotes.is_non_negative_int import is_non_negative_int
+from labnotes.is_non_negative_number import is_non_negative_number
 from labnotes.is_positive_int import is_positive_int
 from labnotes.config_migration import REMOVED_MODE
 from labnotes.runner.read_experiment_config import SETTINGS
 from labnotes.read_path import DEFAULT_PATHS, read_path
-from labnotes.retries import DEFAULT_RETRIES
+from labnotes.retries import DEFAULT_RETRIES, RETRY_SECONDS
 
 CONFIG_FILE = ".labnotes.toml"
 
@@ -51,12 +52,16 @@ def read_config(path: Path) -> LabnotesConfig:
     retries = experiments.get("retries", DEFAULT_RETRIES)
     if not is_non_negative_int(retries):
         raise ValueError(f"{path}: [experiments] retries must be 0 or more")
+    retry_wait = experiments.get("retry_wait", RETRY_SECONDS)
+    if not is_non_negative_number(retry_wait):
+        raise ValueError(f"{path}: [experiments] retry_wait must be 0 or more seconds")
     return LabnotesConfig(
         path.resolve(),
         root,
         **paths,
         concurrency=concurrency,
         retries=retries,
+        retry_wait=retry_wait,
         experiment=root.name if single else None,
         defaults=defaults,
     )

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/read_path.py

@@ -16,7 +16,7 @@ PLACEHOLDERS = {
 # experiments is missing: one experiment has no folder to point at.
 SINGLE_PLACEHOLDERS: dict[str, set[str]] = {"files": set(), "runs": {"run"}}
 # Keys other readers own, so the path check lets them through.
-OTHER_KEYS = {"experiments": {"mode", "concurrency", "retries"}}
+OTHER_KEYS = {"experiments": {"mode", "concurrency", "retries", "retry_wait"}}
 PLACEHOLDER = re.compile(r"\{([^}]*)\}")
 SINGLE = "experiment.toml sits next to .labnotes.toml, so this folder is the experiment"
 

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/runner/prepare_experiment.py

@@ -18,6 +18,7 @@ async def prepare_experiment(
     setup: str | None = None,
     teardown: str | None = None,
     retries: int | None = None,
+    retry_wait: float | None = None,
     replace_capped: bool = False,
 ) -> tuple[ExperimentConfig, int]:
     if config.experiment not in (None, name):
@@ -36,6 +37,7 @@ async def prepare_experiment(
         config.concurrency,
         config.retries,
         config.defaults,
+        config.retry_wait,
     )
     if setup is not None:
         experiment = dataclasses.replace(experiment, setup=setup)
@@ -43,6 +45,8 @@ async def prepare_experiment(
         experiment = dataclasses.replace(experiment, teardown=teardown)
     if retries is not None:
         experiment = dataclasses.replace(experiment, retries=retries)
+    if retry_wait is not None:
+        experiment = dataclasses.replace(experiment, retry_wait=retry_wait)
     if replace_capped:
         experiment = dataclasses.replace(experiment, replace_capped=True)
     if only:

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/runner/read_experiment_config.py

@@ -11,6 +11,7 @@ from labnotes.is_non_negative_number import is_non_negative_number
 from labnotes.memory_interval import DEFAULT_MEMORY_INTERVAL
 from labnotes.is_positive_int import is_positive_int
 from labnotes.config_migration import MISSING_CONTINUES, REMOVED_MODE
+from labnotes.retries import RETRY_SECONDS
 
 SETTINGS = {
     "name",
@@ -20,6 +21,7 @@ SETTINGS = {
     "counts",
     "concurrency",
     "retries",
+    "retry_wait",
     "meta",
     "memory_interval",
     "views",
@@ -39,6 +41,7 @@ def read_experiment_config(
     concurrency: int,
     retries: int,
     defaults: dict[str, object] | None = None,
+    retry_wait: float = RETRY_SECONDS,
 ) -> ExperimentConfig:
     try:
         layer = tomllib.loads(source)
@@ -78,6 +81,9 @@ def read_experiment_config(
     retries = values.get("retries", retries)
     if not is_non_negative_int(retries):
         raise ValueError(f"{path}: retries must be 0 or more")
+    retry_wait = values.get("retry_wait", retry_wait)
+    if not is_non_negative_number(retry_wait):
+        raise ValueError(f"{path}: retry_wait must be 0 or more seconds")
     meta = values.get("meta")
     if meta is not None and (not isinstance(meta, str) or not meta.strip()):
         raise ValueError(f"{path}: meta must be a string")
@@ -127,6 +133,7 @@ def read_experiment_config(
         counts,
         concurrency,
         retries,
+        retry_wait,
         meta,
         memory_interval,
         values.get("setup"),

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/runner/run_experiment.py

@@ -14,7 +14,7 @@ from labnotes.models import (
     Listen,
     Report,
 )
-from labnotes.retries import RETRY_EXIT_CODE, RETRY_SECONDS
+from labnotes.retries import RETRY_EXIT_CODE
 from labnotes.runner.check_hook_placeholders import check_hook_placeholders
 from labnotes.runner.claim_run import LOCK_FILE, claim_run
 from labnotes.runner.execute_run import execute_run
@@ -49,7 +49,6 @@ async def run_experiment(
     report: Report,
     listen: Listen,
     timeout: float | None = None,
-    retry_seconds: float = RETRY_SECONDS,
     only: dict[str, list[str]] | None = None,
     args: list[str] | None = None,
     environment: dict[str, str] | None = None,
@@ -254,7 +253,7 @@ async def run_experiment(
         if tried >= experiment.retries:
             emit({"event": "gave up", "run": run, "retries": tried})
             return
-        seconds = retry_seconds * 2 ** (tried - earlier.get(run, 0))
+        seconds = experiment.retry_wait * 2 ** (tried - earlier.get(run, 0))
 
         def due() -> None:
             del waiting[run]

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/runner/start_experiment.py

@@ -33,6 +33,7 @@ def start_experiment(
     command_line: str | None = None,
     run_id: str | None = None,
     retries: int | None = None,
+    retry_wait: float | None = None,
     replace_capped: bool = False,
 ) -> ExperimentStart:
     state = RunState.create(config, name)
@@ -48,6 +49,7 @@ def start_experiment(
             setup,
             teardown,
             retries,
+            retry_wait,
             replace_capped,
         )
         await finalize_lost_runs(config)

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/static/note-edit.js

@@ -14,7 +14,7 @@ export function attach(note, focus) {
       editing = edit(note, prose, status);
       if (focus) editing.view.focus();
     },
-    () => {},
+    (error) => console.error("Editor import failed:", error),
   );
 
   const changes = new EventSource(note.dataset.changesUrl);

{labnotes-0.2.23 → labnotes-0.2.25}/src/labnotes/static/run-output.js

@@ -1,4 +1,4 @@
-import { AnsiUp } from "https://esm.sh/ansi_up@6.0.6";
+import { AnsiUp } from "/static/vendor/ansi_up.js";
 
 const output = document.querySelector(".run-output");
 const state = document.querySelector(".run-state");