labnotes 0.0.84__tar.gz → 0.0.86__tar.gz

{labnotes-0.0.84 → labnotes-0.0.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.84
+Version: 0.0.86
 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>
@@ -71,7 +71,7 @@ labnotes experiments foo runs   # foo's runs, oldest first
 Each takes `--format table` or `--format json`, which print rows and exit.
 Without `--format`, `labnotes experiments` and `labnotes experiments foo` open
 a browser in a terminal: the experiment list, Enter to open one, Escape to go
-back. An experiment shows its runs grouped by invocation; Space opens one.
+back. An experiment shows its runs grouped by invocation; Enter expands or collapses one.
 Piped, they print a table.
 
 `labnotes experiments new [NAME]` creates an experiment folder with a starter

{labnotes-0.0.84 → labnotes-0.0.86}/README.md

@@ -47,7 +47,7 @@ labnotes experiments foo runs   # foo's runs, oldest first
 Each takes `--format table` or `--format json`, which print rows and exit.
 Without `--format`, `labnotes experiments` and `labnotes experiments foo` open
 a browser in a terminal: the experiment list, Enter to open one, Escape to go
-back. An experiment shows its runs grouped by invocation; Space opens one.
+back. An experiment shows its runs grouped by invocation; Enter expands or collapses one.
 Piped, they print a table.
 
 `labnotes experiments new [NAME]` creates an experiment folder with a starter

{labnotes-0.0.84 → labnotes-0.0.86}/src/labnotes/context.md

@@ -100,7 +100,8 @@ open when they finish. Failed runs show their status in red; `f` hides or shows
 runs it again under a new id. `j` and `k` move the cursor, `g` and `G` jump to the
 first and last row. Runs not started yet show grayed as `pending`, and as
 `skipped` once stopped. Move the cursor to a pending run and press `n` to run it
-next. Space deselects a pending run so it won't run; Space again puts it back at
+next. `m` grabs a pending run; `j` and `k` move it through the queue, Enter or `m`
+drops it, Escape puts it back. Space deselects a pending run so it won't run; Space again puts it back at
 the end of the queue. `/` filters rows by params text; Enter keeps the filter,
 Escape clears it. `D` deselects every pending run the filter shows. `x` stops the
 running run under the cursor; `x` again kills it. `+` and
@@ -129,7 +130,8 @@ going. Elsewhere, it prints a line per event instead.
   waits for a daemon when none is up. `--json` prints one JSON object per line.
   Following doesn't keep the daemon up.
 - `labnotes run control NAME ACTION [ARG]` sends one live-view control to a
-  running experiment: `kill`, `retry`, `run_next` or `toggle` a run,
+  running experiment: `kill`, `retry`, `run_next` or `toggle` a run, `move` a
+  run to a place in the queue counted from 0,
   `set_concurrency` to a number, `interrupt` or `finish`.
 - A second `run` of the same experiment fails while the first is going.
 - It exits 0 even if runs fail; the summary line counts failures. If it can't

{labnotes-0.0.84 → labnotes-0.0.86}/src/labnotes/models.py

@@ -18,6 +18,7 @@ class Controls:
     kill: Callable[[str], None]
     retry: Callable[[str], None]
     finish: Callable[[], None]
+    move: Callable[[str, int], None]
 
 
 Listen = Callable[[Controls], None]

{labnotes-0.0.84 → labnotes-0.0.86}/src/labnotes/run_control.py

@@ -18,7 +18,8 @@ PARAMS = {
     name="control",
     help=(
         "Send one control to an experiment's runs, as the live view's keys do. "
-        "kill, retry, run_next and toggle take a run; set_concurrency a number; "
+        "kill, retry, run_next and toggle take a run; move a run and its new place "
+        "in the queue, from 0; set_concurrency a number; "
         "interrupt and finish nothing."
     ),
 )

{labnotes-0.0.84 → labnotes-0.0.86}/src/labnotes/runner/describe_event.py

@@ -14,6 +14,10 @@ def describe_event(event: dict[str, object]) -> str:
             return f"{event['run']} {outcome}"
         case "queued":
             return f"{event['run']} runs next."
+        case "moved":
+            pending: list[str] = event["pending"]  # type: ignore[assignment]
+            place = pending.index(str(event["run"])) + 1
+            return f"{event['run']} moved to {place} of {len(pending)} in the queue."
         case "deselected":
             return f"{event['run']} deselected."
         case "reselected":

{labnotes-0.0.84 → labnotes-0.0.86}/src/labnotes/runner/run_experiment.py

@@ -125,6 +125,13 @@ async def run_experiment(
             plan.insert(0, entry)
             arrange("queued", run)
 
+    def move(run: str, place: int) -> None:
+        entry = find(plan, run)
+        if entry is not None:
+            plan.remove(entry)
+            plan.insert(max(0, place), entry)
+            arrange("moved", run)
+
     def toggle(run: str) -> None:
         if stopping.is_set():
             return
@@ -202,7 +209,11 @@ async def run_experiment(
         ended[run] = params
         results.append(result)
 
-    listen(Controls(interrupt, run_next, set_concurrency, toggle, kill, retry, finish))
+    listen(
+        Controls(
+            interrupt, run_next, set_concurrency, toggle, kill, retry, finish, move
+        )
+    )
     fill()
     await done.wait()
     await asyncio.gather(*started)

{labnotes-0.0.84 → labnotes-0.0.86}/src/labnotes/tui/experiment_screen.py

@@ -17,7 +17,7 @@ from labnotes.tui.runs_table import RunsTable
 
 class ExperimentScreen(Screen[None]):
     BINDINGS = [
-        Binding("space", "open_invocation", "Open invocation"),
+        Binding("enter", "toggle_invocation", "Expand", priority=True),
         Binding("escape", "app.pop_screen", "Back"),
     ]
 
@@ -65,7 +65,7 @@ class ExperimentScreen(Screen[None]):
             table.add_row(*cells, key=key)
         table.move_cursor(row=row)
 
-    def action_open_invocation(self) -> None:
+    def action_toggle_invocation(self) -> None:
         table = self.query_one(DataTable)
         if not table.row_count:
             return

{labnotes-0.0.84 → labnotes-0.0.86}/src/labnotes/tui/run_app.py

@@ -23,6 +23,8 @@ PENDING, PASSED, FAILED = "○", "✓", "✗"
 SPINNER = "|/-\\"
 SKIPPED, DESELECTED = "–", "⊘"
 VIEWING_ACTIONS = {"leave", "quit", "interrupt", "command_palette"}
+GRABBED_ACTIONS = {"shift", "drop", "put_back"}
+GRABBING_ACTIONS = {*GRABBED_ACTIONS, "grab", "quit", "interrupt", "command_palette"}
 
 
 class RunApp(App[None]):
@@ -30,6 +32,11 @@ class RunApp(App[None]):
     BINDINGS = [
         Binding("ctrl+c", "interrupt", "Stop runs"),
         Binding("n", "run_next", "Run next"),
+        Binding("m", "grab", "Move"),
+        Binding("j,down", "shift(1)", priority=True),
+        Binding("k,up", "shift(-1)", priority=True),
+        Binding("enter", "drop", "Drop", priority=True),
+        Binding("escape", "put_back", "Put back"),
         Binding("space", "toggle_run", "Deselect"),
         Binding("D", "deselect_shown", "Deselect shown"),
         Binding("x", "kill_run", "Stop run"),
@@ -56,6 +63,7 @@ class RunApp(App[None]):
             lambda run: None,
             lambda run: None,
             lambda: None,
+            lambda run, place: None,
         )
         self.concurrency = 1
         self.idle = False
@@ -70,6 +78,8 @@ class RunApp(App[None]):
         self.hiding = False
         self.folders: dict[str, Path] = {}
         self.viewing: str | None = None
+        self.grabbed: str | None = None
+        self.grabbed_from: list[str] = []
         self.offsets: dict[str, int]
         self.decoders = {
             stream: codecs.getincrementaldecoder("utf-8")(errors="replace")
@@ -129,6 +139,8 @@ class RunApp(App[None]):
                     case "adhoc", [only]:
                         self.view(only["run"])  # type: ignore[index]
             case "started":
+                if run == self.grabbed:
+                    self.action_put_back()
                 self.idle = False
                 self.pending.discard(run)
                 self.started[run] = time.monotonic()
@@ -158,10 +170,10 @@ class RunApp(App[None]):
                 del self.started[run]
                 self.redraw(table.cursor_row)
             case "queued":
-                self.reorder(event, table.cursor_row)
-                table.move_cursor(row=table.get_row_index(run))
-                self.show(describe_event(event))
+                self.reposition(event, run)
                 self.next_run = run
+            case "moved":
+                self.reposition(event, run)
             case "deselected":
                 self.pending.discard(run)
                 self.set_cell(run, "status", dim(DESELECTED))
@@ -198,7 +210,14 @@ class RunApp(App[None]):
         passed = len(self.ended) - failed
         self.show(f"{passed} passed, {failed} failed. q to quit.")
 
+    def reposition(self, event: dict[str, object], run: str) -> None:
+        table = self.query_one(DataTable)
+        self.reorder(event, table.cursor_row)
+        table.move_cursor(row=table.get_row_index(run))
+        self.show(describe_event(event))
+
     def reorder(self, event: dict[str, object], row: int) -> None:
+        self.release()
         waiting: list[str] = [*event["pending"], *event["held"]]  # type: ignore[misc]
         for run in waiting:
             self.cells[run] = self.cells.pop(run)
@@ -220,6 +239,10 @@ class RunApp(App[None]):
             table.update_cell(run, column, cell, update_width=True)
 
     def check_action(self, action: str, parameters: tuple[object, ...]) -> bool:
+        if self.grabbed is not None:
+            return action in GRABBING_ACTIONS
+        if action in GRABBED_ACTIONS:
+            return False
         return self.viewing is None or action in VIEWING_ACTIONS
 
     def show_concurrency(self, event: dict[str, object]) -> None:
@@ -262,6 +285,57 @@ class RunApp(App[None]):
         if (run := self.cursor_run()) is not None:
             self.controls.run_next(run)
 
+    def queue(self) -> list[str]:
+        return [run for run in self.cells if run in self.pending]
+
+    def action_grab(self) -> None:
+        if self.grabbed is not None:
+            self.action_drop()
+            return
+        run = self.cursor_run()
+        if run not in self.pending:
+            return
+        self.grabbed = run
+        self.grabbed_from = list(self.cells)
+        self.refresh_bindings()
+        self.show(f"Moving {run}. j/k moves it, Enter drops it, Escape puts it back.")
+
+    def action_shift(self, step: int) -> None:
+        run = str(self.grabbed)
+        queue = self.queue()
+        place = queue.index(run) + step
+        if place not in range(len(queue)):
+            return
+        order = list(self.cells)
+        here, there = order.index(run), order.index(queue[place])
+        order[here], order[there] = order[there], order[here]
+        self.cells = {key: self.cells[key] for key in order}
+        self.redraw_on(run)
+
+    def action_drop(self) -> None:
+        run = str(self.grabbed)
+        self.release()
+        self.show("")
+        self.controls.move(run, self.queue().index(run))
+
+    def action_put_back(self) -> None:
+        run = str(self.grabbed)
+        self.release()
+        places = {key: place for place, key in enumerate(self.grabbed_from)}
+        ordered = sorted(self.cells, key=lambda key: places.get(key, len(places)))
+        self.cells = {key: self.cells[key] for key in ordered}
+        self.redraw_on(run)
+        self.show("")
+
+    def release(self) -> None:
+        self.grabbed = None
+        self.refresh_bindings()
+
+    def redraw_on(self, run: str) -> None:
+        table = self.query_one(DataTable)
+        self.redraw(table.cursor_row)
+        table.move_cursor(row=table.get_row_index(run))
+
     def action_toggle_run(self) -> None:
         if (run := self.cursor_run()) is not None:
             self.controls.toggle(run)
@@ -294,7 +368,8 @@ class RunApp(App[None]):
         field.focus()
 
     def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
-        self.view(str(event.row_key.value))
+        if self.grabbed is None:
+            self.view(str(event.row_key.value))
 
     def view(self, run: str) -> None:
         self.viewing = run