addressing a comment

Author: Jialin Zhang

jupyter_rtc_core/app.py

@@ -4,7 +4,7 @@
 
 from traitlets import Instance, Type
 from .handlers import RouteHandler, FileIDIndexHandler
-from .websockets import GlobalAwarenessWebsocket, YRoomWebsocket
+from .websockets import YRoomWebsocket
 from .rooms.yroom_manager import YRoomManager
 from .outputs import OutputsManager, outputs_handlers
 
@@ -17,8 +17,6 @@ class RtcExtensionApp(ExtensionApp):
         # dummy handler that verifies the server extension is installed;
         # # this can be deleted prior to initial release.
         (r"jupyter-rtc-core/get-example/?", RouteHandler),
-        # global awareness websocket
-        (r"api/collaboration/room/JupyterLab:globalAwareness/?", GlobalAwarenessWebsocket),
         # # ydoc websocket
         (r"api/collaboration/room/(.*)", YRoomWebsocket),
         # # handler that just adds compatibility with Jupyter Collaboration's frontend

jupyter_rtc_core/rooms/yroom.py

@@ -53,8 +53,8 @@ def __init__(
         room_id: str,
         log: Logger,
         loop: asyncio.AbstractEventLoop,
-        fileid_manager: BaseFileIdManager | None = None,
-        contents_manager: AsyncContentsManager | ContentsManager | None = None,
+        fileid_manager: BaseFileIdManager,
+        contents_manager: AsyncContentsManager | ContentsManager,
     ):
         # Bind instance attributes
         self.log = log
@@ -68,7 +68,7 @@ def __init__(
 
         self.file_api = None
         self._jupyter_ydoc = None
-        if fileid_manager and contents_manager: 
+        if self.room_id != "JupyterLab:globalAwareness":
             _, file_type, _ = self.room_id.split(":")
             JupyterYDocClass = cast(
                 type[YBaseDoc],
@@ -125,6 +125,10 @@ async def get_jupyter_ydoc(self):
         """
         if self.file_api:
             await self.file_api.ydoc_content_loaded
+        if self.room_id == "JupyterLab:globalAwareness":
+            message = "There is no Jupyter ydoc for global awareness scenario"
+            self.log.error(message)
+            raise Exception(message)
         return self._jupyter_ydoc
 
 

jupyter_rtc_core/rooms/yroom_manager.py

@@ -48,18 +48,13 @@ def get_room(self, room_id: str) -> YRoom | None:
         # Otherwise, create a new room
         try:
             self.log.info(f"Initializing room '{room_id}'.")
-            if room_id == "JupyterLab:globalAwareness":
-                yroom = YRoom(room_id=room_id,
-                    log=self.log,
-                    loop=self.loop)
-            else:
-                yroom = YRoom(
-                    room_id=room_id,
-                    log=self.log,
-                    loop=self.loop,
-                    fileid_manager=self.fileid_manager,
-                    contents_manager=self.contents_manager,
-                )
+            yroom = YRoom(
+                room_id=room_id,
+                log=self.log,
+                loop=self.loop,
+                fileid_manager=self.fileid_manager,
+                contents_manager=self.contents_manager,
+            )
             self._rooms_by_id[room_id] = yroom
             return yroom
         except Exception as e:

jupyter_rtc_core/websockets/__init__.py

@@ -1,3 +1,2 @@
 from .clients import YjsClient, YjsClientGroup
 from .yroom_ws import YRoomWebsocket
-from .global_awareness_ws import GlobalAwarenessWebsocket

jupyter_rtc_core/websockets/global_awareness_ws.py

@@ -41,10 +41,11 @@ def prepare(self):
         self.room_id = request_path.strip("/").split("/")[-1]
 
         # Verify the file ID contained in the room ID points to a valid file.
-        fileid = self.room_id.split(":")[-1]
-        path = self.fileid_manager.get_path(fileid)
-        if not path:
-            raise HTTPError(404, f"No file with ID '{fileid}'.")
+        if self.room_id != "JupyterLab:globalAwareness":
+            fileid = self.room_id.split(":")[-1]
+            path = self.fileid_manager.get_path(fileid)
+            if not path:
+                raise HTTPError(404, f"No file with ID '{fileid}'.")
 
 
     def open(self, *_, **__):