Initial working version

.gitignore

@@ -0,0 +1 @@
+.env

main.py → BingGPT.py

@@ -1,13 +1,13 @@
 """
 Main.py
 """
+import os
 import json
-import time
 import uuid
-from threading import Thread
 
+import asyncio
 import requests
-from websocket import WebSocket
+import websockets.client as websockets
 
 
 def append_identifier(msg: dict) -> str:
@@ -28,7 +28,7 @@ class ChatHubRequest:
         conversation_signature: str,
         client_id: str,
         conversation_id: str,
-        invocation_id: int,
+        invocation_id: int = 0,
     ) -> None:
         self.struct: dict
 
@@ -36,23 +36,10 @@ class ChatHubRequest:
         self.conversation_id: str = conversation_id
         self.conversation_signature: str = conversation_signature
         self.invocation_id: int = invocation_id
-        self.is_start_of_session: bool = True
-
-        self.update(
-            prompt=None,
-            conversation_signature=conversation_signature,
-            client_id=client_id,
-            conversation_id=conversation_id,
-            invocation_id=invocation_id,
-        )
 
     def update(
         self,
         prompt: str,
-        conversation_signature: str = None,
-        client_id: str = None,
-        conversation_id: str = None,
-        invocation_id: int = None,
     ) -> None:
         """
         Updates request object
@@ -69,26 +56,25 @@ class ChatHubRequest:
                         "responsible_ai_policy_235",
                         "enablemm",
                     ],
-                    "isStartOfSession": self.is_start_of_session,
+                    "isStartOfSession": self.invocation_id == 0,
                     "message": {
-                        "timestamp": "2023-02-09T13:26:58+08:00",
                         "author": "user",
                         "inputMethod": "Keyboard",
                         "text": prompt,
                         "messageType": "Chat",
                     },
-                    "conversationSignature": conversation_signature
-                    or self.conversation_signature,
-                    "participant": {"id": client_id or self.client_id},
-                    "conversationId": conversation_id or self.conversation_id,
-                    "previousMessages": [],
-                },
+                    "conversationSignature": self.conversation_signature,
+                    "participant": {
+                        "id": self.client_id,
+                    },
+                    "conversationId": self.conversation_id,
+                }
             ],
-            "invocationId": str(invocation_id),
+            "invocationId": str(self.invocation_id),
             "target": "chat",
             "type": 4,
         }
-        self.is_start_of_session = False
+        self.invocation_id += 1
 
 
 class Conversation:
@@ -103,9 +89,6 @@ class Conversation:
             "conversationSignature": None,
             "result": {"value": "Success", "message": None},
         }
-        self.__create()
-
-    def __create(self):
         # Build request
         headers = {
             "accept": "application/json",
@@ -129,9 +112,9 @@ class Conversation:
             "x-ms-useragent": "azsdk-js-api-client-factory/1.0.0-beta.1 core-rest-pipeline/1.10.0 OS/Linuxx86_64",
         }
         # Create cookies
-        cookies = json.loads(
-            open("templates/cookies.json", encoding="utf-8").read(),
-        )
+        cookies = {
+            "_U": os.environ.get("BING_U")
+        }
         # Send GET request
         response = requests.get(
             "https://www.bing.com/turing/conversation/create",
@@ -139,65 +122,112 @@ class Conversation:
             cookies=cookies,
             timeout=30,
         )
+        if response.status_code != 200:
+            raise Exception("Authentication failed")
         # Return response
         self.struct = response.json()
 
-
 class ChatHub:
     """
     Chat API
     """
 
     def __init__(self) -> None:
-        self.wss = WebSocket()
-        self.wss.connect(url="wss://sydney.bing.com/sydney/ChatHub")
-        self.__initial_handshake()
-        # Ping in another thread
-        self.thread = Thread(target=self.__ping)
-        self.thread.start()
-        self.stop_thread = False
-
-    def ask(self, prompt: str):
-        pass
-
-    def __initial_handshake(self):
-        self.wss.send(append_identifier({"protocol": "json", "version": 1}))
-        # Receive blank message
-        self.wss.recv()
-
-    def __ping(self):
-        timing = 10
+        self.wss: websockets.WebSocketClientProtocol
+        self.request: ChatHubRequest
+        self.loop: bool
+
+    async def init(self, conversation: Conversation) -> None:
+        """
+        Separate initialization to allow async
+        """
+        self.wss = await websockets.connect("wss://sydney.bing.com/sydney/ChatHub")
+        self.request = ChatHubRequest(
+            conversation_signature=conversation.struct["conversationSignature"],
+            client_id=conversation.struct["clientId"],
+            conversation_id=conversation.struct["conversationId"],
+        )
+        self.loop = True
+        await self.__initial_handshake()
+
+        # Make async ping loop (long running)
+        self.task = asyncio.create_task(self.__ping())
+
+
+    async def ask(self, prompt: str) -> str:
+        """
+        Ask a question to the bot
+        """
+        # Construct a ChatHub request
+        self.request.update(prompt=prompt)
+        # Send request
+        await self.wss.send(append_identifier(self.request.struct))
         while True:
-            if timing == 0:
-                self.wss.send(append_identifier({"type": 6}))
-                # Receive pong
-                self.wss.recv()
-                timing = 10
-            else:
-                timing -= 1
-            time.sleep(1)
-            if self.stop_thread:
+            objects = str(await self.wss.recv()).split("")
+            for obj in objects:
+                if obj is None or obj == "":
+                    continue
+                response = json.loads(obj)
+                if response.get("type") == 2:
+                    return response
+
+    async def __initial_handshake(self):
+        await self.wss.send(append_identifier({"protocol": "json", "version": 1}))
+        await self.wss.send(append_identifier({"type": 6}))
+
+    async def __ping(self):
+        while self.loop:
+            try:
+                await asyncio.sleep(5)
+            except asyncio.CancelledError:
                 break
-
-    def close(self):
+            await self.wss.send(append_identifier({"type": 6}))
+    
+    async def close(self):
         """
