feat. 自动命名功能完善啦

ChuanhuChatbot.py

@@ -371,6 +371,13 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                         use_streaming_checkbox = gr.Checkbox(
                             label=i18n("实时传输回答"), value=True, visible=ENABLE_STREAMING_OPTION, elem_classes="switch-checkbox"
                         )
+                        name_chat_method = gr.Dropdown(
+                            label=i18n("对话命名方式"), 
+                            choices=HISTORY_NAME_METHODS, 
+                            multiselect=False,
+                            interactive=True,
+                            value=HISTORY_NAME_METHODS[0], 
+                        )
                         single_turn_checkbox = gr.Checkbox(label=i18n(
                             "单轮对话"), value=False, elem_classes="switch-checkbox", elem_id="gr-single-session-cb", visible=False)
                         # checkUpdateBtn = gr.Button(i18n("🔄 检查更新..."), visible=check_update)
@@ -544,20 +551,27 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
         fn=get_history_list, inputs=[user_name], outputs=[historySelectList]
     )
 
+    auto_name_chat_history_args = dict(
+        fn=auto_name_chat_history,
+        inputs=[current_model, name_chat_method, user_question, chatbot, user_name, language_select_dropdown],
+        outputs=[historySelectList],
+        show_progress=False,
+    )
+
     # Chatbot
     cancelBtn.click(interrupt, [current_model], [])
 
     user_input.submit(**transfer_input_args).then(**
-                                                  chatgpt_predict_args).then(**end_outputing_args)
+                                                  chatgpt_predict_args).then(**end_outputing_args).then(**auto_name_chat_history_args)
     user_input.submit(**get_usage_args)
 
-    user_input.submit(auto_name_chat_history, [current_model, user_question, chatbot, user_name], [historySelectList], show_progress=False)
+    # user_input.submit(auto_name_chat_history, [current_model, user_question, chatbot, user_name], [historySelectList], show_progress=False)
 
     submitBtn.click(**transfer_input_args).then(**chatgpt_predict_args,
-                                                api_name="predict").then(**end_outputing_args)
+                                                api_name="predict").then(**end_outputing_args).then(**auto_name_chat_history_args)
     submitBtn.click(**get_usage_args)
 
-    submitBtn.click(auto_name_chat_history, [current_model, user_question, chatbot, user_name], [historySelectList], show_progress=False)
+    # submitBtn.click(auto_name_chat_history, [current_model, user_question, chatbot, user_name], [historySelectList], show_progress=False)
 
     index_files.change(handle_file_upload, [current_model, index_files, chatbot, language_select_dropdown], [
                        index_files, chatbot, status_display])

modules/models/base_model.py

@@ -679,8 +679,9 @@ class BaseLLMModel:
         save_file(filename, self.system_prompt, self.history, chatbot, user_name)
         return init_history_list(user_name)
 
-    def auto_name_chat_history(self, user_question, chatbot, user_name):
-        if chatbot == []:
+    def auto_name_chat_history(self, name_chat_method, user_question, chatbot, user_name, language):
+        if len(chatbot) == 1:
+            user_question = chatbot[0][0][26:-6]
             filename = user_question[:16] + ".json"
             return self.rename_chat_history(filename, chatbot, user_name)
         else:

modules/models/models.py

@@ -228,9 +228,63 @@ class OpenAIClient(BaseLLMModel):
         ret = super().set_key(new_access_key)
         self._refresh_header()
         return ret
+    
+    def _single_query_at_once(self, history, temperature=1.0):
+        timeout = TIMEOUT_ALL
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.api_key}",
+            "temperature": f"{temperature}",
+        }
+        payload = {
+            "model": self.model_name,
+            "messages": history,
+        }
+        # 如果有自定义的api-host，使用自定义host发送请求，否则使用默认设置发送请求
+        if shared.state.completion_url != COMPLETION_URL:
+            logging.debug(f"使用自定义API URL: {shared.state.completion_url}")
 
-    # def auto_name_chat_history(self, user_question, chatbot, user_name):
-    #     return super().auto_name_chat_history(user_question, chatbot, user_name)
+        with retrieve_proxy():
+            response = requests.post(
+                shared.state.completion_url,
+                headers=headers,
+                json=payload,
+                stream=False,
+                timeout=timeout,
+            )
+
+        return response
+
+    
+    def auto_name_chat_history(self, name_chat_method, user_question, chatbot, user_name, language):
+        if len(chatbot) == 1:
+            # 用户问题示例”<div class="user-message">你好呀</div>“
+            user_question = chatbot[0][0][26:-6]
+            if name_chat_method == i18n("模型自动总结（消耗tokens）"):
+                # ai回答示例”<div class="raw-message hideM"><pre>你好！有什么我可以帮助你的吗？</pre></div><div class="md-message">\n\n你好！有什么我可以帮助你的吗？\n</div>“
+                pattern = r'<div class="raw-message hideM"><pre>(.*?)</pre></div><div class="md-message">'
+                match = re.search(pattern, chatbot[0][1])
+                ai_answer = match.group(1)
+                try:
+                    history = [
+                        { "role": "system", "content": f"Please summarize the following conversation for a chat topic.\nNo more than 16 characters.\nNo special characters.\nReply in {language}."},
+                        { "role": "user", "content": f"User: {user_question}\nAssistant: {ai_answer}"}
+                    ]
+                    response = self._single_query_at_once(history, temperature=0.0)
+                    response = json.loads(response.text)
+                    content = response["choices"][0]["message"]["content"]
+                    filename = content + ".json"
+                except Exception as e:
+                    logging.info(f"自动命名失败。{e}")
+                    filename = user_question[:16] + ".json"
+                return self.rename_chat_history(filename, chatbot, user_name)
+            elif name_chat_method == i18n("第一次提问"):
+                filename = user_question[:16] + ".json"
+                return self.rename_chat_history(filename, chatbot, user_name)
+            else:
+                return gr.update()
+        else:
+            return gr.update()
 
 
 class ChatGLM_Client(BaseLLMModel):

modules/presets.py

@@ -36,6 +36,7 @@ BILLING_NOT_APPLICABLE_MSG = i18n("账单信息不适用") # 本地运行的模
 TIMEOUT_STREAMING = 60  # 流式对话时的超时时间
 TIMEOUT_ALL = 200  # 非流式对话时的超时时间
 ENABLE_STREAMING_OPTION = True  # 是否启用选择选择是否实时显示回答的勾选框
+ENABLE_LLM_NAME_CHAT_OPTION = True  # 是否启用选择是否使用LLM模型的勾选框
 HIDE_MY_KEY = False  # 如果你想在UI中隐藏你的 API 密钥，将此值设置为 True
 CONCURRENT_COUNT = 100 # 允许同时使用的用户数量
 
@@ -132,6 +133,12 @@ REPLY_LANGUAGES = [
     "跟随问题语言（不稳定）"
 ]
 
+HISTORY_NAME_METHODS = [
+    i18n("根据时间"), 
+    i18n("第一次提问"), 
+    i18n("模型自动总结（消耗tokens）"),
+]
+
 
 WEBSEARCH_PTOMPT_TEMPLATE = """\
 Web search results: