From 63ec9eb354cbed6a699821701e4200f177c82660 Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:04:44 +0800 Subject: [PATCH 1/3] Add delete_conversation Add delete_conversation --- pyproject.toml | 4 ++-- re_edge_gpt/chathub.py | 9 +++++++++ dev.toml => stable.toml | 2 +- test/unit_test/manual_test/test_bot_manual.py | 5 ++--- 4 files changed, 14 insertions(+), 6 deletions(-) rename dev.toml => stable.toml (97%) diff --git a/pyproject.toml b/pyproject.toml index 89e7fd5..7d0aa4a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,8 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "re_edge_gpt" -version = "0.0.25" +name = "re_edge_gpt_dev" +version = "0.0.26" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] diff --git a/re_edge_gpt/chathub.py b/re_edge_gpt/chathub.py index b74a841..0058be4 100644 --- a/re_edge_gpt/chathub.py +++ b/re_edge_gpt/chathub.py @@ -218,3 +218,12 @@ async def set_conversation(self, conversation_dict: dict) -> None: self.conversation.struct[ "encrypted_conversation_signature"] = conversation_dict.get("encrypted_conversation_signature") self.conversation.struct["conversation_signature"] = conversation_dict.get("conversation_signature") + + async def delete_conversation(self, conversation_id: str = None, client_id: str = None, + encrypted_conversation_signature: str = None, conversation_signature: str = None + ) -> None: + self.conversation.struct["conversationId"] = conversation_id + self.conversation.struct["client_id"] = client_id + self.conversation.struct[ + "encrypted_conversation_signature"] = encrypted_conversation_signature + self.conversation.struct["conversation_signature"] = conversation_signature diff --git a/dev.toml b/stable.toml similarity index 97% rename from dev.toml rename to stable.toml index a7a60f6..89e7fd5 100644 --- a/dev.toml +++ b/stable.toml @@ -5,7 +5,7 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "re_edge_gpt_dev" +name = "re_edge_gpt" version = "0.0.25" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, diff --git a/test/unit_test/manual_test/test_bot_manual.py b/test/unit_test/manual_test/test_bot_manual.py index 49b913e..89d2ef1 100644 --- a/test/unit_test/manual_test/test_bot_manual.py +++ b/test/unit_test/manual_test/test_bot_manual.py @@ -22,9 +22,8 @@ async def test_ask() -> None: str(Path(str(Path.cwd()) + "/copilot_cookies.json")), encoding="utf-8").read()) bot = await Chatbot.create(cookies=cookies, mode=mode) response = await bot.ask( - prompt="Beef wellington recipe", + prompt="Chicken nuget recipe", conversation_style=ConversationStyle.balanced, - simplify_response=True, search_result=True ) # If you are using non ascii char you need set ensure_ascii=False @@ -46,4 +45,4 @@ async def test_ask() -> None: loop = asyncio.get_running_loop() except RuntimeError: loop = asyncio.get_event_loop() - loop.run_until_complete(test_ask()) \ No newline at end of file + loop.run_until_complete(test_ask()) From ed39b99e6554926cc41c5417c3ed3453e60425ae Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:17:33 +0800 Subject: [PATCH 2/3] Update actions version Update actions version --- .github/workflows/re_edge_gpt_dev_python3_10.yml | 4 ++-- .github/workflows/re_edge_gpt_dev_python3_11.yml | 4 ++-- .github/workflows/re_edge_gpt_dev_python3_9.yml | 4 ++-- .github/workflows/re_edge_gpt_stable_python3_10.yml | 4 ++-- .github/workflows/re_edge_gpt_stable_python3_11.yml | 4 ++-- .github/workflows/re_edge_gpt_stable_python3_9.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/re_edge_gpt_dev_python3_10.yml b/.github/workflows/re_edge_gpt_dev_python3_10.yml index 0a948c7..9dfe688 100644 --- a/.github/workflows/re_edge_gpt_dev_python3_10.yml +++ b/.github/workflows/re_edge_gpt_dev_python3_10.yml @@ -16,9 +16,9 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/re_edge_gpt_dev_python3_11.yml b/.github/workflows/re_edge_gpt_dev_python3_11.yml index 7354baa..b7a6d13 100644 --- a/.github/workflows/re_edge_gpt_dev_python3_11.yml +++ b/.github/workflows/re_edge_gpt_dev_python3_11.yml @@ -16,9 +16,9 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.11" - name: Install dependencies diff --git a/.github/workflows/re_edge_gpt_dev_python3_9.yml b/.github/workflows/re_edge_gpt_dev_python3_9.yml index e935906..6c22185 100644 --- a/.github/workflows/re_edge_gpt_dev_python3_9.yml +++ b/.github/workflows/re_edge_gpt_dev_python3_9.yml @@ -16,9 +16,9 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.9" - name: Install dependencies diff --git a/.github/workflows/re_edge_gpt_stable_python3_10.yml b/.github/workflows/re_edge_gpt_stable_python3_10.yml index 2e1fd6f..5c67ec0 100644 --- a/.github/workflows/re_edge_gpt_stable_python3_10.yml +++ b/.github/workflows/re_edge_gpt_stable_python3_10.yml @@ -16,9 +16,9 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/re_edge_gpt_stable_python3_11.yml b/.github/workflows/re_edge_gpt_stable_python3_11.yml index c585f2a..0aef7c7 100644 --- a/.github/workflows/re_edge_gpt_stable_python3_11.yml +++ b/.github/workflows/re_edge_gpt_stable_python3_11.yml @@ -16,9 +16,9 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.11" - name: Install dependencies diff --git a/.github/workflows/re_edge_gpt_stable_python3_9.yml b/.github/workflows/re_edge_gpt_stable_python3_9.yml index 808e415..e849859 100644 --- a/.github/workflows/re_edge_gpt_stable_python3_9.yml +++ b/.github/workflows/re_edge_gpt_stable_python3_9.yml @@ -16,9 +16,9 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.9" - name: Install dependencies From 8750f6c1ddb1133aee1d7f7dba8892062d8c1ffc Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:35:10 +0800 Subject: [PATCH 3/3] Rerun --- stable.toml => dev.toml | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename stable.toml => dev.toml (95%) diff --git a/stable.toml b/dev.toml similarity index 95% rename from stable.toml rename to dev.toml index 89e7fd5..7d0aa4a 100644 --- a/stable.toml +++ b/dev.toml @@ -5,8 +5,8 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "re_edge_gpt" -version = "0.0.25" +name = "re_edge_gpt_dev" +version = "0.0.26" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] diff --git a/pyproject.toml b/pyproject.toml index 7d0aa4a..0170386 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "re_edge_gpt_dev" +name = "re_edge_gpt" version = "0.0.26" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" },