From 34dd9d926c13c443a125ad3638e38e6fc9219393 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Mon, 30 Jun 2025 07:42:21 +0800
Subject: [PATCH] 'commit'

---
 .../Config/__pycache__/Config.cpython-310.pyc | Bin 705 -> 705 bytes
 .../__pycache__/__init__.cpython-310.pyc      | Bin 137 -> 137 bytes
 ...lasticsearchConnectionPool.cpython-310.pyc | Bin 2754 -> 2754 bytes
 .../__pycache__/__init__.cpython-310.pyc      | Bin 144 -> 144 bytes
 .../__pycache__/EsSearchUtil.cpython-310.pyc  | Bin 3967 -> 3967 bytes
 .../__pycache__/SearchUtil.cpython-310.pyc    | Bin 3066 -> 3066 bytes
 .../Util/__pycache__/__init__.cpython-310.pyc | Bin 135 -> 135 bytes
 dsRag/static/ai.html                          | 175 +++++++++++-------
 dsRag/static/aj.html                          |  71 -------
 9 files changed, 104 insertions(+), 142 deletions(-)
 delete mode 100644 dsRag/static/aj.html

diff --git a/dsRag/Config/__pycache__/Config.cpython-310.pyc b/dsRag/Config/__pycache__/Config.cpython-310.pyc
index aba3f494c522d3624114892add3f2a0a8a6f05f2..e244bc2194d8482da9f8ca036f66f484acc8b30f 100644
GIT binary patch
delta 93
zcmX@edXSYXpO=@50SL~Wn#lEBI*KbPu{bk1KC!eUBZ{XiwJ0;KGCn!AsH8Y*G7sZ-
v=_pRu;CN?$KQ~YJTfDyhF0MZDjsc$W-ma0iCd)Bdv#|k9Dq@=)&y)lJf-M~A

delta 93
zcmX@edXSYXpO=@50SF{KCvrWPzQvW4Se%(0pIBOwaf_!cwJ0;KGCn!AsHFJTWFE%v
v(ziHWgX5k3{oFj=qj-J&U0i+Q9Rob$y<H=tCd)BdvvB}TD&m+N&y)lJdmJ3K

diff --git a/dsRag/Config/__pycache__/__init__.cpython-310.pyc b/dsRag/Config/__pycache__/__init__.cpython-310.pyc
index 2278514cd50c4f589d57ed9e603ceb02eedfb9c9..b3f99ca71b3b92c5c36e61e071899a9af29e37da 100644
GIT binary patch
delta 18
YcmeBV>}2H1=jG*M0D=QgCvw#T03*BvaR2}S

delta 18
XcmeBV>}2H1=jG*M0D|>K6S?XEAe#fN

diff --git a/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc b/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc
index 6b0788000f2d14c31b78591e5124b342f7c593e7..2c77d6cb0573b0c90091426b9fc84ff0e3f8d74b 100644
GIT binary patch
delta 19
ZcmX>kdPtNjpO=@50SKZDH*)RZ0st-T1XKV3

