From 0e3d384d4de1a05a062c9b2bf4434ab59ecae1c3 Mon Sep 17 00:00:00 2001 From: Wenjie Zhang Date: Wed, 26 Feb 2025 23:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=BC=98=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 -- README.md | 2 +- docker/docker-compose.dev.yml | 1 - src/config/__init__.py | 6 +++--- src/static/config.yaml | 0 web/src/views/SettingView.vue | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 src/static/config.yaml diff --git a/.gitignore b/.gitignore index 83a0cd7a..ad909208 100644 --- a/.gitignore +++ b/.gitignore @@ -38,5 +38,3 @@ notebooks graphrag docker/volumes .cursorrules -src/static/config.yaml -src/static/config.dev.yaml diff --git a/README.md b/README.md index 85b0e2b2..25e1408b 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ docker compose -f docker/docker-compose.yml --env-file src/.env up --build 对于**向量模型**和**重排序模型**，选择以 `local` 前缀开头的模型，可以不做修改会自动下载模型，如果下载过程中出现问题，请参考 [HF-Mirror](https://hf-mirror.com/) 配置相关内容。（但请注意，如果是 Docker 运行，模型仅会缓存到 Docker 里面） -如果想要使用本地已经下载好的模型，可以在网页的 settings 里面做映射。或者修改 `src/static/config.yaml` 来配置映射关系。但请记得，本地模型的路径要在 docker-compose 的文件中映射 volumes。 +如果想要使用本地已经下载好的模型，可以在网页的 settings 里面做映射。或者修改 `saves/config/base.yaml` 来配置映射关系。但请记得，本地模型的路径要在 docker-compose 的文件中映射 volumes。 ## 知识库支持 diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index bd08549f..5eb9939e 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -8,7 +8,6 @@ services: volumes: - ../src:/app/src - ../saves_dev:/app/saves - - ../src/static/config.dev.yaml:/app/src/static/config.yaml # - ${MODEL_DIR}:${MODEL_DIR} # 如果出现 undefined volume MODEL_DIR: invalid compose project，请添加此环境变量或者注释此行 ports: - "5050:5050" diff --git a/src/config/__init__.py b/src/config/__init__.py index bbd959f2..32a361ea 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -44,11 +44,10 @@ class Config(SimpleConfig): super().__init__() self._config_items = {} self.save_dir = "saves" - self.filename = str(Path("src/static/config.yaml")) + self.filename = str(Path("saves/config/base.yaml")) os.makedirs(os.path.dirname(self.filename), exist_ok=True) ### >>> 默认配置 - # 可以在 config/base.yaml 中覆盖 self.add_item("stream", default=True, des="是否开启流式输出") # 功能选项 self.add_item("enable_reranker", default=False, des="是否开启重排序") @@ -63,6 +62,7 @@ class Config(SimpleConfig): self.add_item("model_provider_lite", default="siliconflow", des="模型提供商（用于轻量任务）", choices=list(MODEL_NAMES.keys())) self.add_item("model_name", default="Qwen/Qwen2.5-7B-Instruct", des="模型名称") self.add_item("model_name_lite", default="Qwen/Qwen2.5-7B-Instruct", des="模型名称（用于轻量任务）") + self.add_item("embed_model", default="siliconflow/BAAI/bge-m3", des="Embedding 模型", choices=list(EMBED_MODEL_INFO.keys())) self.add_item("reranker", default="siliconflow/BAAI/bge-reranker-v2-m3", des="Re-Ranker 模型", choices=list(RERANKER_LIST.keys())) self.add_item("model_local_paths", default={}, des="本地模型路径") @@ -155,7 +155,7 @@ class Config(SimpleConfig): logger.info(f"Saving config to {self.filename}") if self.filename is None: logger.warning("Config file is not specified, save to default config/base.yaml") - self.filename = os.path.join(self.save_dir, "config", "config.yaml") + self.filename = os.path.join(self.save_dir, "config", "base.yaml") os.makedirs(os.path.dirname(self.filename), exist_ok=True) if self.filename.endswith(".json"): diff --git a/src/static/config.yaml b/src/static/config.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/web/src/views/SettingView.vue b/web/src/views/SettingView.vue index 2942ab34..82c4fd2f 100644 --- a/web/src/views/SettingView.vue +++ b/web/src/views/SettingView.vue @@ -2,7 +2,7 @@