WIP refactor: 改一下点击下载文件写到js文件里

ChuanhuChatbot.py

@@ -73,9 +73,9 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                                 with gr.Column(min_width=42, scale=1):
                                     historyRefreshBtn = gr.Button(i18n("🔄"))
                                 with gr.Column(min_width=42, scale=1):
-                                    historyDeleteBtn = gr.Button(i18n("🗑️"))
+                                    historyDeleteBtn = gr.Button(i18n("🗑️"), elem_id="gr-history-delete-btn")
                                 with gr.Column(min_width=42, scale=1):
-                                    historyDownloadBtn = gr.Button(i18n("⏬"))
+                                    historyDownloadBtn = gr.Button(i18n("⏬"), elem_id="gr-history-download-btn")
                         with gr.Row():
                             with gr.Column(scale=6):
                                 saveFileName = gr.Textbox(
@@ -583,7 +583,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
     historyDeleteBtn.click(delete_chat_history, [current_model, historyFileSelectDropdown, user_name], [status_display, historyFileSelectDropdown, chatbot], _js='(a,b,c)=>{return showConfirmationDialog(a, b, c);}')
     historyFileSelectDropdown.change(**load_history_from_file_args)
     downloadFile.change(upload_chat_history, [current_model, downloadFile, user_name], [saveFileName, systemPromptTxt, chatbot])
-    historyDownloadBtn.click(None, [user_name, historyFileSelectDropdown], None, _js=download_history_js)
+    historyDownloadBtn.click(None, [user_name, historyFileSelectDropdown], None, _js='(a,b)=>{return downloadHistory(a,b);}')
 
     # Train
     dataset_selection.upload(handle_dataset_selection, dataset_selection, [dataset_preview_json, upload_to_openai_btn, openai_train_status])

modules/presets.py

@@ -250,39 +250,3 @@ small_and_beautiful_theme = gr.themes.Soft(
         chatbot_code_background_color_dark="*neutral_950",
     )
 
-download_history_js = """
-function downloadFile(username, historyname) {
-  // 构建文件的URL
-  let fileUrl;
-  if (username === null) {
-    fileUrl = `/file=./history/${historyname}`;
-  } else {
-    fileUrl = `/file=./history/${username}/${historyname}`;
-  }
-
-  // 发送下载请求
-  fetch(fileUrl)
-    .then(response => response.blob())
-    .then(blob => {
-      // 创建一个临时的URL
-      const url = URL.createObjectURL(blob);
-
-      // 创建一个隐藏的<a>元素，设置下载属性
-      const a = document.createElement('a');
-      a.style.display = 'none';
-      a.href = url;
-      a.download = historyname;
-
-      // 添加到DOM并触发点击事件
-      document.body.appendChild(a);
-      a.click();
-
-      // 清理临时URL和DOM中的<a>元素
-      URL.revokeObjectURL(url);
-      document.body.removeChild(a);
-    })
-    .catch(error => {
-      console.error('下载文件出错:', error);
-    });
-}
-"""

web_assets/javascript/utils.js

@@ -15,6 +15,43 @@ function isImgUrl(url) {
     return false;
 }
 
+function downloadHistory(username, historyname) {
+    let fileUrl;
+    if (username === null) {
+        fileUrl = `/file=./history/${historyname}`;
+    } else {
+        fileUrl = `/file=./history/${username}/${historyname}`;
+    }
+    downloadFile(fileUrl, historyname);
+}
+
+function downloadFile(fileUrl, filename="") {
+    // 发送下载请求
+    fetch(fileUrl)
+        .then(response => response.blob())
+        .then(blob => {
+            // 创建一个临时的URL
+            const url = URL.createObjectURL(blob);
+
+            // 创建一个隐藏的<a>元素，设置下载属性
+            const a = document.createElement('a');
+            a.style.display = 'none';
+            a.href = url;
+            a.download = filename;
+
+            // 添加到DOM并触发点击事件
+            document.body.appendChild(a);
+            a.click();
+
+            // 清理临时URL和DOM中的<a>元素
+            URL.revokeObjectURL(url);
+            document.body.removeChild(a);
+        })
+        .catch(error => {
+            console.error('Failed to download file:', error);
+        });
+}
+
 
 /* NOTE: These reload functions are not used in the current version of the code.
  *       From stable-diffusion-webui