From 84e967c631516e190ed1b10e951ef9dd60584a01 Mon Sep 17 00:00:00 2001 From: Rikki Date: Thu, 6 Mar 2025 18:51:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=20=E5=B1=8F=E8=94=BD.vscode?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 51a11d8c2..deec90be9 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,7 @@ cython_debug/ # jieba jieba.cache + + +# vscode +/.vscode \ No newline at end of file From dac57cf154b8d891812dcf1fb7f623d96e909e55 Mon Sep 17 00:00:00 2001 From: Rikki Date: Fri, 7 Mar 2025 05:31:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=90=8E=20bot=5Fconfig.toml=20=E4=BC=9A?= =?UTF-8?q?=E8=A2=AB=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 4 ++-- {config => templete}/auto_format.py | 0 {config => templete}/bot_config_template.toml | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {config => templete}/auto_format.py (100%) rename {config => templete}/bot_config_template.toml (100%) diff --git a/bot.py b/bot.py index 8ef087476..d0922e4d6 100644 --- a/bot.py +++ b/bot.py @@ -17,11 +17,11 @@ print(rainbow_text) '''彩蛋''' # 初次启动检测 -if not os.path.exists("config/bot_config.toml") or not os.path.exists(".env"): +if not os.path.exists("config/bot_config.toml"): logger.info("检测到bot_config.toml不存在，正在从模板复制") import shutil - shutil.copy("config/bot_config_template.toml", "config/bot_config.toml") + shutil.copy("templete/bot_config_template.toml", "config/bot_config.toml") logger.info("复制完成，请修改config/bot_config.toml和.env.prod中的配置后重新启动") # 初始化.env 默认ENVIRONMENT=prod diff --git a/config/auto_format.py b/templete/auto_format.py similarity index 100% rename from config/auto_format.py rename to templete/auto_format.py diff --git a/config/bot_config_template.toml b/templete/bot_config_template.toml similarity index 100% rename from config/bot_config_template.toml rename to templete/bot_config_template.toml From b69c9ac7f742e0e5f260e04f10edf2a32a58bf5d Mon Sep 17 00:00:00 2001 From: Rikki Date: Fri, 7 Mar 2025 05:50:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E7=94=A8=20embedding=20=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E7=8E=B0=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/models/utils_model.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/models/utils_model.py b/src/plugins/models/utils_model.py index 793a89290..f06e94076 100644 --- a/src/plugins/models/utils_model.py +++ b/src/plugins/models/utils_model.py @@ -317,12 +317,11 @@ class LLM_request: logger.error("达到最大重试次数，请求仍然失败") raise RuntimeError("达到最大重试次数，API请求仍然失败") - def get_embedding_sync(self, text: str, model: str = "BAAI/bge-m3") -> Union[list, None]: + def get_embedding_sync(self, text: str) -> Union[list, None]: """同步方法：获取文本的embedding向量 Args: text: 需要获取embedding的文本 - model: 使用的模型名称，默认为"BAAI/bge-m3" Returns: list: embedding向量，如果失败则返回None @@ -333,7 +332,7 @@ class LLM_request: } data = { - "model": model, + "model": self.model_name, "input": text, "encoding_format": "float" }