-        Close all connections
+        Close the connection
         """
-        self.wss.close()
-        self.stop_thread = True
-        self.thread.join()
+        self.loop = False
+        await self.wss.close()
+        self.task.cancel()
 
 
-async def main():
+class Chatbot:
     """
-    Main function
+    Combines everything to make it seamless
     """
-    # Create conversation
-    conversation = Conversation()
-    print(conversation.struct)
+    def __init__(self) -> None:
+        self.conversation: Conversation
+        self.chat_hub: ChatHub
+    async def a_start(self) -> None:
+        """
+        Separate initialization to allow async
+        """
+        self.conversation = Conversation()
+        self.chat_hub = ChatHub()
+        await self.chat_hub.init(conversation=self.conversation)
 
+    async def a_ask(self, prompt: str) -> str:
+        """
+        Ask a question to the bot
+        """
+        return await self.chat_hub.ask(prompt=prompt)
+    async def a_close(self):
+        """
+        Close the connection
+        """
+        await self.chat_hub.close()
 
-if __name__ == "__main__":
-    import asyncio
 
+async def main():
+    print("Initializing...")
+    bot = Chatbot()
+    await bot.a_start()
+    while True:
+        prompt = input("You: ")
+        if prompt == "!exit":
+            break
+        print("Bot:", (await bot.a_ask(prompt=prompt))["item"]["messages"][1]["text"])
+    await bot.a_close()
+if __name__ == "__main__":
     asyncio.run(main())

templates/chathub_request.json

@@ -1,55 +0,0 @@
-{
-  "arguments": [
-    {
-      "source": "cib",
-      "optionsSets": [
-        "nlu_direct_response_filter",
-        "deepleo",
-        "enable_debug_commands",
-        "disable_emoji_spoken_text",
-        "responsible_ai_policy_235",
-        "enablemm"
-      ],
-      "allowedMessageTypes": [
-        "Chat",
-        "InternalSearchQuery",
-        "InternalSearchResult",
-        "InternalLoaderMessage",
-        "RenderCardRequest",
-        "AdsQuery",
-        "SemanticSerp"
-      ],
-      "sliceIds": [],
-      "traceId": "63e48421455345f0854475fe03c0c78a",
-      "isStartOfSession": true,
-      "message": {
-        "locale": "en-US",
-        "market": "en-US",
-        "region": "SG",
-        "location": "lat:0.000000;long:0.000000;re=0m;",
-        "locationHints": [
-          {
-            "country": "Singapore",
-            "timezoneoffset": 8,
-            "countryConfidence": 8,
-            "Center": { "Latitude": 0, "Longitude": 0 },
-            "RegionType": 2,
-            "SourceType": 1
-          }
-        ],
-        "timestamp": "2023-02-09T13:26:58+08:00",
-        "author": "user",
-        "inputMethod": "Keyboard",
-        "text": "Say this is a test",
-        "messageType": "Chat"
-      },
-      "conversationSignature": "<|CONVERSATION_SIGNATURE|>",
-      "participant": { "id": "<|CLIENT_ID|>" },
-      "conversationId": "<|CONVERSATION_ID|>",
-      "previousMessages": []
-    }
-  ],
-  "invocationId": "1",
-  "target": "chat",
-  "type": 4
-}

templates/chathub_request_backup.json

@@ -1,86 +0,0 @@
-{
-  "arguments": [
-    {
-      "source": "cib",
-      "optionsSets": [
-        "nlu_direct_response_filter",
-        "deepleo",
-        "enable_debug_commands",
-        "disable_emoji_spoken_text",
-        "responsible_ai_policy_235",
-        "enablemm"
-      ],
-      "allowedMessageTypes": [
-        "Chat",
-        "InternalSearchQuery",
-        "InternalSearchResult",
-        "InternalLoaderMessage",
-        "RenderCardRequest",
-        "AdsQuery",
-        "SemanticSerp"
-      ],
-      "sliceIds": [],
-      "traceId": "63e48421455345f0854475fe03c0c78a",
-      "isStartOfSession": true,
-      "message": {
-        "locale": "en-US",
-        "market": "en-US",
-        "region": "SG",
-        "location": "lat:0.000000;long:0.000000;re=0m;",
-        "locationHints": [
-          {
-            "country": "Singapore",
-            "timezoneoffset": 8,
-            "countryConfidence": 8,
-            "Center": { "Latitude": 0, "Longitude": 0 },
-            "RegionType": 2,
-            "SourceType": 1
-          }
-        ],
-        "timestamp": "2023-02-09T13:26:58+08:00",
-        "author": "user",
-        "inputMethod": "Keyboard",
-        "text": "Say this is a test",
-        "messageType": "Chat"
-      },
-      "conversationSignature": "<|CONVERSATION_SIGNATURE|>",
-      "participant": { "id": "<|CLIENT_ID|>" },
-      "conversationId": "<|CONVERSATION_ID|>",
-      "previousMessages": [
-        {
-          "text": "Okay, I’ve cleared the slate for a fresh start. What can I help you explore now?",
-          "author": "bot",
-          "adaptiveCards": [],
-          "suggestedResponses": [
-            {
-              "text": "Teach me a new word",
-              "contentOrigin": "DeepLeo",
-              "messageType": "Suggestion",
-              "messageId": "0b483c19-409a-746c-9c44-2779234c04e4",
-              "offense": "Unknown"
-            },
-            {
-              "text": "Why do humans need sleep?",
-              "contentOrigin": "DeepLeo",
-              "messageType": "Suggestion",
-              "messageId": "b9e18704-b29d-25de-951d-c13aa1b0252c",
-              "offense": "Unknown"
-            },
-            {
-              "text": "I want to learn a new skill",
-              "contentOrigin": "DeepLeo",
-              "messageType": "Suggestion",
-              "messageId": "9092c1e7-4ddf-9726-3da6-efadaa8bc9cb",
-              "offense": "Unknown"
-            }
-          ],
-          "messageId": "57cda79f-4afa-3723-1bad-394e61f1e590",
-          "messageType": "Chat"
-        }
-      ]
-    }
-  ],
-  "invocationId": "2",
-  "target": "chat",
-  "type": 4
-}

templates/cookies.json

@@ -1,3 +0,0 @@
-{
-  "_U": "1YEL2O07jUf0Rdw3Li02tXbvn47K5pNQcjqdjILEq-9hgsxvyYD9bMjIGxICr3nmVHIcWKgZLVGUVxhdQDHY-WWd8spn_8yNwT-pweGVb6115nmreE8zOa44HLPcHqzvaSOuVVWfip7itwiUOakv6_3SxK2k2YVb9fA-d88MAINsknY9mnaA3-fSXdMea5-K-"
-}