Merge pull request #133 from Integration-Automation/dev

JE-Chen · web-flow · commit 437fb52c55a9 · 2024-04-13T01:54:35.000+08:00
Fix remove option that not in options list
diff --git a/dev.toml b/dev.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "re_edge_gpt_dev"
-version = "0.0.42"
+version = "0.0.43"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "re_edge_gpt"
-version = "0.0.35"
+version = "0.0.36"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]
diff --git a/re_edge_gpt/chat/chathub.py b/re_edge_gpt/chat/chathub.py
@@ -121,7 +121,7 @@ async def ask_stream(
         # Construct a ChatHub request
         if remove_options is not None:
             for option in remove_options:
-                if option in remove_options:
+                if option in conversation_style.value:
                     conversation_style.value.remove(option)
         if add_options is not None:
             for option in add_options:
diff --git a/test/unit_test/back-end/manual_test/test_bot_manual.py b/test/unit_test/back-end/manual_test/test_bot_manual.py
@@ -21,7 +21,7 @@ async def test_ask() -> None:
         bot = await Chatbot.create(cookies=cookies, mode=mode)
         response = await bot.ask(
             prompt="What version u are using GPT-4 turbo?",
-            conversation_style=ConversationStyle.creative_classic,
+            conversation_style=ConversationStyle.creative_classic, # ConversationStyle.creative
             simplify_response=True,
             search_result=True,
         )

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"`
`6`	`6`
`7`	`7`	`[project]`
`8`	`8`	`name = "re_edge_gpt_dev"`
`9`		`-version = "0.0.42"`
	`9`	`+version = "0.0.43"`
`10`	`10`	`authors = [`
`11`	`11`	`{ name = "JE-Chen", email = "jechenmailman@gmail.com" },`
`12`	`12`	`]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"`
`6`	`6`
`7`	`7`	`[project]`
`8`	`8`	`name = "re_edge_gpt"`
`9`		`-version = "0.0.35"`
	`9`	`+version = "0.0.36"`
`10`	`10`	`authors = [`
`11`	`11`	`{ name = "JE-Chen", email = "jechenmailman@gmail.com" },`
`12`	`12`	`]`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ async def test_ask() -> None:`
`21`	`21`	`bot = await Chatbot.create(cookies=cookies, mode=mode)`
`22`	`22`	`response = await bot.ask(`
`23`	`23`	`prompt="What version u are using GPT-4 turbo?",`
`24`		`- conversation_style=ConversationStyle.creative_classic,`
	`24`	`+ conversation_style=ConversationStyle.creative_classic, # ConversationStyle.creative`
`25`	`25`	`simplify_response=True,`
`26`	`26`	`search_result=True,`
`27`	`27`	`)`