jupyter-server-ydoc 1.0.0b1__tar.gz → 1.0.0b3__tar.gz

{jupyter_server_ydoc-1.0.0b1 → jupyter_server_ydoc-1.0.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jupyter-server-ydoc
-Version: 1.0.0b1
+Version: 1.0.0b3
 Summary: jupyter-server extension integrating collaborative shared models.
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
 License: # Licensing terms
@@ -78,8 +78,8 @@ Requires-Python: >=3.8
 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-server<3.0.0,>=2.11.1
+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.0b3/jupyter_server_ydoc/_version.py

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

{jupyter_server_ydoc-1.0.0b1 → jupyter_server_ydoc-1.0.0b3}/jupyter_server_ydoc/loaders.py

@@ -117,7 +117,7 @@ class FileLoader:
             self.last_modified = model["last_modified"]
             return model
 
-    async def maybe_save_content(self, model: dict[str, Any]) -> None:
+    async def maybe_save_content(self, model: dict[str, Any]) -> dict[str, Any] | None:
         """
         Save the content of the file.
 
@@ -149,20 +149,34 @@ class FileLoader:
                 # otherwise it could corrupt the file
                 done_saving = asyncio.Event()
                 task = asyncio.create_task(self._save_content(model, done_saving))
+                saved_model = None
                 try:
-                    await asyncio.shield(task)
+                    saved_model = await asyncio.shield(task)
                 except asyncio.CancelledError:
                     pass
                 await done_saving.wait()
+                return saved_model
             else:
                 # file changed on disk, raise an error
                 self.last_modified = m["last_modified"]
                 raise OutOfBandChanges
 
-    async def _save_content(self, model: dict[str, Any], done_saving: asyncio.Event) -> None:
+    async def _save_content(
+        self, model: dict[str, Any], done_saving: asyncio.Event
+    ) -> dict[str, Any]:
         try:
             m = await ensure_async(self._contents_manager.save(model, self.path))
             self.last_modified = m["last_modified"]
+            # TODO, get rid of the extra `get` here once upstream issue:
+            # https://github.com/jupyter-server/jupyter_server/issues/1453 is resolved
+            model_with_hash = await ensure_async(
+                self._contents_manager.get(
+                    self.path,
+                    content=False,
+                    require_hash=True,
+                )
+            )
+            return {**m, "hash": model_with_hash["hash"]}
         finally:
             done_saving.set()
 

{jupyter_server_ydoc-1.0.0b1 → jupyter_server_ydoc-1.0.0b3}/jupyter_server_ydoc/rooms.py

@@ -271,7 +271,7 @@ class DocumentRoom(YRoom):
             await asyncio.sleep(self._save_delay)
 
             self.log.info("Saving the content from room %s", self._room_id)
-            await self._file.maybe_save_content(
+            saved_model = await self._file.maybe_save_content(
                 {
                     "format": self._file_format,
                     "type": self._file_type,
@@ -280,6 +280,8 @@ class DocumentRoom(YRoom):
             )
             async with self._update_lock:
                 self._document.dirty = False
+                if saved_model:
+                    self._document.hash = saved_model["hash"]
 
             self._emit(LogLevel.INFO, "save", "Content saved.")
 

{jupyter_server_ydoc-1.0.0b1 → jupyter_server_ydoc-1.0.0b3}/pyproject.toml

@@ -28,8 +28,8 @@ authors = [
     { name = "Jupyter Development Team", email = "jupyter@googlegroups.com" },
 ]
 dependencies = [
-    "jupyter_server>=2.4.0,<3.0.0",
-    "jupyter_ydoc>=2.0.0,<3.0.0",
+    "jupyter_server>=2.11.1,<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.0b1/jupyter_server_ydoc/_version.py

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