-

Author: davidbrochart

jupyverse_api/jupyverse_api/yjs/__init__.py

@@ -9,7 +9,6 @@
 
 from ..app import App
 from ..auth import Auth, User
-from .models import MergeRoom
 
 
 class Yjs(Router, ABC):
@@ -47,10 +46,10 @@ async def fork_room(
 
         @router.put("/api/collaboration/merge_room", status_code=200)
         async def merge_room(
-            merge_room: MergeRoom,
+            request: Request,
             user: User = Depends(auth.current_user(permissions={"contents": ["read"]})),
         ):
-            return await self.merge_room(merge_room, user)
+            return await self.merge_room(request, user)
 
         self.include_router(router)
 
@@ -83,7 +82,7 @@ async def fork_room(
     @abstractmethod
     async def merge_room(
         self,
-        merge_room: MergeRoom,
+        request: Request,
         user: User,
     ):
         ...

plugins/yjs/fps_yjs/routes.py

@@ -117,9 +117,12 @@ async def fork_room(
 
     async def merge_room(
         self,
-        merge_room: MergeRoom,
+        request: Request,
         user: User,
     ):
+        # we need to process the request manually
+        # see https://github.com/tiangolo/fastapi/issues/3373#issuecomment-1306003451
+        merge_room = MergeRoom(**(await request.json()))
         fork_room = await self.room_manager.websocket_server.get_room(merge_room.fork_roomid)
         root_room = await self.room_manager.websocket_server.get_room(merge_room.root_roomid)
         update = fork_room.ydoc.get_update()