fixing up vscodemessenger

3 files changed, 10 insertions, 22 deletions

diff --git a/continuedev/src/continuedev/server/main.py b/continuedev/src/continuedev/server/main.py
index e87d5fa9..1977bfdd 100644
--- a/continuedev/src/continuedev/server/main.py
+++ b/continuedev/src/continuedev/server/main.py
@@ -32,7 +32,8 @@ args = parser.parse_args()
 
 
 def run_server():
-    uvicorn.run(app, host="0.0.0.0", port=args.port)
+    uvicorn.run(app, host="0.0.0.0", port=args.port,
+                log_config="logging.yaml")
 
 
 if __name__ == "__main__":
diff --git a/continuedev/src/continuedev/server/notebook.py b/continuedev/src/continuedev/server/notebook.py
index edb61a45..ab9211a8 100644
--- a/continuedev/src/continuedev/server/notebook.py
+++ b/continuedev/src/continuedev/server/notebook.py
@@ -51,14 +51,17 @@ class NotebookProtocolServer(AbstractNotebookProtocolServer):
     def __init__(self, session: Session):
         self.session = session
 
-    async def _send_json(self, data: Any):
-        await self.websocket.send_json(data)
+    async def _send_json(self, message_type: str, data: Any):
+        await self.websocket.send_json({
+            "message_type": message_type,
+            "data": data
+        })
 
     async def _receive_json(self, message_type: str) -> Any:
         return await self.sub_queue.get(message_type)
 
     async def _send_and_receive_json(self, data: Any, resp_model: Type[T], message_type: str) -> T:
-        await self._send_json(data)
+        await self._send_json(message_type, data)
         resp = await self._receive_json(message_type)
         return resp_model.parse_obj(resp)
 
@@ -77,8 +80,7 @@ class NotebookProtocolServer(AbstractNotebookProtocolServer):
 
     async def send_state_update(self):
         state = self.session.agent.get_full_state().dict()
-        await self._send_json({
-            "messageType": "state_update",
+        await self._send_json("state_update", {
             "state": state
         })
 
@@ -112,7 +114,7 @@ async def websocket_endpoint(websocket: WebSocket, session: Session = Depends(we
     await protocol.send_state_update()
 
     while AppStatus.should_exit is False:
-        message = await websocket.receive_json()
+        message = await websocket.receive_text()
         print("Received message", message)
         if type(message) is str:
             message = json.loads(message)
diff --git a/continuedev/src/continuedev/server/session_manager.py b/continuedev/src/continuedev/server/session_manager.py
index b48c21b7..c5715034 100644
--- a/continuedev/src/continuedev/server/session_manager.py
+++ b/continuedev/src/continuedev/server/session_manager.py
@@ -77,25 +77,10 @@ class SessionManager:
             print(f"Session {session_id} has no websocket")
             return
 
-        async def a():
-            await self.sessions[session_id].ws.send_json({
-                "messageType": message_type,
-                "data": data
-            })
-
-        # Run coroutine in background
         await self.sessions[session_id].ws.send_json({
             "messageType": message_type,
             "data": data
         })
-        return
-        if self._event_loop is None or self._event_loop.is_closed():
-            self._event_loop = asyncio.new_event_loop()
-            self._event_loop.run_until_complete(a())
-            self._event_loop.close()
-        else:
-            self._event_loop.run_until_complete(a())
-            self._event_loop.close()
 
 
 session_manager = SessionManager()