jupyter-server-ydoc 1.1.0rc0__tar.gz → 2.0.0__tar.gz

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: jupyter-server-ydoc
-Version: 1.1.0rc0
+Version: 2.0.0
 Summary: jupyter-server extension integrating collaborative shared models.
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
 License: # Licensing terms
@@ -62,6 +62,7 @@ License: # Licensing terms
         
             # Copyright (c) Jupyter Development Team.
             # Distributed under the terms of the Modified BSD License.
+License-File: LICENSE
 Classifier: Framework :: Jupyter
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -75,9 +76,9 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Requires-Dist: jsonschema>=4.18.0
-Requires-Dist: jupyter-events>=0.10.0
+Requires-Dist: jupyter-events>=0.11.0
 Requires-Dist: jupyter-server-fileid<1,>=0.7.0
-Requires-Dist: jupyter-server<3.0.0,>=2.11.1
+Requires-Dist: jupyter-server<3.0.0,>=2.15.0
 Requires-Dist: jupyter-ydoc!=3.0.0,!=3.0.1,<4.0.0,>=2.1.2
 Requires-Dist: pycrdt
 Requires-Dist: pycrdt-websocket<0.16.0,>=0.15.0
@@ -88,7 +89,7 @@ Requires-Dist: dirty-equals; extra == 'test'
 Requires-Dist: httpx-ws>=0.5.2; extra == 'test'
 Requires-Dist: importlib-metadata>=4.8.3; (python_version < '3.10') and extra == 'test'
 Requires-Dist: jupyter-server-fileid[test]; extra == 'test'
-Requires-Dist: jupyter-server[test]>=2.4.0; extra == 'test'
+Requires-Dist: jupyter-server[test]>=2.15.0; extra == 'test'
 Requires-Dist: pytest-cov; extra == 'test'
 Requires-Dist: pytest>=7.0; extra == 'test'
 Description-Content-Type: text/markdown

jupyter_server_ydoc-2.0.0/jupyter_server_ydoc/_version.py

@@ -0,0 +1 @@
+__version__ = "2.0.0"

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/jupyter_server_ydoc/events/awareness.yaml

@@ -1,6 +1,6 @@
 "$id": https://schema.jupyter.org/jupyter_collaboration/awareness/v1
 "$schema": "http://json-schema.org/draft-07/schema"
-version: 1
+version: "1"
 title: Collaborative awareness events
 personal-data: true
 description: |

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/jupyter_server_ydoc/events/fork.yaml

@@ -1,6 +1,6 @@
 "$id": https://schema.jupyter.org/jupyter_collaboration/fork/v1
 "$schema": "http://json-schema.org/draft-07/schema"
-version: 1
+version: "1"
 title: Collaborative fork events
 personal-data: true
 description: |

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/jupyter_server_ydoc/events/session.yaml

@@ -1,6 +1,6 @@
 "$id": https://schema.jupyter.org/jupyter_collaboration/session/v1
 "$schema": "http://json-schema.org/draft-07/schema"
-version: 1
+version: "1"
 title: Collaborative session events
 personal-data: true
 description: |

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/jupyter_server_ydoc/handlers.py

@@ -642,7 +642,12 @@ class DocForkHandler(APIHandler):
         Optionally keeps the fork in sync with the root.
         """
         fork_roomid = uuid4().hex
-        root_room = await self._websocket_server.get_room(root_roomid)
+        try:
+            root_room = await self._websocket_server.get_room(root_roomid)
+        except RoomNotFound:
+            self.set_status(404)
+            return self.finish({"code": 404, "error": "Root room not found"})
+
         update = root_room.ydoc.get_update()
         fork_ydoc = Doc()
         fork_ydoc.apply_update(update)
@@ -676,7 +681,10 @@ class DocForkHandler(APIHandler):
         """
         Deletes a forked document, and optionally merges it back in the root document.
         """
-        fork_info = FORK_ROOMS[fork_roomid]
+        fork_info = FORK_ROOMS.get(fork_roomid, None)
+        if fork_info is None:
+            self.set_status(404)
+            return self.finish({"code": 404, "error": "Fork room not found"})
         root_roomid = fork_info["root_roomid"]
         del FORK_ROOMS[fork_roomid]
         if self.get_query_argument("merge") == "true":

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/jupyter_server_ydoc/loaders.py

@@ -153,6 +153,9 @@ class FileLoader:
                     path, format=model["format"], type=model["type"], content=False
                 )
             )
+            # Skip saving if file is not writable
+            if not m["writable"]:
+                return None
 
             if self.last_modified == m["last_modified"]:
                 self._log.info("Saving file: %s", path)

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/jupyter_server_ydoc/pytest_plugin.py

@@ -271,13 +271,16 @@ def rtc_create_mock_document_room():
         last_modified: datetime | None = None,
         save_delay: float | None = None,
         store: SQLiteYStore | None = None,
+        writable: bool = False,
     ) -> tuple[FakeContentsManager, FileLoader, DocumentRoom]:
         paths = {id: path}
 
         if last_modified is None:
-            cm = FakeContentsManager({"content": content})
+            cm = FakeContentsManager({"content": content, "writable": writable})
         else:
-            cm = FakeContentsManager({"last_modified": datetime.now(), "content": content})
+            cm = FakeContentsManager(
+                {"last_modified": datetime.now(), "content": content, "writable": writable}
+            )
 
         loader = FileLoader(
             id,

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/pyproject.toml

@@ -28,11 +28,11 @@ authors = [
     { name = "Jupyter Development Team", email = "jupyter@googlegroups.com" },
 ]
 dependencies = [
-    "jupyter_server>=2.11.1,<3.0.0",
+    "jupyter_server>=2.15.0,<3.0.0",
     "jupyter_ydoc>=2.1.2,<4.0.0,!=3.0.0,!=3.0.1",
     "pycrdt",
     "pycrdt-websocket>=0.15.0,<0.16.0",
-    "jupyter_events>=0.10.0",
+    "jupyter_events>=0.11.0",
     "jupyter_server_fileid>=0.7.0,<1",
     "jsonschema>=4.18.0"
 ]
@@ -42,7 +42,7 @@ dynamic = ["version"]
 test = [
     "coverage",
     "dirty-equals",
-    "jupyter_server[test]>=2.4.0",
+    "jupyter_server[test]>=2.15.0",
     "jupyter_server_fileid[test]",
     "pytest>=7.0",
     "pytest-cov",

{jupyter_server_ydoc-1.1.0rc0 → jupyter_server_ydoc-2.0.0}/tests/test_rooms.py

@@ -51,7 +51,9 @@ async def test_defined_save_delay_should_save_content_after_document_change(
     rtc_create_mock_document_room,
 ):
     content = "test"
-    cm, _, room = rtc_create_mock_document_room("test-id", "test.txt", content, save_delay=0.01)
+    cm, _, room = rtc_create_mock_document_room(
+        "test-id", "test.txt", content, save_delay=0.01, writable=True
+    )
 
     await room.initialize()
     room._document.source = "Test 2"

jupyter_server_ydoc-1.1.0rc0/jupyter_server_ydoc/_version.py

@@ -1 +0,0 @@
-__version__ = "1.1.0rc0"