labnotes 0.0.50__tar.gz → 0.0.52__tar.gz

{labnotes-0.0.50 → labnotes-0.0.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.50
+Version: 0.0.52
 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.50 → labnotes-0.0.52}/src/labnotes/create_app.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from starlette.applications import Starlette
 from starlette.exceptions import HTTPException
 from starlette.requests import Request
-from starlette.responses import HTMLResponse, Response
+from starlette.responses import HTMLResponse, JSONResponse, Response
 from starlette.routing import Mount, Route
 from starlette.staticfiles import StaticFiles
 from starlette.templating import Jinja2Templates
@@ -21,6 +21,7 @@ from labnotes.load_experiment import load_experiment
 from labnotes.models import LabnotesConfig
 from labnotes.notebook_kernel import NotebookKernel
 from labnotes.python_blocks import python_blocks
+from labnotes.save_note import save_note
 from labnotes.saved_outputs import saved_outputs
 from labnotes.stop_idle_kernels import stop_idle_kernels
 from labnotes.tables.open_tables import open_tables
@@ -73,7 +74,7 @@ def create_app(config: LabnotesConfig, kernel_idle_minutes: float) -> Starlette:
             request, "experiment.html", {"experiment": loaded}
         )
 
-    async def note_content(request: Request) -> str:
+    async def find_note(request: Request) -> dict[str, str]:
         if request.headers.get("content-type") != "application/json":
             raise HTTPException(415, "Send JSON")
         name = request.path_params["name"]
@@ -84,10 +85,21 @@ def create_app(config: LabnotesConfig, kernel_idle_minutes: float) -> Starlette:
         if not found:
             raise HTTPException(404, "No such note")
         [note] = found
-        return note["content"]
+        return note
+
+    async def put_note(request: Request) -> Response:
+        note = await find_note(request)
+        body = await request.json()
+        base, content = body.get("base"), body.get("content")
+        if not isinstance(base, str) or not isinstance(content, str):
+            raise HTTPException(400, "Send base and content as strings")
+        current = save_note(Path(note["path"]), base, content)
+        if current is not None:
+            return JSONResponse({"content": current}, status_code=409)
+        return Response(status_code=204)
 
     async def run_block(request: Request) -> Response:
-        blocks = python_blocks(await note_content(request))
+        blocks = python_blocks((await find_note(request))["content"])
         key = (request.path_params["name"], request.path_params["note"])
         block = (await request.json()).get("block")
         if not isinstance(block, int) or not 0 <= block < len(blocks):
@@ -97,7 +109,7 @@ def create_app(config: LabnotesConfig, kernel_idle_minutes: float) -> Starlette:
         return HTMLResponse(await kernels[key].run(blocks[block]))
 
     async def restart_kernel(request: Request) -> Response:
-        await note_content(request)
+        await find_note(request)
         kernel = kernels.get((request.path_params["name"], request.path_params["note"]))
         if kernel is not None:
             await kernel.restart()
@@ -107,6 +119,7 @@ def create_app(config: LabnotesConfig, kernel_idle_minutes: float) -> Starlette:
         routes=[
             Route("/", index),
             Route("/experiments/{name}", experiment),
+            Route("/experiments/{name}/notes/{note:path}", put_note, methods=["PUT"]),
             Route(
                 "/experiments/{name}/notes/{note:path}/run",
                 run_block,

{labnotes-0.0.50 → labnotes-0.0.52}/src/labnotes/experiment_notes.py

@@ -17,6 +17,7 @@ async def experiment_notes(
     return [
         {
             "name": str(row["filename"]),
+            "path": str(root / str(row["path"])),
             "content": (root / str(row["path"])).read_text(encoding="utf-8"),
         }
         for row in rows

labnotes-0.0.52/src/labnotes/save_note.py

@@ -0,0 +1,9 @@
+from pathlib import Path
+
+
+def save_note(path: Path, base: str, content: str) -> str | None:
+    current = path.read_text(encoding="utf-8")
+    if current != base:
+        return current
+    path.write_text(content, encoding="utf-8")
+    return None

{labnotes-0.0.50 → labnotes-0.0.52}/src/labnotes/tui/run_app.py

@@ -21,6 +21,7 @@ STREAMS = ("stdout", "stderr")
 PENDING, PASSED, FAILED = "○", "✓", "✗"
 SPINNER = "|/-\\"
 SKIPPED, DESELECTED = "–", "⊘"
+VIEWING_ACTIONS = {"leave", "quit", "interrupt", "command_palette"}
 
 
 class RunApp(App[None]):
@@ -206,6 +207,9 @@ class RunApp(App[None]):
         if run in table.rows:
             table.update_cell(run, column, cell, update_width=True)
 
+    def check_action(self, action: str, parameters: tuple[object, ...]) -> bool:
+        return self.viewing is None or action in VIEWING_ACTIONS
+
     def show_concurrency(self, event: dict[str, object]) -> None:
         self.concurrency = int(event["concurrency"])  # type: ignore[call-overload]
         self.sub_title = f"{self.concurrency} at a time"
@@ -290,7 +294,9 @@ class RunApp(App[None]):
         self.query_one(Log).clear()
         self.query_one(DataTable).display = False
         self.query_one(Log).display = True
-        self.show(f"{run} stdout and stderr. Escape goes back.")
+        self.sub_title = run
+        self.show("")
+        self.refresh_bindings()
         self.follow()
 
     def follow(self) -> None:
@@ -319,6 +325,8 @@ class RunApp(App[None]):
             self.viewing = None
             self.query_one(Log).display = False
             self.query_one(DataTable).display = True
+            self.sub_title = f"{self.concurrency} at a time"
+            self.refresh_bindings()
             if self.idle:
                 self.show_summary()
             else: