From 6854a7812f7435c5f814f5293a5ea4940ac67752 Mon Sep 17 00:00:00 2001
From: Wenjie Zhang <xerrors@163.com>
Date: Sat, 23 Nov 2024 20:53:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20rewrite=5Fquery=20?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/__init__.py               |  5 +++--
 src/core/retriever.py                |  6 +++++-
 src/routers/chat_router.py           |  1 +
 web/src/components/ChatComponent.vue | 12 ++++--------
 web/src/components/RefsComponent.vue |  4 ++--
 web/src/views/DataBaseInfoView.vue   | 11 ++++-------
 web/src/views/SettingView.vue        | 21 ++++++++++++++++++---
 7 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/config/__init__.py b/src/config/__init__.py
index 5be0e905..e19d86bc 100644
--- a/src/config/__init__.py
+++ b/src/config/__init__.py
@@ -17,7 +17,7 @@ RERANKER_LIST = _models["RERANKER_LIST"]
 class SimpleConfig(dict):
 
     def __key(self, key):
-        return "" if key is None else key.lower()
+        return "" if key is None else key.lower()  # 目前忘记了这里为什么要 lower 了，只能说配置项最好不要有大写的
 
     def __str__(self):
         return json.dumps(self)
@@ -61,6 +61,7 @@ class Config(SimpleConfig):
         self.add_item("model_name", default=None, des="模型名称")
         self.add_item("embed_model", default="zhipu-embedding-3", des="Embedding 模型", choices=list(EMBED_MODEL_INFO.keys()))
         self.add_item("reranker", default="bge-reranker-v2-m3", des="Re-Ranker 模型", choices=list(RERANKER_LIST.keys()))
+        self.add_item("use_rewrite_query", default="off", des="重写查询", choices=["off", "on", "hyde"])
         self.add_item("model_local_paths", default={}, des="本地模型路径")
         ### <<< 默认配置结束
 
@@ -113,7 +114,7 @@ class Config(SimpleConfig):
         self.valuable_model_provider = [k for k, v in self.model_provider_status.items() if v]
         assert len(self.valuable_model_provider) > 0, f"No model provider available, please check your `.env` file. API_KEY_LIST: {conds}"
 
-        
+
 
     def load(self):
         """根据传入的文件覆盖掉默认配置"""
diff --git a/src/core/retriever.py b/src/core/retriever.py
index 3d21971e..46b31c7e 100644
--- a/src/core/retriever.py
+++ b/src/core/retriever.py
@@ -118,7 +118,11 @@ class Retriever:
 
     def rewrite_query(self, query, history, refs):
         """重写查询"""
-        rewrite_query_span = refs["meta"].get("rewriteQuery", "off")
+        if refs["meta"].get("mode") == "search":  # 如果是搜索模式，就使用 meta 的配置，否则就使用全局的配置
+            rewrite_query_span = refs["meta"].get("use_rewrite_query", "off")
+        else:
+            rewrite_query_span = refs["meta"]["config"].get("use_rewrite_query", "off")
+
         if rewrite_query_span == "off":
             rewritten_query = query
         else:
