Merge #541

src/EdgeGPT/EdgeGPT.py

@@ -174,11 +174,11 @@ async def close(self) -> None:
         """
         await self.chat_hub.close()
 
-    async def remove_and_close(self) -> None:
+    async def delete_conversation(self, conversation_id: str=None, conversation_signature: str=None, client_id: str=None) -> None:
         """
         Delete the chat in the server and close the connection
         """
-        await self.chat_hub.remove_and_close()
+        await self.chat_hub.delete_conversation(conversation_id=conversation_id, conversation_signature=conversation_signature, client_id=client_id)
 
     async def reset(self, delete=False) -> None:
         """

src/EdgeGPT/chathub.py

@@ -229,10 +229,10 @@ async def _initial_handshake(self, wss: aiohttp.ClientWebSocketResponse) -> None
         await wss.receive(timeout=900)
         await wss.send_str(append_identifier({"type": 6}))
 
-    async def remove_and_close(self) -> None:
-        conversation_id = self.request.conversation_id
-        conversation_signature = self.request.conversation_signature
-        client_id = self.request.client_id
+    async def delete_conversation(self, conversation_id: str=None, conversation_signature: str=None, client_id: str=None) -> None:
+        conversation_id = conversation_id or self.request.conversation_id
+        conversation_signature = conversation_signature or self.request.conversation_signature
+        client_id = client_id or self.request.client_id
         url = "https://sydney.bing.com/sydney/DeleteSingleConversation"
         await self.session.post(
             url,
@@ -244,7 +244,5 @@ async def remove_and_close(self) -> None:
                 "optionsSets": ["autosave"]
             }
         )
-        await self.session.aclose()
-
     async def close(self) -> None:
         await self.session.aclose()