WIP: export+download markdown

ChuanhuChatbot.py

@@ -99,7 +99,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                             saveHistoryBtn = gr.Button(
                                 i18n("💾 保存对话"), elem_id="gr-history-save-btn")
                             exportMarkdownBtn = gr.Button(
-                                i18n("📝 导出为Markdown"))
+                                i18n("📝 导出为Markdown"), elem_id="gr-markdown-export-btn")
                             gr.Markdown(i18n("默认保存于history文件夹"))
                     with gr.Row():
                         with gr.Column():
@@ -667,9 +667,9 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
     downloadFile.change(upload_chat_history, [current_model, downloadFile, user_name], [
                         saveFileName, systemPromptTxt, chatbot])
     historyDownloadBtn.click(None, [
-                             user_name, historySelectList], None, _js='(a,b)=>{return downloadHistory(a,b);}')
+                             user_name, historySelectList], None, _js='(a,b)=>{return downloadHistory(a,b,".json");}')
     historyMarkdownDownloadBtn.click(None, [
-                                     user_name, historySelectList], None, _js='(a,b)=>{return downloadHistoryMarkdown(a,b);}')
+                                     user_name, historySelectList], None, _js='(a,b)=>{return downloadHistory(a,b,".md");}')
     historySearchTextbox.input(
         filter_history,
         [user_name, historySearchTextbox],

web_assets/javascript/ChuanhuChat.js

@@ -93,10 +93,10 @@ function initialize() {
     toolbox = gradioApp().querySelector('#toolbox-area');
     // trainBody = gradioApp().querySelector('#train-body');
 
-    if (loginUserForm) {
-        localStorage.setItem("userLogged", true);
-        userLogged = true;
-    }
+    // if (loginUserForm) {
+    // localStorage.setItem("userLogged", true);
+    // userLogged = true;
+    // }
 
     adjustDarkMode();
     adjustSide();

web_assets/javascript/chat-list.js

@@ -1,9 +1,22 @@
 
+var currentChatName = null;
+
 function setChatList() {
     var selectedChat = null;
     var chatList = gradioApp().querySelector('fieldset#history-select-dropdown');
     selectedChat = chatList.querySelector(".wrap label.selected")
-    if (!selectedChat || selectedChat.classList.contains('added-chat-btns')) {
+    if (!selectedChat) {
+        currentChatName = null;
+        return;
+    }
+
+    // if (userLogged) {
+    //     currentChatName = username + "/" + selectedChat.querySelector('span').innerText;
+    // } else {
+        currentChatName = selectedChat.querySelector('span').innerText;
+    // }
+
+    if (selectedChat.classList.contains('added-chat-btns')) {
         return;
     }
 

web_assets/javascript/fake-gradio.js

@@ -9,7 +9,10 @@ function jsonDownloadClick() {
     gradioApp().querySelector('#gr-history-download-btn').click();
 }
 function mdDownloadClick() {
-    return;
+    gradioApp().querySelector('#gr-markdown-export-btn').click();
+    gradioApp().querySelector('#gr-history-mardown-download-btn').click();
+
+    // downloadHistory(username, currentChatName, ".md");
 }
 
 // index files

web_assets/javascript/user-info.js

@@ -1,6 +1,7 @@
 
-var userLogged = false;
+// var userLogged = false;
 var usernameGotten = false;
+var usernameTmp = null;
 var username = null;
 
 
@@ -8,27 +9,28 @@ function getUserInfo() {
     if (usernameGotten) {
         return;
     }
-    userLogged = localStorage.getItem('userLogged');
-    if (userLogged) {
-        username = userInfoDiv.innerText;
-        if (username) {
-            if (username.includes("getting user info…")) {
-                setTimeout(getUserInfo, 500);
-                return;
-            } else if (username === " ") {
-                localStorage.removeItem("username");
-                localStorage.removeItem("userLogged")
-                userLogged = false;
-                usernameGotten = true;
-                return;
-            } else {
-                username = username.match(/User:\s*(.*)/)[1] || username;
-                localStorage.setItem("username", username);
-                usernameGotten = true;
-                clearHistoryHtml();
-            }
+    // userLogged = localStorage.getItem('userLogged');
+    // if (userLogged) {
+    usernameTmp = userInfoDiv.innerText;
+    if (usernameTmp) {
+        if (usernameTmp.includes("getting user info")) {
+            setTimeout(getUserInfo, 500);
+            return;
+        } else if (usernameTmp === " ") {
+            localStorage.removeItem("username");
+            // localStorage.removeItem("userLogged")
+            // userLogged = false;
+            usernameGotten = true;
+            return;
+        } else {
+            usernameTmp = usernameTmp.match(/User:\s*(.*)/)[1] || usernameTmp;
+            localStorage.setItem("username", usernameTmp);
+            username = usernameTmp;
+            usernameGotten = true;
+            clearHistoryHtml();
         }
     }
+    // }
 }
 
 function showOrHideUserInfo() {

web_assets/javascript/utils.js

@@ -15,52 +15,62 @@ function isImgUrl(url) {
     return false;
 }
 
-function downloadHistory(username, historyname) {
+function downloadHistory(gradioUsername, historyname, format=".json") {
     let fileUrl;
-    if (username === null) {
+    if (gradioUsername === null || usegradioUsernamername.trim() === "") {
         fileUrl = `/file=./history/${historyname}`;
     } else {
-        fileUrl = `/file=./history/${username}/${historyname}`;
+        fileUrl = `/file=./history/${gradioUsername}/${historyname}`;
     }
-    downloadFile(fileUrl + ".json", historyname + ".json");
+    console.log("gradioUsername",gradioUsername, "fileUrl ",fileUrl, "historyname", historyname, "format", format);
+    downloadFile(fileUrl, historyname, format);
 }
 
-function downloadHistoryMarkdown(username, historyname) {
-    let fileUrl;
-    if (username === null) {
-        fileUrl = `/file=./history/${historyname}`;
-    } else {
-        fileUrl = `/file=./history/${username}/${historyname}`;
+function downloadFile(fileUrl, filename = "", format = "", retryTimeout = 200, maxAttempts = 10) {
+
+    fileUrl = fileUrl + format;
+    filename = filename + format;
+
+    let attempts = 0;
+
+    async function tryDownload() {
+        if (attempts >= maxAttempts) {
+            console.error('Max attempts reached, download failed.');
+            alert('Download failed:' + filename);
+            return;
+        }
+        try {
+            const response = await fetch(fileUrl);
+            if (!response.ok) {
+                attempts++;
+                console.error("Error fetching file, retrying...");
+                setTimeout(tryDownload, retryTimeout);
+            } else {
+                response.blob()
+                    .then(blob => {
+                        const url = URL.createObjectURL(blob);
+                        const a = document.createElement('a');
+                        a.style.display = 'none';
+                        a.href = url;
+                        a.download = filename;
+                        document.body.appendChild(a);
+                        a.click();
+                        URL.revokeObjectURL(url);
+                        document.body.removeChild(a);
+                    })
+                    .catch(error => {
+                        console.error('Error downloading file:', error);
+                    });
+            }
+        } catch (error) {
+            attempts++;
+            setTimeout(tryDownload, retryTimeout);
+        }
     }
-    downloadFile(fileUrl + ".md", historyname + ".md");
-}
 
-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);
-        });
+    tryDownload();
 }
+    
 
 
 /* NOTE: These reload functions are not used in the current version of the code.