Merge pull request #14 from Integration-Automation/dev

Dev

Author: JE-Chen

README.md

@@ -148,10 +148,14 @@ if __name__ == "__main__":
 
 </details>
 
-<details open>
+<summary>
 
 # How to generate image
 
+</summary>
+
+<details open>
+
 ## Getting authentication
 > ### Chromium based browsers (Edge, Opera, Vivaldi, Brave)
 > * Go to https://bing.com/.

dev.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "re_edge_gpt_dev"
-version = "0.0.06"
+version = "0.0.07"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]

docs/source/docs/Eng/chat_example.rst

@@ -0,0 +1,50 @@
+ReEdgeGPT Chat Example
+----
+
+.. code-block:: python
+
+    import asyncio
+    import json
+    from pathlib import Path
+
+    from re_edge_gpt import Chatbot
+    from re_edge_gpt import ConversationStyle
+
+
+    async def test_ask() -> None:
+        # Read local bing_cookies.json (if you don't have this file please read README)
+        cookies = json.loads(open(
+            str(Path(str(Path.cwd()) + "/bing_cookies.json")), encoding="utf-8").read())
+        # init BOT
+        bot = await Chatbot.create(cookies=cookies)
+        # Start chat and get Bing response
+        response = await bot.ask(
+            prompt="Hello.",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True,
+        )
+        print(json.dumps(response, indent=2))
+        response = await bot.ask(
+            prompt="How do I make a cake?",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True,
+        )
+        print(json.dumps(response, indent=2))
+        response = await bot.ask(
+            prompt="Can you suggest me an easy recipe for beginners?",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True,
+        )
+        print(json.dumps(response, indent=2))
+        response = await bot.ask(
+            prompt="Thanks",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True,
+        )
+        print(json.dumps(response, indent=2))
+        # Close bot
+        await bot.close()
+
+    if __name__ == "__main__":
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(test_ask())

docs/source/docs/Eng/eng_index.rst

@@ -4,3 +4,4 @@ ReEdgeGPT English Documentation
 .. toctree::
     :maxdepth: 4
 
+    chat_example.rst

docs/source/docs/Zh/chat_example.rst

@@ -0,0 +1,50 @@
+ReEdgeGPT 對話範例
+----
+
+.. code-block:: python
+
+    import asyncio
+    import json
+    from pathlib import Path
+
+    from re_edge_gpt import Chatbot
+    from re_edge_gpt import ConversationStyle
+
+
+    async def test_ask() -> None:
+        # 取得本地 bing_cookies.json (沒有請讀 README)
+        cookies = json.loads(open(
+            str(Path(str(Path.cwd()) + "/bing_cookies.json")), encoding="utf-8").read())
+        # 初始化 BOT
+        bot = await Chatbot.create(cookies=cookies)
+        # 開始對話並取得 Bing 回應
+        response = await bot.ask(
+            prompt="Hello.",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True,
+        )
+        print(json.dumps(response, indent=2))
+        response = await bot.ask(
+            prompt="How do I make a cake?",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True,
+        )
+        print(json.dumps(response, indent=2))
+        response = await bot.ask(
+            prompt="Can you suggest me an easy recipe for beginners?",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True,
+        )
+        print(json.dumps(response, indent=2))
+        response = await bot.ask(
+            prompt="Thanks",
+            conversation_style=ConversationStyle.balanced,
+            simplify_response=True,
+        )
+        print(json.dumps(response, indent=2))
+        # 關閉對話
+        await bot.close()
+
+    if __name__ == "__main__":
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(test_ask())

docs/source/docs/Zh/zh_index.rst

@@ -4,5 +4,4 @@ ReEdgeGPT 繁體中文 文件
 .. toctree::
     :maxdepth: 4
 
-    ui.rst
-    how_to_extend_ui.rst
+    chat_example.rst

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "re_edge_gpt"
-version = "0.0.05"
+version = "0.0.06"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]

re_edge_gpt/image_genearation.py

@@ -141,7 +141,7 @@ def get_images(self, prompt: str) -> list:
             if response.status_code != 302:
                 if self.debug_file:
                     self.debug(f"ERROR: {error_redirect}")
-                print(f"ERROR: {response.text}")
+                print(f"ERROR: {response.text.encode('utf-8')}")
                 raise Exception(error_redirect)
         # Get redirect URL
         redirect_url = response.headers["Location"].replace("&nfy=1", "")
@@ -314,7 +314,7 @@ async def get_images(self, prompt: str) -> list:
                 timeout=200,
             )
             if response.status_code != 302:
-                print(f"ERROR: {response.text}")
+                print(f"ERROR: {response.text.encode('utf-8')}")
                 raise Exception("Redirect failed")
         # Get redirect URL
         redirect_url = response.headers["Location"].replace("&nfy=1", "")

test/unit_test/test_generate_image/test_generation.py

@@ -23,21 +23,13 @@ def test_save_images_sync():
 
 
 def test_generate_image_sync():
-    image_list = sync_gen.get_images("Big Ben")
-    print(image_list)
-    image_list = sync_gen.get_images("Кра́снаяпло́щадь")
-    print(image_list)
-    image_list = sync_gen.get_images("La Tour Eiffel")
+    image_list = sync_gen.get_images("Big, Golden, Tree")
     print(image_list)
 
 
 # Generate image list async
 async def test_generate_image_async():
-    image_list = sync_gen.get_images("Big Ben")
-    print(image_list)
-    image_list = await async_gen.get_images("Кра́снаяпло́щадь")
-    print(image_list)
-    image_list = await async_gen.get_images("La Tour Eiffel")
+    image_list = sync_gen.get_images("Big, Golden, Tree")
     print(image_list)