From 51188b1428ea5c8c3fa289b2ab6cff42c330221f Mon Sep 17 00:00:00 2001
From: CaiHQ <caihq@pku.edu.cn>
Date: Sat, 15 Feb 2025 13:02:24 +0800
Subject: [PATCH] update search result in prompt

---
 src/assets/locale/zh/common.json |  2 +-
 src/hooks/useMessageOption.tsx   |  1 +
 src/web/web.ts                   | 25 ++++++++++++++-----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/assets/locale/zh/common.json b/src/assets/locale/zh/common.json
index e57d65a..c4ba2e8 100644
--- a/src/assets/locale/zh/common.json
+++ b/src/assets/locale/zh/common.json
@@ -38,7 +38,7 @@
         }
     },
     "copyToClipboard": "复制到剪贴板",
-    "webSearch": "搜索万维网",
+    "webSearch": "正在搜索",
     "iodSearch": "搜索数联网",
     "regenerate": "重新生成",
     "edit": "编辑",
diff --git a/src/hooks/useMessageOption.tsx b/src/hooks/useMessageOption.tsx
index 9452550..322ed31 100644
--- a/src/hooks/useMessageOption.tsx
+++ b/src/hooks/useMessageOption.tsx
@@ -294,6 +294,7 @@ export const useMessageOption = () => {
         webSearch,
         iodSearch,
       )
+      console.log("prompt:\n"+prompt);
       setIsSearchingInternet(false)
 
       //  message = message.trim().replaceAll("\n", " ")
diff --git a/src/web/web.ts b/src/web/web.ts
index d28c5c9..83d9ea2 100644
--- a/src/web/web.ts
+++ b/src/web/web.ts
@@ -85,19 +85,22 @@ export const getSystemPromptForWeb = async (
       //   )
       //   .join("\n")
     }
-
-    const search_results =  iodSearchResults.map((res) => ({
+    const iod_search_results =  iodSearchResults.map((res) => ({
       url: `${res.doId}: ${res.name}`,
       content: res.description
-    }))
-      .concat(
-        webSearchResults
-      )
-      .map(
-        (result, idx) =>
-          `<result source="${result.url}" id="${idx}">${result.content}</result>`
-      )
-      .join("\n")
+    })).map(
+      (result, idx) =>
+        `<result source="${result.url}" id="${idx}">${result.content}</result>`
+    )
+    .join("\n");
+    console.log("iod_search_result:"+iod_search_results);
+    const web_search_results = webSearchResults.map(
+      (result, idx) =>
+        `<result source="${result.url}" id="${idx}">${result.content}</result>`
+    )
+    .join("\n");
+    const search_results = (iodSearch?"<数联网搜索结果>"+iod_search_results+"</数联网搜索结果>":"")
+      + (webSearch?"<万维网搜索结果>"+web_search_results+"</万维网搜索结果>":"");
 
     const current_date_time = new Date().toLocaleString()