jupyverse 0.10.2__tar.gz → 0.10.3__tar.gz

{jupyverse-0.10.2 → jupyverse-0.10.3}/.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.12.3
     hooks:
       - id: ruff
         args: ["--fix"]

{jupyverse-0.10.2 → jupyverse-0.10.3}/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Version history
 
+## 0.10.3
+
+- Propagate `yjs` settings.
+
 ## 0.10.2
 
 - Rework `test_kernels.py` to use ASGI transport.

{jupyverse-0.10.2 → jupyverse-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyverse
-Version: 0.10.2
+Version: 0.10.3
 Summary: A set of FPS plugins implementing a Jupyter server
 Project-URL: Homepage, https://jupyter.org
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
@@ -17,7 +17,7 @@ Requires-Dist: fps-kernels<0.10.0,>=0.9.1
 Requires-Dist: fps-lab<0.10.0,>=0.9.0
 Requires-Dist: fps-nbconvert<0.10.0,>=0.9.0
 Requires-Dist: fps-terminals<0.10.0,>=0.9.0
-Requires-Dist: fps-yjs<0.11.0,>=0.10.0
+Requires-Dist: fps-yjs<0.11.0,>=0.10.1
 Requires-Dist: fps[anycorn,click,fastapi]<0.5.0,>=0.4.0
 Requires-Dist: jupyverse-api<0.11.0,>=0.10.0
 Requires-Dist: rich-click<2,>=1.6.1

{jupyverse-0.10.2 → jupyverse-0.10.3}/plugins/yjs/fps_yjs/main.py

@@ -27,7 +27,7 @@ class YjsModule(Module):
         file_id = await self.get(FileId)  # type: ignore[type-abstract]
         lifespan = await self.get(Lifespan)
 
-        self.yjs = _Yjs(app, auth, contents, file_id, lifespan)
+        self.yjs = _Yjs(app, auth, contents, file_id, lifespan, self.config)
 
         async with create_task_group() as tg:
             await tg.start(self.yjs.start)

{jupyverse-0.10.2 → jupyverse-0.10.3}/plugins/yjs/fps_yjs/routes.py

@@ -25,7 +25,7 @@ from jupyverse_api.auth import Auth, User
 from jupyverse_api.contents import Contents
 from jupyverse_api.file_id import FileId
 from jupyverse_api.main import Lifespan
-from jupyverse_api.yjs import Yjs
+from jupyverse_api.yjs import Yjs, YjsConfig
 from jupyverse_api.yjs.models import CreateDocumentSession
 
 from .ywebsocket.websocket import Websocket
@@ -51,11 +51,13 @@ class _Yjs(Yjs):
         contents: Contents,
         file_id: FileId,
         lifespan: Lifespan,
+        config: YjsConfig,
     ) -> None:
         super().__init__(app=app, auth=auth)
         self.contents = contents
         self.file_id = file_id
         self.lifespan = lifespan
+        self.config = config
         if Widgets is None:
             self.widgets = None
         else:
@@ -63,7 +65,7 @@ class _Yjs(Yjs):
 
     async def start(self, *, task_status: TaskStatus[None] = TASK_STATUS_IGNORED) -> None:
         async with create_task_group() as tg:
-            self.room_manager = RoomManager(self.contents, self.file_id, self.lifespan)
+            self.room_manager = RoomManager(self.contents, self.file_id, self.lifespan, self.config)
             tg.start_soon(self.room_manager.start)
             task_status.started()
 
@@ -166,7 +168,7 @@ class RoomManager:
     room_write_permissions: dict[str, set[YWebsocket]]
     room_lock: ResourceLock
 
-    def __init__(self, contents: Contents, file_id: FileId, lifespan: Lifespan):
+    def __init__(self, contents: Contents, file_id: FileId, lifespan: Lifespan, config: YjsConfig):
         self.contents = contents
         self.file_id = file_id
         self.lifespan = lifespan
@@ -178,6 +180,7 @@ class RoomManager:
         self.room_write_permissions = {}  # a dictionary of room_name:websockets that can write
         self.websocket_server = JupyterWebsocketServer(rooms_ready=False, auto_clean_rooms=False)
         self.room_lock = ResourceLock()
+        self.config = config
 
     async def start(self):
         async with create_task_group() as self.task_group:
@@ -364,8 +367,8 @@ class RoomManager:
     async def maybe_save_document(
         self, file_id: str, file_type: str, file_format: str, document: YBaseDoc
     ) -> None:
-        # save after 1 second of inactivity to prevent too frequent saving
-        await sleep(1)  # FIXME: pass in config
+        # save after configured delay to prevent too frequent saving
+        await sleep(self.config.document_save_delay)
         # if the room cannot be found, don't save
         try:
             file_path = await self.get_file_path(file_id, document)
@@ -401,7 +404,7 @@ class RoomManager:
     async def maybe_clean_room(self, room, ws_path: str) -> None:
         file_id = ws_path.split(":", 2)[2]
         # keep the document for a while in case someone reconnects
-        await sleep(60)  # FIXME: pass in config
+        await sleep(self.config.document_cleanup_delay)
         document = self.documents[ws_path]
         document.unobserve()
         del self.documents[ws_path]

{jupyverse-0.10.2 → jupyverse-0.10.3}/plugins/yjs/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_yjs"
-version = "0.10.0"
+version = "0.10.1"
 description = "An FPS plugin for the Yjs API"
 keywords = [ "jupyter", "server", "fastapi", "plugins" ]
 requires-python = ">=3.9"

{jupyverse-0.10.2 → jupyverse-0.10.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jupyverse"
-version = "0.10.2"
+version = "0.10.3"
 description = "A set of FPS plugins implementing a Jupyter server"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
@@ -16,7 +16,7 @@ dependencies = [
     "fps-kernels >=0.9.1,<0.10.0",
     "fps-terminals >=0.9.0,<0.10.0",
     "fps-nbconvert >=0.9.0,<0.10.0",
-    "fps-yjs >=0.10.0,<0.11.0",
+    "fps-yjs >=0.10.1,<0.11.0",
     "fps-lab >=0.9.0,<0.10.0",
     "fps-frontend >=0.9.0,<0.10.0",
     "jupyverse-api >=0.10.0,<0.11.0",