jupyverse 0.10.13__tar.gz → 0.10.14__tar.gz

{jupyverse-0.10.13 → jupyverse-0.10.14}/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Version history
 
+## 0.10.14
+
+- Fix document duplication with out-of-band changes.
+
 ## 0.10.13
 
 - Support separate kernel environment.

{jupyverse-0.10.13 → jupyverse-0.10.14}/PKG-INFO

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

{jupyverse-0.10.13 → jupyverse-0.10.14}/plugins/yjs/fps_yjs/routes.py

@@ -256,12 +256,13 @@ class RoomManager:
                                 file_type,
                                 file_format,
                                 document,
+                                room,
                             )
                         )
                         # update the document when file changes
                         if file_id not in self.watchers:
                             self.watchers[file_id] = create_task(
-                                self.watch_file(file_format, file_id, document),
+                                self.watch_file(file_format, file_id, document, room),
                                 self.task_group,
                             )
 
@@ -317,7 +318,13 @@ class RoomManager:
             document.path = file_path
         return file_path
 
-    async def watch_file(self, file_format: str, file_id: str, document: YBaseDoc) -> None:
+    async def watch_file(
+        self,
+        file_format: str,
+        file_id: str,
+        document: YBaseDoc,
+        room: YRoom,
+    ) -> None:
         file_path = await self.get_file_path(file_id, document)
         assert file_path is not None
         logger.info("Watching file", path=file_path)
@@ -332,11 +339,17 @@ class RoomManager:
                 self.file_id.unwatch(file_path, watcher)
                 file_path = new_file_path
                 # break
-            await self.maybe_load_file(file_format, file_path, file_id)
+            await self.maybe_load_file(file_format, file_path, file_id, room)
         if file_id in self.watchers:
             del self.watchers[file_id]
 
-    async def maybe_load_file(self, file_format: str, file_path: str, file_id: str) -> None:
+    async def maybe_load_file(
+        self,
+        file_format: str,
+        file_path: str,
+        file_id: str,
+        room: YRoom,
+    ) -> None:
         model = await self.contents.read_content(file_path, False)
         # do nothing if the file was saved by us
         assert model.last_modified is not None
@@ -347,10 +360,19 @@ class RoomManager:
             documents = [v for k, v in self.documents.items() if k.split(":", 2)[2] == file_id]
             for document in documents:
                 document.source = model.content
+                assert room.ystore is not None
+                await room.ystore.encode_state_as_update(room.ydoc)
             self.last_modified[file_id] = to_datetime(model.last_modified)
 
     def on_document_change(
-        self, file_id: str, file_type: str, file_format: str, document: YBaseDoc, target, event
+        self,
+        file_id: str,
+        file_type: str,
+        file_format: str,
+        document: YBaseDoc,
+        room: YRoom,
+        target,
+        event,
     ) -> None:
         if target == "state" and "dirty" in event.keys:
             dirty = event.keys["dirty"]["newValue"]
@@ -361,17 +383,22 @@ class RoomManager:
         # e.g. a new cell added to a notebook
         document.unobserve()
         document.observe(
-            partial(self.on_document_change, file_id, file_type, file_format, document)
+            partial(self.on_document_change, file_id, file_type, file_format, document, room)
         )
         if file_id in self.savers:
             self.savers[file_id].cancel(raise_exception=False)
         self.savers[file_id] = create_task(
-            self.maybe_save_document(file_id, file_type, file_format, document),
+            self.maybe_save_document(file_id, file_type, file_format, document, room),
             self.task_group,
         )
 
     async def maybe_save_document(
-        self, file_id: str, file_type: str, file_format: str, document: YBaseDoc
+        self,
+        file_id: str,
+        file_type: str,
+        file_format: str,
+        document: YBaseDoc,
+        room: YRoom,
     ) -> None:
         # save after configured delay to prevent too frequent saving
         await sleep(self.config.document_save_delay)
@@ -386,6 +413,8 @@ class RoomManager:
         if self.last_modified[file_id] < to_datetime(model.last_modified):
             # file changed on disk, let's revert
             document.source = model.content
+            assert room.ystore is not None
+            await room.ystore.encode_state_as_update(room.ydoc)
             self.last_modified[file_id] = to_datetime(model.last_modified)
             return
         if model.content != document.source:

{jupyverse-0.10.13 → jupyverse-0.10.14}/plugins/yjs/pyproject.toml

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

{jupyverse-0.10.13 → jupyverse-0.10.14}/plugins/yjs/tests/test_yjs.py

@@ -1,3 +1,5 @@
+import sys
+
 import pytest
 from anyio import create_task_group
 from fps import get_root_module
@@ -10,7 +12,15 @@ from jupyverse_api.yjs.models import CreateDocumentSession
 
 
 @pytest.mark.anyio
-async def test_concurrent_disconnect(tmp_path):
+async def test_concurrent_disconnect(tmp_path, anyio_backend_name):
+    if (
+        anyio_backend_name == "trio" and
+        sys.version_info >= (3, 13) and
+        sys.version_info < (3, 14) and
+        sys.platform == "darwin"
+    ):
+        pytest.skip("Timeout")
+
     config = {
         "jupyverse": {
             "type": "jupyverse",

{jupyverse-0.10.13 → jupyverse-0.10.14}/pyproject.toml

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