feat: Add switch for Remain System Prompt.(#907)

ChuanhuChatbot.py

@@ -203,6 +203,8 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                                 value=INITIAL_SYSTEM_PROMPT,
                                 lines=8
                             )
+                            remain_system_prompt_checkbox = gr.Checkbox(
+                                label=i18n("新建对话保留Prompt"), value=False, visible=True, elem_classes="switch-checkbox")
                             with gr.Accordion(label=i18n("加载Prompt模板"), open=False):
                                 with gr.Column():
                                     with gr.Row():
@@ -582,10 +584,10 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
 
     emptyBtn.click(
         reset,
-        inputs=[current_model],
+        inputs=[current_model, remain_system_prompt_checkbox],
         outputs=[chatbot, status_display, historySelectList, systemPromptTxt],
         show_progress=True,
-        _js='clearChatbot',
+        _js='(a,b)=>{return clearChatbot(a,b);}',
     )
 
     retryBtn.click(**start_outputing_args).then(
@@ -680,10 +682,10 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
     historyRefreshBtn.click(**refresh_history_args)
     historyDeleteBtn.click(delete_chat_history, [current_model, historySelectList, user_name], [status_display, historySelectList, chatbot], _js='(a,b,c)=>{return showConfirmationDialog(a, b, c);}').then(
         reset,
-        inputs=[current_model],
-        outputs=[chatbot, status_display, historySelectList],
+        inputs=[current_model, remain_system_prompt_checkbox],
+        outputs=[chatbot, status_display, historySelectList, systemPromptTxt],
         show_progress=True,
-        _js='clearChatbot',
+        _js='(a,b)=>{return clearChatbot(a,b);}',
     )
     historySelectList.input(**load_history_from_file_args)
     uploadFileBtn.upload(upload_chat_history, [current_model, uploadFileBtn, user_name], [

modules/models/XMChat.py

@@ -28,7 +28,7 @@ class XMChat(BaseLLMModel):
         self.url = "https://xmbot.net/web"
         self.last_conv_id = None
 
-    def reset(self):
+    def reset(self, remain_system_prompt=False):
         self.session_id = str(uuid.uuid4())
         self.last_conv_id = None
         return super().reset()
@@ -146,4 +146,4 @@ class XMChat(BaseLLMModel):
             response = json.loads(response.text)
             return response["data"], len(response["data"])
         except Exception as e:
-            return response.text, len(response.text)
+            return response.text, len(response.text)

modules/models/base_model.py

@@ -627,14 +627,15 @@ class BaseLLMModel:
     def set_single_turn(self, new_single_turn):
         self.single_turn = new_single_turn
 
-    def reset(self):
+    def reset(self, remain_system_prompt=False):
         self.history = []
         self.all_token_counts = []
         self.interrupted = False
         self.history_file_path = new_auto_history_filename(self.user_identifier)
         history_name = self.history_file_path[:-5]
         choices = [history_name] + get_history_names(self.user_identifier)
-        return [], self.token_message([0]), gr.Radio.update(choices=choices, value=history_name), ""
+        system_prompt = self.system_prompt if remain_system_prompt else ""
+        return [], self.token_message([0]), gr.Radio.update(choices=choices, value=history_name), system_prompt
 
     def delete_first_conversation(self):
         if self.history:

modules/models/midjourney.py

@@ -217,7 +217,7 @@ class Midjourney_Client(XMChat):
                 logging.info("使用图片作为输入")
         return None, chatbot, None
 
-    def reset(self):
+    def reset(self, remain_system_prompt=False):
         self.image_bytes = None
         self.image_path = None
         return super().reset()

web_assets/javascript/ChuanhuChat.js

@@ -335,9 +335,10 @@ function setChatbotScroll() {
     chatbotWrap.scrollTo(0,scrollHeight)
 }
 
-function clearChatbot() {
+function clearChatbot(a, b) {
     clearHistoryHtml();
     // clearMessageRows();
+    return [a, b]
 }
 
 function chatbotContentChanged(attempt = 1, force = false) {