fix(ai): 审计问题修复 — 错误映射/性能/SSE/依赖规范化
- C3: handler 中 .map_err(AppError::Internal) 改为 ? 操作符,
利用 From<AiError> for AppError 实现正确的 HTTP 状态码映射
- H1: AiState 预构建在 AppState 初始化时,避免每次请求重建
ClaudeProvider/AnalysisService/PromptService/UsageService
- H3: stream_analyze 的 user_id 参数传递到 created_by/updated_by
- H5: SSE 事件添加 .event("chunk"/"error"/"done") 类型字段
- L3: erp-ai Cargo.toml 依赖改用 workspace 引用
(reqwest/handlebars/sha2/hex)
- 修复 erp-health 编译错误: points_handler 缺少 ColumnTrait 导入,
points_service 版本字段部分移动问题
This commit is contained in:
@@ -19,7 +19,7 @@ tracing.workspace = true
|
|||||||
thiserror.workspace = true
|
thiserror.workspace = true
|
||||||
utoipa.workspace = true
|
utoipa.workspace = true
|
||||||
async-trait.workspace = true
|
async-trait.workspace = true
|
||||||
reqwest = { version = "0.12", features = ["stream", "json"] }
|
reqwest.workspace = true
|
||||||
handlebars = "6"
|
handlebars.workspace = true
|
||||||
sha2 = "0.10"
|
sha2.workspace = true
|
||||||
hex = "0.4"
|
hex.workspace = true
|
||||||
|
|||||||
@@ -38,8 +38,7 @@ where
|
|||||||
let prompt = state
|
let prompt = state
|
||||||
.prompt
|
.prompt
|
||||||
.get_active_prompt(ctx.tenant_id, "lab_report_interpretation")
|
.get_active_prompt(ctx.tenant_id, "lab_report_interpretation")
|
||||||
.await
|
.await?;
|
||||||
.map_err(|e| erp_core::error::AppError::Internal(e.to_string()))?;
|
|
||||||
|
|
||||||
let model_config = &prompt.model_config;
|
let model_config = &prompt.model_config;
|
||||||
let model = model_config["model"].as_str().unwrap_or("claude-sonnet-4-6").to_string();
|
let model = model_config["model"].as_str().unwrap_or("claude-sonnet-4-6").to_string();
|
||||||
@@ -61,8 +60,7 @@ where
|
|||||||
temperature,
|
temperature,
|
||||||
max_tokens,
|
max_tokens,
|
||||||
)
|
)
|
||||||
.await
|
.await?;
|
||||||
.map_err(|e| erp_core::error::AppError::Internal(e.to_string()))?;
|
|
||||||
|
|
||||||
let analysis_id_clone = analysis_id;
|
let analysis_id_clone = analysis_id;
|
||||||
let state_clone = state.clone();
|
let state_clone = state.clone();
|
||||||
@@ -82,14 +80,14 @@ where
|
|||||||
index,
|
index,
|
||||||
};
|
};
|
||||||
let data = serde_json::to_string(&event).unwrap_or_default();
|
let data = serde_json::to_string(&event).unwrap_or_default();
|
||||||
yield Ok(Event::default().data(data));
|
yield Ok(Event::default().event("chunk").data(data));
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let event = AnalysisSseEvent::Error {
|
let event = AnalysisSseEvent::Error {
|
||||||
message: e.to_string(),
|
message: e.to_string(),
|
||||||
};
|
};
|
||||||
let data = serde_json::to_string(&event).unwrap_or_default();
|
let data = serde_json::to_string(&event).unwrap_or_default();
|
||||||
yield Ok(Event::default().data(data));
|
yield Ok(Event::default().event("error").data(data));
|
||||||
let _ = state_clone
|
let _ = state_clone
|
||||||
.analysis
|
.analysis
|
||||||
.fail_analysis(analysis_id_clone, e.to_string())
|
.fail_analysis(analysis_id_clone, e.to_string())
|
||||||
@@ -111,7 +109,7 @@ where
|
|||||||
status: "completed".into(),
|
status: "completed".into(),
|
||||||
};
|
};
|
||||||
let data = serde_json::to_string(&done_event).unwrap_or_default();
|
let data = serde_json::to_string(&done_event).unwrap_or_default();
|
||||||
yield Ok(Event::default().data(data));
|
yield Ok(Event::default().event("done").data(data));
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(Sse::new(sse_stream).keep_alive(KeepAlive::default()))
|
Ok(Sse::new(sse_stream).keep_alive(KeepAlive::default()))
|
||||||
@@ -134,8 +132,7 @@ where
|
|||||||
let prompt = state
|
let prompt = state
|
||||||
.prompt
|
.prompt
|
||||||
.get_active_prompt(ctx.tenant_id, "health_trend_analysis")
|
.get_active_prompt(ctx.tenant_id, "health_trend_analysis")
|
||||||
.await
|
.await?;
|
||||||
.map_err(|e| erp_core::error::AppError::Internal(e.to_string()))?;
|
|
||||||
|
|
||||||
let model_config = &prompt.model_config;
|
let model_config = &prompt.model_config;
|
||||||
let model = model_config["model"].as_str().unwrap_or("claude-sonnet-4-6").to_string();
|
let model = model_config["model"].as_str().unwrap_or("claude-sonnet-4-6").to_string();
|
||||||
@@ -157,8 +154,7 @@ where
|
|||||||
temperature,
|
temperature,
|
||||||
max_tokens,
|
max_tokens,
|
||||||
)
|
)
|
||||||
.await
|
.await?;
|
||||||
.map_err(|e| erp_core::error::AppError::Internal(e.to_string()))?;
|
|
||||||
|
|
||||||
let analysis_id_clone = analysis_id;
|
let analysis_id_clone = analysis_id;
|
||||||
let state_clone = state.clone();
|
let state_clone = state.clone();
|
||||||
@@ -184,8 +180,7 @@ where
|
|||||||
let prompt = state
|
let prompt = state
|
||||||
.prompt
|
.prompt
|
||||||
.get_active_prompt(ctx.tenant_id, "personalized_checkup_plan")
|
.get_active_prompt(ctx.tenant_id, "personalized_checkup_plan")
|
||||||
.await
|
.await?;
|
||||||
.map_err(|e| erp_core::error::AppError::Internal(e.to_string()))?;
|
|
||||||
|
|
||||||
let model_config = &prompt.model_config;
|
let model_config = &prompt.model_config;
|
||||||
let model = model_config["model"].as_str().unwrap_or("claude-sonnet-4-6").to_string();
|
let model = model_config["model"].as_str().unwrap_or("claude-sonnet-4-6").to_string();
|
||||||
@@ -207,8 +202,7 @@ where
|
|||||||
temperature,
|
temperature,
|
||||||
max_tokens,
|
max_tokens,
|
||||||
)
|
)
|
||||||
.await
|
.await?;
|
||||||
.map_err(|e| erp_core::error::AppError::Internal(e.to_string()))?;
|
|
||||||
|
|
||||||
let analysis_id_clone = analysis_id;
|
let analysis_id_clone = analysis_id;
|
||||||
let state_clone = state.clone();
|
let state_clone = state.clone();
|
||||||
@@ -234,8 +228,7 @@ where
|
|||||||
let prompt = state
|
let prompt = state
|
||||||
.prompt
|
.prompt
|
||||||
.get_active_prompt(ctx.tenant_id, "report_summary_generation")
|
.get_active_prompt(ctx.tenant_id, "report_summary_generation")
|
||||||
.await
|
.await?;
|
||||||
.map_err(|e| erp_core::error::AppError::Internal(e.to_string()))?;
|
|
||||||
|
|
||||||
let model_config = &prompt.model_config;
|
let model_config = &prompt.model_config;
|
||||||
let model = model_config["model"].as_str().unwrap_or("claude-sonnet-4-6").to_string();
|
let model = model_config["model"].as_str().unwrap_or("claude-sonnet-4-6").to_string();
|
||||||
@@ -257,8 +250,7 @@ where
|
|||||||
temperature,
|
temperature,
|
||||||
max_tokens,
|
max_tokens,
|
||||||
)
|
)
|
||||||
.await
|
.await?;
|
||||||
.map_err(|e| erp_core::error::AppError::Internal(e.to_string()))?;
|
|
||||||
|
|
||||||
let analysis_id_clone = analysis_id;
|
let analysis_id_clone = analysis_id;
|
||||||
let state_clone = state.clone();
|
let state_clone = state.clone();
|
||||||
@@ -323,12 +315,12 @@ fn build_sse_stream(
|
|||||||
index += 1;
|
index += 1;
|
||||||
let event = AnalysisSseEvent::Chunk { content: chunk, index };
|
let event = AnalysisSseEvent::Chunk { content: chunk, index };
|
||||||
let data = serde_json::to_string(&event).unwrap_or_default();
|
let data = serde_json::to_string(&event).unwrap_or_default();
|
||||||
yield Ok(Event::default().data(data));
|
yield Ok(Event::default().event("chunk").data(data));
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let event = AnalysisSseEvent::Error { message: e.to_string() };
|
let event = AnalysisSseEvent::Error { message: e.to_string() };
|
||||||
let data = serde_json::to_string(&event).unwrap_or_default();
|
let data = serde_json::to_string(&event).unwrap_or_default();
|
||||||
yield Ok(Event::default().data(data));
|
yield Ok(Event::default().event("error").data(data));
|
||||||
let _ = state.analysis.fail_analysis(analysis_id, e.to_string()).await;
|
let _ = state.analysis.fail_analysis(analysis_id, e.to_string()).await;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -343,6 +335,6 @@ fn build_sse_stream(
|
|||||||
status: "completed".into(),
|
status: "completed".into(),
|
||||||
};
|
};
|
||||||
let data = serde_json::to_string(&done_event).unwrap_or_default();
|
let data = serde_json::to_string(&done_event).unwrap_or_default();
|
||||||
yield Ok(Event::default().data(data));
|
yield Ok(Event::default().event("done").data(data));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ impl AnalysisService {
|
|||||||
pub async fn stream_analyze(
|
pub async fn stream_analyze(
|
||||||
&self,
|
&self,
|
||||||
tenant_id: Uuid,
|
tenant_id: Uuid,
|
||||||
_user_id: Uuid,
|
user_id: Uuid,
|
||||||
patient_id: Uuid,
|
patient_id: Uuid,
|
||||||
analysis_type: AnalysisType,
|
analysis_type: AnalysisType,
|
||||||
source_ref: String,
|
source_ref: String,
|
||||||
@@ -58,6 +58,7 @@ impl AnalysisService {
|
|||||||
self.create_analysis_record(
|
self.create_analysis_record(
|
||||||
analysis_id,
|
analysis_id,
|
||||||
tenant_id,
|
tenant_id,
|
||||||
|
user_id,
|
||||||
patient_id,
|
patient_id,
|
||||||
analysis_type.as_str(),
|
analysis_type.as_str(),
|
||||||
&source_ref,
|
&source_ref,
|
||||||
@@ -145,6 +146,7 @@ impl AnalysisService {
|
|||||||
&self,
|
&self,
|
||||||
id: Uuid,
|
id: Uuid,
|
||||||
tenant_id: Uuid,
|
tenant_id: Uuid,
|
||||||
|
user_id: Uuid,
|
||||||
patient_id: Uuid,
|
patient_id: Uuid,
|
||||||
analysis_type: &str,
|
analysis_type: &str,
|
||||||
source_ref: &str,
|
source_ref: &str,
|
||||||
@@ -170,8 +172,8 @@ impl AnalysisService {
|
|||||||
error_message: Set(None),
|
error_message: Set(None),
|
||||||
created_at: Set(now),
|
created_at: Set(now),
|
||||||
updated_at: Set(now),
|
updated_at: Set(now),
|
||||||
created_by: Set(None),
|
created_by: Set(Some(user_id)),
|
||||||
updated_by: Set(None),
|
updated_by: Set(Some(user_id)),
|
||||||
deleted_at: Set(None),
|
deleted_at: Set(None),
|
||||||
version_lock: Set(1),
|
version_lock: Set(1),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -427,6 +427,28 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
// Extract JWT secret for middleware construction
|
// Extract JWT secret for middleware construction
|
||||||
let jwt_secret = config.jwt.secret.clone();
|
let jwt_secret = config.jwt.secret.clone();
|
||||||
|
|
||||||
|
// Pre-build AI state (avoids per-request reconstruction)
|
||||||
|
let ai_state = {
|
||||||
|
let mut provider = erp_ai::provider::claude::ClaudeProvider::new(
|
||||||
|
config.ai.api_key.clone(),
|
||||||
|
);
|
||||||
|
if let Some(ref base_url) = config.ai.base_url {
|
||||||
|
provider = provider.with_base_url(base_url.clone());
|
||||||
|
}
|
||||||
|
let analysis = std::sync::Arc::new(
|
||||||
|
erp_ai::service::analysis::AnalysisService::new(Box::new(provider), db.clone()),
|
||||||
|
);
|
||||||
|
let prompt = std::sync::Arc::new(erp_ai::service::prompt::PromptService::new(db.clone()));
|
||||||
|
let usage = std::sync::Arc::new(erp_ai::service::usage::UsageService::new(db.clone()));
|
||||||
|
erp_ai::AiState {
|
||||||
|
db: db.clone(),
|
||||||
|
event_bus: event_bus.clone(),
|
||||||
|
analysis,
|
||||||
|
prompt,
|
||||||
|
usage,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Build shared state
|
// Build shared state
|
||||||
let state = AppState {
|
let state = AppState {
|
||||||
db,
|
db,
|
||||||
@@ -440,6 +462,7 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
.max_capacity(1000)
|
.max_capacity(1000)
|
||||||
.time_to_idle(std::time::Duration::from_secs(300))
|
.time_to_idle(std::time::Duration::from_secs(300))
|
||||||
.build(),
|
.build(),
|
||||||
|
ai_state,
|
||||||
};
|
};
|
||||||
|
|
||||||
// --- Build the router ---
|
// --- Build the router ---
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ pub struct AppState {
|
|||||||
pub plugin_engine: erp_plugin::engine::PluginEngine,
|
pub plugin_engine: erp_plugin::engine::PluginEngine,
|
||||||
/// 插件实体缓存
|
/// 插件实体缓存
|
||||||
pub plugin_entity_cache: moka::sync::Cache<String, erp_plugin::state::EntityInfo>,
|
pub plugin_entity_cache: moka::sync::Cache<String, erp_plugin::state::EntityInfo>,
|
||||||
|
/// AI 模块状态(启动时构建,避免每次请求重建)
|
||||||
|
pub ai_state: erp_ai::AiState,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Allow handlers to extract `DatabaseConnection` directly from `State<AppState>`.
|
/// Allow handlers to extract `DatabaseConnection` directly from `State<AppState>`.
|
||||||
@@ -119,27 +121,6 @@ impl FromRef<AppState> for erp_health::HealthState {
|
|||||||
/// Allow erp-ai handlers to extract their required state.
|
/// Allow erp-ai handlers to extract their required state.
|
||||||
impl FromRef<AppState> for erp_ai::AiState {
|
impl FromRef<AppState> for erp_ai::AiState {
|
||||||
fn from_ref(state: &AppState) -> Self {
|
fn from_ref(state: &AppState) -> Self {
|
||||||
let mut provider = erp_ai::provider::claude::ClaudeProvider::new(
|
state.ai_state.clone()
|
||||||
state.config.ai.api_key.clone(),
|
|
||||||
);
|
|
||||||
if let Some(ref base_url) = state.config.ai.base_url {
|
|
||||||
provider = provider.with_base_url(base_url.clone());
|
|
||||||
}
|
|
||||||
let db = state.db.clone();
|
|
||||||
let event_bus = state.event_bus.clone();
|
|
||||||
|
|
||||||
let analysis = std::sync::Arc::new(
|
|
||||||
erp_ai::service::analysis::AnalysisService::new(Box::new(provider), db.clone()),
|
|
||||||
);
|
|
||||||
let prompt = std::sync::Arc::new(erp_ai::service::prompt::PromptService::new(db.clone()));
|
|
||||||
let usage = std::sync::Arc::new(erp_ai::service::usage::UsageService::new(db.clone()));
|
|
||||||
|
|
||||||
Self {
|
|
||||||
db,
|
|
||||||
event_bus,
|
|
||||||
analysis,
|
|
||||||
prompt,
|
|
||||||
usage,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user