Fix types

Author: davidbrochart

jupyter_server_ydoc/app.py

@@ -7,7 +7,7 @@
     raise ModuleNotFoundError("Jupyter Server must be installed to use this extension.")
 
 from traitlets import Float, Int, Type, Unicode, observe
-from ypy_websocket.ystore import BaseYStore, SQLiteYStore
+from ypy_websocket.ystore import BaseYStore, SQLiteYStore  # type: ignore
 
 from .handlers import YDocRoomIdHandler, YDocWebSocketHandler, sqlite_ystore_factory
 

jupyter_server_ydoc/handlers.py

@@ -5,16 +5,17 @@
 import json
 from logging import Logger
 from pathlib import Path
-from typing import Any, Dict, Optional, Tuple
+from typing import Any, Dict, Optional, Tuple, Type
 
 from jupyter_server.auth import authorized
 from jupyter_server.base.handlers import APIHandler, JupyterHandler
 from jupyter_server.utils import ensure_async
 from jupyter_ydoc import ydocs as YDOCS  # type: ignore
 from tornado import web
 from tornado.websocket import WebSocketHandler
-from ypy_websocket import WebsocketServer, YMessageType, YRoom
-from ypy_websocket.ystore import BaseYStore, SQLiteYStore, TempFileYStore, YDocNotFound
+from ypy_websocket.websocket_server import WebsocketServer, YRoom  # type: ignore
+from ypy_websocket.ystore import BaseYStore, SQLiteYStore, TempFileYStore, YDocNotFound  # type: ignore
+from ypy_websocket.yutils import YMessageType  # type: ignore
 
 YFILE = YDOCS["file"]
 
@@ -25,7 +26,7 @@ class JupyterTempFileYStore(TempFileYStore):
 
 def sqlite_ystore_factory(
     db_path: str = ".jupyter_ystore.db", document_ttl: Optional[int] = None
-) -> SQLiteYStore:
+) -> Type[SQLiteYStore]:
     _db_path = db_path
     _document_ttl = document_ttl
 
@@ -39,8 +40,6 @@ class JupyterSQLiteYStore(SQLiteYStore):
 class DocumentRoom(YRoom):
     """A Y room for a possibly stored document (e.g. a notebook)."""
 
-    is_transient = False
-
     def __init__(self, type: str, ystore: BaseYStore, log: Optional[Logger]):
         super().__init__(ready=False, ystore=ystore, log=log)
         self.type = type
@@ -52,8 +51,6 @@ def __init__(self, type: str, ystore: BaseYStore, log: Optional[Logger]):
 class TransientRoom(YRoom):
     """A Y room for sharing state (e.g. awareness)."""
 
-    is_transient = True
-
     def __init__(self, log: Optional[Logger]):
         super().__init__(log=log)
 
@@ -135,6 +132,7 @@ async def __anext__(self):
 
     def get_file_info(self) -> Tuple[str, str, str]:
         assert self.websocket_server is not None
+        assert isinstance(self.room, DocumentRoom)
         room_name = self.websocket_server.get_room_name(self.room)
         file_format: str
         file_type: str
@@ -178,10 +176,10 @@ async def open(self, path):
         asyncio.create_task(self.websocket_server.serve(self))
 
         # cancel the deletion of the room if it was scheduled
-        if not self.room.is_transient and self.room.cleaner is not None:
+        if isinstance(self.room, DocumentRoom) and self.room.cleaner is not None:
             self.room.cleaner.cancel()
 
-        if not self.room.is_transient and not self.room.ready:
+        if isinstance(self.room, DocumentRoom) and not self.room.ready:
             file_format, file_type, file_path = self.get_file_info()
             self.log.debug("Opening Y document from disk: %s", file_path)
             model = await ensure_async(
@@ -191,26 +189,30 @@ async def open(self, path):
             # check again if ready, because loading the file can be async
             if not self.room.ready:
                 # try to apply Y updates from the YStore for this document
-                try:
-                    await self.room.ystore.apply_updates(self.room.ydoc)
-                    read_from_source = False
-                except YDocNotFound:
-                    # YDoc not found in the YStore, create the document from the source file (no change history)
-                    read_from_source = True
+                read_from_source = True
+                if self.room.ystore is not None:
+                    try:
+                        await self.room.ystore.apply_updates(self.room.ydoc)
+                        read_from_source = False
+                    except YDocNotFound:
+                        # YDoc not found in the YStore, create the document from the source file (no change history)
+                        pass
                 if not read_from_source:
                     # if YStore updates and source file are out-of-sync, resync updates with source
                     if self.room.document.source != model["content"]:
                         read_from_source = True
                 if read_from_source:
                     self.room.document.source = model["content"]
-                    await self.room.ystore.encode_state_as_update(self.room.ydoc)
+                    if self.room.ystore:
+                        await self.room.ystore.encode_state_as_update(self.room.ydoc)
                 self.room.document.dirty = False
                 self.room.ready = True
                 self.room.watcher = asyncio.create_task(self.watch_file())
                 # save the document when changed
                 self.room.document.observe(self.on_document_change)
 
     async def watch_file(self):
+        assert isinstance(self.room, DocumentRoom)
         poll_interval = self.settings["collaborative_file_poll_interval"]
         if not poll_interval:
             self.room.watcher = None
@@ -220,6 +222,7 @@ async def watch_file(self):
             await self.maybe_load_document()
 
     async def maybe_load_document(self):
+        assert isinstance(self.room, DocumentRoom)
         file_format, file_type, file_path = self.get_file_info()
         async with self.lock:
             model = await ensure_async(
@@ -270,7 +273,7 @@ def on_message(self, message):
             # filter out message depending on changes
             if skip:
                 self.log.debug(
-                    "Filtered out Y message of type: %s", YMessageType(message_type).raw_str()
+                    "Filtered out Y message of type: %s", YMessageType(message_type).name
                 )
                 return skip
         self._message_queue.put_nowait(message)
@@ -279,12 +282,13 @@ def on_message(self, message):
     def on_close(self) -> None:
         # stop serving this client
         self._message_queue.put_nowait(b"")
-        if not self.room.is_transient and self.room.clients == [self]:
+        if isinstance(self.room, DocumentRoom) and self.room.clients == [self]:
             # no client in this room after we disconnect
             # keep the document for a while in case someone reconnects
             self.room.cleaner = asyncio.create_task(self.clean_room())
 
     async def clean_room(self) -> None:
+        assert isinstance(self.room, DocumentRoom)
         seconds = self.settings["collaborative_document_cleanup_delay"]
         if seconds is None:
             return
@@ -312,6 +316,7 @@ def on_document_change(self, event):
         self.saving_document = asyncio.create_task(self.maybe_save_document())
 
     async def maybe_save_document(self):
+        assert isinstance(self.room, DocumentRoom)
         seconds = self.settings["collaborative_document_save_delay"]
         if seconds is None:
             return