labnotes 0.0.61__tar.gz → 0.0.62__tar.gz

{labnotes-0.0.61 → labnotes-0.0.62}/PKG-INFO

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

@@ -31,7 +31,6 @@ 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
 from labnotes.wait_for_note import wait_for_note
 
@@ -42,20 +41,16 @@ templates.env.filters["duration"] = format_duration
 templates.env.globals["asset"] = asset_url
 
 
-def create_app(config: LabnotesConfig, kernel_idle_minutes: float) -> Starlette:
+def create_app(config: LabnotesConfig) -> Starlette:
     kernels: dict[tuple[str, str], NotebookKernel] = {}
 
     @asynccontextmanager
     async def lifespan(app: Starlette) -> AsyncIterator[None]:
         app.state.tables = open_tables(config)
         await app.state.tables.ready()
-        watchers = [
-            asyncio.create_task(drain_watch(app.state.tables)),
-            asyncio.create_task(stop_idle_kernels(kernels, kernel_idle_minutes)),
-        ]
+        watcher = asyncio.create_task(drain_watch(app.state.tables))
         yield
-        for watcher in watchers:
-            watcher.cancel()
+        watcher.cancel()
         for kernel in kernels.values():
             await kernel.stop()
 

{labnotes-0.0.61 → labnotes-0.0.62}/src/labnotes/notebook_kernel.py

@@ -1,7 +1,6 @@
 import asyncio
 import hashlib
 from pathlib import Path
-from time import monotonic
 
 from jupyter_client.asynchronous.client import AsyncKernelClient
 from jupyter_client.manager import AsyncKernelManager
@@ -24,7 +23,6 @@ class NotebookKernel:
         self._lock = asyncio.Lock()
         self._manager: AsyncKernelManager | None = None
         self._client: AsyncKernelClient | None = None
-        self.last_used = monotonic()
 
     async def _start(self) -> None:
         self._manager = AsyncKernelManager(kernel_name="python3")
@@ -35,27 +33,24 @@ class NotebookKernel:
 
     async def run(self, code: str) -> str:
         async with self._lock:
-            try:
-                if self._client is None:
-                    await self._start()
-                assert self._client is not None
-                messages: list[dict[str, object]] = []
-                await self._client.execute_interactive(
-                    code,
-                    output_hook=lambda message: messages.append(message),
-                    allow_stdin=False,
-                )
-                html = output_html(
-                    [
-                        {"msg_type": message["msg_type"], "content": message["content"]}
-                        for message in messages
-                        if message["msg_type"] not in QUIET
-                    ]
-                )
-                self.outputs[block_key(code)] = html
-                return html
-            finally:
-                self.last_used = monotonic()
+            if self._client is None:
+                await self._start()
+            assert self._client is not None
+            messages: list[dict[str, object]] = []
+            await self._client.execute_interactive(
+                code,
+                output_hook=lambda message: messages.append(message),
+                allow_stdin=False,
+            )
+            html = output_html(
+                [
+                    {"msg_type": message["msg_type"], "content": message["content"]}
+                    for message in messages
+                    if message["msg_type"] not in QUIET
+                ]
+            )
+            self.outputs[block_key(code)] = html
+            return html
 
     async def stop(self) -> None:
         client, manager = self._client, self._manager
@@ -68,7 +63,3 @@ class NotebookKernel:
     async def restart(self) -> None:
         async with self._lock:
             await self.stop()
-
-    async def stop_if_idle(self, idle_seconds: float) -> None:
-        if not self._lock.locked() and monotonic() - self.last_used > idle_seconds:
-            await self.stop()

{labnotes-0.0.61 → labnotes-0.0.62}/src/labnotes/serve_app.py

@@ -7,10 +7,7 @@ from labnotes.create_app import create_app
 from labnotes.read_config import read_config
 
 CONFIG = "LABNOTES_CONFIG"
-KERNEL_IDLE_MINUTES = "LABNOTES_KERNEL_IDLE_MINUTES"
 
 
 def serve_app() -> Starlette:
-    return create_app(
-        read_config(Path(os.environ[CONFIG])), int(os.environ[KERNEL_IDLE_MINUTES])
-    )
+    return create_app(read_config(Path(os.environ[CONFIG])))

{labnotes-0.0.61 → labnotes-0.0.62}/src/labnotes/server.py

@@ -5,7 +5,7 @@ from uvicorn.main import main as uvicorn_main
 
 from labnotes.load_config import load_config
 from labnotes.read_config import CONFIG_FILE
-from labnotes.serve_app import CONFIG, KERNEL_IDLE_MINUTES
+from labnotes.serve_app import CONFIG
 
 # labnotes owns these; the rest of uvicorn's options pass straight through.
 OWN_OPTIONS = {"app", "factory", "app_dir", "version", "host", "port"}
@@ -14,14 +14,6 @@ OWN_OPTIONS = {"app", "factory", "app_dir", "version", "host", "port"}
 @click.command(
     help="Serve the experiments, their notes and their runs as a local site."
 )
-@click.option(
-    "--kernel-idle-minutes",
-    type=click.IntRange(min=1),
-    default=30,
-    show_default=True,
-    envvar=KERNEL_IDLE_MINUTES,
-    help="Stop a note's Python kernel after this long without a run.",
-)
 @click.option(
     "-h",
     "--host",
@@ -31,19 +23,14 @@ OWN_OPTIONS = {"app", "factory", "app_dir", "version", "host", "port"}
 )
 @click.option("-p", "--port", type=int, default=8000, show_default=True)
 @click.pass_context
-def server(
-    ctx: click.Context,
-    kernel_idle_minutes: int,
-    **server_options: object,
-) -> None:
+def server(ctx: click.Context, **server_options: object) -> None:
     config = load_config(ctx)
     if config is None:
         raise click.ClickException(
             f"No {CONFIG_FILE} here. Run labnotes init, or pass -c PATH."
         )
-    # Through the environment so --reload and --workers child processes see them.
+    # Through the environment so --reload and --workers child processes see it.
     os.environ[CONFIG] = str(config.path.resolve())
-    os.environ[KERNEL_IDLE_MINUTES] = str(kernel_idle_minutes)
     ctx.invoke(
         uvicorn_main,
         app="labnotes.serve_app:serve_app",

labnotes-0.0.61/src/labnotes/stop_idle_kernels.py

@@ -1,13 +0,0 @@
-import asyncio
-from collections.abc import Mapping
-
-from labnotes.notebook_kernel import NotebookKernel
-
-
-async def stop_idle_kernels(
-    kernels: Mapping[tuple[str, str], NotebookKernel], idle_minutes: float
-) -> None:
-    while True:
-        await asyncio.sleep(60)
-        for kernel in list(kernels.values()):
-            await kernel.stop_if_idle(idle_minutes * 60)