delta 19
ZcmX>kdPtNjpO=@50SI<@Z{*s+1pqLk1k3;c

diff --git a/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc b/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc
index f7c5e0e6a622fc3bc50e548acf6d6728aa53a406..94ae6ce2baf4d4f283db992edbc385bb28d4e8c7 100644
GIT binary patch
delta 18
YcmbQhIDwHXpO=@50SKaaCUUg_03S~SM*si-

delta 18
YcmbQhIDwHXpO=@50SI<@PvmL?03sm+<NyEw

diff --git a/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc b/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc
index 753978228c94264aafee922ece3ceccbc835065c..8d10dd8681357ae8e44821f8f98470b8fb12cf1c 100644
GIT binary patch
delta 19
Zcmew__g{`HpO=@50SN9!Z{#ZF2LL-31y29~

delta 19
Zcmew__g{`HpO=@50SHd++{jhR4*)!L1(^T<

diff --git a/dsRag/Util/__pycache__/SearchUtil.cpython-310.pyc b/dsRag/Util/__pycache__/SearchUtil.cpython-310.pyc
index ab6219cd1431100b177818bf374db5fdbf4df1d9..006f496a706bf6e5625f7b1bf16d1c4062ec5e4c 100644
GIT binary patch
delta 19
Zcmew*{!5%IpO=@50SNqTH*$U81^_m81pxp6

delta 19
Zcmew*{!5%IpO=@50SI1uY~=dD4FEb@1*rf4

diff --git a/dsRag/Util/__pycache__/__init__.cpython-310.pyc b/dsRag/Util/__pycache__/__init__.cpython-310.pyc
index 2089b6b502a2908d4f89653139dba6f8d101300d..79767003c9ac32bf4142003b854ef98e2eacfc07 100644
GIT binary patch
delta 18
XcmZo?Y-i-k=jG*M0D@rdiCnb+9qj`o

delta 18
XcmZo?Y-i-k=jG*M0D=$N6S-;uA$|kl

diff --git a/dsRag/static/ai.html b/dsRag/static/ai.html
index 058cfd86..399e7287 100644
--- a/dsRag/static/ai.html
+++ b/dsRag/static/ai.html
@@ -168,6 +168,34 @@
             height: auto;
             overflow-y: auto; /* 添加滚动条 */
         }
+
+        .loading-animation {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            height: 200px;
+            color: #666;
+        }
+
+        .spinner {
+            width: 40px;
+            height: 40px;
+            border: 4px solid #f3f3f3;
+            border-top: 4px solid #3498db;
+            border-radius: 50%;
+            animation: spin 1s linear infinite;
+            margin-bottom: 10px;
+        }
+
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+            }
+            100% {
+                transform: rotate(360deg);
+            }
+        }
     </style>
 </head>
 <body>
@@ -231,32 +259,32 @@
 </div>
 
 <script>
-  // 禁用所有按钮
-  document.addEventListener('DOMContentLoaded', function() {
-    const buttons = document.querySelectorAll('button');
-    buttons.forEach(btn => btn.disabled = true);
-  });
-
-  MathJax = {
-    tex: {
-      inlineMath: [['$', '$'], ['\\(', '\\)']],
-      displayMath: [['$$', '$$'], ['\\[', '\\]']]
-    },
-    svg: {
-      fontCache: 'global'
-    },
-    startup: {
-      pageReady: () => {
-        return MathJax.startup.defaultPageReady().then(() => {
-          console.log('MathJax initialized');
-          // 启用所有按钮
-          const buttons = document.querySelectorAll('button');
-          buttons.forEach(btn => btn.disabled = false);
-          return MathJax.typesetPromise();
-        });
-      }
-    }
-  };
+    // 禁用所有按钮
+    document.addEventListener('DOMContentLoaded', function () {
+        const buttons = document.querySelectorAll('button');
+        buttons.forEach(btn => btn.disabled = true);
+    });
+
+    MathJax = {
+        tex: {
+            inlineMath: [['$', '$'], ['\\(', '\\)']],
+            displayMath: [['$$', '$$'], ['\\[', '\\]']]
+        },
+        svg: {
+            fontCache: 'global'
+        },
+        startup: {
+            pageReady: () => {
+                return MathJax.startup.defaultPageReady().then(() => {
+                    console.log('MathJax initialized');
+                    // 启用所有按钮
+                    const buttons = document.querySelectorAll('button');
+                    buttons.forEach(btn => btn.disabled = false);
+                    return MathJax.typesetPromise();
+                });
+            }
+        }
+    };
 </script>
 <!--国内可以访问的JS,不要使用静态的本地的，因为文件不全的话没有好的显示效果！-->
 <script src="https://cdn.bootcdn.net/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.js" id="MathJax-script" async></script>
@@ -283,12 +311,8 @@
         const selectedDocs = Array.from(checkboxes).map(cb => cb.value);
         const answerArea = document.getElementById('answerArea');
 
-        answerArea.innerHTML = '';
-
-        const data = {
-            query: question,
-            tags: selectedDocs
-        };
+        // 添加加载动画
+        answerArea.innerHTML = '<div class="loading-animation"><div class="spinner"></div><div>思考中...</div></div>';
 
         fetch('/api/rag', {
             method: 'POST',
@@ -296,52 +320,60 @@
                 'Content-Type': 'application/json',
                 'Accept': 'text/event-stream'
             },
-            body: JSON.stringify(data)
+            body: JSON.stringify({
+                query: question,
+                tags: selectedDocs
+            })
         })
-        .then(response => {
-            const reader = response.body.getReader();
-            const decoder = new TextDecoder();
-            let buffer = '';
-            let accumulatedContent = '';
-
-            function processChunk() {
-                return reader.read().then(({done, value}) => {
-                    if (done) return;
-
-                    buffer += decoder.decode(value, {stream: true});
-                    const lines = buffer.split('\n');
-                    buffer = lines.pop();
-
-                    for (const line of lines) {
-                        if (line.includes('data:')) {
-                            const jsonStr = line.replace(/^data:\s*/, '').replace(/^data:\s*/, '').trim();
-                            if (jsonStr) {
-                                try {
-                                    const data = JSON.parse(jsonStr);
-                                    if (data.reply) {
-                                        accumulatedContent += data.reply;
-                                        answerArea.innerHTML = marked.parse(accumulatedContent);
-                                        MathJax.typesetPromise();
+            .then(response => {
+                const reader = response.body.getReader();
+                const decoder = new TextDecoder();
+                let buffer = '';
+                let accumulatedContent = '';
+
+                function processChunk() {
+                    return reader.read().then(({done, value}) => {
+                        if (done) return;
+
+                        buffer += decoder.decode(value, {stream: true});
+                        const lines = buffer.split('\n');
+                        buffer = lines.pop();
+
+                        for (const line of lines) {
+                            if (line.includes('data:')) {
+                                const jsonStr = line.replace(/^data:\s*/, '').replace(/^data:\s*/, '').trim();
+                                if (jsonStr) {
+                                    try {
+                                        const data = JSON.parse(jsonStr);
+                                        if (data.reply) {
+                                            accumulatedContent += data.reply;
+                                            answerArea.innerHTML = marked.parse(accumulatedContent);
+                                            MathJax.typesetPromise();
+                                        }
+                                    } catch (e) {
+                                        console.log('忽略解析错误:', e);
                                     }
-                                } catch (e) {
-                                    console.log('忽略解析错误:', e);
                                 }
                             }
                         }
-                    }
 
-                    return processChunk().then(() => {
-                        // 在流处理完成后保存完整的markdown内容
-                        localStorage.setItem('lastMarkdownContent', accumulatedContent);
+                        return processChunk().then(() => {
+                            // 在流处理完成后保存完整的markdown内容
+                            localStorage.setItem('lastMarkdownContent', accumulatedContent);
+                        });
                     });
-                });
-            }
+                }
 
-            return processChunk();
-        })
-        .catch(error => {
-            console.error('Error:', error);
-        });
+                return processChunk();
+            })
+            .catch(error => {
+                // 移除加载动画
+                answerArea.innerHTML = '';
+
+                console.error('Error:', error);
+                // 出错时也移除加载动画
+                answerArea.innerHTML = '<div style="color:red">请求出错，请重试</div>';
+            });
     }
 
     function clearAll() {
@@ -392,4 +424,5 @@
     }
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
+
diff --git a/dsRag/static/aj.html b/dsRag/static/aj.html
deleted file mode 100644
index d78e5339..00000000
--- a/dsRag/static/aj.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>SSE测试</title>
-    <link rel="icon" href="data:,">
-</head>
-<body>
-<button onclick="callRagAPI()">调用RAG接口</button>
-<div id="responseArea"></div>
-
-<script>
-    async function callRagAPI() {
-        const responseArea = document.getElementById('responseArea');
-        responseArea.innerHTML = '';
-
-        const data = {
-            query: "小学数学中有哪些模型？",
-            tags: ["MATH_1"]
-        };
-
-        try {
-            const response = await fetch('http://127.0.0.1:8000/api/rag', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Accept': 'text/event-stream'
-                },
-                body: JSON.stringify(data)
-            });
-
-            const reader = response.body.getReader();
-            const decoder = new TextDecoder();
-            let buffer = '';
-
-            while (true) {
-                const {done, value} = await reader.read();
-                if (done) break;
-
-                buffer += decoder.decode(value, {stream: true});
-
-                // 处理可能的多行数据
-                const lines = buffer.split('\n');
-                buffer = lines.pop();
-
-                for (const line of lines) {
-                    if (line.includes('data:')) {
-                        // 处理可能的多重data:前缀
-                        const jsonStr = line.replace(/^data:\s*/, '').replace(/^data:\s*/, '').trim();
-                        if (jsonStr) {
-                            try {
-                                const data = JSON.parse(jsonStr);
-                                if (data.reply) {
-                                    // 将换行符转换为HTML换行标签
-                                    const formattedReply = data.reply.replace(/\n/g, '<br>');
-                                    responseArea.innerHTML += formattedReply;
-                                }
-                            } catch (e) {
-                                console.log('忽略解析错误:', e);
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (error) {
-            console.error('请求失败:', error);
-            responseArea.innerHTML = '请求失败: ' + error.message;
-        }
-    }
-</script>
-</body>
-</html>
\ No newline at end of file