查询结果:
@@ -346,25 +320,6 @@
resultElement.classList.remove('visible');
}
- // 工具函数：显示进度日志
- function showProgressLog(messages) {
- const logElement = document.getElementById('progressLog');
- if (messages && messages.length > 0) {
- logElement.innerHTML = messages.map(msg =>
- `
${escapeHtml(msg)}
`
- ).join('');
- logElement.classList.add('visible');
- } else {
- logElement.classList.remove('visible');
- }
- }
-
- // 工具函数：隐藏进度日志
- function hideProgressLog() {
- const logElement = document.getElementById('progressLog');
- logElement.classList.remove('visible');
- }
-
// 工具函数：转义HTML特殊字符
function escapeHtml(text) {
const map = {
@@ -405,7 +360,6 @@
setButtonLoading(button, true);
showStatus('loadStatus', '正在加载文件...', 'loading');
hideResult();
- hideProgressLog();
try {
const response = await fetch('/load-files/', {
@@ -451,7 +405,6 @@
setButtonLoading(button, true);
showStatus('webLoadStatus', '正在加载网站内容...', 'loading');
hideResult();
- hideProgressLog();
try {
const response = await fetch('/load-website/', {
@@ -499,7 +452,6 @@
setButtonLoading(button, true);
showStatus('queryStatus', '正在处理查询...', 'loading');
hideResult();
- hideProgressLog();
try {
const response = await fetch(`/query/?original_query=${encodeURIComponent(queryText)}&max_iter=${maxIter}`, {
@@ -515,9 +467,6 @@
showStatus('queryStatus', '查询完成', 'success');
document.getElementById('resultText').textContent = data.result;
showResult();
-
- // 显示进度日志
- showProgressLog(data.progress_messages);
} else {
showStatus('queryStatus', `查询失败: ${data.detail}`, 'error');
}
diff --git a/deepsearcher/llm/openai_llm.py b/deepsearcher/llm/openai_llm.py
index bbd3998..02a21c9 100644
--- a/deepsearcher/llm/openai_llm.py
+++ b/deepsearcher/llm/openai_llm.py
@@ -50,6 +50,7 @@ class OpenAILLM(BaseLLM):
stream=True,
temperature=0.6
) as stream:
+ # stream仅做测试，不需要发送到前端
content = ""
reasoning_content = ""
for chunk in stream:
@@ -63,5 +64,5 @@ class OpenAILLM(BaseLLM):
if hasattr(delta, 'content') and delta.content is not None:
print(delta.content, end="", flush=True)
content += delta.content
- print("\n")
+ print("\n")
return content
diff --git a/deepsearcher/online_query.py b/deepsearcher/online_query.py
index 77ed6e6..096124a 100644
--- a/deepsearcher/online_query.py
+++ b/deepsearcher/online_query.py
@@ -3,7 +3,7 @@ from deepsearcher import configuration
from deepsearcher.vector_db.base import RetrievalResult
-def query(original_query: str) -> tuple[str, list[RetrievalResult]]:
+def query(original_query: str, max_iter: int | None = None) -> tuple[str, list[RetrievalResult]]:
"""
Query the knowledge base with a question and get an answer.
@@ -20,10 +20,10 @@ def query(original_query: str) -> tuple[str, list[RetrievalResult]]:
- A list of retrieval results that were used to generate the answer
"""
default_searcher = configuration.default_searcher
- return default_searcher.query(original_query)
+ return default_searcher.query(original_query, max_iter=max_iter)
-def retrieve(original_query: str) -> tuple[list[RetrievalResult], list[str]]:
+def retrieve(original_query: str, max_iter: int | None = None) -> tuple[list[RetrievalResult], list[str]]:
"""
Retrieve relevant information from the knowledge base without generating an answer.
@@ -40,5 +40,5 @@ def retrieve(original_query: str) -> tuple[list[RetrievalResult], list[str]]:
- A list of strings representing consumed tokens
"""
default_searcher = configuration.default_searcher
- retrieved_results, metadata = default_searcher.retrieve(original_query)
+ retrieved_results, metadata = default_searcher.retrieve(original_query, max_iter=max_iter)
return retrieved_results
diff --git a/main.py b/main.py
index d0ea344..77eafdc 100644
--- a/main.py
+++ b/main.py
@@ -203,19 +203,10 @@ def perform_query(
HTTPException: If the query fails.
"""
try:
- # 清除之前的进度消息
- from deepsearcher.utils.log import clear_progress_messages
- clear_progress_messages()
-
result_text, _ = query(original_query, max_iter)
- # 获取进度消息
- from deepsearcher.utils.log import get_progress_messages
- progress_messages = get_progress_messages()
-
return {
- "result": result_text,
- "progress_messages": progress_messages
+ "result": result_text
}
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))