fix: 使用self.history实现自动命名

modules/models/base_model.py

@@ -680,8 +680,8 @@ class BaseLLMModel:
         return init_history_list(user_name)
 
     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]
+        if len(self.history) == 2:
+            user_question = self.history[0]["content"]
             filename = user_question[:16] + ".json"
             return self.rename_chat_history(filename, chatbot, user_name)
         else:

modules/models/models.py

@@ -257,17 +257,13 @@ class OpenAIClient(BaseLLMModel):
 
     
     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 len(self.history) == 2:
+            user_question = self.history[0]["content"]
             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)
+                ai_answer = self.history[1]["content"]
                 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 user's language."},
+                        { "role": "system", "content": SUMMARY_CHAT_SYSTEM_PROMPT},
                         { "role": "user", "content": f"User: {user_question}\nAssistant: {ai_answer}"}
                     ]
                     response = self._single_query_at_once(history, temperature=0.0)

modules/presets.py

@@ -184,6 +184,15 @@ SUMMARIZE_PROMPT = """Write a concise summary of the following:
 
 CONCISE SUMMARY IN 中文:"""
 
+SUMMARY_CHAT_SYSTEM_PROMPT = """\
+Please summarize the following conversation for a chat topic.
+No more than 16 characters.
+No special characters.
+Punctuation mark is banned.
+Not including '.' ':' '?' '!' '“' '*' '<' '>'.
+Reply in user's language.
+"""
+
 ALREADY_CONVERTED_MARK = "<!-- ALREADY CONVERTED BY PARSER. -->"
 START_OF_OUTPUT_MARK = "<!-- SOO IN MESSAGE -->"
 END_OF_OUTPUT_MARK = "<!-- EOO IN MESSAGE -->"