:recycle: [Refactor] Build Connector from params

apis/chat_api.py

@@ -3,7 +3,11 @@ import uvicorn
 from fastapi import FastAPI, APIRouter, WebSocket, WebSocketDisconnect
 from fastapi.routing import APIRoute
 from pydantic import BaseModel, Field
-from conversations import ConversationSession
+from conversations import (
+    ConversationConnector,
+    ConversationCreator,
+    ConversationSession,
+)
 
 
 class ChatAPIApp:
@@ -18,27 +22,27 @@ class ChatAPIApp:
     def get_available_models(self):
         self.available_models = [
             {
-                "id": "bing-precise",
+                "id": "precise",
                 "description": "Bing (Precise): Concise and straightforward.",
             },
             {
-                "id": "bing-balanced",
+                "id": "balanced",
                 "description": "Bing (Balanced): Informative and friendly.",
             },
             {
-                "id": "bing-creative",
+                "id": "creative",
                 "description": "Bing (Creative): Original and imaginative.",
             },
             {
-                "id": "bing-precise-offline",
+                "id": "precise-offline",
                 "description": "Bing (Precise): (No Internet) Concise and straightforward.",
             },
             {
-                "id": "bing-balanced-offline",
+                "id": "balanced-offline",
                 "description": "Bing (Balanced): (No Internet) Informative and friendly.",
             },
             {
-                "id": "bing-creative-offline",
+                "id": "creative-offline",
                 "description": "Bing (Creative): (No Internet) Original and imaginative.",
             },
         ]
@@ -51,12 +55,13 @@ class ChatAPIApp:
         )
 
     def create_conversation_session(self, item: CreateConversationSessionPostItem):
-        session = ConversationSession(item.model)
-        session.open()
+        creator = ConversationCreator()
+        creator.create()
         return {
-            "conversation_id": session.connector.conversation_id,
-            "client_id": session.connector.client_id,
-            "sec_access_token": session.connector.sec_access_token,
+            "model": item.model,
+            "conversation_id": creator.conversation_id,
+            "client_id": creator.client_id,
+            "sec_access_token": creator.sec_access_token,
         }
 
     def setup_routes(self):

conversations/conversation_connector.py

@@ -40,7 +40,7 @@ class ConversationConnector:
         await self.wss.receive_str()
         await self.wss_send({"type": 6})
 
-    async def init_wss_connection(self):
+    async def connect(self):
         self.quotelized_sec_access_token = urllib.parse.quote(self.sec_access_token)
         self.ws_url = (
             f"wss://sydney.bing.com/sydney/ChatHub"
@@ -67,7 +67,7 @@ class ConversationConnector:
         await self.wss_send(self.connect_request_payload)
 
     async def stream_chat(self, prompt=""):
-        await self.init_wss_connection()
+        await self.connect()
         await self.send_chathub_request(prompt)
         message_parser = MessageParser()
         while not self.wss.closed:

conversations/conversation_session.py

@@ -4,8 +4,15 @@ from utils.logger import logger
 
 
 class ConversationSession:
-    def __init__(self, conversation_style: str = "precise"):
+    def __init__(
+        self,
+        conversation_style: str = "precise",
+        creator=None,
+        connector=None,
+    ):
         self.conversation_style = conversation_style
+        self.creator = creator
+        self.connector = connector
 
     def __enter__(self):
         self.open()
@@ -19,15 +26,16 @@ class ConversationSession:
         self.creator.create()
 
     def connect(self):
-        self.connector = ConversationConnector(
-            conversation_style=self.conversation_style,
-            sec_access_token=self.creator.sec_access_token,
-            client_id=self.creator.client_id,
-            conversation_id=self.creator.conversation_id,
-        )
+        if self.connector is None:
+            self.create()
+            self.connector = ConversationConnector(
+                conversation_style=self.conversation_style,
+                sec_access_token=self.creator.sec_access_token,
+                client_id=self.creator.client_id,
+                conversation_id=self.creator.conversation_id,
+            )
 
     def open(self):
-        self.create()
         self.connect()
         self.event_loop = asyncio.new_event_loop()
         asyncio.set_event_loop(self.event_loop)