f624971613
* chore(core.utils): 🚨 修正错误Lint
* chore(core.provider): 🚨 修复基类错误Lint
* chore(core.utils): 补全session_get()的重载
* chore(core.provider): 🚨 修正实现错误Lint
* chore(core.platform): 🚨 修正platform基类和webchat的错误Lint
* chore(core.platform): 修正错误实现Lint
* fix(core.provider): 修复循环调用和错误assert
* chore(core.platform): 修复部分实现Lint
* chore(core.provider): 补充Dify.text_chat_stream的参数类型
* chore(core.pipeline): 🚨 修复错误Lint
* fix(core.slack): 补充遗漏导入
* chore(core.utils): 修复错误的session_get声明
* chore(core.platform): 移除Lark adapter import中的wildcard
* chore(core.db): 修复声明和部分逻辑
* chore(core.db): 添加typings,使faiss参数能被正确识别。
* chore(core): 修复声明
* chore(core): 修改声明
* chore: 补充faiss声明
* chore(dashboard): 修改实现,减少报错
* chore(package): 修改部分声明与实现,减少报错
* chore(core): 添加Handler的overload,以去除部分assert同时通过类型检查
* chore(core.pipeline): 修改Pipeline Scheduler的execute,将判断属性改为判断类型,通过静态类型检查
* chore(core.config): 添加类型标注,通过类型检查
* chore(core.message): 为File._download_file添加检查,通过类型检查
* fix: 将断言改为条件判断以实现优雅关闭的容错性
* refactor: 移除 discord 客户端中的 assert,改用 if None 判断并抛出异常
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: DiscordPlatformAdapter 对 self.client.user 为 None 做日志并返回,移除断言
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 增强 Lark 相关空值/异常检查并完善日志输出
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 将断言替换为条件检查并加入日志与错误处理
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* chore: 移除LLM生成的无用注释
* refactor: 使用 File.get_file 替换下载逻辑并移除 assert,提供默认 filename
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: Slack Socket 未初始化抛出运行时异常,图片 URL 判空改为非空判断
* refactor: 将 WeChatPadProAdapter 的断言改为空值判断并添加日志
* refactor: 使用 isinstance 替代断言实现类型判断,便于静态检查
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 去除cast,直接使用字段与字典访问,修正端口解析
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 使用 match-case 重构 ProviderManager 加载并通过类型检查抛出 TypeError
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: group_name_display 时若 group 对象为空则记录错误并返回
* fix: 将 _get_current_persona_id 的 assert 替换成 if guard 并返回 None
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 优化插件目录存在性检查及图片URL非空验证,更新JSON排序配置
* fix: 将 datetime_str 的 assert 替换为显式检查并抛出异常
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除 cast,改为运行时检查并在找不到调度器时跳过
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除 cast,改用 isinstance 检查 FaissVecDB 并警告
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 删除 typing.cast 导入,并在获取文件绝对路径前校验 file_
* refactor: 移除 typing.cast,简化内容安全检查调用
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 将 PlatformMetadata.id 设为必填并在注册时传入 id,移除 cast
* refactor: 移除 cast,改用 HasInitialize 与 isinstance 进行初始化
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 为 ProviderManager.initialize 增加ID类型判断,避免 None 导致 get 失败
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 为 OTTSProvider 与 AzureNativeProvider 引入 _client 与 client 属性改进上下文管理
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 为 Whisper 自托管源添加模型未初始化校验并直接调用 transcribe
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除未使用的 cast 导入并简化 platform_name 赋值
* refactor: 引入 cast 并对 id 使用 cast(str, ...) 提升类型安全
* fix: 将 _id_to_sid 返回改为 str,空值返回空串;对 id 与 message_id 使用 cast
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 重构 Discord 处理逻辑:强制 类型转换、优先斜杠指令并优化提及判断
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 统一对 id 获取执行 cast,并在微信消息解析失败时抛错
* Revert "fix: 去除cast,直接使用字段与字典访问,修正端口解析"
This reverts commit 1cbfdf9d1b.
* fix: 百炼 Rerank 会话关闭时返回空结果;初始化 request.prompt 避免空值拼接
* fix: 统一处理搜索结果链接为字符串,新增 _get_url 助手并适配 Bing/Sogo
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 调整 call_handler 泛型、Discord 通道注解及 FishAudioTTS API 请求类型
* refactor: 使用 col(...) 替代列引用并对结果进行 CursorResult 强转
* chore: ruff format
---------
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
Co-authored-by: Soulter <905617992@qq.com>
177 lines
6.2 KiB
Python
177 lines
6.2 KiB
Python
import enum
|
|
import json
|
|
import logging
|
|
import os
|
|
|
|
from astrbot.core.utils.astrbot_path import get_astrbot_data_path
|
|
|
|
from .default import DEFAULT_CONFIG, DEFAULT_VALUE_MAP
|
|
|
|
ASTRBOT_CONFIG_PATH = os.path.join(get_astrbot_data_path(), "cmd_config.json")
|
|
logger = logging.getLogger("astrbot")
|
|
|
|
|
|
class RateLimitStrategy(enum.Enum):
|
|
STALL = "stall"
|
|
DISCARD = "discard"
|
|
|
|
|
|
class AstrBotConfig(dict):
|
|
"""从配置文件中加载的配置,支持直接通过点号操作符访问根配置项。
|
|
|
|
- 初始化时会将传入的 default_config 与配置文件进行比对,如果配置文件中缺少配置项则会自动插入默认值并进行一次写入操作。会递归检查配置项。
|
|
- 如果配置文件路径对应的文件不存在,则会自动创建并写入默认配置。
|
|
- 如果传入了 schema,将会通过 schema 解析出 default_config,此时传入的 default_config 会被忽略。
|
|
"""
|
|
|
|
config_path: str
|
|
default_config: dict
|
|
schema: dict | None
|
|
|
|
def __init__(
|
|
self,
|
|
config_path: str = ASTRBOT_CONFIG_PATH,
|
|
default_config: dict = DEFAULT_CONFIG,
|
|
schema: dict | None = None,
|
|
):
|
|
super().__init__()
|
|
|
|
# 调用父类的 __setattr__ 方法,防止保存配置时将此属性写入配置文件
|
|
object.__setattr__(self, "config_path", config_path)
|
|
object.__setattr__(self, "default_config", default_config)
|
|
object.__setattr__(self, "schema", schema)
|
|
|
|
if schema:
|
|
default_config = self._config_schema_to_default_config(schema)
|
|
|
|
if not self.check_exist():
|
|
"""不存在时载入默认配置"""
|
|
with open(config_path, "w", encoding="utf-8-sig") as f:
|
|
json.dump(default_config, f, indent=4, ensure_ascii=False)
|
|
object.__setattr__(self, "first_deploy", True) # 标记第一次部署
|
|
|
|
with open(config_path, encoding="utf-8-sig") as f:
|
|
conf_str = f.read()
|
|
conf = json.loads(conf_str)
|
|
|
|
# 检查配置完整性,并插入
|
|
has_new = self.check_config_integrity(default_config, conf)
|
|
self.update(conf)
|
|
if has_new:
|
|
self.save_config()
|
|
|
|
self.update(conf)
|
|
|
|
def _config_schema_to_default_config(self, schema: dict) -> dict:
|
|
"""将 Schema 转换成 Config"""
|
|
conf = {}
|
|
|
|
def _parse_schema(schema: dict, conf: dict):
|
|
for k, v in schema.items():
|
|
if v["type"] not in DEFAULT_VALUE_MAP:
|
|
raise TypeError(
|
|
f"不受支持的配置类型 {v['type']}。支持的类型有:{DEFAULT_VALUE_MAP.keys()}",
|
|
)
|
|
if "default" in v:
|
|
default = v["default"]
|
|
else:
|
|
default = DEFAULT_VALUE_MAP[v["type"]]
|
|
|
|
if v["type"] == "object":
|
|
conf[k] = {}
|
|
_parse_schema(v["items"], conf[k])
|
|
else:
|
|
conf[k] = default
|
|
|
|
_parse_schema(schema, conf)
|
|
|
|
return conf
|
|
|
|
def check_config_integrity(self, refer_conf: dict, conf: dict, path=""):
|
|
"""检查配置完整性,如果有新的配置项或顺序不一致则返回 True"""
|
|
has_new = False
|
|
|
|
# 创建一个新的有序字典以保持参考配置的顺序
|
|
new_conf = {}
|
|
|
|
# 先按照参考配置的顺序添加配置项
|
|
for key, value in refer_conf.items():
|
|
if key not in conf:
|
|
# 配置项不存在,插入默认值
|
|
path_ = path + "." + key if path else key
|
|
logger.info(f"检查到配置项 {path_} 不存在,已插入默认值 {value}")
|
|
new_conf[key] = value
|
|
has_new = True
|
|
elif conf[key] is None:
|
|
# 配置项为 None,使用默认值
|
|
new_conf[key] = value
|
|
has_new = True
|
|
elif isinstance(value, dict):
|
|
# 递归检查子配置项
|
|
if not isinstance(conf[key], dict):
|
|
# 类型不匹配,使用默认值
|
|
new_conf[key] = value
|
|
has_new = True
|
|
else:
|
|
# 递归检查并同步顺序
|
|
child_has_new = self.check_config_integrity(
|
|
value,
|
|
conf[key],
|
|
path + "." + key if path else key,
|
|
)
|
|
new_conf[key] = conf[key]
|
|
has_new |= child_has_new
|
|
else:
|
|
# 直接使用现有配置
|
|
new_conf[key] = conf[key]
|
|
|
|
# 检查是否存在参考配置中没有的配置项
|
|
for key in list(conf.keys()):
|
|
if key not in refer_conf:
|
|
path_ = path + "." + key if path else key
|
|
logger.info(f"检查到配置项 {path_} 不存在,将从当前配置中删除")
|
|
has_new = True
|
|
|
|
# 顺序不一致也算作变更
|
|
if list(conf.keys()) != list(new_conf.keys()):
|
|
if path:
|
|
logger.info(f"检查到配置项 {path} 的子项顺序不一致,已重新排序")
|
|
else:
|
|
logger.info("检查到配置项顺序不一致,已重新排序")
|
|
has_new = True
|
|
|
|
# 更新原始配置
|
|
conf.clear()
|
|
conf.update(new_conf)
|
|
|
|
return has_new
|
|
|
|
def save_config(self, replace_config: dict | None = None):
|
|
"""将配置写入文件
|
|
|
|
如果传入 replace_config,则将配置替换为 replace_config
|
|
"""
|
|
if replace_config:
|
|
self.update(replace_config)
|
|
with open(self.config_path, "w", encoding="utf-8-sig") as f:
|
|
json.dump(self, f, indent=2, ensure_ascii=False)
|
|
|
|
def __getattr__(self, item):
|
|
try:
|
|
return self[item]
|
|
except KeyError:
|
|
return None
|
|
|
|
def __delattr__(self, key):
|
|
try:
|
|
del self[key]
|
|
self.save_config()
|
|
except KeyError:
|
|
raise AttributeError(f"没有找到 Key: '{key}'")
|
|
|
|
def __setattr__(self, key, value):
|
|
self[key] = value
|
|
|
|
def check_exist(self) -> bool:
|
|
return os.path.exists(self.config_path)
|