pulsareon/ShowenV2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 main.rs config move 后借用错误 (提前提取 ai 配置)

Browse Source
This commit is contained in:
pulsareonbot
2026-07-04 15:12:16 +08:00
parent 1bb044a3d7
commit 4877d54a1c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@@ -46,6 +46,12 @@ fn main() -> Result<()> {
let config = AppConfig::from_file(&config_path)?; let config = AppConfig::from_file(&config_path)?;
config.validate_paths()?; config.validate_paths()?;
// 在 config move 进 ServiceManager 之前，提取 AI 相关配置
let ai_model_store = config.ai.model_store.clone();
let ai_tools_dir = config.ai.tools_dir.clone();
let ai_tmp_dir = config.ai.tmp_dir.clone();
let ai_context_window = config.ai.context_window;
let mut manager = ServiceManager::new(config); let mut manager = ServiceManager::new(config);
// 按依赖顺序注册插件 // 按依赖顺序注册插件
@@ -70,12 +76,11 @@ fn main() -> Result<()> {
// AiPlugin: 需要在注册前创建实例以获取 pipeline 句柄，再注册进 manager // AiPlugin: 需要在注册前创建实例以获取 pipeline 句柄，再注册进 manager
// pipeline 会传给 HttpPlugin，建立 HTTP → AI 的直接通道 // pipeline 会传给 HttpPlugin，建立 HTTP → AI 的直接通道
let ai_config = &config.ai;
let ai_plugin = AiPlugin::new_default( let ai_plugin = AiPlugin::new_default(
ai_config.model_store.clone(), ai_model_store,
ai_config.tools_dir.clone(), ai_tools_dir,
ai_config.tmp_dir.clone(), ai_tmp_dir,
ai_config.context_window, ai_context_window,
); );
let ai_pipeline = ai_plugin.pipeline(); let ai_pipeline = ai_plugin.pipeline();
let ai_models = ai_plugin.models(); let ai_models = ai_plugin.models();