Compute document in the backend using y-py

jupyter-server · Jan 19, 2022 · 6c0d0d0 · 6c0d0d0
1 parent 4d82190
commit 6c0d0d0
Show file tree

Hide file tree

Showing 3 changed files with 407 additions and 28 deletions.
diff --git a/jupyter_server/services/contents/filemanager.py b/jupyter_server/services/contents/filemanager.py
@@ -2,7 +2,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 import errno
-import json
 import mimetypes
 import os
 import shutil
@@ -447,10 +446,7 @@ def save(self, model, path=""):
             raise web.HTTPError(400, u"No file type provided")
 
         if YJS_SUPPORT and path in ROOMS:
-            if model["type"] == "notebook":
-                model["content"] = json.loads(ROOMS[path].source)
-            elif model["type"] == "file":
-                model["content"] = ROOMS[path].source
+            model["content"] = ROOMS[path].get_source()
 
         if "content" not in model and model["type"] != "directory":
             raise web.HTTPError(400, u"No file content provided")
@@ -780,12 +776,7 @@ async def save(self, model, path=""):
             raise web.HTTPError(400, u"No file type provided")
 
         if YJS_SUPPORT and path in ROOMS:
-            await ROOMS[path].ready_to_save.wait()
-            if model["type"] == "notebook":
-                model["content"] = json.loads(ROOMS[path].source)
-            elif model["type"] == "file":
-                model["content"] = ROOMS[path].source
-            ROOMS[path].ready_to_save.clear()
+            model["content"] = ROOMS[path].get_source()
 
         if "content" not in model and model["type"] != "directory":
             raise web.HTTPError(400, u"No file content provided")

diff --git a/jupyter_server/services/contents/largefilemanager.py b/jupyter_server/services/contents/largefilemanager.py
@@ -1,6 +1,5 @@
 import base64
 import io
-import json
 import os
 
 from anyio.to_thread import run_sync
@@ -39,10 +38,7 @@ def save(self, model, path=""):
                 )
 
             if YJS_SUPPORT and path in ROOMS:
-                if model["type"] == "notebook":
-                    model["content"] = json.loads(ROOMS[path].source)
-                elif model["type"] == "file":
-                    model["content"] = ROOMS[path].source
+                model["content"] = ROOMS[path].get_source()
 
             if "content" not in model and model["type"] != "directory":
                 raise web.HTTPError(400, u"No file content provided")
@@ -121,12 +117,7 @@ async def save(self, model, path=""):
                 )
 
             if YJS_SUPPORT and path in ROOMS:
-                await ROOMS[path].ready_to_save.wait()
-                if model["type"] == "notebook":
-                    model["content"] = json.loads(ROOMS[path].source)
-                elif model["type"] == "file":
-                    model["content"] = ROOMS[path].source
-                ROOMS[path].ready_to_save.clear()
+                model["content"] = ROOMS[path].get_source()
 
             if "content" not in model and model["type"] != "directory":
                 raise web.HTTPError(400, u"No file content provided")