Enrich external API failure audit metadata

This commit is contained in:
kdletters
2026-05-28 15:42:46 +08:00
parent 2cd2b9704b
commit f1fb92aa29
40 changed files with 315 additions and 152 deletions

View File

@@ -325,11 +325,15 @@ fn validate_admin_work_visibility(
) -> Result<(String, String, bool), AppError> {
let source_type = payload.source_type.trim().to_string();
if source_type.is_empty() {
return Err(AppError::from_status(StatusCode::BAD_REQUEST).with_message("sourceType 不能为空"));
return Err(
AppError::from_status(StatusCode::BAD_REQUEST).with_message("sourceType 不能为空")
);
}
let profile_id = payload.profile_id.trim().to_string();
if profile_id.is_empty() {
return Err(AppError::from_status(StatusCode::BAD_REQUEST).with_message("profileId 不能为空"));
return Err(
AppError::from_status(StatusCode::BAD_REQUEST).with_message("profileId 不能为空")
);
}
Ok((source_type, profile_id, payload.visible))
}

View File

@@ -658,7 +658,8 @@ mod tests {
#[tokio::test]
async fn spacetime_unavailable_router_returns_service_unavailable_for_requests() {
let app = build_spacetime_unavailable_router("SpacetimeDB 启动恢复认证快照超时".to_string());
let app =
build_spacetime_unavailable_router("SpacetimeDB 启动恢复认证快照超时".to_string());
let response = app
.oneshot(

View File

@@ -311,6 +311,7 @@ pub async fn generate_bark_battle_image_asset(
async {
generate_and_persist_bark_battle_image_asset(
&state,
&request_context,
&owner_user_id,
&slot,
draft_id.as_deref(),
@@ -1197,6 +1198,7 @@ fn bark_battle_sanitize_path_segment(value: &str, fallback: &str) -> String {
async fn generate_and_persist_bark_battle_image_asset(
state: &AppState,
request_context: &RequestContext,
owner_user_id: &str,
slot: &BarkBattleAssetSlot,
draft_id: Option<&str>,
@@ -1205,6 +1207,7 @@ async fn generate_and_persist_bark_battle_image_asset(
size: &str,
) -> Result<BarkBattleGeneratedImageAsset, AppError> {
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
&request_context,
Some(owner_user_id.to_string()),
Some(draft_id.unwrap_or(asset_id).to_string()),
);

View File

@@ -95,8 +95,12 @@ pub async fn generate_character_visual(
let result = async {
let settings = require_openai_image_settings(&state)?
.with_external_api_audit_context(Some(owner_user_id.clone()), Some(character_id.clone()))
.with_external_api_audit_request_id(Some(request_context.request_id().to_string()));
.with_external_api_audit_context(
&request_context,
Some(owner_user_id.clone()),
Some(character_id.clone()),
)
;
let http_client = build_openai_image_http_client(&settings)?;
state
@@ -320,7 +324,7 @@ pub(crate) async fn generate_character_primary_visual_for_profile(
&model,
&prompt,
)?;
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
let settings = require_openai_image_settings(state)?.with_external_api_audit_actor(
Some(owner_user_id.to_string()),
Some(character_id.clone()),
);

View File

@@ -555,10 +555,10 @@ pub async fn generate_custom_world_scene_image(
async {
let settings = require_openai_image_settings(&state)?
.with_external_api_audit_context(
&request_context,
Some(owner_user_id.to_string()),
normalized.profile_id.clone(),
)
.with_external_api_audit_request_id(Some(request_context.request_id().to_string()));
);
let http_client = build_openai_image_http_client(&settings)?;
let reference_image =
if let Some(reference_image_src) = normalized.reference_image_src.as_deref() {
@@ -680,7 +680,7 @@ pub(crate) async fn generate_custom_world_scene_image_for_profile(
}),
};
let normalized = normalize_scene_image_request(payload)?;
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
let settings = require_openai_image_settings(state)?.with_external_api_audit_actor(
Some(owner_user_id.to_string()),
normalized.profile_id.clone(),
);
@@ -1021,10 +1021,10 @@ pub async fn generate_custom_world_opening_cg(
async {
let image_settings = require_openai_image_settings(&state)?
.with_external_api_audit_context(
&request_context,
Some(owner_user_id.clone()),
normalized.profile_id.clone(),
)
.with_external_api_audit_request_id(Some(request_context.request_id().to_string()));
);
let image_http_client = build_openai_image_http_client(&image_settings)?;
let video_settings = require_ark_video_settings(&state)?;
let video_http_client = build_upstream_http_client(video_settings.request_timeout_ms)?;

View File

@@ -8,10 +8,7 @@ pub(super) async fn generate_opening_cg_storyboard(
normalized: &NormalizedOpeningCgRequest,
reference_images: &[String],
) -> Result<GeneratedOpeningCgStoryboard, AppError> {
let audit_settings = settings.clone().with_external_api_audit_context(
Some(owner_user_id.to_string()),
normalized.profile_id.clone(),
);
let audit_settings = settings.clone();
let generated = create_openai_image_generation(
http_client,
&audit_settings,

View File

@@ -260,13 +260,28 @@ fn build_external_api_failure_metadata(failure: &ExternalApiFailureDraft) -> Val
if let Some(image_model) = failure.image_model {
metadata["imageModel"] = json!(image_model);
}
if let Some(user_id) = failure.user_id.as_deref().map(str::trim).filter(|value| !value.is_empty()) {
if let Some(user_id) = failure
.user_id
.as_deref()
.map(str::trim)
.filter(|value| !value.is_empty())
{
metadata["userId"] = json!(truncate_field(user_id, 1_000));
}
if let Some(profile_id) = failure.profile_id.as_deref().map(str::trim).filter(|value| !value.is_empty()) {
if let Some(profile_id) = failure
.profile_id
.as_deref()
.map(str::trim)
.filter(|value| !value.is_empty())
{
metadata["profileId"] = json!(truncate_field(profile_id, 1_000));
}
if let Some(request_id) = failure.request_id.as_deref().map(str::trim).filter(|value| !value.is_empty()) {
if let Some(request_id) = failure
.request_id
.as_deref()
.map(str::trim)
.filter(|value| !value.is_empty())
{
metadata["requestId"] = json!(truncate_field(request_id, 1_000));
}
if let Some(source) = failure

View File

@@ -416,14 +416,14 @@ async fn maybe_generate_jump_hop_assets(
.map(|settings| {
settings
.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(profile_id.clone()),
)
.with_external_api_audit_request_id(Some(request_context.request_id().to_string()))
})
.map_err(|error| {
jump_hop_error_response(request_context, JUMP_HOP_CREATION_PROVIDER, error)
})?;
jump_hop_error_response(request_context, JUMP_HOP_CREATION_PROVIDER, error)
})?;
let http_client = build_openai_image_http_client(&settings).map_err(|error| {
jump_hop_error_response(request_context, JUMP_HOP_CREATION_PROVIDER, error)
})?;

View File

@@ -172,7 +172,9 @@ async fn run_server(config: AppConfig) -> Result<(), io::Error> {
build_spacetime_unavailable_router(message)
}
Err(error) => {
return Err(std::io::Error::other(format!("初始化应用状态失败:{error}")));
return Err(std::io::Error::other(format!(
"初始化应用状态失败:{error}"
)));
}
};

View File

@@ -701,6 +701,7 @@ pub async fn generate_match3d_cover_image(
.await?;
let generated_cover = generate_match3d_cover_image_asset(
&state,
&request_context,
&context.owner_user_id,
context.session_id.as_str(),
profile_id.as_str(),
@@ -772,6 +773,7 @@ pub async fn generate_match3d_background_image_for_work(
async {
let generated_background = generate_match3d_background_image(
&state,
&request_context,
owner_user_id.as_str(),
session_id.as_str(),
profile_id.as_str(),
@@ -883,6 +885,7 @@ pub async fn generate_match3d_container_image_for_work(
async {
let generated_container = generate_match3d_container_image(
&state,
&request_context,
owner_user_id.as_str(),
session_id.as_str(),
profile_id.as_str(),

View File

@@ -202,6 +202,7 @@ async fn generate_match3d_item_image_assets_in_batches(
async move {
let material_sheet = generate_match3d_material_sheet_from_level_scene(
state,
request_context,
owner_user_id,
session_id,
profile_id,
@@ -747,16 +748,19 @@ pub(super) struct Match3DSlicedItemImage {
async fn generate_match3d_material_sheet_from_level_scene(
state: &AppState,
request_context: &RequestContext,
owner_user_id: &str,
session_id: &str,
profile_id: &str,
config: &Match3DConfigJson,
background_asset: Option<&Match3DGeneratedBackgroundAsset>,
) -> Result<Match3DMaterialSheet, AppError> {
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let settings = require_openai_image_settings(state)?
.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let http_client = build_openai_image_http_client(&settings)?;
let prompt = build_match3d_item_spritesheet_prompt();
let reference = load_match3d_level_scene_reference_image(state, background_asset).await?;

View File

@@ -214,6 +214,7 @@ pub(super) async fn ensure_match3d_background_asset(
let generated_background = generate_match3d_level_asset_bundle(
state,
request_context,
owner_user_id,
session_id,
profile_id,
@@ -260,6 +261,7 @@ pub(super) async fn resolve_or_generate_match3d_level_asset_bundle(
};
generate_match3d_level_asset_bundle(
state,
request_context,
owner_user_id,
session_id,
profile_id,
@@ -292,6 +294,7 @@ pub(super) fn build_match3d_item_slug(item_id: &str, item_name: &str) -> String
pub(super) async fn generate_match3d_cover_image_asset(
state: &AppState,
request_context: &RequestContext,
owner_user_id: &str,
session_id: &str,
profile_id: &str,
@@ -301,10 +304,12 @@ pub(super) async fn generate_match3d_cover_image_asset(
reference_image_srcs: Vec<String>,
) -> Result<Match3DAssetUpload, AppError> {
require_match3d_oss_client(state)?;
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let settings = require_openai_image_settings(state)?
.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let http_client = build_openai_image_http_client(&settings)?;
let cover_prompt = build_match3d_cover_generation_prompt(config, prompt);
let generated = if let Some(uploaded_image) = resolve_match3d_reference_image_for_edit(
@@ -425,6 +430,7 @@ pub(super) fn build_match3d_cover_reference_generation_prompt(
pub(super) async fn generate_match3d_background_image(
state: &AppState,
request_context: &RequestContext,
owner_user_id: &str,
session_id: &str,
profile_id: &str,
@@ -433,6 +439,7 @@ pub(super) async fn generate_match3d_background_image(
) -> Result<Match3DGeneratedBackgroundAsset, AppError> {
generate_match3d_level_asset_bundle(
state,
request_context,
owner_user_id,
session_id,
profile_id,
@@ -444,6 +451,7 @@ pub(super) async fn generate_match3d_background_image(
pub(super) async fn generate_match3d_level_asset_bundle(
state: &AppState,
request_context: &RequestContext,
owner_user_id: &str,
session_id: &str,
profile_id: &str,
@@ -451,10 +459,12 @@ pub(super) async fn generate_match3d_level_asset_bundle(
prompt: &str,
) -> Result<Match3DGeneratedBackgroundAsset, AppError> {
require_match3d_oss_client(state)?;
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let settings = require_openai_image_settings(state)?
.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let http_client = build_openai_image_http_client(&settings)?;
let level_scene_prompt = build_match3d_level_scene_generation_prompt(config);
@@ -589,6 +599,7 @@ pub(super) async fn generate_match3d_level_asset_bundle(
pub(super) async fn generate_match3d_container_image(
state: &AppState,
request_context: &RequestContext,
owner_user_id: &str,
session_id: &str,
profile_id: &str,
@@ -596,10 +607,12 @@ pub(super) async fn generate_match3d_container_image(
prompt: &str,
) -> Result<Match3DGeneratedBackgroundAsset, AppError> {
require_match3d_oss_client(state)?;
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let settings = require_openai_image_settings(state)?
.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let http_client = build_openai_image_http_client(&settings)?;
let reference_image = load_match3d_container_reference_image()?;
let container_prompt = build_match3d_container_generation_prompt(config, prompt);

View File

@@ -16,6 +16,7 @@ use crate::{
record_external_api_failure,
},
http_error::AppError,
request_context::RequestContext,
state::AppState,
tracking::record_external_generation_run_after_success,
};
@@ -258,7 +259,7 @@ pub(crate) fn build_openai_image_request_body(
}
impl OpenAiImageSettings {
pub(crate) fn with_external_api_audit_context(
pub(crate) fn with_external_api_audit_actor(
mut self,
user_id: Option<String>,
profile_id: Option<String>,
@@ -268,8 +269,15 @@ impl OpenAiImageSettings {
self
}
pub(crate) fn with_external_api_audit_request_id(mut self, request_id: Option<String>) -> Self {
self.external_api_audit_request_id = request_id;
pub(crate) fn with_external_api_audit_context(
mut self,
request_context: &RequestContext,
user_id: Option<String>,
profile_id: Option<String>,
) -> Self {
self.external_api_audit_user_id = user_id;
self.external_api_audit_profile_id = profile_id;
self.external_api_audit_request_id = Some(request_context.request_id().to_string());
self
}

View File

@@ -269,10 +269,10 @@ pub(crate) async fn generate_puzzle_ui_background_image(
) -> Result<GeneratedPuzzleUiBackgroundResponse, AppError> {
let settings = require_openai_image_settings(state.root_state())?
.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(session_id.to_string()),
)
.with_external_api_audit_request_id(Some(request_context.request_id().to_string()));
);
let http_client = build_openai_image_http_client(&settings)?;
let generated = create_openai_image_generation(
&http_client,
@@ -311,7 +311,11 @@ pub(crate) async fn generate_puzzle_level_asset_bundle(
puzzle_image: &PuzzleDownloadedImage,
) -> Result<GeneratedPuzzleLevelAssetBundle, AppError> {
let settings = require_puzzle_vector_engine_settings(state)?
.with_external_api_audit_request_id(Some(request_context.request_id().to_string()));
.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(session_id.to_string()),
);
let http_client = build_puzzle_image_http_client(state, PuzzleImageModel::GptImage2)?;
let puzzle_reference = build_puzzle_downloaded_image_reference(puzzle_image);
let scene_generated = create_puzzle_vector_engine_image_generation(

View File

@@ -109,13 +109,19 @@ impl PuzzleVectorEngineSettings {
}
}
pub(crate) fn with_external_api_audit_request_id(
pub(crate) fn with_external_api_audit_context(
mut self,
request_id: Option<String>,
request_context: &RequestContext,
user_id: Option<String>,
profile_id: Option<String>,
) -> Self {
self.external_api_audit_request_id = request_id;
self.external_api_audit_user_id = user_id;
self.external_api_audit_profile_id = profile_id;
self.external_api_audit_request_id =
Some(request_context.request_id().to_string());
self
}
}
pub(crate) struct ParsedPuzzleImageDataUrl {

View File

@@ -62,6 +62,7 @@ pub(super) async fn generate_square_hole_visual_assets_for_session(
_ => Some(
generate_square_hole_image_data_url(
state,
request_context,
&owner_user_id,
&session_id,
profile_id.as_str(),
@@ -90,6 +91,7 @@ pub(super) async fn generate_square_hole_visual_assets_for_session(
_ => Some(
generate_square_hole_image_data_url(
state,
request_context,
&owner_user_id,
&session_id,
profile_id.as_str(),
@@ -118,6 +120,7 @@ pub(super) async fn generate_square_hole_visual_assets_for_session(
option.image_src = Some(
generate_square_hole_image_data_url(
state,
request_context,
&owner_user_id,
&session_id,
profile_id.as_str(),
@@ -145,6 +148,7 @@ pub(super) async fn generate_square_hole_visual_assets_for_session(
option.image_src = Some(
generate_square_hole_image_data_url(
state,
request_context,
&owner_user_id,
&session_id,
profile_id.as_str(),
@@ -252,6 +256,7 @@ pub(super) async fn regenerate_square_hole_visual_asset_for_work(
work.cover_image_src = Some(
generate_square_hole_image_data_url(
state,
request_context,
owner_user_id.as_str(),
synthetic_session_id.as_str(),
profile_id.as_str(),
@@ -271,6 +276,7 @@ pub(super) async fn regenerate_square_hole_visual_asset_for_work(
work.background_image_src = Some(
generate_square_hole_image_data_url(
state,
request_context,
owner_user_id.as_str(),
synthetic_session_id.as_str(),
profile_id.as_str(),
@@ -301,6 +307,7 @@ pub(super) async fn regenerate_square_hole_visual_asset_for_work(
option.image_src = Some(
generate_square_hole_image_data_url(
state,
request_context,
owner_user_id.as_str(),
synthetic_session_id.as_str(),
profile_id.as_str(),
@@ -331,6 +338,7 @@ pub(super) async fn regenerate_square_hole_visual_asset_for_work(
option.image_src = Some(
generate_square_hole_image_data_url(
state,
request_context,
owner_user_id.as_str(),
synthetic_session_id.as_str(),
profile_id.as_str(),
@@ -380,6 +388,7 @@ pub(super) async fn regenerate_square_hole_visual_asset_for_work(
async fn generate_square_hole_image_data_url(
state: &AppState,
request_context: &RequestContext,
owner_user_id: &str,
session_id: &str,
profile_id: &str,
@@ -389,10 +398,12 @@ async fn generate_square_hole_image_data_url(
size: &str,
failure_context: &str,
) -> Result<String, AppError> {
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let settings = require_openai_image_settings(state)?
.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);
let http_client = build_openai_image_http_client(&settings)?;
let generated = create_openai_image_generation(
&http_client,

View File

@@ -1042,7 +1042,9 @@ impl fmt::Display for AppStateInitError {
match self {
Self::Jwt(error) => write!(f, "{error}"),
Self::RefreshCookie(error) => write!(f, "{error}"),
Self::AuthStore(error) | Self::DependencyUnavailable(error) | Self::WechatPay(error) => {
Self::AuthStore(error)
| Self::DependencyUnavailable(error)
| Self::WechatPay(error) => {
write!(f, "{error}")
}
Self::SmsProvider(error) => write!(f, "{error}"),

View File

@@ -526,6 +526,7 @@ async fn maybe_generate_hit_object_asset(
let generated = generate_wooden_fish_image_assets(
state,
request_context,
owner_user_id,
session_id,
profile_id.as_str(),
@@ -659,6 +660,7 @@ struct WoodenFishGeneratedImageAssets {
async fn generate_wooden_fish_image_assets(
state: &AppState,
request_context: &RequestContext,
owner_user_id: &str,
session_id: &str,
profile_id: &str,
@@ -666,6 +668,7 @@ async fn generate_wooden_fish_image_assets(
hit_object_reference_image_src: Option<&str>,
) -> Result<WoodenFishGeneratedImageAssets, AppError> {
let settings = require_openai_image_settings(state)?.with_external_api_audit_context(
request_context,
Some(owner_user_id.to_string()),
Some(profile_id.to_string()),
);

View File

@@ -98,7 +98,10 @@ pub fn should_rebind_orphan_work_owner(
return false;
}
!matches!(auth_user_service.get_user_by_id(&owner_user_id), Ok(Some(_)))
!matches!(
auth_user_service.get_user_by_id(&owner_user_id),
Ok(Some(_))
)
}
#[cfg(test)]
@@ -137,6 +140,9 @@ mod tests {
assert!(should_rebind_orphan_work_owner(&service, ""));
assert!(should_rebind_orphan_work_owner(&service, "user_missing"));
assert!(!should_rebind_orphan_work_owner(&service, ORPHAN_WORK_OWNER_USER_ID));
assert!(!should_rebind_orphan_work_owner(
&service,
ORPHAN_WORK_OWNER_USER_ID
));
}
}