From 750e8706727f9944b0fd83fb4b6d99240f4e0f6e Mon Sep 17 00:00:00 2001 From: Rikki Date: Sat, 8 Mar 2025 16:21:16 +0800 Subject: [PATCH 01/13] =?UTF-8?q?feat:=20=E6=B6=88=E9=99=A4=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E4=BB=A3=E7=A0=81=E4=B8=AD=E9=97=B4=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E5=BA=93=E7=9A=84=E8=A1=8C=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bot.py b/bot.py index 715fe9aa..922a2328 100644 --- a/bot.py +++ b/bot.py @@ -1,4 +1,5 @@ import os +import shutil import nonebot from nonebot.adapters.onebot.v11 import Adapter from dotenv import load_dotenv @@ -19,7 +20,7 @@ print(rainbow_text) # 初次启动检测 if not os.path.exists("config/bot_config.toml"): logger.warning("检测到bot_config.toml不存在，正在从模板复制") - import shutil + # 检查config目录是否存在 if not os.path.exists("config"): os.makedirs("config") From f5f325208a7373c1d9113098c2ebec3d99ef3f3f Mon Sep 17 00:00:00 2001 From: Rikki Date: Sat, 8 Mar 2025 17:05:45 +0800 Subject: [PATCH 02/13] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E5=8A=A0=E8=BD=BD=E5=99=A8=20?= =?UTF-8?q?=E5=B9=B6=20=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BE=9B=E5=95=86?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=8A=9F=E8=83=BD=EF=BC=8C=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=20config=20=E5=8A=A0=E8=BD=BD=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E6=9B=BF=E6=8D=A2=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 171 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 66 deletions(-) diff --git a/bot.py b/bot.py index 922a2328..716d0f4b 100644 --- a/bot.py +++ b/bot.py @@ -5,65 +5,6 @@ from nonebot.adapters.onebot.v11 import Adapter from dotenv import load_dotenv from loguru import logger -'''彩蛋''' -from colorama import init, Fore - -init() -text = "多年以后，面对AI行刑队，张三将会回想起他2023年在会议上讨论人工智能的那个下午" -rainbow_colors = [Fore.RED, Fore.YELLOW, Fore.GREEN, Fore.CYAN, Fore.BLUE, Fore.MAGENTA] -rainbow_text = "" -for i, char in enumerate(text): - rainbow_text += rainbow_colors[i % len(rainbow_colors)] + char -print(rainbow_text) -'''彩蛋''' - -# 初次启动检测 -if not os.path.exists("config/bot_config.toml"): - logger.warning("检测到bot_config.toml不存在，正在从模板复制") - - # 检查config目录是否存在 - if not os.path.exists("config"): - os.makedirs("config") - logger.info("创建config目录") - - shutil.copy("template/bot_config_template.toml", "config/bot_config.toml") - logger.info("复制完成，请修改config/bot_config.toml和.env.prod中的配置后重新启动") - -# 初始化.env 默认ENVIRONMENT=prod -if not os.path.exists(".env"): - with open(".env", "w") as f: - f.write("ENVIRONMENT=prod") - - # 检测.env.prod文件是否存在 - if not os.path.exists(".env.prod"): - logger.error("检测到.env.prod文件不存在") - shutil.copy("template.env", "./.env.prod") - -# 首先加载基础环境变量.env -if os.path.exists(".env"): - load_dotenv(".env") - logger.success("成功加载基础环境变量配置") - -# 根据 ENVIRONMENT 加载对应的环境配置 -if os.getenv("ENVIRONMENT") == "prod": - logger.success("加载生产环境变量配置") - load_dotenv(".env.prod", override=True) # override=True 允许覆盖已存在的环境变量 -elif os.getenv("ENVIRONMENT") == "dev": - logger.success("加载开发环境变量配置") - load_dotenv(".env.dev", override=True) # override=True 允许覆盖已存在的环境变量 -elif os.path.exists(f".env.{os.getenv('ENVIRONMENT')}"): - logger.success(f"加载{os.getenv('ENVIRONMENT')}环境变量配置") - load_dotenv(f".env.{os.getenv('ENVIRONMENT')}", override=True) # override=True 允许覆盖已存在的环境变量 -else: - logger.error(f"ENVIRONMENT配置错误，请检查.env文件中的ENVIRONMENT变量对应的.env.{os.getenv('ENVIRONMENT')}是否存在") - exit(1) - -# 检测Key是否存在 -if not os.getenv("SILICONFLOW_KEY"): - logger.error("缺失必要的API KEY") - logger.error(f"请至少在.env.{os.getenv('ENVIRONMENT')}文件中填写SILICONFLOW_KEY后重新启动") - exit(1) - # 获取所有环境变量 env_config = {key: os.getenv(key) for key in os.environ} @@ -74,15 +15,113 @@ base_config = { "log_level": "INFO", } -# 合并配置 -nonebot.init(**base_config, **env_config) +def easter_egg(): + # 彩蛋 + from colorama import init, Fore -# 注册适配器 -driver = nonebot.get_driver() -driver.register_adapter(Adapter) + init() + text = "多年以后，面对AI行刑队，张三将会回想起他2023年在会议上讨论人工智能的那个下午" + rainbow_colors = [Fore.RED, Fore.YELLOW, Fore.GREEN, Fore.CYAN, Fore.BLUE, Fore.MAGENTA] + rainbow_text = "" + for i, char in enumerate(text): + rainbow_text += rainbow_colors[i % len(rainbow_colors)] + char + print(rainbow_text) -# 加载插件 -nonebot.load_plugins("src/plugins") +def init_config(): + # 初次启动检测 + if not os.path.exists("config/bot_config.toml"): + logger.warning("检测到bot_config.toml不存在，正在从模板复制") + + # 检查config目录是否存在 + if not os.path.exists("config"): + os.makedirs("config") + logger.info("创建config目录") + + shutil.copy("template/bot_config_template.toml", "config/bot_config.toml") + logger.info("复制完成，请修改config/bot_config.toml和.env.prod中的配置后重新启动") + +def init_env(): + # 初始化.env 默认ENVIRONMENT=prod + if not os.path.exists(".env"): + with open(".env", "w") as f: + f.write("ENVIRONMENT=prod") + + # 检测.env.prod文件是否存在 + if not os.path.exists(".env.prod"): + logger.error("检测到.env.prod文件不存在") + shutil.copy("template.env", "./.env.prod") + + else: + # 首先加载基础环境变量.env + load_dotenv(".env") + logger.success("成功加载基础环境变量配置") + +def load_env(): + # 使用闭包实现对加载器的横向扩展，避免大量重复判断 + def prod(): + logger.success("加载生产环境变量配置") + load_dotenv(".env.prod", override=True) # override=True 允许覆盖已存在的环境变量 + + def dev(): + logger.success("加载开发环境变量配置") + load_dotenv(".env.dev", override=True) # override=True 允许覆盖已存在的环境变量 + + fn_map = { + "prod": prod, + "dev": dev + } + + env = os.getenv("ENVIRONMENT") + if env in fn_map: + fn_map[env]() # 根据映射执行闭包函数 + + elif os.path.exists(f".env.{env}"): + logger.success(f"加载{env}环境变量配置") + load_dotenv(f".env.{env}", override=True) # override=True 允许覆盖已存在的环境变量 + + else: + logger.error(f"ENVIRONMENT 配置错误，请检查 .env 文件中的 ENVIRONMENT 变量及对应 .env.{env} 是否存在") + exit(1) + +provider = {} + +def scan_provider(): + # 遍历 env_config 的所有键 + for key in env_config: + # 检查键是否符合 {provider}_BASE_URL 或 {provider}_KEY 的格式 + if key.endswith("_BASE_URL") or key.endswith("_KEY"): + # 提取 provider 名称 + provider_name = key.rsplit("_", 1)[0] # 从右边分割一次，取第一部分 + + # 初始化 provider 的字典（如果尚未初始化） + if provider_name not in provider: + provider[provider_name] = {"url": None, "key": None} + + # 根据键的类型填充 url 或 key + if key.endswith("_BASE_URL"): + provider[provider_name]["url"] = env_config[key] + elif key.endswith("_KEY"): + provider[provider_name]["key"] = env_config[key] + + # 检查每个 provider 是否同时存在 url 和 key + for provider_name, config in provider.items(): + if config["url"] is None or config["key"] is None: + raise ValueError(f"请检查 '{provider_name}' 提供商配置是否丢失 BASE_URL 或 KEY 环境变量") if __name__ == "__main__": + easter_egg() + init_config() + init_env() + scan_provider() + + # 合并配置 + nonebot.init(**base_config, **env_config) + + # 注册适配器 + driver = nonebot.get_driver() + driver.register_adapter(Adapter) + + # 加载插件 + nonebot.load_plugins("src/plugins") + nonebot.run() From 0f492ed4032b9fe279c469bdb1acd71a57ee3e6d Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 02:39:58 +0800 Subject: [PATCH 03/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20BASE=5FURL/KE?= =?UTF-8?q?Y=20=E7=BB=84=E5=90=88=E6=A3=80=E6=9F=A5=E4=B8=AD=E8=A2=AB=20GP?= =?UTF-8?q?G=5FKEY=20=E5=B9=B2=E6=89=B0=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 | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/bot.py b/bot.py index 716d0f4b..5b25d75f 100644 --- a/bot.py +++ b/bot.py @@ -6,7 +6,7 @@ from dotenv import load_dotenv from loguru import logger # 获取所有环境变量 -env_config = {key: os.getenv(key) for key in os.environ} +env_mask = {key: os.getenv(key) for key in os.environ} # 设置基础配置 base_config = { @@ -83,9 +83,17 @@ def load_env(): logger.error(f"ENVIRONMENT 配置错误，请检查 .env 文件中的 ENVIRONMENT 变量及对应 .env.{env} 是否存在") exit(1) -provider = {} -def scan_provider(): + +def scan_provider(env_config: dict): + provider = {} + + # 利用未初始化 env 时获取的 env_mask 来对新的环境变量集去重 + # 避免 GPG_KEY 这样的变量干扰检查 + for key in env_config: + if key in env_mask: + del env_config[key] + # 遍历 env_config 的所有键 for key in env_config: # 检查键是否符合 {provider}_BASE_URL 或 {provider}_KEY 的格式 @@ -106,13 +114,19 @@ def scan_provider(): # 检查每个 provider 是否同时存在 url 和 key for provider_name, config in provider.items(): if config["url"] is None or config["key"] is None: + logger.error( + f"provider 内容：{config}\n" + f"env_config 内容：{env_config}" + ) raise ValueError(f"请检查 '{provider_name}' 提供商配置是否丢失 BASE_URL 或 KEY 环境变量") if __name__ == "__main__": easter_egg() init_config() init_env() - scan_provider() + + env_config = {key: os.getenv(key) for key in os.environ} + scan_provider(env_config) # 合并配置 nonebot.init(**base_config, **env_config) From edc07acd6fa11b4bde8d38692162935a50711bae Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 02:40:39 +0800 Subject: [PATCH 04/13] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=99=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=89=88=E6=9C=AC=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=92=8C=E7=A8=8B=E5=BA=8F=E5=85=BC=E5=AE=B9=E8=83=BD?= =?UTF-8?q?=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/config.py | 361 ++++++++++++++++++++++++++----------- 1 file changed, 258 insertions(+), 103 deletions(-) diff --git a/src/plugins/chat/config.py b/src/plugins/chat/config.py index 0186001a..b668e152 100644 --- a/src/plugins/chat/config.py +++ b/src/plugins/chat/config.py @@ -6,12 +6,16 @@ import tomli import sys from loguru import logger from nonebot import get_driver - +from packaging import version +from packaging.version import Version, InvalidVersion +from packaging.specifiers import SpecifierSet,InvalidSpecifier @dataclass class BotConfig: """机器人配置类""" + INNER_VERSION: SpecifierSet + BOT_QQ: Optional[int] = 1 BOT_NICKNAME: Optional[str] = None @@ -77,131 +81,282 @@ class BotConfig: if not os.path.exists(config_dir): os.makedirs(config_dir) return config_dir + + @classmethod + def convert_to_specifierset(value: str) -> SpecifierSet: + """将 字符串 版本表达式转换成 SpecifierSet + Args: + value[str]: 版本表达式(字符串) + Returns: + SpecifierSet + """ + try: + converted = SpecifierSet(value) + except InvalidSpecifier as e: + logger.error( + f"{value} 分类使用了错误的版本约束表达式\n", + "请阅读 https://semver.org/lang/zh-CN/ 修改代码" + ) + exit(1) + + return converted + + @classmethod + def get_config_version(cls, toml: dict) -> Version: + """提取配置文件的 SpecifierSet 版本数据 + Args: + toml[dict]: 输入的配置文件字典 + Returns: + Version + """ + + if 'inner' in toml: + try: + config_version : str = toml["inner"]["version"] + except KeyError as e: + logger.error(f"配置文件中 inner 段 不存在 {e}, 这是错误的配置文件") + exit(1) + else: + toml["inner"] = { "version": "0.0.0" } + config_version = toml["inner"]["version"] + + try: + ver = version.parse(config_version) + except InvalidVersion as e: + logger.error( + "配置文件中 inner段 的 version 键是错误的版本描述\n" + "请阅读 https://semver.org/lang/zh-CN/ 修改配置，并参考本项目指定的模板进行修改\n" + "本项目在不同的版本下有不同的模板，请注意识别" + ) + exit(1) + + return ver @classmethod def load_config(cls, config_path: str = None) -> "BotConfig": """从TOML配置文件加载配置""" config = cls() + + def personality(parent: dict): + personality_config = parent['personality'] + personality = personality_config.get('prompt_personality') + if len(personality) >= 2: + logger.info(f"载入自定义人格:{personality}") + config.PROMPT_PERSONALITY=personality_config.get('prompt_personality',config.PROMPT_PERSONALITY) + logger.info(f"载入自定义日程prompt:{personality_config.get('prompt_schedule',config.PROMPT_SCHEDULE_GEN)}") + config.PROMPT_SCHEDULE_GEN=personality_config.get('prompt_schedule',config.PROMPT_SCHEDULE_GEN) + + def emoji(parent: dict): + emoji_config = parent["emoji"] + config.EMOJI_CHECK_INTERVAL = emoji_config.get("check_interval", config.EMOJI_CHECK_INTERVAL) + config.EMOJI_REGISTER_INTERVAL = emoji_config.get("register_interval", config.EMOJI_REGISTER_INTERVAL) + config.EMOJI_CHECK_PROMPT = emoji_config.get('check_prompt',config.EMOJI_CHECK_PROMPT) + config.EMOJI_SAVE = emoji_config.get('auto_save',config.EMOJI_SAVE) + config.EMOJI_CHECK = emoji_config.get('enable_check',config.EMOJI_CHECK) + + def cq_code(parent: dict): + cq_code_config = parent["cq_code"] + config.ENABLE_PIC_TRANSLATE = cq_code_config.get("enable_pic_translate", config.ENABLE_PIC_TRANSLATE) + + def bot(parent: dict): + # 机器人基础配置 + bot_config = parent["bot"] + bot_qq = bot_config.get("qq") + config.BOT_QQ = int(bot_qq) + config.BOT_NICKNAME = bot_config.get("nickname", config.BOT_NICKNAME) + + def response(parent: dict): + response_config = parent["response"] + config.MODEL_R1_PROBABILITY = response_config.get("model_r1_probability", config.MODEL_R1_PROBABILITY) + config.MODEL_V3_PROBABILITY = response_config.get("model_v3_probability", config.MODEL_V3_PROBABILITY) + config.MODEL_R1_DISTILL_PROBABILITY = response_config.get("model_r1_distill_probability", config.MODEL_R1_DISTILL_PROBABILITY) + config.max_response_length = response_config.get("max_response_length", config.max_response_length) + + def model(parent: dict): + # 加载模型配置 + model_config = parent["model"] + config_version : Version = cls.get_config_version(parent) + + config_list = [ + "llm_reasoning", + "llm_reasoning_minor", + "llm_normal", + "llm_normal_minor", + "llm_topic_judge", + "llm_summary_by_topic", + "llm_emotion_judge", + "vlm", + "embedding", + "moderation" + ] + + for item in config_list: + if item in model_config: + cfg_item = model_config[item] + + # base_url 的例子： SILICONFLOW_BASE_URL + # key 的例子： SILICONFLOW_KEY + cfg_target = { + "name" : "", + "base_url" : "", + "key" : "", + "pri_in" : 0, + "pri_out" : 0 + } + + if config_version in SpecifierSet("<0.0.0"): + cfg_target = cfg_item + + elif config_version in SpecifierSet(">=0.0.1"): + stable_item = ["name","pri_in","pri_out"] + for i in stable_item: + cfg_target[i] = cfg_item[i] + + provider = cfg_item["provider"] + + cfg_target["base_url"] = f"{provider}_BASE_URL" + cfg_target["key"] = f"{provider}_KEY" + + + # 如果 列表中的项目在 model_config 中，利用反射来设置对应项目 + setattr(config,item,cfg_target) + + def message(parent: dict): + msg_config = parent["message"] + config.MIN_TEXT_LENGTH = msg_config.get("min_text_length", config.MIN_TEXT_LENGTH) + config.MAX_CONTEXT_SIZE = msg_config.get("max_context_size", config.MAX_CONTEXT_SIZE) + config.emoji_chance = msg_config.get("emoji_chance", config.emoji_chance) + config.ban_words=msg_config.get("ban_words",config.ban_words) + + def memory(parent: dict): + memory_config = parent["memory"] + config.build_memory_interval = memory_config.get("build_memory_interval", config.build_memory_interval) + config.forget_memory_interval = memory_config.get("forget_memory_interval", config.forget_memory_interval) + + def mood(parent: dict): + mood_config = parent["mood"] + config.mood_update_interval = mood_config.get("mood_update_interval", config.mood_update_interval) + config.mood_decay_rate = mood_config.get("mood_decay_rate", config.mood_decay_rate) + config.mood_intensity_factor = mood_config.get("mood_intensity_factor", config.mood_intensity_factor) + + def groups(parent: dict): + groups_config = parent["groups"] + config.talk_allowed_groups = set(groups_config.get("talk_allowed", [])) + config.talk_frequency_down_groups = set(groups_config.get("talk_frequency_down", [])) + config.ban_user_id = set(groups_config.get("ban_user_id", [])) + + def others(parent: dict): + others_config = parent["others"] + config.enable_advance_output = others_config.get("enable_advance_output", config.enable_advance_output) + config.enable_kuuki_read = others_config.get("enable_kuuki_read", config.enable_kuuki_read) + + # 版本表达式：>=1.0.0,<2.0.0 + include_configs = { + "personality": { + "func": personality, + "support": ">=0.0.0" + }, + "emoji": { + "func": emoji, + "support": ">=0.0.0" + }, + "cq_code": { + "func": cq_code, + "support": ">=0.0.0" + }, + "bot": { + "func": bot, + "support": ">=0.0.0" + }, + "response": { + "func": response, + "support": ">=0.0.0" + }, + "model": { + "func": model, + "support": ">=0.0.0" + }, + "message": { + "func": message, + "support": ">=0.0.0" + }, + "memory": { + "func": memory, + "support": ">=0.0.0" + }, + "mood": { + "func": mood, + "support": ">=0.0.0" + }, + "groups": { + "func": groups, + "support": ">=0.0.0" + }, + "others": { + "func": others, + "support": ">=0.0.0" + } + } + + # 原地修改，将 字符串版本表达式 转换成 版本对象 + for key in include_configs: + item_support = include_configs[key]["support"] + include_configs[key]["support"] = cls.convert_to_specifierset(item_support) + if os.path.exists(config_path): with open(config_path, "rb") as f: toml_dict = tomli.load(f) - - if 'personality' in toml_dict: - personality_config=toml_dict['personality'] - personality=personality_config.get('prompt_personality') - if len(personality) >= 2: - logger.info(f"载入自定义人格:{personality}") - config.PROMPT_PERSONALITY=personality_config.get('prompt_personality',config.PROMPT_PERSONALITY) - logger.info(f"载入自定义日程prompt:{personality_config.get('prompt_schedule',config.PROMPT_SCHEDULE_GEN)}") - config.PROMPT_SCHEDULE_GEN=personality_config.get('prompt_schedule',config.PROMPT_SCHEDULE_GEN) + + # 获取配置文件版本 + config_version : Version = cls.get_config_version(toml_dict) - if "emoji" in toml_dict: - emoji_config = toml_dict["emoji"] - config.EMOJI_CHECK_INTERVAL = emoji_config.get("check_interval", config.EMOJI_CHECK_INTERVAL) - config.EMOJI_REGISTER_INTERVAL = emoji_config.get("register_interval", config.EMOJI_REGISTER_INTERVAL) - config.EMOJI_CHECK_PROMPT = emoji_config.get('check_prompt',config.EMOJI_CHECK_PROMPT) - config.EMOJI_SAVE = emoji_config.get('auto_save',config.EMOJI_SAVE) - config.EMOJI_CHECK = emoji_config.get('enable_check',config.EMOJI_CHECK) - - if "cq_code" in toml_dict: - cq_code_config = toml_dict["cq_code"] - config.ENABLE_PIC_TRANSLATE = cq_code_config.get("enable_pic_translate", config.ENABLE_PIC_TRANSLATE) - - # 机器人基础配置 - if "bot" in toml_dict: - bot_config = toml_dict["bot"] - bot_qq = bot_config.get("qq") - config.BOT_QQ = int(bot_qq) - config.BOT_NICKNAME = bot_config.get("nickname", config.BOT_NICKNAME) - - if "response" in toml_dict: - response_config = toml_dict["response"] - config.MODEL_R1_PROBABILITY = response_config.get("model_r1_probability", config.MODEL_R1_PROBABILITY) - config.MODEL_V3_PROBABILITY = response_config.get("model_v3_probability", config.MODEL_V3_PROBABILITY) - config.MODEL_R1_DISTILL_PROBABILITY = response_config.get("model_r1_distill_probability", config.MODEL_R1_DISTILL_PROBABILITY) - config.max_response_length = response_config.get("max_response_length", config.max_response_length) - - # 加载模型配置 - if "model" in toml_dict: - model_config = toml_dict["model"] - - if "llm_reasoning" in model_config: - config.llm_reasoning = model_config["llm_reasoning"] - - if "llm_reasoning_minor" in model_config: - config.llm_reasoning_minor = model_config["llm_reasoning_minor"] - - if "llm_normal" in model_config: - config.llm_normal = model_config["llm_normal"] - - if "llm_normal_minor" in model_config: - config.llm_normal_minor = model_config["llm_normal_minor"] - - if "llm_topic_judge" in model_config: - config.llm_topic_judge = model_config["llm_topic_judge"] - - if "llm_summary_by_topic" in model_config: - config.llm_summary_by_topic = model_config["llm_summary_by_topic"] - - if "llm_emotion_judge" in model_config: - config.llm_emotion_judge = model_config["llm_emotion_judge"] - - if "vlm" in model_config: - config.vlm = model_config["vlm"] - - if "embedding" in model_config: - config.embedding = model_config["embedding"] - - if "moderation" in model_config: - config.moderation = model_config["moderation"] - - # 消息配置 - if "message" in toml_dict: - msg_config = toml_dict["message"] - config.MIN_TEXT_LENGTH = msg_config.get("min_text_length", config.MIN_TEXT_LENGTH) - config.MAX_CONTEXT_SIZE = msg_config.get("max_context_size", config.MAX_CONTEXT_SIZE) - config.emoji_chance = msg_config.get("emoji_chance", config.emoji_chance) - config.ban_words=msg_config.get("ban_words",config.ban_words) + # 如果在配置中找到了需要的项，调用对应项的闭包函数处理 + for key in include_configs: + if key in toml_dict: + group_specifierset: SpecifierSet = toml_dict[key]["support"] - if "memory" in toml_dict: - memory_config = toml_dict["memory"] - config.build_memory_interval = memory_config.get("build_memory_interval", config.build_memory_interval) - config.forget_memory_interval = memory_config.get("forget_memory_interval", config.forget_memory_interval) - - if "mood" in toml_dict: - mood_config = toml_dict["mood"] - config.mood_update_interval = mood_config.get("mood_update_interval", config.mood_update_interval) - config.mood_decay_rate = mood_config.get("mood_decay_rate", config.mood_decay_rate) - config.mood_intensity_factor = mood_config.get("mood_intensity_factor", config.mood_intensity_factor) - - # 群组配置 - if "groups" in toml_dict: - groups_config = toml_dict["groups"] - config.talk_allowed_groups = set(groups_config.get("talk_allowed", [])) - config.talk_frequency_down_groups = set(groups_config.get("talk_frequency_down", [])) - config.ban_user_id = set(groups_config.get("ban_user_id", [])) - - if "others" in toml_dict: - others_config = toml_dict["others"] - config.enable_advance_output = others_config.get("enable_advance_output", config.enable_advance_output) - config.enable_kuuki_read = others_config.get("enable_kuuki_read", config.enable_kuuki_read) - - logger.success(f"成功加载配置文件: {config_path}") + # 检查配置文件版本是否在支持范围内 + if config_version in group_specifierset: + # 如果版本在支持范围内，检查是否在支持的末端 + if config_version == group_specifierset.filter([config_version])[-1]: + logger.warning( + f"配置文件中的 '{key}' 字段的版本 ({config_version}) 已接近支持范围的末端。\n" + f"未来版本可能会移除对该字段的支持。" + ) + include_configs[key]["func"](toml_dict) + + else: + # 如果版本不在支持范围内，崩溃并提示用户 + logger.error( + f"配置文件中的 '{key}' 字段的版本 ({config_version}) 不在支持范围内。\n" + f"当前程序仅支持以下版本范围: {group_specifierset}" + ) + exit(1) + + else: + # 如果用户根本没有需要的配置项，提示缺少配置 + logger.error(f"配置文件中缺少必需的字段: '{key}'") + exit(1) + + logger.success(f"成功加载配置文件: {config_path}") return config # 获取配置文件路径 - bot_config_floder_path = BotConfig.get_config_dir() print(f"正在品鉴配置文件目录: {bot_config_floder_path}") + bot_config_path = os.path.join(bot_config_floder_path, "bot_config.toml") + if os.path.exists(bot_config_path): # 如果开发环境配置文件不存在，则使用默认配置文件 print(f"异常的新鲜，异常的美味: {bot_config_path}") logger.info("使用bot配置文件") else: - logger.info("没有找到美味") + # 配置文件不存在 + logger.error("配置文件不存在，请检查路径: {bot_config_path}") + raise FileNotFoundError(f"配置文件不存在: {bot_config_path}") global_config = BotConfig.load_config(config_path=bot_config_path) From 32aa032736611699d63f2e48fb2080094e9801c9 Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 02:42:55 +0800 Subject: [PATCH 05/13] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=83=200.0.1=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/bot_config_template.toml | 34 +++++++++++++------------------ 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 95e14fc0..48c11175 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -1,3 +1,6 @@ +[inner] +version = "0.0.1" + [bot] qq = 123 nickname = "麦麦" @@ -71,49 +74,42 @@ ban_user_id = [] #禁止回复消息的QQ号 [model.llm_reasoning] #回复模型1 主要回复模型 name = "Pro/deepseek-ai/DeepSeek-R1" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" pri_in = 0 #模型的输入价格（非必填，可以记录消耗） pri_out = 0 #模型的输出价格（非必填，可以记录消耗） + [model.llm_reasoning_minor] #回复模型3 次要回复模型 name = "deepseek-ai/DeepSeek-R1-Distill-Qwen-32B" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" #非推理模型 [model.llm_normal] #V3 回复模型2 次要回复模型 name = "Pro/deepseek-ai/DeepSeek-V3" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" [model.llm_normal_minor] #V2.5 name = "deepseek-ai/DeepSeek-V2.5" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" [model.llm_emotion_judge] #主题判断 0.7/m name = "Qwen/Qwen2.5-14B-Instruct" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" [model.llm_topic_judge] #主题判断：建议使用qwen2.5 7b name = "Pro/Qwen/Qwen2.5-7B-Instruct" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" [model.llm_summary_by_topic] #建议使用qwen2.5 32b 及以上 name = "Qwen/Qwen2.5-32B-Instruct" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" pri_in = 0 pri_out = 0 [model.moderation] #内容审核 未启用 name = "" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" pri_in = 0 pri_out = 0 @@ -121,8 +117,7 @@ pri_out = 0 [model.vlm] #图像识别 0.35/m name = "Pro/Qwen/Qwen2-VL-7B-Instruct" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" @@ -130,5 +125,4 @@ key = "SILICONFLOW_KEY" [model.embedding] #嵌入 name = "BAAI/bge-m3" -base_url = "SILICONFLOW_BASE_URL" -key = "SILICONFLOW_KEY" +provider = "SILICONFLOW" From 5856074123bde73f3564b92bbd84ed480ee9fa91 Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 02:50:17 +0800 Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E8=A1=8C=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE?= =?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 --- bot.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bot.py b/bot.py index 5b25d75f..446205d0 100644 --- a/bot.py +++ b/bot.py @@ -5,16 +5,9 @@ from nonebot.adapters.onebot.v11 import Adapter from dotenv import load_dotenv from loguru import logger -# 获取所有环境变量 +# 获取没有加载env时的环境变量 env_mask = {key: os.getenv(key) for key in os.environ} -# 设置基础配置 -base_config = { - "websocket_port": int(env_config.get("PORT", 8080)), - "host": env_config.get("HOST", "127.0.0.1"), - "log_level": "INFO", -} - def easter_egg(): # 彩蛋 from colorama import init, Fore @@ -87,7 +80,7 @@ def load_env(): def scan_provider(env_config: dict): provider = {} - + # 利用未初始化 env 时获取的 env_mask 来对新的环境变量集去重 # 避免 GPG_KEY 这样的变量干扰检查 for key in env_config: @@ -128,6 +121,13 @@ if __name__ == "__main__": env_config = {key: os.getenv(key) for key in os.environ} scan_provider(env_config) + # 设置基础配置 + base_config = { + "websocket_port": int(env_config.get("PORT", 8080)), + "host": env_config.get("HOST", "127.0.0.1"), + "log_level": "INFO", + } + # 合并配置 nonebot.init(**base_config, **env_config) From 07f48e945d33ec924181bcde3f50295ecd9e76ec Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 02:51:33 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E5=88=A9=E7=94=A8filter=E6=9D=A5?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=9B=B4=E6=8E=A5=E5=88=A0=E9=99=A4key?= =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=20RuntimeError:=20dictionary=20chan?= =?UTF-8?q?ged=20size=20during=20iteration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bot.py b/bot.py index 446205d0..e4d03435 100644 --- a/bot.py +++ b/bot.py @@ -83,9 +83,7 @@ def scan_provider(env_config: dict): # 利用未初始化 env 时获取的 env_mask 来对新的环境变量集去重 # 避免 GPG_KEY 这样的变量干扰检查 - for key in env_config: - if key in env_mask: - del env_config[key] + env_config = dict(filter(lambda item: item[0] not in env_mask, env_config.items())) # 遍历 env_config 的所有键 for key in env_config: From 18f839b7d6012457846bfcd78349372173bc4e9d Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 02:57:14 +0800 Subject: [PATCH 08/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20missing=201?= =?UTF-8?q?=20required=20positional=20argument:=20'INNER=5FVERSION'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/config.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/plugins/chat/config.py b/src/plugins/chat/config.py index b668e152..e8c1480f 100644 --- a/src/plugins/chat/config.py +++ b/src/plugins/chat/config.py @@ -14,7 +14,7 @@ from packaging.specifiers import SpecifierSet,InvalidSpecifier @dataclass class BotConfig: """机器人配置类""" - INNER_VERSION: SpecifierSet + INNER_VERSION: Version = None BOT_QQ: Optional[int] = 1 BOT_NICKNAME: Optional[str] = None @@ -176,7 +176,6 @@ class BotConfig: def model(parent: dict): # 加载模型配置 model_config = parent["model"] - config_version : Version = cls.get_config_version(parent) config_list = [ "llm_reasoning", @@ -205,10 +204,10 @@ class BotConfig: "pri_out" : 0 } - if config_version in SpecifierSet("<0.0.0"): + if config.INNER_VERSION in SpecifierSet("<0.0.0"): cfg_target = cfg_item - elif config_version in SpecifierSet(">=0.0.1"): + elif config.INNER_VERSION in SpecifierSet(">=0.0.1"): stable_item = ["name","pri_in","pri_out"] for i in stable_item: cfg_target[i] = cfg_item[i] @@ -309,7 +308,7 @@ class BotConfig: toml_dict = tomli.load(f) # 获取配置文件版本 - config_version : Version = cls.get_config_version(toml_dict) + config.INNER_VERSION = cls.get_config_version(toml_dict) # 如果在配置中找到了需要的项，调用对应项的闭包函数处理 for key in include_configs: @@ -317,11 +316,11 @@ class BotConfig: group_specifierset: SpecifierSet = toml_dict[key]["support"] # 检查配置文件版本是否在支持范围内 - if config_version in group_specifierset: + if config.INNER_VERSION in group_specifierset: # 如果版本在支持范围内，检查是否在支持的末端 - if config_version == group_specifierset.filter([config_version])[-1]: + if config.INNER_VERSION == group_specifierset.filter([config.INNER_VERSION])[-1]: logger.warning( - f"配置文件中的 '{key}' 字段的版本 ({config_version}) 已接近支持范围的末端。\n" + f"配置文件中的 '{key}' 字段的版本 ({config.INNER_VERSION}) 已接近支持范围的末端。\n" f"未来版本可能会移除对该字段的支持。" ) include_configs[key]["func"](toml_dict) From dd095767206de1b6502be80349e457cd37101d11 Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 02:58:43 +0800 Subject: [PATCH 09/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20TypeError:=20?= =?UTF-8?q?BotConfig.convert=5Fto=5Fspecifierset()=20takes=201=20positiona?= =?UTF-8?q?l=20argument=20but=202=20were=20given?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/chat/config.py b/src/plugins/chat/config.py index e8c1480f..8675ca9e 100644 --- a/src/plugins/chat/config.py +++ b/src/plugins/chat/config.py @@ -83,7 +83,7 @@ class BotConfig: return config_dir @classmethod - def convert_to_specifierset(value: str) -> SpecifierSet: + def convert_to_specifierset(cls, value: str) -> SpecifierSet: """将 字符串 版本表达式转换成 SpecifierSet Args: value[str]: 版本表达式(字符串) From 2306ebf3f608db6f73c0e4fe3da961f589b5958c Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 03:15:37 +0800 Subject: [PATCH 10/13] =?UTF-8?q?feat:=20=E5=9B=A0=E4=B8=BA=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=B8=B4=E7=95=8C=E7=89=88=E6=9C=AC=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E6=AF=94=E8=BE=83=E9=BA=BB=E7=83=A6=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20notice=20=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8E=9F=E6=9C=AC=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=88=E5=AD=98=E5=9C=A8=E6=95=85=E9=9A=9C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/config.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/plugins/chat/config.py b/src/plugins/chat/config.py index 8675ca9e..492efa90 100644 --- a/src/plugins/chat/config.py +++ b/src/plugins/chat/config.py @@ -251,6 +251,10 @@ class BotConfig: config.enable_kuuki_read = others_config.get("enable_kuuki_read", config.enable_kuuki_read) # 版本表达式：>=1.0.0,<2.0.0 + # 允许字段：func: method, support: str, notice: str + # 如果使用 notice 字段，在该组配置加载时，会展示该字段对用户的警示 + # 例如："notice": "personality 将在 1.3.2 后被移除"，那么在有效版本中的用户就会虽然可以 + # 正常执行程序，但是会看到这条自定义提示 include_configs = { "personality": { "func": personality, @@ -313,22 +317,20 @@ class BotConfig: # 如果在配置中找到了需要的项，调用对应项的闭包函数处理 for key in include_configs: if key in toml_dict: - group_specifierset: SpecifierSet = toml_dict[key]["support"] + group_specifierset: SpecifierSet = include_configs[key]["support"] # 检查配置文件版本是否在支持范围内 if config.INNER_VERSION in group_specifierset: # 如果版本在支持范围内，检查是否在支持的末端 - if config.INNER_VERSION == group_specifierset.filter([config.INNER_VERSION])[-1]: - logger.warning( - f"配置文件中的 '{key}' 字段的版本 ({config.INNER_VERSION}) 已接近支持范围的末端。\n" - f"未来版本可能会移除对该字段的支持。" - ) + if 'notice' in include_configs[key]: + logger.warning(include_configs[key]["notice"]) + include_configs[key]["func"](toml_dict) else: # 如果版本不在支持范围内，崩溃并提示用户 logger.error( - f"配置文件中的 '{key}' 字段的版本 ({config_version}) 不在支持范围内。\n" + f"配置文件中的 '{key}' 字段的版本 ({config.INNER_VERSION}) 不在支持范围内。\n" f"当前程序仅支持以下版本范围: {group_specifierset}" ) exit(1) From d86610d6fd3a74ce04073a868a51e61eaf71b527 Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 03:36:11 +0800 Subject: [PATCH 11/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E5=8A=A0=E8=BD=BD=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?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 --- bot.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bot.py b/bot.py index e4d03435..dad3de44 100644 --- a/bot.py +++ b/bot.py @@ -44,8 +44,8 @@ def init_env(): logger.error("检测到.env.prod文件不存在") shutil.copy("template.env", "./.env.prod") - else: - # 首先加载基础环境变量.env + # 首先加载基础环境变量.env + if os.path.exists(".env"): load_dotenv(".env") logger.success("成功加载基础环境变量配置") @@ -65,6 +65,8 @@ def load_env(): } env = os.getenv("ENVIRONMENT") + logger.info(f"[load_env] 当前的 ENVIRONMENT 变量值：{env}") + if env in fn_map: fn_map[env]() # 根据映射执行闭包函数 @@ -90,7 +92,7 @@ def scan_provider(env_config: dict): # 检查键是否符合 {provider}_BASE_URL 或 {provider}_KEY 的格式 if key.endswith("_BASE_URL") or key.endswith("_KEY"): # 提取 provider 名称 - provider_name = key.rsplit("_", 1)[0] # 从右边分割一次，取第一部分 + provider_name = key.split("_", 1)[0] # 从左分割一次，取第一部分 # 初始化 provider 的字典（如果尚未初始化） if provider_name not in provider: @@ -115,6 +117,7 @@ if __name__ == "__main__": easter_egg() init_config() init_env() + load_env() env_config = {key: os.getenv(key) for key in os.environ} scan_provider(env_config) From 25f705255c3219cf77d4c46f2be57fb8365a363e Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 04:14:16 +0800 Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=80=A7=E9=80=89=E9=A1=B9=E5=92=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E7=89=88=E6=9C=AC=E4=B9=8B=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E9=97=B4=E9=9A=99=200.0.0=20?= =?UTF-8?q?=E7=89=88=EF=BC=8C=E5=B9=B6=E5=B0=86=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E9=80=80=E5=87=BA=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 2 +- src/plugins/chat/config.py | 36 +++++++++++++++++++++++-------- src/plugins/models/utils_model.py | 1 + 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/bot.py b/bot.py index dad3de44..9503caa7 100644 --- a/bot.py +++ b/bot.py @@ -76,7 +76,7 @@ def load_env(): else: logger.error(f"ENVIRONMENT 配置错误，请检查 .env 文件中的 ENVIRONMENT 变量及对应 .env.{env} 是否存在") - exit(1) + RuntimeError(f"ENVIRONMENT 配置错误，请检查 .env 文件中的 ENVIRONMENT 变量及对应 .env.{env} 是否存在") diff --git a/src/plugins/chat/config.py b/src/plugins/chat/config.py index 492efa90..dff1ce07 100644 --- a/src/plugins/chat/config.py +++ b/src/plugins/chat/config.py @@ -116,7 +116,7 @@ class BotConfig: config_version : str = toml["inner"]["version"] except KeyError as e: logger.error(f"配置文件中 inner 段 不存在 {e}, 这是错误的配置文件") - exit(1) + raise KeyError(f"配置文件中 inner 段 不存在 {e}, 这是错误的配置文件") else: toml["inner"] = { "version": "0.0.0" } config_version = toml["inner"]["version"] @@ -129,7 +129,7 @@ class BotConfig: "请阅读 https://semver.org/lang/zh-CN/ 修改配置，并参考本项目指定的模板进行修改\n" "本项目在不同的版本下有不同的模板，请注意识别" ) - exit(1) + raise InvalidVersion("配置文件中 inner段 的 version 键是错误的版本描述\n") return ver @@ -175,7 +175,7 @@ class BotConfig: def model(parent: dict): # 加载模型配置 - model_config = parent["model"] + model_config:dict = parent["model"] config_list = [ "llm_reasoning", @@ -192,7 +192,7 @@ class BotConfig: for item in config_list: if item in model_config: - cfg_item = model_config[item] + cfg_item:dict = model_config[item] # base_url 的例子： SILICONFLOW_BASE_URL # key 的例子： SILICONFLOW_KEY @@ -204,15 +204,30 @@ class BotConfig: "pri_out" : 0 } - if config.INNER_VERSION in SpecifierSet("<0.0.0"): + if config.INNER_VERSION in SpecifierSet("<=0.0.0"): cfg_target = cfg_item elif config.INNER_VERSION in SpecifierSet(">=0.0.1"): stable_item = ["name","pri_in","pri_out"] + pricing_item = ["pri_in","pri_out"] + # 从配置中原始拷贝稳定字段 for i in stable_item: - cfg_target[i] = cfg_item[i] + # 如果 字段 属于计费项 且获取不到，那默认值是 0 + if i in pricing_item and i not in cfg_item: + cfg_target[i] = 0 + else: + # 没有特殊情况则原样复制 + try: + cfg_target[i] = cfg_item[i] + except KeyError as e: + logger.error(f"{item} 中的必要字段 {e} 不存在，请检查") + raise KeyError(f"{item} 中的必要字段 {e} 不存在，请检查") - provider = cfg_item["provider"] + + provider = cfg_item.get("provider") + if provider == None: + logger.error(f"provider 字段在模型配置 {item} 中不存在，请检查") + raise KeyError(f"provider 字段在模型配置 {item} 中不存在，请检查") cfg_target["base_url"] = f"{provider}_BASE_URL" cfg_target["key"] = f"{provider}_KEY" @@ -220,6 +235,9 @@ class BotConfig: # 如果 列表中的项目在 model_config 中，利用反射来设置对应项目 setattr(config,item,cfg_target) + else: + logger.error(f"模型 {item} 在config中不存在，请检查") + raise KeyError(f"模型 {item} 在config中不存在，请检查") def message(parent: dict): msg_config = parent["message"] @@ -333,12 +351,12 @@ class BotConfig: f"配置文件中的 '{key}' 字段的版本 ({config.INNER_VERSION}) 不在支持范围内。\n" f"当前程序仅支持以下版本范围: {group_specifierset}" ) - exit(1) + raise InvalidVersion(f"当前程序仅支持以下版本范围: {group_specifierset}") else: # 如果用户根本没有需要的配置项，提示缺少配置 logger.error(f"配置文件中缺少必需的字段: '{key}'") - exit(1) + raise KeyError(f"配置文件中缺少必需的字段: '{key}'") logger.success(f"成功加载配置文件: {config_path}") diff --git a/src/plugins/models/utils_model.py b/src/plugins/models/utils_model.py index 24f21e0a..0a72cfec 100644 --- a/src/plugins/models/utils_model.py +++ b/src/plugins/models/utils_model.py @@ -23,6 +23,7 @@ class LLM_request: self.api_key = getattr(config, model["key"]) self.base_url = getattr(config, model["base_url"]) except AttributeError as e: + logger.error(f"原始 model dict 信息：{model}") logger.error(f"配置错误：找不到对应的配置项 - {str(e)}") raise ValueError(f"配置错误：找不到对应的配置项 - {str(e)}") from e self.model_name = model["name"] From b7cfe6d51c7339ac98be9a593fbe67ecb578db9c Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 9 Mar 2025 05:28:41 +0800 Subject: [PATCH 13/13] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=83=E7=AC=AC=200.0?= =?UTF-8?q?.2=20=E7=89=88=E6=9C=AC=E9=85=8D=E7=BD=AE=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/bot_config_template.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 991fbb86..e0f54a46 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -1,5 +1,5 @@ [inner] -version = "0.0.1" +version = "0.0.2" [bot] qq = 123