feat: add v1

main.py

@@ -213,17 +213,16 @@ async def create_upload_file(file: UploadFile):
 
     return {"filename": file.filename}
 
-@api_app.websocket("/ws/{room_id}/{user_id}")
-async def websocket_endpoint_room(websocket: WebSocket, room_id: str, user_id: str):
+@api_app.websocket("/ws/{user_id}")
+async def websocket_endpoint_student(websocket: WebSocket, user_id: str):
     global QA
 
-    await socket_manager.add_user_to_room(room_id, websocket)
-
     message = {
-        "message": f"Student {user_id} connected to the classroom"
+        "message": f"Student {user_id} connected"
     }
 
-    await socket_manager.broadcast_to_room(room_id, json.dumps(message))
+    await socket_manager.add_user_to_room(user_id, websocket)
+    await socket_manager.broadcast_to_room(user_id, json.dumps(message))
 
     try:
         while True:
@@ -231,29 +230,30 @@ async def websocket_endpoint_room(websocket: WebSocket, room_id: str, user_id: s
 
             prompt_response_dict = sendPromptChain(QA, data)
 
-            await socket_manager.broadcast_to_room(room_id, json.dumps(prompt_response_dict))
+            await socket_manager.broadcast_to_room(user_id, json.dumps(prompt_response_dict))
 
     except WebSocketDisconnect:
-        await socket_manager.remove_user_from_room(room_id, websocket)
+        await socket_manager.remove_user_from_room(user_id, websocket)
 
         message = {
-            "message": f"Student {user_id} disconnected from room - {room_id}"
+            "message": f"Student {user_id} disconnected"
         }
 
-        await socket_manager.broadcast_to_room(room_id, json.dumps(message))
+        await socket_manager.broadcast_to_room(user_id, json.dumps(message))
     except RuntimeError as error:
         print(error)
 
-@api_app.websocket("/ws/{user_id}")
-async def websocket_endpoint_student(websocket: WebSocket, user_id: str):
+@api_app.websocket("/ws/{room_id}/{user_id}")
+async def websocket_endpoint_room(websocket: WebSocket, room_id: str, user_id: str):
     global QA
 
+    await socket_manager.add_user_to_room(room_id, websocket)
+
     message = {
-        "message": f"Student {user_id} connected"
+        "message": f"Student {user_id} connected to the classroom"
     }
 
-    await socket_manager.add_user_to_room(user_id, websocket)
-    await socket_manager.broadcast_to_room(user_id, json.dumps(message))
+    await socket_manager.broadcast_to_room(room_id, json.dumps(message))
 
     try:
         while True:
@@ -261,15 +261,16 @@ async def websocket_endpoint_student(websocket: WebSocket, user_id: str):
 
             prompt_response_dict = sendPromptChain(QA, data)
 
-            await socket_manager.broadcast_to_room(user_id, json.dumps(prompt_response_dict))
+            await socket_manager.broadcast_to_room(room_id, json.dumps(prompt_response_dict))
 
     except WebSocketDisconnect:
-        await socket_manager.remove_user_from_room(user_id, websocket)
+        await socket_manager.remove_user_from_room(room_id, websocket)
 
         message = {
-            "message": f"Student {user_id} disconnected"
+            "message": f"Student {user_id} disconnected from room - {room_id}"
         }
 
-        await socket_manager.broadcast_to_room(user_id, json.dumps(message))
+        await socket_manager.broadcast_to_room(room_id, json.dumps(message))
     except RuntimeError as error:
         print(error)
+