Merge pull request #34 from Integration-Automation/dev

Refactor and edit doc

Author: JE-Chen

README.md

@@ -229,25 +229,24 @@ if __name__ == "__main__":
 <details open>
 
 > * Q: RuntimeError: This event loop is already running
-> * A: If you are using Jupyter, pls use nest_asyncio.apply()
-
+>   * A: If you are using Jupyter, pls use nest_asyncio.apply()
+>   * Like: https://github.com/Integration-Automation/ReEdgeGPT/issues/30
+> * Q: json.dumps return non utf-8 char
+>   * A: json.dumps(response, ensure_ascii=False)
+>   * Like: https://github.com/Integration-Automation/ReEdgeGPT/issues/32
 > * Q: Exception: UnauthorizedRequest: Cannot retrieve user status.
-> * A: Renew your cookie file.
-
+>   * A: Renew your cookie file.
 > * Q: Exception: conversationSignature
-> * A: Clear all your bing cookie and renew your cookie file.
->   * Like : https://github.com/Integration-Automation/ReEdgeGPT/issues/17
+>   * A: Clear all your bing cookie and renew your cookie file.
+>   * Like: https://github.com/Integration-Automation/ReEdgeGPT/issues/17
 >   * And: https://github.com/Integration-Automation/ReEdgeGPT/issues/22
-
 > * Q: ValueError: Invalid header value b'_U=***\n'
 > * A: Renew your image cookie.
-
 > * Q: Image blocking or redirect error
-> * A: Now we can't generate multi image on same time (Cause bing limit)
->   * See https://github.com/Integration-Automation/ReEdgeGPT/issues/22 
-
+>   * A: Now we can't generate multi image on same time (Cause bing limit)
+>   * See https://github.com/Integration-Automation/ReEdgeGPT/issues/22
 > * Q: UnauthorizedRequest: Token issued by https://sydney.bing.com/sydney is invalid
-> * Bing block your connect, Try to use proxy or clear cookie.
+>   * A: Bing block your connect, Try to use proxy or clear cookie.
 
 </details>
 

test/unit_test/test_bot/test_bot.py

@@ -7,14 +7,21 @@
 
 
 async def test_ask() -> None:
-    bot = await Chatbot.create(cookies=json.loads(getenv("EDGE_COOKIES")))
-    response = await bot.ask(
-        prompt="find me some information about the new ai released by meta.",
-        conversation_style=ConversationStyle.balanced
-    )
-    await bot.close()
-    print(json.dumps(response, indent=2))
-    assert response
+    bot = None
+    try:
+        bot = await Chatbot.create(cookies=json.loads(getenv("EDGE_COOKIES")))
+        response = await bot.ask(
+            prompt="find me some information about the new ai released by meta.",
+            conversation_style=ConversationStyle.balanced
+        )
+        await bot.close()
+        print(json.dumps(response, indent=2))
+        assert response
+    except Exception as error:
+        raise error
+    finally:
+        if bot is not None:
+            await bot.close()
 
 
 if __name__ == "__main__":

test/unit_test/test_bot/test_bot_manual.py

@@ -1,25 +1,36 @@
 import asyncio
 import json
 from pathlib import Path
-# If you are using jupyter pls install this package
-# from nest_asyncio import apply
 
 from re_edge_gpt import Chatbot
 from re_edge_gpt import ConversationStyle
 
 
+# If you are using jupyter pls install this package
+# from nest_asyncio import apply
+
+
 async def test_ask() -> None:
-    cookies = json.loads(open(
-        str(Path(str(Path.cwd()) + "/bing_cookies.json")), encoding="utf-8").read())
-    bot = await Chatbot.create(cookies=cookies)
-    response = await bot.ask(
-        prompt="find me some information about the new ai released by meta.",
-        conversation_style=ConversationStyle.balanced,
-        simplify_response=True,
-    )
-    await bot.close()
-    print(json.dumps(response, indent=2))
-    assert response
+    bot = None
+    try:
+        cookies = json.loads(open(
+            str(Path(str(Path.cwd()) + "/bing_cookies.json")), encoding="utf-8").read())
+        bot = await Chatbot.create(cookies=cookies)
+        response = await bot.ask(
+            prompt="How to boil the egg",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True
+        )
+        # If you are using non ascii char you need set ensure_ascii=False
+        print(json.dumps(response, indent=2, ensure_ascii=False))
+        # Raw response
+        print(response)
+        assert response
+    except Exception as error:
+        raise error
+    finally:
+        if bot is not None:
+            await bot.close()
 
 
 if __name__ == "__main__":