diff --git a/src/routers/chat_router.py b/src/routers/chat_router.py
index 0f5659ef..1ef7ed5e 100644
--- a/src/routers/chat_router.py
+++ b/src/routers/chat_router.py
@@ -42,6 +42,7 @@ def chat_post(
             chunk = make_chunk("", "searching", history=None)
             yield chunk
 
+            meta["config"] = startup.config
             new_query, refs = startup.retriever(query, history_manager.messages, meta)
             refs_pool[cur_res_id] = refs
         else:
diff --git a/web/src/components/ChatComponent.vue b/web/src/components/ChatComponent.vue
index 13b37d58..d9ea6fe8 100644
--- a/web/src/components/ChatComponent.vue
+++ b/web/src/components/ChatComponent.vue
@@ -81,9 +81,9 @@
           <div class="flex-center" @click="meta.use_web = !meta.use_web" v-if="configStore.config.enable_search_engine && meta.enable_retrieval">
             搜索引擎（Bing） <div @click.stop><a-switch v-model:checked="meta.use_web" /></div>
           </div>
-          <div class="flex-center" v-if="configStore.config.enable_knowledge_base && meta.enable_retrieval">
-            重写查询 <a-segmented v-model:value="meta.rewriteQuery" :options="['off', 'on', 'hyde']"/>
-          </div>
+          <!-- <div class="flex-center" v-if="configStore.config.enable_knowledge_base && meta.enable_retrieval">
+            重写查询 <a-segmented v-model:value="meta.use_rewrite_query" :options="['off', 'on', 'hyde']"/>
+          </div> -->
         </div>
       </div>
     </div>
@@ -191,11 +191,7 @@ const panel = ref(null)
 const modelCard = ref(null)
 const examples = ref([
   '写一个冒泡排序',
-  '肉碱的分子量是多少？直接回答',
-  '总结大蒜的功效是什么？',
   '今天天气怎么样？',
-  '吃饭吃出苍蝇可以索赔吗？',
-  '帮我写一个请假条',
   '贾宝玉今年多少岁？',
 ])
 
@@ -211,7 +207,7 @@ const meta = reactive(JSON.parse(localStorage.getItem('meta')) || {
   use_graph: false,
   use_web: false,
   graph_name: "neo4j",
-  rewriteQuery: "off",
+  // use_rewrite_query: "off",
   selectedKB: null,
   stream: true,
   summary_title: true,
diff --git a/web/src/components/RefsComponent.vue b/web/src/components/RefsComponent.vue
index 78f874ac..342994f7 100644
--- a/web/src/components/RefsComponent.vue
+++ b/web/src/components/RefsComponent.vue
@@ -2,8 +2,8 @@
   <div class="refs" v-if="showRefs">
     <div class="tags">
       <span class="item btn" @click="copyText(msg.text)"><CopyOutlined /></span>
-      <span class="item btn" @click="likeThisResponse(msg)"><LikeOutlined /></span>
-      <span class="item btn" @click="dislikeThisResponse(msg)"><DislikeOutlined /></span>
+      <!-- <span class="item btn" @click="likeThisResponse(msg)"><LikeOutlined /></span> -->
+      <!-- <span class="item btn" @click="dislikeThisResponse(msg)"><DislikeOutlined /></span> -->
       <span class="item"><GlobalOutlined /> {{ msg.model_name }}</span>
       <span
         class="item btn"
diff --git a/web/src/views/DataBaseInfoView.vue b/web/src/views/DataBaseInfoView.vue
index d07e539f..132c882e 100644
--- a/web/src/views/DataBaseInfoView.vue
+++ b/web/src/views/DataBaseInfoView.vue
@@ -132,7 +132,7 @@
                 <div class="params-group">
                   <div class="params-item col">
                     <p>重写查询<small>（修改后需重新检索）</small>：</p>
-                    <a-segmented v-model:value="meta.rewriteQuery" :options="rewriteQueryOptions">
+                    <a-segmented v-model:value="meta.use_rewrite_query" :options="use_rewrite_queryOptions">
                       <template #label="{ payload }">
                         <div>
                           <p style="margin: 4px 0">{{ payload.subTitle }}</p>
@@ -251,13 +251,13 @@ const meta = reactive({
   mode: 'search',
   maxQueryCount: 30,
   filter: true,
-  rewriteQuery: 'off',
+  use_rewrite_query: 'off',
   rerankThreshold: 0.1,
   distanceThreshold: 0.3,
   topK: 10,
 });
 
-const rewriteQueryOptions = ref([
+const use_rewrite_queryOptions = ref([
   { value: 'off', payload: { title: 'off', subTitle: '不启用' } },
   { value: 'on', payload: { title: 'on', subTitle: '启用重写' } },
   { value: 'hyde', payload: { title: 'hyde', subTitle: '伪文档生成' } },
@@ -546,10 +546,7 @@ watch(() => meta, () => {
 
 // 添加示例查询
 const queryExamples = ref([
-  '食品添加剂的安全性如何?',
-  '如何识别和预防食物中毒?',
-  '转基因食品对人体健康有什么影响?',
-  '如何正确储存和处理生鲜食品?'
+  '贾宝玉的丫鬟有哪些？',
 ]);
 
 // 使用示例查询的方法
diff --git a/web/src/views/SettingView.vue b/web/src/views/SettingView.vue
index 534a84c0..ca0fe1ab 100644
--- a/web/src/views/SettingView.vue
+++ b/web/src/views/SettingView.vue
@@ -79,6 +79,21 @@
             />
           </div>
         </div>
+        <h3>检索配置</h3>
+        <div class="section">
+          <div class="card">
+            <span class="label">{{ items?.use_rewrite_query.des }}</span>
+            <a-select style="width: 200px"
+              :value="configStore.config?.use_rewrite_query"
+              @change="handleChange('use_rewrite_query', $event)"
+            >
+              <a-select-option
+                v-for="(name, idx) in items?.use_rewrite_query.choices" :key="idx"
+                :value="name">{{ name }}
+              </a-select-option>
+            </a-select>
+          </div>
+        </div>
       </div>
       <div class="setting" v-if="state.section === 'model'">
         <h3>模型配置</h3>
@@ -161,10 +176,10 @@
         </div>
         <div class="model-provider-card" v-for="(item, key) in notModelKeys" :key="key">
           <div class="card-header">
-            <h3>{{ modelNames[item].name }}</h3>
-            <a :href="modelNames[item].url" target="_blank">详情</a>
+            <h3 style="font-weight: 400">{{ modelNames[item].name }}</h3>
+            <a :href="modelNames[item].url" target="_blank"><InfoCircleOutlined /></a>
             <div class="missing-keys">
-              需配置 <span v-for="(key, idx) in modelNames[item].env" :key="idx">{{ key }}</span>
+              <small>需配置</small> <span v-for="(key, idx) in modelNames[item].env" :key="idx">{{ key }}</span>
             </div>
           </div>
         </div>

From bd679f47d637702a6e38735280a4cce20e1b5277 Mon Sep 17 00:00:00 2001
From: Wenjie Zhang <xerrors@163.com>
Date: Sat, 23 Nov 2024 22:25:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=EF=BC=88=E6=9C=AA=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/models/embedding.py                     |  14 +-
 src/plugins/oneke.py                        |   4 +-
 web/src/components/TableConfigComponent.vue | 202 ++++++++++++++++++++
 web/src/views/SettingView.vue               |  14 +-
 4 files changed, 217 insertions(+), 17 deletions(-)
 create mode 100644 web/src/components/TableConfigComponent.vue

diff --git a/src/models/embedding.py b/src/models/embedding.py
index 7b576abe..604d1c1d 100644
--- a/src/models/embedding.py
+++ b/src/models/embedding.py
@@ -15,11 +15,7 @@ GLOBAL_EMBED_STATE = {}
 class EmbeddingModel(FlagModel):
     def __init__(self, model_info, config, **kwargs):
         self.info = model_info
-        model_name_or_path = handle_local_model(
-            paths=config.model_local_paths,
-            model_name=model_info["name"],
-            default_path=model_info.get("default_path", None))
-
+        model_name_or_path = config.model_local_paths.get(model_info["name"], model_info.get("default_path", None))
         logger.info(f"Loading embedding model {model_info['name']} from {model_name_or_path}")
 
         super().__init__(model_name_or_path,
@@ -34,11 +30,7 @@ class Reranker(FlagReranker):
 
         assert config.reranker in RERANKER_LIST.keys(), f"Unsupported Reranker: {config.reranker}, only support {RERANKER_LIST.keys()}"
 
-        model_name_or_path = handle_local_model(
-            paths=config.model_local_paths,
-            model_name=config.reranker,
-            default_path=RERANKER_LIST[config.reranker])
-
+        model_name_or_path = config.model_local_paths.get(config.reranker, default_path=RERANKER_LIST[config.reranker])
         logger.info(f"Loading Reranker model {config.reranker} from {model_name_or_path}")
 
         super().__init__(model_name_or_path, use_fp16=True, **kwargs)
@@ -113,6 +105,4 @@ def get_embedding_model(config):
 
 def handle_local_model(paths, model_name, default_path):
     model_path = paths.get(model_name, default_path)
-    if os.getenv("MODEL_ROOT_DIR") and not os.path.isabs(model_path):
-        model_path = os.path.join(os.getenv("MODEL_ROOT_DIR"), model_path)
     return model_path
\ No newline at end of file
diff --git a/src/plugins/oneke.py b/src/plugins/oneke.py
index aea4c5c8..3ca3d60b 100644
--- a/src/plugins/oneke.py
+++ b/src/plugins/oneke.py
@@ -16,8 +16,6 @@ logger = setup_logger("OneKE")
 
 dotenv.load_dotenv()
 
-MODEL_NAME_OR_PATH = os.path.join(os.getenv('MODEL_ROOT_DIR', './'), 'OneKE')
-
 instruction_mapper = {
     'NERzh': "你是专门进行实体抽取的专家。请从input中抽取出符合schema定义的实体，不存在的实体类型返回空列表。请按照JSON字符串的格式回答。",
     'REzh': "你是专门进行关系抽取的专家。请从input中抽取出符合schema定义的关系三元组。请按照JSON字符串的格式回答。",
@@ -42,7 +40,7 @@ class OneKE:
     def __init__(self, config=None):
 
         self.config = config
-        model_name_or_path = config.model_local_paths.get('oneke', "zjunlp/OneKE")
+        model_name_or_path = config.model_local_paths.get('zjunlp/OneKE', "zjunlp/OneKE")
         logger.info(f"Loading KGC model OneKE from {model_name_or_path}")
 
         model_config = AutoConfig.from_pretrained(model_name_or_path, trust_remote_code=True)
diff --git a/web/src/components/TableConfigComponent.vue b/web/src/components/TableConfigComponent.vue
new file mode 100644
index 00000000..7b372d4c
--- /dev/null
+++ b/web/src/components/TableConfigComponent.vue
@@ -0,0 +1,202 @@
+<template>
+  <a-card class="config-card" style="max-width: 960px">
+    <a-form layout="vertical">
+      <div
+        v-for="(item, index) in configList"
+        :key="index"
+        class="config-item"
+      >
+        <a-row :gutter="[16, 8]" align="middle">
+          <a-col :span="8">
+            <a-input
+              v-model:value="item.key"
+              placeholder="模型名称"
+              readonly
+              class="key-input"
+            />
+          </a-col>
+          <a-col :span="14">
+            <a-input
+              v-model:value="item.value"
+              @change="updateValue(index)"
+              placeholder="模型本地路径"
+              class="value-input"
+            />
+          </a-col>
+          <a-col :span="2" class="delete-btn-col">
+            <a-button
+              type="link"
+              danger
+              class="delete-btn"
+              @click="deleteConfig(index)"
+            >
+              <DeleteOutlined />
+            </a-button>
+          </a-col>
+        </a-row>
+      </div>
+
+      <a-button block @click="addConfig" class="add-btn" :disabled="isAdding">
+        <PlusOutlined /> 添加路径映射
+      </a-button>
+    </a-form>
+
+    <a-modal
+      title="添加路径映射"
+      v-model:visible="addConfigModalVisible"
+      @ok="confirmAddConfig"
+      class="config-modal"
+    >
+      <a-form layout="vertical">
+        <a-form-item label="模型名称（与Huggingface名称一致，比如 BAAI/bge-large-zh-v1.5" required>
+          <a-input
+            v-model:value="newConfig.key"
+            placeholder="请输入模型名称"
+            class="modal-input"
+          />
+        </a-form-item>
+        <a-form-item label="模型本地路径（绝对路径，比如 /hdd/models/BAAI/bge-large-zh-v1.5）" required>
+          <a-input
+            v-model:value="newConfig.value"
+            placeholder="请输入模型本地路径"
+            class="modal-input"
+          />
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </a-card>
+</template>
+
+<script setup>
+import { ref, reactive, computed, watch } from 'vue';
+import { message } from 'ant-design-vue';
+import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue';
+
+const props = defineProps({
+  config: {
+    type: Object,
+    default: () => ({})
+  }
+});
+
+const emit = defineEmits(['update:config']);
+
+// 配置列表
+const configList = reactive([]);
+
+// 初始化配置列表
+props.config && Object.entries(props.config).forEach(([key, value]) => {
+  configList.push({ key, value });
+});
+
+// 控制模态框显示
+const addConfigModalVisible = ref(false);
+
+// 新增配置项数据
+const newConfig = ref({ key: '', value: '' });
+
+// 添加配置
+const addConfig = () => {
+  addConfigModalVisible.value = true;
+};
+
+// 确认添加配置
+const confirmAddConfig = () => {
+  if (newConfig.value.key === '' || newConfig.value.value === '') {
+    message.warning('键或值不能为空');
+    return;
+  }
+  if (configList.some(item => item.key === newConfig.value.key)) {
+    message.warning('键已存在');
+    return;
+  }
+  configList.push({ key: newConfig.value.key, value: newConfig.value.value });
+  addConfigModalVisible.value = false;
+  newConfig.value = { key: '', value: '' };
+};
+
+// 删除配置
+const deleteConfig = (index) => {
+  configList.splice(index, 1);
+};
+
+// 更新值
+const updateValue = (index) => {
+  // 值的更新实时反映在 configList 中，无需额外处理
+};
+
+// 将配置列表转换为对象
+const configObject = computed(() => {
+  return configList.reduce((acc, item) => {
+    acc[item.key] = item.value;
+    return acc;
+  }, {});
+});
+
+// 监听配置变化并传递回父组件
+watch(configObject, (newValue) => {
+  emit('update:config', newValue);
+}, { deep: true });
+</script>
+
+<style scoped>
+.config-card {
+  background-color: var(--gray-10);
+  border-radius: 8px;
+  border: 1px solid var(--gray-300);
+}
+
+.config-item {
+  border-bottom: 1px solid #f0f0f0;
+  padding: 12px 0;
+  transition: background-color 0.3s ease;
+}
+
+.config-item:hover {
+  background-color: #fafafa;
+}
+
+.config-item:last-child {
+  border-bottom: none;
+}
+
+.key-input {
+  background-color: #f8f8f8;
+  border-color: #e8e8e8;
+}
+
+.delete-btn-col {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.delete-btn {
+  opacity: 0.6;
+  transition: opacity 0.3s ease;
+}
+
+.delete-btn:hover {
+  opacity: 1;
+}
+
+.add-btn {
+  margin-top: 16px;
+  height: 40px;
+  transition: all 0.3s ease;
+  width: auto;
+}
+
+.modal-input {
+  margin-bottom: 8px;
+}
+
+:deep(.ant-modal-content) {
+  border-radius: 8px;
+}
+
+:deep(.ant-card-body) {
+  padding: 16px;
+}
+</style>
+
diff --git a/web/src/views/SettingView.vue b/web/src/views/SettingView.vue
index ca0fe1ab..a314595a 100644
--- a/web/src/views/SettingView.vue
+++ b/web/src/views/SettingView.vue
@@ -185,7 +185,11 @@
         </div>
       </div>
       <div class="setting" v-if="state.section ==='path'">
-        <h3>暂无配置</h3>
+        <h3>本地模型配置</h3>
+        <TableConfigComponent
+          :config="configStore.config?.model_local_paths"
+          @update:config="handleModelLocalPathsUpdate"
+        />
       </div>
     </div>
   </div>
@@ -206,6 +210,7 @@ import {
   InfoCircleOutlined,
 } from '@ant-design/icons-vue';
 import HeaderComponent from '@/components/HeaderComponent.vue';
+import TableConfigComponent from '@/components/TableConfigComponent.vue';
 import { notification, Button } from 'ant-design-vue';
 
 const configStore = useConfigStore()
@@ -246,6 +251,10 @@ const generateRandomHash = (length) => {
   return hash;
 }
 
+const handleModelLocalPathsUpdate = (config) => {
+  handleChange('model_local_paths', config)
+}
+
 const handleChange = (key, e) => {
   if (key == 'enable_knowledge_graph' && e && !configStore.config.enable_knowledge_base) {
     message.error('启动知识图谱必须请先启用知识库功能')
@@ -264,7 +273,8 @@ const handleChange = (key, e) => {
         || key == 'model_provider'
         || key == 'model_name'
         || key == 'embed_model'
-        || key == 'reranker') {
+        || key == 'reranker'
+        || key == 'model_local_paths') {
     if (!isNeedRestart.value) {
       isNeedRestart.value = true
       notification.info({

From 66e18298ce7d930c67af6ca588ba8b2a06dffdfb Mon Sep 17 00:00:00 2001
From: Wenjie Zhang <xerrors@163.com>
Date: Sat, 23 Nov 2024 22:35:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0BGE-M3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/models.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/config/models.yaml b/src/config/models.yaml
index f42781c2..813f4f87 100644
--- a/src/config/models.yaml
+++ b/src/config/models.yaml
@@ -81,6 +81,10 @@ EMBED_MODEL_INFO:
     default_path: BAAI/bge-large-zh-v1.5
     dimension: 1024
     query_instruction: "为这个句子生成表示以用于检索相关文章："
+  bge-m3:
+    name: bge-m3
+    default_path: BAAI/bge-m3
+    dimension: 1024
   zhipu-embedding-2:
     name: zhipu-embedding-2
     default_path: embedding-2

From 5453452452136d754161899cd22f7794243dc2f1 Mon Sep 17 00:00:00 2001
From: littlewwwhite <1095245867@qq.com>
Date: Sat, 15 Feb 2025 19:29:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8E=20tavil=E7=9A=84web=20=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                           |   5 +-
 requirements.txt                     |   3 +-
 src/config/__init__.py               |   2 +-
 src/config/models.yaml               |   1 +
 src/core/startup.py                  |  22 ++++-
 src/models/__init__.py               |  59 ++++--------
 src/models/chat_model.py             |  13 ++-
 src/routers/chat_router.py           |  42 +++++++--
 web/src/components/ChatComponent.vue | 132 +++++++++++++++++----------
 9 files changed, 179 insertions(+), 100 deletions(-)

diff --git a/.gitignore b/.gitignore
index df19050c..439e3613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,7 @@ web/package-lock.json
 saves
 notebooks
 graphrag
-docker/volumes
\ No newline at end of file
+docker/volumes
+
+
+.cursorrules
diff --git a/requirements.txt b/requirements.txt
index ed96727a..c7f87bf4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,4 +24,5 @@ opencv-python-headless
 docx2txt
 uvicorn[standard]
 fastapi
-python-multipart
\ No newline at end of file
+python-multipart
+tavily-python
\ No newline at end of file
diff --git a/src/config/__init__.py b/src/config/__init__.py
index 5be0e905..2d82e268 100644
--- a/src/config/__init__.py
+++ b/src/config/__init__.py
@@ -53,7 +53,7 @@ class Config(SimpleConfig):
         self.add_item("enable_knowledge_base", default=False, des="是否开启知识库")
         self.add_item("enable_knowledge_graph", default=False, des="是否开启知识图谱")
         self.add_item("enable_search_engine", default=False, des="是否开启搜索引擎")
-
+        self.add_item("enable_web_search", default=False, des="是否开启网页搜索")
         # 模型配置
         ## 注意这里是模型名，而不是具体的模型路径，默认使用 HuggingFace 的路径
         ## 如果需要自定义路径，则在 config/base.yaml 中配置 model_local_paths
diff --git a/src/config/models.yaml b/src/config/models.yaml
index f42781c2..55dd90f0 100644
--- a/src/config/models.yaml
+++ b/src/config/models.yaml
@@ -18,6 +18,7 @@ MODEL_NAMES:
       - DEEPSEEK_API_KEY
     models:
       - deepseek-chat
+      - deepseek-reasoner
   zhipu:
     name: 智谱AI (Zhipu)
     url: https://open.bigmodel.cn/dev/api
diff --git a/src/core/startup.py b/src/core/startup.py
index 943dd10b..ee4f95dd 100644
--- a/src/core/startup.py
+++ b/src/core/startup.py
@@ -1,3 +1,4 @@
+import os
 from src.core import DataBaseManager
 from src.core.retriever import Retriever
 from src.models import select_model
@@ -9,10 +10,29 @@ logger = setup_logger("Startup")
 
 class Startup:
     def __init__(self):
+        self.config = Config("config/base.yaml")
+        self._check_environment()
         self.start()
 
+    def _check_environment(self):
+        """检查必要的环境变量"""
+        required_vars = {
+            "zhipu": ["ZHIPUAI_API_KEY"],
+            "openai": ["OPENAI_API_KEY"],
+            "deepseek": ["DEEPSEEK_API_KEY"],
+        }
+        
+        provider = self.config.model_provider
+        if provider in required_vars:
+            missing = [var for var in required_vars[provider] if not os.getenv(var)]
+            if missing:
+                logger.error(f"Missing required environment variables for {provider}: {missing}")
+                raise ValueError(f"Missing required environment variables: {missing}")
+                
+        if self.config.enable_web_search and not os.getenv("TAVILY_API_KEY"):
+            logger.warning("TAVILY_API_KEY not set, web search will be disabled")
+
     def start(self):
-        self.config = Config()
         self.model = select_model(self.config)
         self.dbm = DataBaseManager(self.config)
         self.retriever = Retriever(self.config, self.dbm, self.model)
diff --git a/src/models/__init__.py b/src/models/__init__.py
index b5efa9d0..4f7a3d39 100644
--- a/src/models/__init__.py
+++ b/src/models/__init__.py
@@ -1,46 +1,23 @@
 from src.utils.logging_config import logger
+from src.models.chat_model import OpenModel, DeepSeek, Zhipu, Qianfan, DashScope, SiliconFlow
+from src.models.embedding import get_embedding_model
 
 
 def select_model(config):
-
-    model_provider = config.model_provider
-    model_name = config.model_name
-
-    logger.info(f"Selecting model from {model_provider} with {model_name}")
-
-    if model_provider == "deepseek":
-        from src.models.chat_model import DeepSeek
-        return DeepSeek(model_name)
-
-    elif model_provider == "zhipu":
-        from src.models.chat_model import Zhipu
-        return Zhipu(model_name)
-
-    elif model_provider == "qianfan":
-        from src.models.chat_model import Qianfan
-        return Qianfan(model_name)
-
-    elif model_provider == "dashscope":
-        from src.models.chat_model import DashScope
-        return DashScope(model_name)
-
-    elif model_provider == "openai":
-        from src.models.chat_model import OpenModel
-        return OpenModel(model_name)
-
-    elif model_provider == "siliconflow":
-        from src.models.chat_model import SiliconFlow
-        return SiliconFlow(model_name)
-
-    elif model_provider == "custom":
-        model_info = next((x for x in config.custom_models if x["custom_id"] == model_name), None)
-        if model_info is None:
-            raise ValueError(f"Model {model_name} not found in custom models")
-
-        from src.models.chat_model import CustomModel
-        return CustomModel(model_info)
-
-    elif model_provider is None:
-        raise ValueError("Model provider not specified, please modify `model_provider` in `src/config/base.yaml`")
+    """
+    根据配置选择模型
+    """
+    if config.model_provider == "deepseek":
+        return DeepSeek(config.model_name)
+    elif config.model_provider == "zhipu":
+        return Zhipu(config.model_name)
+    elif config.model_provider == "openai":
+        return OpenModel(config.model_name)
+    elif config.model_provider == "qianfan":
+        return Qianfan(config.model_name)
+    elif config.model_provider == "dashscope":
+        return DashScope(config.model_name)
+    elif config.model_provider == "siliconflow":
+        return SiliconFlow(config.model_name)
     else:
-        raise ValueError(f"Model provider {model_provider} not supported")
+        raise ValueError(f"Unsupported model provider: {config.model_provider}")
diff --git a/src/models/chat_model.py b/src/models/chat_model.py
index 8f1924e7..bcf331b3 100644
--- a/src/models/chat_model.py
+++ b/src/models/chat_model.py
@@ -1,6 +1,7 @@
 import os
 from openai import OpenAI
 from src.utils.logging_config import setup_logger
+from zhipuai import ZhipuAI
 
 
 logger = setup_logger(__name__)
@@ -50,8 +51,8 @@ class OpenModel(OpenAIBase):
 class DeepSeek(OpenAIBase):
     def __init__(self, model_name=None):
         model_name = model_name or "deepseek-chat"
-        api_key = os.getenv("DEEPSEEK_API_KEY")
-        base_url = "https://api.deepseek.com"
+        api_key = os.getenv("DEEPSEEK_API_KEY", "your-default-api-key")
+        base_url = os.getenv("DEEPSEEK_API_BASE", "https://api.deepseek.com/v1")
         super().__init__(api_key=api_key, base_url=base_url, model_name=model_name)
 
 
@@ -165,6 +166,14 @@ class DashScope:
         return response.output.choices[0].message
 
 
+class ChatModel:
+    def __init__(self, config):
+        if config.model_provider == "zhipu":
+            self.client = ZhipuAI(api_key=os.getenv("ZHIPUAI_API_KEY"))
+        elif config.model_provider == "openai":
+            self.client = OpenAI(api_key=os.getenv("OPENAI_API_KEY"))
+
+
 if __name__ == "__main__":
     model = SiliconFlow()
     for a in model.predict("你好", stream=True):
diff --git a/src/routers/chat_router.py b/src/routers/chat_router.py
index 0f5659ef..ad136dde 100644
--- a/src/routers/chat_router.py
+++ b/src/routers/chat_router.py
@@ -6,6 +6,7 @@ from concurrent.futures import ThreadPoolExecutor
 from src.core import HistoryManager
 from src.core.startup import startup
 from src.utils.logging_config import setup_logger
+from src.utils.web_search import WebSearcher
 
 chat = APIRouter(prefix="/chat")
 logger = setup_logger("server-chat")
@@ -13,6 +14,7 @@ logger = setup_logger("server-chat")
 executor = ThreadPoolExecutor()
 
 refs_pool = {}
+web_searcher = WebSearcher()
 
 @chat.get("/")
 async def chat_get():
@@ -37,19 +39,45 @@ def chat_post(
         }, ensure_ascii=False).encode('utf-8') + b"\n"
 
     def generate_response():
+        modified_query = query
+        
+        # 处理网页搜索
+        if meta and meta.get("enable_web_search"):
+            chunk = make_chunk("正在进行网络搜索...", "searching", history=None)
+            yield chunk
 
-        if meta.get("enable_retrieval"):
+            try:
+                search_results = web_searcher.search(query)
+                if search_results:
+                    search_context = web_searcher.format_search_results(search_results)
+                    # 将搜索结果添加到查询中
+                    modified_query = f"""基于以下网络搜索结果回答问题：
+
+                    {search_context}
+
+                    用户问题：{query}
+
+                    请综合以上搜索结果，给出准确、客观的回答。如果搜索结果与问题相关性不大，请直接基于你的知识回答。
+                    """
+                    logger.info(f"Web search results added to query")
+                else:
+                    logger.warning("No web search results found")
+            except Exception as e:
+                logger.error(f"Web search error: {str(e)}")
+                chunk = make_chunk("网络搜索失败，将直接回答问题。", "loading", history=None)
+                yield chunk
+
+        # 处理知识库检索
+        if meta and meta.get("enable_retrieval"):
             chunk = make_chunk("", "searching", history=None)
             yield chunk
 
-            new_query, refs = startup.retriever(query, history_manager.messages, meta)
+            modified_query, refs = startup.retriever(modified_query, history_manager.messages, meta)
             refs_pool[cur_res_id] = refs
-        else:
-            new_query = query
 
-        messages = history_manager.get_history_with_msg(new_query, max_rounds=meta.get('history_round'))
-        history_manager.add_user(query)
-        logger.debug(f"Web history: {history_manager.messages}")
+        messages = history_manager.get_history_with_msg(modified_query, max_rounds=meta.get('history_round'))
+        history_manager.add_user(query)  # 注意这里使用原始查询
+        logger.debug(f"Final query: {modified_query}")
 
         content = ""
         for delta in startup.model.predict(messages, stream=True):
diff --git a/web/src/components/ChatComponent.vue b/web/src/components/ChatComponent.vue
index 13b37d58..165395f7 100644
--- a/web/src/components/ChatComponent.vue
+++ b/web/src/components/ChatComponent.vue
@@ -81,6 +81,9 @@
           <div class="flex-center" @click="meta.use_web = !meta.use_web" v-if="configStore.config.enable_search_engine && meta.enable_retrieval">
             搜索引擎（Bing） <div @click.stop><a-switch v-model:checked="meta.use_web" /></div>
           </div>
+          <div class="flex-center" @click="meta.enable_web_search = !meta.enable_web_search">
+            网页搜索 <div @click.stop><a-switch v-model:checked="meta.enable_web_search" /></div>
+          </div>
           <div class="flex-center" v-if="configStore.config.enable_knowledge_base && meta.enable_retrieval">
             重写查询 <a-segmented v-model:value="meta.rewriteQuery" :options="['off', 'on', 'hyde']"/>
           </div>
@@ -166,6 +169,8 @@ import {
   GlobalOutlined,
   FileTextOutlined,
   RobotOutlined,
+  EditOutlined,
+  PlusOutlined,
 } from '@ant-design/icons-vue'
 import { onClickOutside } from '@vueuse/core'
 import { Marked } from 'marked';
@@ -210,12 +215,14 @@ const meta = reactive(JSON.parse(localStorage.getItem('meta')) || {
   enable_retrieval: false,
   use_graph: false,
   use_web: false,
+  enable_web_search: false,
   graph_name: "neo4j",
   rewriteQuery: "off",
   selectedKB: null,
   stream: true,
   summary_title: true,
   history_round: 5,
+  db_name: null,
 })
 
 const marked = new Marked(
@@ -327,35 +334,26 @@ const appendAiMessage = (message, refs=null) => {
 
 const updateMessage = (info) => {
   const message = conv.value.messages.find((message) => message.id === info.id);
-
   if (message) {
-    // 只有在 text 不为空时更新
-    if (info.text !== null && info.text !== undefined && info.text !== '') {
-      message.text = info.text;
-    }
-
-    // 只有在 refs 不为空时更新
-    if (info.refs !== null && info.refs !== undefined) {
-      message.refs = info.refs;
-    }
-
-    if (info.model_name !== null && info.model_name !== undefined && info.model_name !== '') {
-      message.model_name = info.model_name;
-    }
-
-    // 只有在 status 不为空时更新
-    if (info.status !== null && info.status !== undefined && info.status !== '') {
-      message.status = info.status;
-    }
-
-    if (info.meta !== null && info.meta !== undefined) {
-      message.meta = info.meta;
+    try {
+      if (info.text !== null && info.text !== undefined && info.text !== '') {
+        message.text = info.text;
+      }
+      if (info.status !== null && info.status !== undefined && info.status !== '') {
+        message.status = info.status;
+      }
+      if (info.meta !== null && info.meta !== undefined) {
+        message.meta = info.meta;
+      }
+      scrollToBottom();
+    } catch (error) {
+      console.error('Error updating message:', error);
+      message.status = 'error';
+      message.text = '消息更新失败';
     }
   } else {
-    console.error('Message not found');
+    console.error('Message not found:', info.id);
   }
-
-  scrollToBottom();
 };
 
 
@@ -399,21 +397,21 @@ const loadDatabases = () => {
 }
 
 // 新函数用于处理 fetch 请求
-const fetchChatResponse = (user_input, cur_res_id) => {
+const fetchChatResponse = (requestData) => {
   fetch('/api/chat/', {
     method: 'POST',
-    body: JSON.stringify({
-      query: user_input,
-      history: conv.value.history,
-      meta: meta,
-      cur_res_id: cur_res_id,
-    }),
     headers: {
       'Content-Type': 'application/json'
-    }
+    },
+    body: JSON.stringify(requestData)
   })
-  .then((response) => {
-    if (!response.body) throw new Error("ReadableStream not supported.");
+  .then(response => {
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
+    if (!response.body) {
+      throw new Error("ReadableStream not supported.");
+    }
     const reader = response.body.getReader();
     const decoder = new TextDecoder("utf-8");
     let buffer = '';
@@ -421,22 +419,22 @@ const fetchChatResponse = (user_input, cur_res_id) => {
     const readChunk = () => {
       return reader.read().then(({ done, value }) => {
         if (done) {
-          const message = conv.value.messages.find((message) => message.id === cur_res_id)
+          const message = conv.value.messages.find((message) => message.id === requestData.cur_res_id)
           console.log(message)
           if (message.meta.enable_retrieval) {
             console.log("fetching refs")
-            fetchRefs(cur_res_id).then((data) => {
+            fetchRefs(requestData.cur_res_id).then((data) => {
               console.log(data)
               updateMessage({
-                id: cur_res_id,
+                id: requestData.cur_res_id,
                 refs: data,
                 status: "finished",
               });
-              groupRefs(cur_res_id);
+              groupRefs(requestData.cur_res_id);
             })
           } else {
             updateMessage({
-              id: cur_res_id,
+              id: requestData.cur_res_id,
               status: "finished",
             });
           }
@@ -455,7 +453,7 @@ const fetchChatResponse = (user_input, cur_res_id) => {
             try {
               const data = JSON.parse(line);
               updateMessage({
-                id: cur_res_id,
+                id: requestData.cur_res_id,
                 text: data.response,
                 model_name: data.model_name,
                 status: data.status,
@@ -482,12 +480,14 @@ const fetchChatResponse = (user_input, cur_res_id) => {
     readChunk();
   })
   .catch((error) => {
-    console.error(error);
+    console.error('Error in fetchChatResponse:', error);
     updateMessage({
-      id: cur_res_id,
+      id: requestData.cur_res_id,
       status: "error",
+      text: `请求错误：${error.message}`,
     });
     isStreaming.value = false;
+    message.error(`请求失败：${error.message}`);
   });
 }
 
@@ -518,9 +518,30 @@ const sendMessage = () => {
     appendAiMessage("", null);
     const cur_res_id = conv.value.messages[conv.value.messages.length - 1].id;
     conv.value.inputText = '';
-    meta.db_name = dbName;
+    
+    // 准备发送的数据
+    const requestData = {
+      query: user_input,
+      history: conv.value.history,
+      cur_res_id: cur_res_id,
+      meta: {
+        enable_retrieval: meta.enable_retrieval,
+        use_graph: meta.use_graph,
+        use_web: meta.use_web,
+        enable_web_search: meta.enable_web_search,
+        graph_name: meta.graph_name,
+        rewriteQuery: meta.rewriteQuery,
+        selectedKB: meta.selectedKB,
+        stream: meta.stream,
+        summary_title: meta.summary_title,
+        history_round: meta.history_round,
+        db_name: dbName,
+      }
+    };
 
-    fetchChatResponse(user_input, cur_res_id)
+    console.log('Sending request with data:', requestData); // 添加日志
+
+    fetchChatResponse(requestData);
   } else {
     console.log('请输入消息');
   }
@@ -648,6 +669,17 @@ watch(
     &:hover {
       background-color: var(--main-light-3);
     }
+
+    .anticon {
+      margin-right: 8px;
+      font-size: 16px;
+    }
+    
+    .ant-switch {
+      &.ant-switch-checked {
+        background-color: var(--main-500);
+      }
+    }
   }
 }
 
@@ -977,7 +1009,15 @@ watch(
   }
 }
 
-
+.controls {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .search-switch {
+    margin-right: 8px;
+  }
+}
 </style>
 
 <style lang="less">