:recycle: [Refactor] Format ports among classes

conversation_connector.py

@@ -36,24 +36,19 @@ class ConversationConnectRequestHeadersConstructor:
 class ConversationConnector:
     def __init__(
         self,
-        conversation_style="precise",
-        sec_access_token=None,
-        client_id=None,
-        conversation_id=None,
-        invocation_id=0,
+        conversation_style: str = "precise",
+        sec_access_token: str = "",
+        client_id: str = "",
+        conversation_id: str = "",
+        invocation_id: int = 0,
         cookies={},
     ):
         self.conversation_style = conversation_style
         self.sec_access_token = sec_access_token
-        self.quotelized_sec_access_token = urllib.parse.quote(self.sec_access_token)
         self.client_id = client_id
         self.conversation_id = conversation_id
         self.invocation_id = invocation_id
         self.cookies = cookies
-        self.ws_url = (
-            f"wss://sydney.bing.com/sydney/ChatHub"
-            f"?sec_access_token={self.quotelized_sec_access_token}"
-        )
 
     async def wss_send(self, message):
         serialized_websocket_message = json.dumps(message, ensure_ascii=False) + "\x1e"
@@ -65,6 +60,11 @@ class ConversationConnector:
         await self.wss_send({"type": 6})
 
     async def init_wss_connection(self):
+        self.quotelized_sec_access_token = urllib.parse.quote(self.sec_access_token)
+        self.ws_url = (
+            f"wss://sydney.bing.com/sydney/ChatHub"
+            f"?sec_access_token={self.quotelized_sec_access_token}"
+        )
         self.aiohttp_session = aiohttp.ClientSession(cookies=self.cookies)
         request_headers_constructor = ConversationConnectRequestHeadersConstructor()
         self.wss = await self.aiohttp_session.ws_connect(

conversation_creator.py

@@ -1,6 +1,6 @@
 import httpx
 import json
-import pprint
+from pprint import pprint
 
 http_proxy = "http://localhost:11111"  # Replace with yours
 
@@ -8,16 +8,16 @@ http_proxy = "http://localhost:11111"  # Replace with yours
 class ConversationCreator:
     conversation_create_url = "https://www.bing.com/turing/conversation/create"
 
-    def __init__(self, cookies={}):
+    def __init__(self, cookies: dict = {}):
         self.cookies = cookies
-        self.construct_cookies()
 
     def construct_cookies(self):
         self.httpx_cookies = httpx.Cookies()
         for key, val in self.cookies.items():
             self.httpx_cookies.set(key, val)
 
-    def create(self, proxy=None):
+    def create(self, proxy: str = None):
+        self.construct_cookies()
         self.response = httpx.get(
             self.conversation_create_url,
             proxies=http_proxy if proxy is None else proxy,
@@ -25,8 +25,14 @@ class ConversationCreator:
         )
         self.response_content = json.loads(self.response.content.decode("utf-8"))
         self.response_headers = dict(self.response.headers)
-        pprint.pprint(self.response_content)
-        # pprint.pprint(self.response_headers)
+        pprint(self.response_content)
+
+        # These info would be used in ConversationConnector
+        self.sec_access_token = self.response_headers[
+            "x-sydney-encryptedconversationsignature"
+        ]
+        self.client_id = self.response_content["clientId"]
+        self.conversation_id = self.response_content["conversationId"]
 
 
 if __name__ == "__main__":

conversation_session.py

@@ -5,7 +5,7 @@ from logger.logger import logger
 
 
 class ConversationSession:
-    def __init__(self, conversation_style="precise"):
+    def __init__(self, conversation_style: str = "precise"):
         self.conversation_style = conversation_style
 
     def __enter__(self):
@@ -22,11 +22,9 @@ class ConversationSession:
     def connect(self):
         self.connector = ConversationConnector(
             conversation_style=self.conversation_style,
-            sec_access_token=self.creator.response_headers[
-                "x-sydney-encryptedconversationsignature"
-            ],
-            client_id=self.creator.response_content["clientId"],
-            conversation_id=self.creator.response_content["conversationId"],
+            sec_access_token=self.creator.sec_access_token,
+            client_id=self.creator.client_id,
+            conversation_id=self.creator.conversation_id,
         )
 
     def open(self):