jupyter-server-ydoc 1.0.0b0__tar.gz → 1.0.0b2__tar.gz

{jupyter_server_ydoc-1.0.0b0 → jupyter_server_ydoc-1.0.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jupyter-server-ydoc
-Version: 1.0.0b0
+Version: 1.0.0b2
 Summary: jupyter-server extension integrating collaborative shared models.
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
 License: # Licensing terms
@@ -79,7 +79,7 @@ Requires-Dist: jsonschema>=4.18.0
 Requires-Dist: jupyter-events>=0.10.0
 Requires-Dist: jupyter-server-fileid<1,>=0.7.0
 Requires-Dist: jupyter-server<3.0.0,>=2.4.0
-Requires-Dist: jupyter-ydoc<3.0.0,>=2.0.0
+Requires-Dist: jupyter-ydoc<4.0.0,>=2.0.0
 Requires-Dist: pycrdt
 Requires-Dist: pycrdt-websocket<0.15.0,>=0.14.0
 Provides-Extra: test

jupyter_server_ydoc-1.0.0b2/jupyter_server_ydoc/_version.py

@@ -0,0 +1 @@
+__version__ = "1.0.0b2"

jupyter_server_ydoc-1.0.0b0/tests/conftest.py → jupyter_server_ydoc-1.0.0b2/jupyter_server_ydoc/pytest_plugin.py

@@ -16,9 +16,7 @@ from jupyter_ydoc import YNotebook, YUnicode
 from pycrdt_websocket import WebsocketProvider
 from websockets import connect
 
-from .utils import FakeContentsManager, FakeEventLogger, FakeFileIDManager
-
-pytest_plugins = ["jupyter_server.pytest_plugin", "jupyter_server_fileid.pytest_plugin"]
+from .test_utils import FakeContentsManager, FakeEventLogger, FakeFileIDManager
 
 
 @pytest.fixture
@@ -30,7 +28,10 @@ def rtc_document_save_delay():
 def jp_server_config(jp_root_dir, jp_server_config, rtc_document_save_delay):
     return {
         "ServerApp": {
-            "jpserver_extensions": {"jupyter_server_ydoc": True, "jupyter_server_fileid": True},
+            "jpserver_extensions": {
+                "jupyter_server_ydoc": True,
+                "jupyter_server_fileid": True,
+            },
             "token": "",
             "password": "",
             "disable_check_xsrf": True,
@@ -148,11 +149,12 @@ def rtc_connect_doc_client(jp_http_port, jp_base_url, rtc_fetch_session):
 def rtc_add_doc_to_store(rtc_connect_doc_client):
     event = Event()
 
-    def _on_document_change(target: str, e: Any) -> None:
-        if target == "source":
-            event.set()
-
     async def _inner(format: str, type: str, path: str) -> None:
+        def _on_document_change(target: str, e: Any) -> None:
+            expected_target = "cells" if type == "notebook" else "source"
+            if target == expected_target:
+                event.set()
+
         if type == "notebook":
             doc = YNotebook()
         else:
@@ -172,7 +174,7 @@ def rtc_add_doc_to_store(rtc_connect_doc_client):
 def rtc_create_SQLite_store_factory(jp_serverapp):
     async def _inner(type: str, path: str, content: str) -> DocumentRoom:
         db = SQLiteYStore(path=f"{type}:{path}", config=jp_serverapp.config)
-        task = create_task(db.start())
+        _ = create_task(db.start())
         await db.started.wait()
 
         if type == "notebook":
@@ -221,7 +223,14 @@ def rtc_create_mock_document_room():
             cm,
             loader,
             DocumentRoom(
-                "test-room", "text", "file", loader, FakeEventLogger(), store, None, save_delay
+                "test-room",
+                "text",
+                "file",
+                loader,
+                FakeEventLogger(),
+                store,
+                None,
+                save_delay,
             ),
         )
 

{jupyter_server_ydoc-1.0.0b0 → jupyter_server_ydoc-1.0.0b2}/pyproject.toml

@@ -29,7 +29,7 @@ authors = [
 ]
 dependencies = [
     "jupyter_server>=2.4.0,<3.0.0",
-    "jupyter_ydoc>=2.0.0,<3.0.0",
+    "jupyter_ydoc>=2.0.0,<4.0.0",
     "pycrdt",
     "pycrdt-websocket>=0.14.0,<0.15.0",
     "jupyter_events>=0.10.0",

jupyter_server_ydoc-1.0.0b2/tests/conftest.py

@@ -0,0 +1,8 @@
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+pytest_plugins = [
+    "jupyter_server.pytest_plugin",
+    "jupyter_server_fileid.pytest_plugin",
+    "jupyter_server_ydoc.pytest_plugin",
+]

{jupyter_server_ydoc-1.0.0b0 → jupyter_server_ydoc-1.0.0b2}/tests/test_app.py

@@ -3,11 +3,11 @@
 
 from __future__ import annotations
 
+import nbformat
 import pytest
+from jupyter_server_ydoc.pytest_plugin import rtc_create_SQLite_store_factory
 from jupyter_server_ydoc.stores import SQLiteYStore, TempFileYStore
 
-from .conftest import rtc_create_SQLite_store_factory
-
 
 def test_default_settings(jp_serverapp):
     settings = jp_serverapp.web_app.settings["jupyter_server_ydoc_config"]
@@ -88,6 +88,25 @@ async def test_get_document_file(rtc_create_file, jp_serverapp, copy):
     await collaboration.stop_extension()
 
 
+@pytest.mark.parametrize("copy", [True, False])
+async def test_get_document_notebook(rtc_create_notebook, jp_serverapp, copy):
+    nb = nbformat.v4.new_notebook(
+        cells=[nbformat.v4.new_code_cell(source="1+1", execution_count=99)]
+    )
+    nb_content = nbformat.writes(nb, version=4)
+    path, _ = await rtc_create_notebook("test.ipynb", nb_content, store=True)
+    collaboration = jp_serverapp.web_app.settings["jupyter_server_ydoc"]
+    document = await collaboration.get_document(
+        path=path, content_type="notebook", file_format="json", copy=copy
+    )
+    doc = document.get()
+    assert len(doc["cells"]) == 1
+    cell = doc["cells"][0]
+    assert cell["source"] == "1+1"
+    assert cell["execution_count"] == 99
+    await collaboration.stop_extension()
+
+
 async def test_get_document_file_copy_is_independent(
     rtc_create_file, jp_serverapp, rtc_fetch_session
 ):

{jupyter_server_ydoc-1.0.0b0 → jupyter_server_ydoc-1.0.0b2}/tests/test_loaders.py

@@ -7,8 +7,7 @@ import asyncio
 from datetime import datetime, timedelta, timezone
 
 from jupyter_server_ydoc.loaders import FileLoader, FileLoaderMapping
-
-from .utils import FakeContentsManager, FakeFileIDManager
+from jupyter_server_ydoc.test_utils import FakeContentsManager, FakeFileIDManager
 
 
 async def test_FileLoader_with_watcher():

jupyter_server_ydoc-1.0.0b0/jupyter_server_ydoc/_version.py

@@ -1 +0,0 @@
-__version__ = "1.0.0b0"