[WIP] Fix issues using RTCore Yroom

Author: Naresh Kumar Kolloju

jupyter_rtc_core/kernels/kernel_client.py

@@ -199,7 +199,7 @@ async def handle_iopub_message(self, msg: list[bytes]) -> t.Optional[list[bytes]
             for yroom in self._yrooms:
                 # NOTE: We need to create a real message here.
                 awareness_update_message = b""
-                self.log.debug(f"Update Awareness here: {dmsg}. YRoom: {yroom}")
+                self.log.info(f"Update Awareness here: {dmsg}. YRoom: {yroom}")
                 #self.log.debug(f"Getting YDoc: {await yroom.get_ydoc()}")
                 #yroom.add_message(awareness_update_message)
 

jupyter_rtc_core/kernels/kernel_manager.py

@@ -1,5 +1,6 @@
 import typing
 import asyncio
+from datetime import datetime
 from traitlets import default
 from traitlets import Instance
 from traitlets import Int
@@ -141,6 +142,7 @@ async def connect(self):
         self.set_state(LifecycleStates.CONNECTING, ExecutionStates.BUSY)
         # Use the new API for getting a client.
         self.main_client = self.client()
+        self.last_activity = datetime.utcnow()
         # Track execution state by watching all messages that come through
         # the kernel client.
         self.main_client.add_listener(self.execution_state_listener)
@@ -183,6 +185,7 @@ def broadcast_state(self):
     def execution_state_listener(self, channel_name: str, msg: list[bytes]):
         """Set the execution state by watching messages returned by the shell channel."""
         # Only continue if we're on the IOPub where the status is published.
+        self.last_activity = datetime.utcnow()
         if channel_name != "iopub":
             return
 

jupyter_rtc_core/rooms/yroom.py

@@ -64,7 +64,7 @@ def __init__(
         self._client_group = YjsClientGroup(room_id=room_id, log=self.log, loop=self._loop)
         self._ydoc = pycrdt.Doc()
         self._awareness = pycrdt.Awareness(ydoc=self._ydoc)
-        _, file_type, _ = self.room_id.split(":")
+        file_type, _, _ = self.room_id.split(":")
         JupyterYDocClass = cast(
             type[YBaseDoc],
             jupyter_ydoc_classes.get(file_type, jupyter_ydoc_classes["file"])

jupyter_rtc_core/rooms/yroom_file_api.py

@@ -34,7 +34,7 @@ class YRoomFileAPI:
     # See `filemanager.py` in `jupyter_server` for references on supported file
     # formats & file types.
     room_id: str
-    file_format: Literal["text", "base64"]
+    file_format: Literal["text", "base64", "json"]
     file_type: Literal["file", "notebook"]
     file_id: str
     log: logging.Logger
@@ -173,6 +173,7 @@ async def _process_scheduled_saves(self) -> None:
             try:
                 assert self.jupyter_ydoc
                 path = self.get_path()
+                self.log.info(f"Saving content for room ID '{self.room_id}'. {path}. {self.file_format} {self.file_type}")
                 content = self.jupyter_ydoc.source
                 file_format = self.file_format
                 file_type = self.file_type if self.file_type in SAVEABLE_FILE_TYPES else "file"

jupyter_rtc_core/session_manager.py

@@ -35,12 +35,18 @@ def get_kernel_client(self, kernel_id) -> DocumentAwareKernelClient:
         kernel_client = kernel_manager.main_client
         return kernel_client
 
-    def get_yroom(self, path) -> YRoom:
+    def get_yroom(self, path, type) -> YRoom:
         """Get the yroom for a given path."""
         file_id = self.file_id_manager.get_id(path)
-        yroom = self.yroom_manager.get_room(file_id)
+        room_id = self.build_notebook_room_id(file_id, type)
+        self.log.info(f"Getting yroom for file {room_id}")
+        yroom = self.yroom_manager.get_room(room_id)
         return yroom 
 
+    def build_notebook_room_id(self, file_id, file_type) -> str:
+        # TOOD: extract/how to construct file format?
+        return f"{file_type}:notebook:{file_id}"
+    
     async def create_session(
         self,
         path: Optional[str] = None,
@@ -52,6 +58,8 @@ async def create_session(
         """
         After creating a session, connects the yroom to the kernel client.
         """
+        self.log.info(f"Creating session for path {path}, kernel_id {kernel_id}")
+        path = "Untitled.ipynb"
         output = await super().create_session(
             path, 
             name,
@@ -65,7 +73,7 @@ async def create_session(
 
         # NOTE: Question - is room_id equivalent to file ID? 
         # Connect this session's yroom to the kernel.
-        yroom = self.get_yroom(path)
+        yroom = self.get_yroom(path=path, type=type)
         # TODO: we likely have a race condition here... need to 
         # think about it more. Currently, the kernel client gets
         # created after the kernel starts fully. We need the