:recycle: [Refactor] Re-organize project with folders

conversations/__init__.py

@@ -0,0 +1,3 @@
+from .conversation_connector import ConversationConnector
+from .conversation_creator import ConversationCreator
+from .conversation_session import ConversationSession

conversation_connector.py → conversations/conversation_connector.py

@@ -4,35 +4,16 @@ import httpx
 import json
 import urllib
 
-from conversation_creator import ConversationCreator
-from chathub_request_constructor import ChathubRequestConstructor
-from message_parser import MessageParser
-from logger.logger import logger
-
+from networks import (
+    ChathubRequestPayloadConstructor,
+    ConversationRequestHeadersConstructor,
+)
+from networks import MessageParser
+from utils.logger import logger
 
 http_proxy = "http://localhost:11111"  # Replace with yours
 
 
-class ConversationConnectRequestHeadersConstructor:
-    def __init__(self):
-        self.construct()
-
-    def construct(self):
-        self.request_headers = {
-            "Accept-Encoding": " gzip, deflate, br",
-            "Accept-Language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7",
-            "Cache-Control": "no-cache",
-            "Connection": "Upgrade",
-            "Host": "sydney.bing.com",
-            "Origin": "https://www.bing.com",
-            "Pragma": "no-cache",
-            "Sec-Websocket-Extensions": "permessage-deflate; client_max_window_bits",
-            "Sec-Websocket-Version": "13",
-            "Upgrade": "websocket",
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
-        }
-
-
 class ConversationConnector:
     def __init__(
         self,
@@ -66,23 +47,23 @@ class ConversationConnector:
             f"?sec_access_token={self.quotelized_sec_access_token}"
         )
         self.aiohttp_session = aiohttp.ClientSession(cookies=self.cookies)
-        request_headers_constructor = ConversationConnectRequestHeadersConstructor()
+        headers_constructor = ConversationRequestHeadersConstructor()
         self.wss = await self.aiohttp_session.ws_connect(
             self.ws_url,
-            headers=request_headers_constructor.request_headers,
+            headers=headers_constructor.request_headers,
             proxy=http_proxy,
         )
         await self.init_handshake()
 
     async def send_chathub_request(self, prompt):
-        chathub_request_constructor = ChathubRequestConstructor(
+        payload_constructor = ChathubRequestPayloadConstructor(
             prompt=prompt,
             conversation_style=self.conversation_style,
             client_id=self.client_id,
             conversation_id=self.conversation_id,
             invocation_id=self.invocation_id,
         )
-        self.connect_request_payload = chathub_request_constructor.request_payload
+        self.connect_request_payload = payload_constructor.request_payload
         await self.wss_send(self.connect_request_payload)
 
     async def stream_chat(self, prompt=""):

conversation_session.py → conversations/conversation_session.py

@@ -1,7 +1,6 @@
 import asyncio
-from conversation_creator import ConversationCreator
-from conversation_connector import ConversationConnector
-from logger.logger import logger
+from conversations import ConversationCreator, ConversationConnector
+from utils.logger import logger
 
 
 class ConversationSession:

main.py

@@ -0,0 +1,10 @@
+from conversations import ConversationSession
+
+if __name__ == "__main__":
+    prompts = [
+        "Today's weather of California",
+        "Please summarize your previous answer in table format",
+    ]
+    with ConversationSession("precise") as session:
+        for prompt in prompts:
+            session.chat(prompt)

networks/__init__.py

@@ -0,0 +1,6 @@
+from .chathub_request_payload_constructor import ChathubRequestPayloadConstructor
+from .cookies_constructor import CookiesConstructor
+from .conversation_request_headers_constructor import (
+    ConversationRequestHeadersConstructor,
+)
+from .message_parser import MessageParser

chathub_request_constructor.py → networks/chathub_request_payload_constructor.py

@@ -2,7 +2,7 @@ import random
 import uuid
 
 
-class ChathubRequestConstructor:
+class ChathubRequestPayloadConstructor:
     def __init__(
         self,
         prompt,

networks/conversation_request_headers_constructor.py

@@ -0,0 +1,18 @@
+class ConversationRequestHeadersConstructor:
+    def __init__(self):
+        self.construct()
+
+    def construct(self):
+        self.request_headers = {
+            "Accept-Encoding": "gzip, deflate, br",
+            "Accept-Language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7",
+            "Cache-Control": "no-cache",
+            "Connection": "Upgrade",
+            "Host": "sydney.bing.com",
+            "Origin": "https://www.bing.com",
+            "Pragma": "no-cache",
+            "Sec-Websocket-Extensions": "permessage-deflate; client_max_window_bits",
+            "Sec-Websocket-Version": "13",
+            "Upgrade": "websocket",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
+        }

message_parser.py → networks/message_parser.py

@@ -1,4 +1,4 @@
-from logger.logger import logger
+from utils.logger import logger
 
 
 class MessageParser:
@@ -7,11 +7,9 @@ class MessageParser:
 
     def parse(self, data):
         arguments = data["arguments"][0]
-
         if arguments.get("throttling"):
             throttling = arguments.get("throttling")
             # pprint.pprint(throttling)
-
         if arguments.get("messages"):
             for message in arguments.get("messages"):
                 message_type = message.get("messageType")