fix:移动A_memorix配置项到botconfig
This commit is contained in:
@@ -16,6 +16,7 @@ from .file_watcher import FileChange, FileWatcher
|
||||
from .legacy_migration import migrate_legacy_bind_env_to_bot_config_dict, try_migrate_legacy_bot_config_dict
|
||||
from .model_configs import APIProvider, ModelInfo, ModelTaskConfig
|
||||
from .official_configs import (
|
||||
AMemorixConfig,
|
||||
BotConfig,
|
||||
ChatConfig,
|
||||
ChineseTypoConfig,
|
||||
@@ -55,8 +56,9 @@ CONFIG_DIR: Path = PROJECT_ROOT / "config"
|
||||
BOT_CONFIG_PATH: Path = (CONFIG_DIR / "bot_config.toml").resolve().absolute()
|
||||
MODEL_CONFIG_PATH: Path = (CONFIG_DIR / "model_config.toml").resolve().absolute()
|
||||
LEGACY_ENV_PATH: Path = (PROJECT_ROOT / ".env").resolve().absolute()
|
||||
A_MEMORIX_LEGACY_CONFIG_PATH: Path = (CONFIG_DIR / "a_memorix.toml").resolve().absolute()
|
||||
MMC_VERSION: str = "1.0.0"
|
||||
CONFIG_VERSION: str = "8.9.20"
|
||||
CONFIG_VERSION: str = "8.9.21"
|
||||
MODEL_CONFIG_VERSION: str = "1.14.6"
|
||||
|
||||
logger = get_logger("config")
|
||||
@@ -86,6 +88,9 @@ class Config(ConfigBase):
|
||||
memory: MemoryConfig = Field(default_factory=MemoryConfig)
|
||||
"""记忆配置类"""
|
||||
|
||||
a_memorix: AMemorixConfig = Field(default_factory=AMemorixConfig)
|
||||
"""A_Memorix 长期记忆子系统配置"""
|
||||
|
||||
message_receive: MessageReceiveConfig = Field(default_factory=MessageReceiveConfig)
|
||||
"""消息接收配置类"""
|
||||
|
||||
@@ -176,6 +181,45 @@ class ModelConfig(ConfigBase):
|
||||
return super().model_post_init(context)
|
||||
|
||||
|
||||
def _normalize_a_memorix_legacy_config(config_data: dict[str, Any]) -> dict[str, Any]:
|
||||
normalized = copy.deepcopy(config_data)
|
||||
web_config = normalized.get("web")
|
||||
if isinstance(web_config, dict) and "import" in web_config and "import_config" not in web_config:
|
||||
web_config["import_config"] = web_config.pop("import")
|
||||
return normalized
|
||||
|
||||
|
||||
def _migrate_legacy_a_memorix_config(config_data: dict[str, Any]) -> tuple[dict[str, Any], bool]:
|
||||
if isinstance(config_data.get("a_memorix"), dict):
|
||||
return config_data, False
|
||||
if not A_MEMORIX_LEGACY_CONFIG_PATH.exists():
|
||||
return config_data, False
|
||||
|
||||
try:
|
||||
with A_MEMORIX_LEGACY_CONFIG_PATH.open("r", encoding="utf-8") as handle:
|
||||
legacy_data = tomlkit.load(handle).unwrap()
|
||||
except Exception as exc:
|
||||
logger.warning(f"读取旧版 A_Memorix 配置失败,已使用主配置默认值: {A_MEMORIX_LEGACY_CONFIG_PATH},原因: {exc}")
|
||||
return config_data, False
|
||||
|
||||
if not isinstance(legacy_data, dict):
|
||||
logger.warning(f"旧版 A_Memorix 配置内容无效,已使用主配置默认值: {A_MEMORIX_LEGACY_CONFIG_PATH}")
|
||||
return config_data, False
|
||||
|
||||
migrated_data = copy.deepcopy(config_data)
|
||||
migrated_data["a_memorix"] = _normalize_a_memorix_legacy_config(legacy_data)
|
||||
logger.warning(f"检测到旧版 A_Memorix 配置,已迁移到 bot_config.toml 的 [a_memorix]: {A_MEMORIX_LEGACY_CONFIG_PATH}")
|
||||
return migrated_data, True
|
||||
|
||||
|
||||
def _normalize_loaded_bot_config_dict(config_data: dict[str, Any]) -> dict[str, Any]:
|
||||
normalized = copy.deepcopy(config_data)
|
||||
a_memorix_config = normalized.get("a_memorix")
|
||||
if isinstance(a_memorix_config, dict):
|
||||
normalized["a_memorix"] = _normalize_a_memorix_legacy_config(a_memorix_config)
|
||||
return normalized
|
||||
|
||||
|
||||
class ConfigManager:
|
||||
"""总配置管理类"""
|
||||
|
||||
@@ -498,6 +542,7 @@ def load_config_from_file(
|
||||
raise TypeError(t("config.invalid_inner_version"))
|
||||
old_ver: str = inner_version
|
||||
env_migration_applied: bool = False
|
||||
a_memorix_migration_applied: bool = False
|
||||
config_data.remove("inner") # 移除 inner 部分,避免干扰后续处理
|
||||
config_data = config_data.unwrap() # 转换为普通字典,方便后续处理
|
||||
if config_path.name == "bot_config.toml" and config_class.__name__ == "Config":
|
||||
@@ -510,6 +555,8 @@ def load_config_from_file(
|
||||
if legacy_migration.migrated:
|
||||
logger.warning(t("config.legacy_migrated", reason=legacy_migration.reason))
|
||||
config_data = legacy_migration.data
|
||||
config_data, a_memorix_migration_applied = _migrate_legacy_a_memorix_config(config_data)
|
||||
config_data = _normalize_loaded_bot_config_dict(config_data)
|
||||
# 保留一份“干净”的原始数据副本,避免第一次 from_dict 过程中对 dict 的就地修改
|
||||
original_data: dict[str, Any] = copy.deepcopy(config_data)
|
||||
try:
|
||||
@@ -529,7 +576,7 @@ def load_config_from_file(
|
||||
raise e
|
||||
else:
|
||||
raise e
|
||||
if compare_versions(old_ver, new_ver) or env_migration_applied:
|
||||
if compare_versions(old_ver, new_ver) or env_migration_applied or a_memorix_migration_applied:
|
||||
output_config_changes(attribute_data, logger, old_ver, new_ver, config_path.name)
|
||||
write_config_to_file(target_config, config_path, new_ver, override_repr)
|
||||
if env_migration_applied:
|
||||
@@ -578,6 +625,14 @@ def write_config_to_file(
|
||||
else:
|
||||
raise TypeError(t("config.write_unsupported_type"))
|
||||
|
||||
if isinstance(config, Config):
|
||||
try:
|
||||
a_memorix_web = full_config_data["a_memorix"]["web"]
|
||||
if "import_config" in a_memorix_web and "import" not in a_memorix_web:
|
||||
a_memorix_web["import"] = a_memorix_web.pop("import_config")
|
||||
except Exception:
|
||||
logger.debug("A_Memorix 配置写出时转换 web.import_config 失败", exc_info=True)
|
||||
|
||||
# 备份旧文件
|
||||
if config_path.exists():
|
||||
backup_root = config_path.parent / "old"
|
||||
|
||||
@@ -649,6 +649,345 @@ class MemoryConfig(ConfigBase):
|
||||
return super().model_post_init(context)
|
||||
|
||||
|
||||
class AMemorixPluginConfig(ConfigBase):
|
||||
"""A_Memorix 子系统状态"""
|
||||
|
||||
enabled: bool = Field(default=False)
|
||||
"""是否启用 A_Memorix"""
|
||||
|
||||
|
||||
class AMemorixStorageConfig(ConfigBase):
|
||||
"""A_Memorix 存储位置"""
|
||||
|
||||
data_dir: str = Field(default="data/a-memorix")
|
||||
"""数据目录"""
|
||||
|
||||
|
||||
class AMemorixEmbeddingFallbackConfig(ConfigBase):
|
||||
"""A_Memorix Embedding 回退"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用回退机制"""
|
||||
|
||||
probe_interval_seconds: int = Field(default=180, ge=10)
|
||||
"""探测间隔秒数"""
|
||||
|
||||
allow_metadata_only_write: bool = Field(default=True)
|
||||
"""是否允许仅写入元数据"""
|
||||
|
||||
|
||||
class AMemorixParagraphVectorBackfillConfig(ConfigBase):
|
||||
"""A_Memorix 段落向量回填"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用回填任务"""
|
||||
|
||||
interval_seconds: int = Field(default=60, ge=5)
|
||||
"""回填轮询间隔"""
|
||||
|
||||
batch_size: int = Field(default=64, ge=1)
|
||||
"""单批回填数量"""
|
||||
|
||||
max_retry: int = Field(default=5, ge=0)
|
||||
"""最大重试次数"""
|
||||
|
||||
|
||||
class AMemorixEmbeddingConfig(ConfigBase):
|
||||
"""A_Memorix Embedding 配置"""
|
||||
|
||||
model_name: str = Field(default="auto")
|
||||
"""Embedding 模型选择"""
|
||||
|
||||
dimension: int = Field(default=1024, ge=1)
|
||||
"""向量维度"""
|
||||
|
||||
batch_size: int = Field(default=32, ge=1)
|
||||
"""单批请求大小"""
|
||||
|
||||
max_concurrent: int = Field(default=5, ge=1)
|
||||
"""最大并发数"""
|
||||
|
||||
enable_cache: bool = Field(default=False)
|
||||
"""是否启用缓存"""
|
||||
|
||||
quantization_type: Literal["int8"] = Field(default="int8")
|
||||
"""量化方式,当前 vNext 仅支持 int8(SQ8)"""
|
||||
|
||||
fallback: AMemorixEmbeddingFallbackConfig = Field(default_factory=AMemorixEmbeddingFallbackConfig)
|
||||
"""Embedding 回退配置"""
|
||||
|
||||
paragraph_vector_backfill: AMemorixParagraphVectorBackfillConfig = Field(
|
||||
default_factory=AMemorixParagraphVectorBackfillConfig
|
||||
)
|
||||
"""段落向量回填配置"""
|
||||
|
||||
|
||||
class AMemorixSparseRetrievalConfig(ConfigBase):
|
||||
"""A_Memorix 稀疏检索配置"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用稀疏检索"""
|
||||
|
||||
backend: Literal["fts5"] = Field(default="fts5")
|
||||
"""稀疏检索后端"""
|
||||
|
||||
mode: Literal["auto", "fallback_only", "hybrid"] = Field(default="auto")
|
||||
"""稀疏检索模式"""
|
||||
|
||||
tokenizer_mode: Literal["jieba", "mixed", "char_2gram"] = Field(default="jieba")
|
||||
"""分词模式"""
|
||||
|
||||
candidate_k: int = Field(default=80, ge=1)
|
||||
"""段落候选数"""
|
||||
|
||||
relation_candidate_k: int = Field(default=60, ge=1)
|
||||
"""关系候选数"""
|
||||
|
||||
|
||||
class AMemorixRetrievalConfig(ConfigBase):
|
||||
"""A_Memorix 检索配置"""
|
||||
|
||||
top_k_paragraphs: int = Field(default=20, ge=1)
|
||||
"""段落候选数"""
|
||||
|
||||
top_k_relations: int = Field(default=10, ge=1)
|
||||
"""关系候选数"""
|
||||
|
||||
top_k_final: int = Field(default=10, ge=1)
|
||||
"""最终返回条数"""
|
||||
|
||||
alpha: float = Field(default=0.5, ge=0.0, le=1.0)
|
||||
"""关系融合权重"""
|
||||
|
||||
enable_ppr: bool = Field(default=True)
|
||||
"""是否启用 PPR"""
|
||||
|
||||
ppr_alpha: float = Field(default=0.85, ge=0.0, le=1.0)
|
||||
"""PPR alpha"""
|
||||
|
||||
ppr_timeout_seconds: float = Field(default=1.5, ge=0.1)
|
||||
"""PPR 超时秒数"""
|
||||
|
||||
ppr_concurrency_limit: int = Field(default=4, ge=1)
|
||||
"""PPR 并发限制"""
|
||||
|
||||
enable_parallel: bool = Field(default=True)
|
||||
"""是否启用并行检索"""
|
||||
|
||||
sparse: AMemorixSparseRetrievalConfig = Field(default_factory=AMemorixSparseRetrievalConfig)
|
||||
"""稀疏检索配置"""
|
||||
|
||||
|
||||
class AMemorixThresholdConfig(ConfigBase):
|
||||
"""A_Memorix 阈值过滤配置"""
|
||||
|
||||
min_threshold: float = Field(default=0.3, ge=0.0, le=1.0)
|
||||
"""最小阈值"""
|
||||
|
||||
max_threshold: float = Field(default=0.95, ge=0.0, le=1.0)
|
||||
"""最大阈值"""
|
||||
|
||||
percentile: int = Field(default=75, ge=0, le=100)
|
||||
"""动态阈值百分位"""
|
||||
|
||||
min_results: int = Field(default=3, ge=1)
|
||||
"""最小保留条数"""
|
||||
|
||||
enable_auto_adjust: bool = Field(default=True)
|
||||
"""是否启用自动阈值调整"""
|
||||
|
||||
|
||||
class AMemorixFilterConfig(ConfigBase):
|
||||
"""A_Memorix 聊天过滤配置"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用聊天过滤"""
|
||||
|
||||
mode: Literal["blacklist", "whitelist"] = Field(default="blacklist")
|
||||
"""过滤模式"""
|
||||
|
||||
chats: list[str] = Field(default_factory=lambda: [])
|
||||
"""聊天流列表"""
|
||||
|
||||
|
||||
class AMemorixEpisodeConfig(ConfigBase):
|
||||
"""A_Memorix Episode 配置"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用 Episode"""
|
||||
|
||||
generation_enabled: bool = Field(default=True)
|
||||
"""是否启用自动生成"""
|
||||
|
||||
pending_batch_size: int = Field(default=20, ge=1)
|
||||
"""待处理批大小"""
|
||||
|
||||
pending_max_retry: int = Field(default=3, ge=0)
|
||||
"""待处理最大重试次数"""
|
||||
|
||||
max_paragraphs_per_call: int = Field(default=20, ge=1)
|
||||
"""单次最大段落数"""
|
||||
|
||||
max_chars_per_call: int = Field(default=6000, ge=100)
|
||||
"""单次最大字符数"""
|
||||
|
||||
source_time_window_hours: float = Field(default=24.0, ge=0.0)
|
||||
"""时间窗口小时数"""
|
||||
|
||||
segmentation_model: str = Field(default="auto")
|
||||
"""分段模型选择"""
|
||||
|
||||
|
||||
class AMemorixPersonProfileConfig(ConfigBase):
|
||||
"""A_Memorix 人物画像配置"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用画像"""
|
||||
|
||||
refresh_interval_minutes: int = Field(default=30, ge=1)
|
||||
"""刷新间隔分钟数"""
|
||||
|
||||
active_window_hours: float = Field(default=72.0, ge=1.0)
|
||||
"""活跃窗口小时数"""
|
||||
|
||||
max_refresh_per_cycle: int = Field(default=50, ge=1)
|
||||
"""单轮最大刷新数"""
|
||||
|
||||
top_k_evidence: int = Field(default=12, ge=1)
|
||||
"""证据条数"""
|
||||
|
||||
|
||||
class AMemorixMemoryEvolutionConfig(ConfigBase):
|
||||
"""A_Memorix 记忆演化配置"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用记忆演化"""
|
||||
|
||||
half_life_hours: float = Field(default=24.0, ge=0.1)
|
||||
"""半衰期小时数"""
|
||||
|
||||
prune_threshold: float = Field(default=0.1, ge=0.0, le=1.0)
|
||||
"""裁剪阈值"""
|
||||
|
||||
freeze_duration_hours: float = Field(default=24.0, ge=0.0)
|
||||
"""冻结时长小时数"""
|
||||
|
||||
|
||||
class AMemorixAdvancedConfig(ConfigBase):
|
||||
"""A_Memorix 高级运行时配置"""
|
||||
|
||||
enable_auto_save: bool = Field(default=True)
|
||||
"""是否启用自动保存"""
|
||||
|
||||
auto_save_interval_minutes: int = Field(default=5, ge=1)
|
||||
"""自动保存间隔"""
|
||||
|
||||
debug: bool = Field(default=False)
|
||||
"""是否启用调试"""
|
||||
|
||||
|
||||
class AMemorixWebImportConfig(ConfigBase):
|
||||
"""A_Memorix 导入中心配置"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用导入中心"""
|
||||
|
||||
max_queue_size: int = Field(default=20, ge=1)
|
||||
"""最大队列长度"""
|
||||
|
||||
max_files_per_task: int = Field(default=200, ge=1)
|
||||
"""单任务最大文件数"""
|
||||
|
||||
max_file_size_mb: int = Field(default=20, ge=1)
|
||||
"""单文件大小上限 MB"""
|
||||
|
||||
max_paste_chars: int = Field(default=200000, ge=100)
|
||||
"""粘贴字符数上限"""
|
||||
|
||||
default_file_concurrency: int = Field(default=2, ge=1)
|
||||
"""默认文件并发"""
|
||||
|
||||
default_chunk_concurrency: int = Field(default=4, ge=1)
|
||||
"""默认分块并发"""
|
||||
|
||||
|
||||
class AMemorixWebTuningConfig(ConfigBase):
|
||||
"""A_Memorix 调优中心配置"""
|
||||
|
||||
enabled: bool = Field(default=True)
|
||||
"""是否启用调优中心"""
|
||||
|
||||
max_queue_size: int = Field(default=8, ge=1)
|
||||
"""最大队列长度"""
|
||||
|
||||
poll_interval_ms: int = Field(default=1200, ge=200)
|
||||
"""轮询间隔毫秒数"""
|
||||
|
||||
default_intensity: Literal["quick", "standard", "deep"] = Field(default="standard")
|
||||
"""默认调优强度"""
|
||||
|
||||
default_objective: Literal["precision_priority", "balanced", "recall_priority"] = Field(
|
||||
default="precision_priority"
|
||||
)
|
||||
"""默认调优目标"""
|
||||
|
||||
default_top_k_eval: int = Field(default=20, ge=1)
|
||||
"""默认评估 Top-K"""
|
||||
|
||||
default_sample_size: int = Field(default=24, ge=1)
|
||||
"""默认样本数"""
|
||||
|
||||
|
||||
class AMemorixWebConfig(ConfigBase):
|
||||
"""A_Memorix Web 运维配置"""
|
||||
|
||||
import_config: AMemorixWebImportConfig = Field(default_factory=AMemorixWebImportConfig)
|
||||
"""导入中心配置"""
|
||||
|
||||
tuning: AMemorixWebTuningConfig = Field(default_factory=AMemorixWebTuningConfig)
|
||||
"""调优中心配置"""
|
||||
|
||||
|
||||
class AMemorixConfig(ConfigBase):
|
||||
"""A_Memorix 长期记忆子系统配置"""
|
||||
|
||||
__ui_label__ = "长期记忆"
|
||||
__ui_icon__ = "brain"
|
||||
|
||||
plugin: AMemorixPluginConfig = Field(default_factory=AMemorixPluginConfig)
|
||||
"""子系统状态"""
|
||||
|
||||
storage: AMemorixStorageConfig = Field(default_factory=AMemorixStorageConfig)
|
||||
"""存储位置"""
|
||||
|
||||
embedding: AMemorixEmbeddingConfig = Field(default_factory=AMemorixEmbeddingConfig)
|
||||
"""Embedding 配置"""
|
||||
|
||||
retrieval: AMemorixRetrievalConfig = Field(default_factory=AMemorixRetrievalConfig)
|
||||
"""检索配置"""
|
||||
|
||||
threshold: AMemorixThresholdConfig = Field(default_factory=AMemorixThresholdConfig)
|
||||
"""阈值过滤配置"""
|
||||
|
||||
filter: AMemorixFilterConfig = Field(default_factory=AMemorixFilterConfig)
|
||||
"""聊天过滤配置"""
|
||||
|
||||
episode: AMemorixEpisodeConfig = Field(default_factory=AMemorixEpisodeConfig)
|
||||
"""Episode 配置"""
|
||||
|
||||
person_profile: AMemorixPersonProfileConfig = Field(default_factory=AMemorixPersonProfileConfig)
|
||||
"""人物画像配置"""
|
||||
|
||||
memory: AMemorixMemoryEvolutionConfig = Field(default_factory=AMemorixMemoryEvolutionConfig)
|
||||
"""记忆演化配置"""
|
||||
|
||||
advanced: AMemorixAdvancedConfig = Field(default_factory=AMemorixAdvancedConfig)
|
||||
"""高级运行时配置"""
|
||||
|
||||
web: AMemorixWebConfig = Field(default_factory=AMemorixWebConfig)
|
||||
"""Web 运维配置"""
|
||||
|
||||
|
||||
class LearningItem(ConfigBase):
|
||||
platform: str = Field(
|
||||
default="",
|
||||
|
||||
Reference in New Issue
Block a user