Spaces:
Sleeping
Sleeping
Tuchuanhuhuhu
commited on
Commit
·
319e4f2
1
Parent(s):
1a233c9
feat: 保存按钮现在是重命名按钮了
Browse files- ChuanhuChatbot.py +1 -1
- modules/models/base_model.py +6 -4
- modules/utils.py +1 -1
ChuanhuChatbot.py
CHANGED
@@ -578,7 +578,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
|
|
578 |
saveHistoryBtn.click(
|
579 |
save_chat_history,
|
580 |
[current_model, saveFileName, chatbot, user_name],
|
581 |
-
downloadFile,
|
582 |
show_progress=True,
|
583 |
_js='(a,b,c,d)=>{return saveChatHistory(a,b,c,d);}'
|
584 |
)
|
|
|
578 |
saveHistoryBtn.click(
|
579 |
save_chat_history,
|
580 |
[current_model, saveFileName, chatbot, user_name],
|
581 |
+
[downloadFile, historyFileSelectDropdown],
|
582 |
show_progress=True,
|
583 |
_js='(a,b,c,d)=>{return saveChatHistory(a,b,c,d);}'
|
584 |
)
|
modules/models/base_model.py
CHANGED
@@ -207,7 +207,7 @@ class BaseLLMModel:
|
|
207 |
self.api_key = None
|
208 |
self.need_api_key = False
|
209 |
self.single_turn = False
|
210 |
-
self.history_file_path =
|
211 |
|
212 |
self.temperature = temperature
|
213 |
self.top_p = top_p
|
@@ -663,10 +663,12 @@ class BaseLLMModel:
|
|
663 |
|
664 |
def save_chat_history(self, filename, chatbot, user_name):
|
665 |
if filename == "":
|
666 |
-
return
|
667 |
if not filename.endswith(".json"):
|
668 |
filename += ".json"
|
669 |
-
|
|
|
|
|
670 |
|
671 |
def auto_save(self, chatbot):
|
672 |
save_file(self.history_file_path, self.system_prompt,
|
@@ -715,7 +717,7 @@ class BaseLLMModel:
|
|
715 |
except:
|
716 |
# 没有对话历史或者对话历史解析失败
|
717 |
logging.info(f"没有找到对话历史记录 {self.history_file_path}")
|
718 |
-
return
|
719 |
|
720 |
def delete_chat_history(self, filename, user_name):
|
721 |
if filename == "CANCELED":
|
|
|
207 |
self.api_key = None
|
208 |
self.need_api_key = False
|
209 |
self.single_turn = False
|
210 |
+
self.history_file_path = get_history_names(user)[0]
|
211 |
|
212 |
self.temperature = temperature
|
213 |
self.top_p = top_p
|
|
|
663 |
|
664 |
def save_chat_history(self, filename, chatbot, user_name):
|
665 |
if filename == "":
|
666 |
+
return gr.update(), gr.update()
|
667 |
if not filename.endswith(".json"):
|
668 |
filename += ".json"
|
669 |
+
self.delete_chat_history(self.history_file_path, user_name)
|
670 |
+
self.history_file_path = filename
|
671 |
+
return save_file(filename, self.system_prompt, self.history, chatbot, user_name), init_history_list(user_name)
|
672 |
|
673 |
def auto_save(self, chatbot):
|
674 |
save_file(self.history_file_path, self.system_prompt,
|
|
|
717 |
except:
|
718 |
# 没有对话历史或者对话历史解析失败
|
719 |
logging.info(f"没有找到对话历史记录 {self.history_file_path}")
|
720 |
+
return self.history_file_path, self.system_prompt, []
|
721 |
|
722 |
def delete_chat_history(self, filename, user_name):
|
723 |
if filename == "CANCELED":
|
modules/utils.py
CHANGED
@@ -356,7 +356,7 @@ def sorted_by_pinyin(list):
|
|
356 |
return sorted(list, key=lambda char: lazy_pinyin(char)[0][0])
|
357 |
|
358 |
def sorted_by_last_modified_time(list, dir):
|
359 |
-
return sorted(list, key=lambda char: os.path.
|
360 |
|
361 |
def get_file_names_by_type(dir, filetypes=[".json"]):
|
362 |
logging.debug(f"获取文件名列表,目录为{dir},文件类型为{filetypes}")
|
|
|
356 |
return sorted(list, key=lambda char: lazy_pinyin(char)[0][0])
|
357 |
|
358 |
def sorted_by_last_modified_time(list, dir):
|
359 |
+
return sorted(list, key=lambda char: os.path.getctime(os.path.join(dir, char)), reverse=True)
|
360 |
|
361 |
def get_file_names_by_type(dir, filetypes=[".json"]):
|
362 |
logging.debug(f"获取文件名列表,目录为{dir},文件类型为{filetypes}")
|