feat: 重构配置格式
perf: 优化配置处理过程和呈现方式
This commit is contained in:
Soulter
+242
-45
@@ -1,33 +1,236 @@
|
||||
import os
|
||||
import json
|
||||
from type.config import DEFAULT_CONFIG
|
||||
import logging
|
||||
from type.config import DEFAULT_CONFIG, DEFAULT_CONFIG_VERSION_2, MAPPINGS_1_2
|
||||
from dataclasses import dataclass, field, asdict
|
||||
from typing import List, Dict, Optional
|
||||
|
||||
cpath = "data/cmd_config.json"
|
||||
ASTRBOT_CONFIG_PATH = "data/cmd_config.json"
|
||||
logger = logging.getLogger("astrbot")
|
||||
|
||||
def check_exist():
|
||||
if not os.path.exists(cpath):
|
||||
with open(cpath, "w", encoding="utf-8-sig") as f:
|
||||
json.dump({}, f, ensure_ascii=False)
|
||||
f.flush()
|
||||
@dataclass
|
||||
class RateLimit:
|
||||
time: int = 60
|
||||
count: int = 30
|
||||
|
||||
@dataclass
|
||||
class PlatformSettings:
|
||||
unique_session: bool = False
|
||||
welcome_message_when_join: str = ""
|
||||
rate_limit: RateLimit = field(default_factory=RateLimit)
|
||||
reply_prefix: str = ""
|
||||
forward_threshold: int = 200
|
||||
|
||||
def __post_init__(self):
|
||||
self.rate_limit = RateLimit(**self.rate_limit)
|
||||
|
||||
@dataclass
|
||||
class PlatformConfig():
|
||||
name: str = ""
|
||||
enable: bool = False
|
||||
|
||||
@dataclass
|
||||
class QQOfficialPlatformConfig(PlatformConfig):
|
||||
appid: str = ""
|
||||
secret: str = ""
|
||||
enable_group_c2c: bool = True
|
||||
enable_guild_direct_message: bool = True
|
||||
|
||||
@dataclass
|
||||
class NakuruPlatformConfig(PlatformConfig):
|
||||
host: str = "172.0.0.1",
|
||||
port: int = 5700,
|
||||
websocket_port: int = 6700,
|
||||
enable_group: bool = True,
|
||||
enable_guild: bool = True,
|
||||
enable_direct_message: bool = True,
|
||||
enable_group_increase: bool = True
|
||||
|
||||
@dataclass
|
||||
class AiocqhttpPlatformConfig(PlatformConfig):
|
||||
ws_reverse_host: str = ""
|
||||
ws_reverse_port: int = 6199
|
||||
|
||||
@dataclass
|
||||
class ModelConfig:
|
||||
model: str = "gpt-4o"
|
||||
max_tokens: int = 6000
|
||||
temperature: float = 0.9
|
||||
top_p: float = 1
|
||||
frequency_penalty: float = 0
|
||||
presence_penalty: float = 0
|
||||
|
||||
@dataclass
|
||||
class ImageGenerationModelConfig:
|
||||
enable: bool = True
|
||||
model: str = "dall-e-3"
|
||||
size: str = "1024x1024"
|
||||
style: str = "vivid"
|
||||
quality: str = "standard"
|
||||
|
||||
@dataclass
|
||||
class LLMConfig:
|
||||
name: str = "openai"
|
||||
enable: bool = True
|
||||
key: List[str] = field(default_factory=list)
|
||||
api_base: str = ""
|
||||
prompt_prefix: str = ""
|
||||
default_personality: str = ""
|
||||
model_config: ModelConfig = field(default_factory=ModelConfig)
|
||||
image_generation_model_config: ImageGenerationModelConfig = field(default_factory=ImageGenerationModelConfig)
|
||||
|
||||
def __post_init__(self):
|
||||
self.model_config = ModelConfig(**self.model_config)
|
||||
self.image_generation_model_config = ImageGenerationModelConfig(**self.image_generation_model_config)
|
||||
|
||||
@dataclass
|
||||
class LLMSettings:
|
||||
wake_prefix: str = ""
|
||||
web_search: bool = False
|
||||
|
||||
@dataclass
|
||||
class BaiduAIPConfig:
|
||||
enable: bool = False
|
||||
app_id: str = ""
|
||||
api_key: str = ""
|
||||
secret_key: str = ""
|
||||
|
||||
@dataclass
|
||||
class InternalKeywordsConfig:
|
||||
enable: bool = True
|
||||
extra_keywords: List[str] = field(default_factory=list)
|
||||
|
||||
@dataclass
|
||||
class ContentSafetyConfig:
|
||||
baidu_aip: BaiduAIPConfig = field(default_factory=BaiduAIPConfig)
|
||||
internal_keywords: InternalKeywordsConfig = field(default_factory=InternalKeywordsConfig)
|
||||
|
||||
def __post_init__(self):
|
||||
self.baidu_aip = BaiduAIPConfig(**self.baidu_aip)
|
||||
self.internal_keywords = InternalKeywordsConfig(**self.internal_keywords)
|
||||
|
||||
@dataclass
|
||||
class DashboardConfig:
|
||||
enable: bool = True
|
||||
username: str = ""
|
||||
password: str = ""
|
||||
|
||||
@dataclass
|
||||
class AstrBotConfig():
|
||||
config_version: int = 2
|
||||
platform_settings: PlatformSettings = field(default_factory=PlatformSettings)
|
||||
llm: List[LLMConfig] = field(default_factory=list)
|
||||
llm_settings: LLMSettings = field(default_factory=LLMSettings)
|
||||
content_safety: ContentSafetyConfig = field(default_factory=ContentSafetyConfig)
|
||||
t2i: bool = True
|
||||
dump_history_interval: int = 10
|
||||
admins_id: List[str] = field(default_factory=list)
|
||||
https_proxy: str = ""
|
||||
http_proxy: str = ""
|
||||
dashboard: DashboardConfig = field(default_factory=DashboardConfig)
|
||||
platform: List[PlatformConfig] = field(default_factory=list)
|
||||
wake_prefix: List[str] = field(default_factory=list)
|
||||
|
||||
class CmdConfig():
|
||||
def __init__(self) -> None:
|
||||
self.cached_config: dict = {}
|
||||
self.init_configs()
|
||||
|
||||
# compability
|
||||
if isinstance(self.wake_prefix, str):
|
||||
self.wake_prefix = [self.wake_prefix]
|
||||
|
||||
def load_from_dict(self, data: Dict):
|
||||
'''从字典中加载配置到对象。
|
||||
|
||||
@note: 适用于 version 2 配置文件。
|
||||
'''
|
||||
self.config_version=data.get("version", 2)
|
||||
self.platform=[]
|
||||
for p in data.get("platform", []):
|
||||
if 'name' not in p:
|
||||
logger.warning("A platform config missing name, skipping.")
|
||||
continue
|
||||
if p["name"] == "qq_official":
|
||||
self.platform.append(QQOfficialPlatformConfig(**p))
|
||||
elif p["name"] == "nakuru":
|
||||
self.platform.append(NakuruPlatformConfig(**p))
|
||||
elif p["name"] == "aiocqhttp":
|
||||
self.platform.append(AiocqhttpPlatformConfig(**p))
|
||||
else:
|
||||
self.platform.append(PlatformConfig(**p))
|
||||
self.platform_settings=PlatformSettings(**data.get("platform_settings", {}))
|
||||
self.llm=[LLMConfig(**l) for l in data.get("llm", [])]
|
||||
self.llm_settings=LLMSettings(**data.get("llm_settings", {}))
|
||||
self.content_safety=ContentSafetyConfig(**data.get("content_safety", {}))
|
||||
self.t2i=data.get("t2i", True)
|
||||
self.dump_history_interval=data.get("dump_history_interval", 10)
|
||||
self.admins_id=data.get("admins_id", [])
|
||||
self.https_proxy=data.get("https_proxy", "")
|
||||
self.http_proxy=data.get("http_proxy", "")
|
||||
self.dashboard=DashboardConfig(**data.get("dashboard", {}))
|
||||
self.wake_prefix=data.get("wake_prefix", [])
|
||||
|
||||
def migrate_config_1_2(self, old: dict) -> dict:
|
||||
'''将配置文件从版本 1 迁移至版本 2'''
|
||||
logger.info("正在更新配置文件到 version 2...")
|
||||
new_config = DEFAULT_CONFIG_VERSION_2
|
||||
mappings = MAPPINGS_1_2
|
||||
|
||||
def set_nested_value(d, keys, value):
|
||||
cursor = d
|
||||
for key in keys[:-1]:
|
||||
cursor = cursor[key]
|
||||
cursor[keys[-1]] = value
|
||||
|
||||
for old_path, new_path in mappings:
|
||||
value = old
|
||||
try:
|
||||
for key in old_path:
|
||||
value = value[key] # soooooo convenient!!
|
||||
set_nested_value(new_config, new_path, value)
|
||||
except KeyError:
|
||||
# 如果旧配置中没有这个键，跳过，即使用新配置的默认值
|
||||
continue
|
||||
|
||||
logger.info("配置文件更新完成。")
|
||||
return new_config
|
||||
|
||||
def flush_config(self, config: dict = None):
|
||||
'''将配置写入文件, 如果没有传入配置，则写入默认配置'''
|
||||
with open(ASTRBOT_CONFIG_PATH, "w", encoding="utf-8-sig") as f:
|
||||
json.dump(config if config else DEFAULT_CONFIG_VERSION_2, f, indent=2, ensure_ascii=False)
|
||||
f.flush()
|
||||
|
||||
def init_configs(self):
|
||||
'''
|
||||
初始化必需的配置项
|
||||
'''
|
||||
self.init_config_items(DEFAULT_CONFIG)
|
||||
'''初始化必需的配置项'''
|
||||
config = None
|
||||
|
||||
if not self.check_exist():
|
||||
self.flush_config()
|
||||
config = DEFAULT_CONFIG_VERSION_2
|
||||
else:
|
||||
config = self.get_all()
|
||||
# check if the config is outdated
|
||||
if 'config_version' not in config: # version 1
|
||||
config = self.migrate_config_1_2(config)
|
||||
self.flush_config(config)
|
||||
|
||||
_tag = False
|
||||
for key, val in DEFAULT_CONFIG_VERSION_2.items():
|
||||
if key not in config:
|
||||
config[key] = val
|
||||
_tag = True
|
||||
if _tag:
|
||||
with open(ASTRBOT_CONFIG_PATH, "w", encoding="utf-8-sig") as f:
|
||||
json.dump(config, f, indent=2, ensure_ascii=False)
|
||||
f.flush()
|
||||
|
||||
@staticmethod
|
||||
def get(key, default=None):
|
||||
self.load_from_dict(config)
|
||||
|
||||
def get(self, key, default=None):
|
||||
'''
|
||||
从文件系统中直接获取配置
|
||||
'''
|
||||
check_exist()
|
||||
with open(cpath, "r", encoding="utf-8-sig") as f:
|
||||
with open(ASTRBOT_CONFIG_PATH, "r", encoding="utf-8-sig") as f:
|
||||
d = json.load(f)
|
||||
if key in d:
|
||||
return d[key]
|
||||
@@ -38,8 +241,7 @@ class CmdConfig():
|
||||
'''
|
||||
从文件系统中获取所有配置
|
||||
'''
|
||||
check_exist()
|
||||
with open(cpath, "r", encoding="utf-8-sig") as f:
|
||||
with open(ASTRBOT_CONFIG_PATH, "r", encoding="utf-8-sig") as f:
|
||||
conf_str = f.read()
|
||||
if conf_str.startswith(u'/ufeff'): # remove BOM
|
||||
conf_str = conf_str.encode('utf8')[3:].decode('utf8')
|
||||
@@ -47,21 +249,19 @@ class CmdConfig():
|
||||
return conf
|
||||
|
||||
def put(self, key, value):
|
||||
with open(cpath, "r", encoding="utf-8-sig") as f:
|
||||
with open(ASTRBOT_CONFIG_PATH, "r", encoding="utf-8-sig") as f:
|
||||
d = json.load(f)
|
||||
d[key] = value
|
||||
with open(cpath, "w", encoding="utf-8-sig") as f:
|
||||
with open(ASTRBOT_CONFIG_PATH, "w", encoding="utf-8-sig") as f:
|
||||
json.dump(d, f, indent=2, ensure_ascii=False)
|
||||
f.flush()
|
||||
|
||||
self.cached_config[key] = value
|
||||
|
||||
@staticmethod
|
||||
def put_by_dot_str(key: str, value):
|
||||
'''
|
||||
根据点分割的字符串，将值写入配置文件
|
||||
'''
|
||||
with open(cpath, "r", encoding="utf-8-sig") as f:
|
||||
|
||||
def to_dict(self) -> Dict:
|
||||
return asdict(self)
|
||||
|
||||
def put_by_dot_str(self, key: str, value):
|
||||
'''根据点分割的字符串，将值写入配置文件'''
|
||||
with open(ASTRBOT_CONFIG_PATH, "r", encoding="utf-8-sig") as f:
|
||||
d = json.load(f)
|
||||
_d = d
|
||||
_ks = key.split(".")
|
||||
@@ -70,23 +270,20 @@ class CmdConfig():
|
||||
_d[_ks[i]] = value
|
||||
else:
|
||||
_d = _d[_ks[i]]
|
||||
with open(cpath, "w", encoding="utf-8-sig") as f:
|
||||
with open(ASTRBOT_CONFIG_PATH, "w", encoding="utf-8-sig") as f:
|
||||
json.dump(d, f, indent=2, ensure_ascii=False)
|
||||
f.flush()
|
||||
|
||||
def init_config_items(self, d: dict):
|
||||
conf = self.get_all()
|
||||
|
||||
def update_by_path(self, path: List):
|
||||
'''根据路径更新配置文件。
|
||||
|
||||
if not self.cached_config:
|
||||
self.cached_config = conf
|
||||
这个方法首先会更新缓存在内存中的配置，然后再写入文件。
|
||||
'''
|
||||
|
||||
for key in path:
|
||||
if key not in self:
|
||||
raise KeyError(f"Key {key} not found in config.")
|
||||
|
||||
_tag = False
|
||||
|
||||
for key, val in d.items():
|
||||
if key not in conf:
|
||||
conf[key] = val
|
||||
_tag = True
|
||||
if _tag:
|
||||
with open(cpath, "w", encoding="utf-8-sig") as f:
|
||||
json.dump(conf, f, indent=2, ensure_ascii=False)
|
||||
f.flush()
|
||||
def check_exist(self) -> bool:
|
||||
return os.path.exists(ASTRBOT_CONFIG_PATH)
|
||||
+9
-10
@@ -1,16 +1,15 @@
|
||||
import json, os
|
||||
from util.cmd_config import CmdConfig
|
||||
import json, os, shutil
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger("astrbot")
|
||||
|
||||
def try_migrate_config():
|
||||
'''
|
||||
将 cmd_config.json 迁移至 data/cmd_config.json (如果存在的话)
|
||||
'''
|
||||
if os.path.exists("cmd_config.json"):
|
||||
with open("cmd_config.json", "r", encoding="utf-8-sig") as f:
|
||||
data = json.load(f)
|
||||
with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
|
||||
json.dump(data, f, indent=2, ensure_ascii=False)
|
||||
if os.path.exists("cmd_config.json") and not os.path.exists("data/cmd_config.json"):
|
||||
try:
|
||||
os.remove("cmd_config.json")
|
||||
except Exception as e:
|
||||
pass
|
||||
shutil.move("cmd_config.json", "data/cmd_config.json")
|
||||
except:
|
||||
logger.error("迁移 cmd_config.json 失败。AstrBot 将不会读取配置文件，你可以手动将 cmd_config.json 迁移至 data/cmd_config.json。")
|
||||
|
||||
+2
-1
@@ -5,6 +5,7 @@ import sys
|
||||
|
||||
from type.types import Context
|
||||
from collections import defaultdict
|
||||
from type.config import VERSION
|
||||
|
||||
class MetricUploader():
|
||||
def __init__(self, context: Context) -> None:
|
||||
@@ -49,7 +50,7 @@ class MetricUploader():
|
||||
try:
|
||||
res = {
|
||||
"stat_version": "moon",
|
||||
"version": context.version, # 版本号
|
||||
"version": VERSION, # 版本号
|
||||
"platform_stats": self.platform_stats, # 过去 30 分钟各消息平台交互消息数
|
||||
"llm_stats": self.llm_stats,
|
||||
"plugin_stats": self.plugin_stats,
|
||||
|
||||
@@ -7,6 +7,6 @@ Platform类是消息平台的抽象类，定义了消息平台的基本接口。
|
||||
|
||||
from model.platform import Platform
|
||||
|
||||
from model.platform.qq_nakuru import QQGOCQ
|
||||
from model.platform.qq_nakuru import QQNakuru
|
||||
from model.platform.qq_official import QQOfficial
|
||||
from model.platform.qq_aiocqhttp import AIOCQHTTP
|
||||
Reference in New Issue
Block a user