GenarrativeAI/Genarrative
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(api-server): narrow puzzle state surface

Browse Source
This commit is contained in:
kdletters
2026-05-21 18:55:25 +08:00
parent cc23b6020d
commit 5834a99107
31 changed files with 1087 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
server-rs/crates/api-server/src/puzzle/draft.rs
View File

@@ -24,7 +24,7 @@ pub(crate) fn build_puzzle_form_seed_text_from_parts(
}
pub(crate) async fn save_puzzle_form_payload_before_compile(
state: &AppState,
state: &PuzzleApiState,
request_context: &RequestContext,
session_id: &str,
owner_user_id: &str,
@@ -76,7 +76,7 @@ pub(crate) async fn save_puzzle_form_payload_before_compile(
}
pub(crate) async fn create_seeded_puzzle_session_when_form_save_missing(
state: &AppState,
state: &PuzzleApiState,
request_context: &RequestContext,
session_id: &str,
owner_user_id: &str,
@@ -209,7 +209,7 @@ pub(crate) fn parse_puzzle_level_records_from_module_json(
}
pub(crate) async fn get_puzzle_session_for_image_generation(
state: &AppState,
state: &PuzzleApiState,
session_id: String,
owner_user_id: String,
payload: &ExecutePuzzleAgentActionRequest,
@@ -469,7 +469,7 @@ impl PuzzleLevelNaming {
}
pub(crate) async fn generate_puzzle_first_level_name(
state: &AppState,
state: &PuzzleApiState,
picture_description: &str,
) -> PuzzleLevelNaming {
if let Some(llm_client) = state.llm_client() {
@@ -511,7 +511,7 @@ pub(crate) async fn generate_puzzle_first_level_name(
}
pub(crate) async fn generate_puzzle_first_level_name_from_image(
state: &AppState,
state: &PuzzleApiState,
picture_description: &str,
image: &PuzzleDownloadedImage,
) -> Option<PuzzleLevelNaming> {
@@ -1033,42 +1033,8 @@ pub(crate) fn attach_puzzle_level_ui_background(
levels[index].ui_background_image_object_key = Some(generated.object_key);
}
pub(crate) async fn generate_puzzle_background_music_required(
state: &AppState,
owner_user_id: &str,
profile_id: &str,
title: &str,
) -> Result<CreationAudioAsset, AppError> {
let normalized_title = title.trim();
if normalized_title.is_empty() {
return Err(
AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({
"provider": PUZZLE_AGENT_API_BASE_PROVIDER,
"message": "拼图草稿背景音乐名称为空，无法完成背景音乐生成",
})),
);
}
generate_background_music_asset_for_creation(
state,
owner_user_id,
String::new(),
normalized_title.to_string(),
Some("轻快, 拼图, 循环, instrumental".to_string()),
None,
GeneratedCreationAudioTarget {
entity_kind: PUZZLE_ENTITY_KIND.to_string(),
entity_id: profile_id.to_string(),
slot: PUZZLE_BACKGROUND_MUSIC_SLOT.to_string(),
asset_kind: PUZZLE_BACKGROUND_MUSIC_ASSET_KIND.to_string(),
profile_id: Some(profile_id.to_string()),
storage_prefix: LegacyAssetPrefix::PuzzleAssets,
},
)
.await
}
pub(crate) async fn generate_puzzle_initial_ui_background_required(
state: &AppState,
state: &PuzzleApiState,
owner_user_id: &str,
session_id: &str,
draft: &PuzzleResultDraftRecord,
@@ -1128,7 +1094,7 @@ pub(crate) fn find_puzzle_level_for_initial_asset_check<'a>(
}
pub(crate) async fn compile_puzzle_draft_with_initial_cover(
state: &AppState,
state: &PuzzleApiState,
session_id: String,
owner_user_id: String,
prompt_text: Option<&str>,
@@ -1398,7 +1364,7 @@ pub(crate) async fn compile_puzzle_draft_with_initial_cover(
}
pub(crate) async fn compile_puzzle_draft_with_uploaded_cover(
state: &AppState,
state: &PuzzleApiState,
session_id: String,
owner_user_id: String,
prompt_text: Option<&str>,
@@ -1417,7 +1383,12 @@ pub(crate) async fn compile_puzzle_draft_with_uploaded_cover(
})?;
let http_client = reqwest::Client::new();
let uploaded_downloaded_image =
resolve_puzzle_reference_image_as_data_url(state, &http_client, uploaded_image_src)
resolve_puzzle_reference_image(
state,
&http_client,
uploaded_image_src,
Some(owner_user_id.as_str()),
)
.await
.map(PuzzleDownloadedImage::from_resolved_reference_image)
.map_err(|error| {
@@ -1425,7 +1396,7 @@ pub(crate) async fn compile_puzzle_draft_with_uploaded_cover(
AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
"provider": PUZZLE_AGENT_API_BASE_PROVIDER,
"field": "referenceImageSrc",
"message": "关闭 AI 重绘时上传图必须是图片 Data URL 或历史生成图片路径。",
"message": "关闭 AI 重绘时上传图必须是拼图图片 assetObjectId、图片 Data URL 或历史生成图片路径。",
}))
} else {
error

15
server-rs/crates/api-server/src/puzzle/generation.rs
View File

@@ -18,7 +18,7 @@ pub(crate) fn should_fallback_puzzle_reference_edit_to_generation(error: &AppErr
}
pub(crate) async fn generate_puzzle_image_candidates(
state: &AppState,
state: &PuzzleApiState,
owner_user_id: &str,
session_id: &str,
level_name: &str,
@@ -58,8 +58,13 @@ pub(crate) async fn generate_puzzle_image_candidates(
.filter(|_| should_use_reference_image_edit)
{
Some(source) => {
let resolved =
resolve_puzzle_reference_image_as_data_url(state, &http_client, source).await?;
let resolved = resolve_puzzle_reference_image(
state,
&http_client,
source,
Some(owner_user_id),
)
.await?;
tracing::info!(
provider = resolved_model.provider_name(),
image_model = resolved_model.request_model_name(),
@@ -219,13 +224,13 @@ pub(crate) async fn generate_puzzle_image_candidates(
}
pub(crate) async fn generate_puzzle_ui_background_image(
state: &AppState,
state: &PuzzleApiState,
owner_user_id: &str,
session_id: &str,
level_name: &str,
prompt: &str,
) -> Result<GeneratedPuzzleUiBackgroundResponse, AppError> {
let settings = require_openai_image_settings(state)?;
let settings = require_openai_image_settings(state.root_state())?;
let http_client = build_openai_image_http_client(&settings)?;
let generated = create_openai_image_generation(
&http_client,

72
server-rs/crates/api-server/src/puzzle/handlers.rs
View File

@@ -1,7 +1,7 @@
use super::*;
pub async fn create_puzzle_agent_session(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
payload: Result<Json<CreatePuzzleAgentSessionRequest>, JsonRejection>,
@@ -46,7 +46,7 @@ pub async fn create_puzzle_agent_session(
}
pub async fn generate_puzzle_onboarding_work(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
Extension(request_context): Extension<RequestContext>,
payload: Result<Json<PuzzleOnboardingGenerateRequest>, JsonRejection>,
) -> Result<Json<Value>, Response> {
@@ -161,7 +161,7 @@ pub async fn generate_puzzle_onboarding_work(
}
pub async fn save_puzzle_onboarding_work(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
payload: Result<Json<PuzzleOnboardingSaveRequest>, JsonRejection>,
@@ -270,7 +270,7 @@ pub async fn save_puzzle_onboarding_work(
}
pub async fn get_puzzle_agent_session(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(session_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -303,7 +303,7 @@ pub async fn get_puzzle_agent_session(
}
pub async fn submit_puzzle_agent_message(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(session_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -359,7 +359,7 @@ pub async fn submit_puzzle_agent_message(
llm_client: state.llm_client(),
session: &submitted_session,
quick_fill_requested: payload.quick_fill_requested.unwrap_or(false),
enable_web_search: state.config.creation_agent_llm_web_search_enabled,
enable_web_search: state.creation_agent_llm_web_search_enabled(),
},
|_| {},
)
@@ -401,7 +401,7 @@ pub async fn submit_puzzle_agent_message(
}
pub async fn stream_puzzle_agent_message(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(session_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -464,7 +464,7 @@ pub async fn stream_puzzle_agent_message(
llm_client: state.llm_client(),
session: &session,
quick_fill_requested,
enable_web_search: state.config.creation_agent_llm_web_search_enabled,
enable_web_search: state.creation_agent_llm_web_search_enabled(),
},
move |text| {
let _ = reply_tx.send(text.to_string());
@@ -554,7 +554,7 @@ pub async fn stream_puzzle_agent_message(
}
pub async fn execute_puzzle_agent_action(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(session_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -595,6 +595,8 @@ pub async fn execute_puzzle_agent_action(
has_reference_image = has_puzzle_reference_images(
payload.reference_image_src.as_deref(),
payload.reference_image_srcs.as_slice(),
payload.reference_image_asset_object_id.as_deref(),
payload.reference_image_asset_object_ids.as_slice(),
),
"拼图 Agent action 开始执行"
);
@@ -604,6 +606,8 @@ pub async fn execute_puzzle_agent_action(
let reference_image_sources = collect_puzzle_reference_image_sources(
payload.reference_image_src.as_deref(),
payload.reference_image_srcs.as_slice(),
payload.reference_image_asset_object_id.as_deref(),
payload.reference_image_asset_object_ids.as_slice(),
);
let primary_reference_image_src = reference_image_sources.first().map(String::as_str);
let prompt_text = payload
@@ -627,7 +631,7 @@ pub async fn execute_puzzle_agent_action(
};
let session = if ai_redraw {
execute_billable_asset_operation_with_cost(
&state,
state.root_state(),
&owner_user_id,
"puzzle_initial_image",
&billing_asset_id,
@@ -652,7 +656,7 @@ pub async fn execute_puzzle_agent_action(
compile_session_id.clone(),
owner_user_id.clone(),
prompt_text,
payload.reference_image_src.as_deref(),
primary_reference_image_src,
now,
)
.await
@@ -737,7 +741,7 @@ pub async fn execute_puzzle_agent_action(
}))
});
let session = execute_billable_asset_operation_with_cost(
&state,
state.root_state(),
&owner_user_id,
"puzzle_generated_image",
&billing_asset_id,
@@ -787,6 +791,8 @@ pub async fn execute_puzzle_agent_action(
let reference_image_sources = collect_puzzle_reference_image_sources(
payload.reference_image_src.as_deref(),
payload.reference_image_srcs.as_slice(),
payload.reference_image_asset_object_id.as_deref(),
payload.reference_image_asset_object_ids.as_slice(),
);
let primary_reference_image_src =
reference_image_sources.first().map(String::as_str);
@@ -942,7 +948,7 @@ pub async fn execute_puzzle_agent_action(
}))
});
let session = execute_billable_asset_operation_with_cost(
&state,
state.root_state(),
&owner_user_id,
"puzzle_ui_background_image",
&billing_asset_id,
@@ -1147,7 +1153,7 @@ pub async fn execute_puzzle_agent_action(
let (work_id, profile_id) = build_stable_puzzle_work_ids(&session_id);
let author_display_name = resolve_author_display_name(&state, &authenticated);
let profile = execute_billable_asset_operation(
&state,
state.root_state(),
&owner_user_id,
"puzzle_publish_work",
&work_id,
@@ -1235,7 +1241,7 @@ pub async fn execute_puzzle_agent_action(
}
pub async fn get_puzzle_works(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
) -> Result<Json<Value>, Response> {
@@ -1263,7 +1269,7 @@ pub async fn get_puzzle_works(
}
pub async fn get_puzzle_work_detail(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(profile_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(_authenticated): Extension<AuthenticatedAccessToken>,
@@ -1296,7 +1302,7 @@ pub async fn get_puzzle_work_detail(
}
pub async fn put_puzzle_work(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(profile_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1355,7 +1361,7 @@ pub async fn put_puzzle_work(
}
pub async fn delete_puzzle_work(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(profile_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1391,7 +1397,7 @@ pub async fn delete_puzzle_work(
}
pub async fn claim_puzzle_work_point_incentive(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(profile_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1428,7 +1434,7 @@ pub async fn claim_puzzle_work_point_incentive(
}
pub async fn list_puzzle_gallery(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
Extension(request_context): Extension<RequestContext>,
) -> Result<Response, Response> {
if let Some(response) = state.puzzle_gallery_cache().read_fresh_response().await {
@@ -1487,7 +1493,7 @@ pub async fn list_puzzle_gallery(
}
pub async fn get_puzzle_gallery_detail(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(profile_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
) -> Result<Json<Value>, Response> {
@@ -1519,7 +1525,7 @@ pub async fn get_puzzle_gallery_detail(
}
pub async fn record_puzzle_gallery_like(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(profile_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1556,7 +1562,7 @@ pub async fn record_puzzle_gallery_like(
}
pub async fn remix_puzzle_gallery_work(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(profile_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1599,7 +1605,7 @@ pub async fn remix_puzzle_gallery_work(
}
pub async fn start_puzzle_run(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
payload: Result<Json<StartPuzzleRunRequest>, JsonRejection>,
@@ -1639,7 +1645,7 @@ pub async fn start_puzzle_run(
)
})?;
record_work_play_start_after_success(
record_puzzle_work_play_start_after_success(
&state,
&request_context,
WorkPlayTrackingDraft::new(
@@ -1665,7 +1671,7 @@ pub async fn start_puzzle_run(
}
pub async fn get_puzzle_run(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(run_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1693,7 +1699,7 @@ pub async fn get_puzzle_run(
}
pub async fn swap_puzzle_pieces(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(run_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1750,7 +1756,7 @@ pub async fn swap_puzzle_pieces(
}
pub async fn drag_puzzle_piece_or_group(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(run_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1802,7 +1808,7 @@ pub async fn drag_puzzle_piece_or_group(
}
pub async fn advance_puzzle_next_level(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(run_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1854,7 +1860,7 @@ pub async fn advance_puzzle_next_level(
}
pub async fn update_puzzle_run_pause(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(run_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1898,7 +1904,7 @@ pub async fn update_puzzle_run_pause(
}
pub async fn use_puzzle_runtime_prop(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(run_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,
@@ -1944,7 +1950,7 @@ pub async fn use_puzzle_runtime_prop(
let fallback_run_id = run_id.clone();
let fallback_owner_user_id = owner_user_id.clone();
let run_result = execute_billable_asset_operation(
&state,
state.root_state(),
&owner_user_id,
billing_asset_kind,
billing_asset_id.as_str(),
@@ -1996,7 +2002,7 @@ pub async fn use_puzzle_runtime_prop(
}
pub async fn submit_puzzle_leaderboard(
State(state): State<AppState>,
State(state): State<PuzzleApiState>,
AxumPath(run_id): AxumPath<String>,
Extension(request_context): Extension<RequestContext>,
Extension(authenticated): Extension<AuthenticatedAccessToken>,

16
server-rs/crates/api-server/src/puzzle/mappers.rs
View File

@@ -343,11 +343,11 @@ fn has_puzzle_level_image(level: &PuzzleDraftLevelRecord) -> bool {
}
pub(super) fn map_puzzle_work_summary_response(
state: &AppState,
state: &PuzzleApiState,
item: PuzzleWorkProfileRecord,
) -> PuzzleWorkSummaryResponse {
let generation_status = resolve_puzzle_work_generation_status(&item);
let author = resolve_work_author_by_user_id(
let author = resolve_puzzle_work_author_by_user_id(
state,
&item.owner_user_id,
Some(&item.author_display_name),
@@ -391,10 +391,10 @@ pub(super) fn map_puzzle_work_summary_response(
}
pub(super) fn map_puzzle_gallery_card_response(
state: &AppState,
state: &PuzzleApiState,
item: PuzzleGalleryCardRecord,
) -> PuzzleWorkSummaryResponse {
let author = resolve_work_author_by_user_id(
let author = resolve_puzzle_work_author_by_user_id(
state,
&item.owner_user_id,
Some(&item.author_display_name),
@@ -434,7 +434,7 @@ pub(super) fn map_puzzle_gallery_card_response(
}
pub(super) fn map_puzzle_work_profile_response(
state: &AppState,
state: &PuzzleApiState,
item: PuzzleWorkProfileRecord,
) -> PuzzleWorkProfileResponse {
let mut summary = map_puzzle_work_summary_response(state, item.clone());
@@ -491,7 +491,7 @@ pub(super) fn map_puzzle_recommended_next_work_response(
}
pub(super) async fn enrich_puzzle_run_author_name(
state: &AppState,
state: &PuzzleApiState,
mut run: PuzzleRunRecord,
) -> PuzzleRunRecord {
if let Some(level) = run.current_level.as_mut() {
@@ -500,7 +500,7 @@ pub(super) async fn enrich_puzzle_run_author_name(
.get_puzzle_gallery_detail(level.profile_id.clone())
.await
{
level.author_display_name = resolve_work_author_by_user_id(
level.author_display_name = resolve_puzzle_work_author_by_user_id(
state,
&profile.owner_user_id,
Some(&profile.author_display_name),
@@ -632,7 +632,7 @@ pub(super) fn map_puzzle_board_response(
}
pub(super) fn resolve_author_display_name(
state: &AppState,
state: &PuzzleApiState,
authenticated: &AuthenticatedAccessToken,
) -> String {
state

4
server-rs/crates/api-server/src/puzzle/tags.rs
View File

@@ -1,7 +1,7 @@
use super::*;
pub(super) async fn generate_puzzle_work_tags(
state: &AppState,
state: &PuzzleApiState,
work_title: &str,
work_description: &str,
) -> Vec<String> {
@@ -143,7 +143,7 @@ pub(super) fn build_fallback_puzzle_tags(
}
pub(super) async fn save_generated_puzzle_tags_to_session(
state: &AppState,
state: &PuzzleApiState,
session_id: &str,
owner_user_id: &str,
payload: &ExecutePuzzleAgentActionRequest,

95
server-rs/crates/api-server/src/puzzle/tests.rs
View File

@@ -41,6 +41,7 @@ fn puzzle_vector_engine_generation_fallback_includes_reference_image() {
mime_type: "image/png".to_string(),
bytes_len: cursor.get_ref().len(),
bytes: cursor.into_inner(),
signed_read_url: None,
};
let body = build_puzzle_vector_engine_image_request_body(
@@ -64,6 +65,33 @@ fn puzzle_vector_engine_generation_fallback_includes_reference_image() {
);
}
#[test]
fn puzzle_vector_engine_generation_prefers_signed_reference_url() {
let reference_image = PuzzleResolvedReferenceImage {
mime_type: "image/png".to_string(),
bytes_len: 4,
bytes: b"test".to_vec(),
signed_read_url: Some(
"https://oss.example/generated-puzzle-assets/reference.png?x-oss-signature=abc"
.to_string(),
),
};
let body = build_puzzle_vector_engine_image_request_body(
PuzzleImageModel::GptImage2,
"参考图里的小猫做成拼图主图。",
PUZZLE_DEFAULT_NEGATIVE_PROMPT,
PUZZLE_VECTOR_ENGINE_GENERATED_IMAGE_SIZE,
1,
Some(&reference_image),
);
assert_eq!(
body["image"][0],
"https://oss.example/generated-puzzle-assets/reference.png?x-oss-signature=abc"
);
}
#[test]
fn puzzle_vector_engine_edit_url_uses_images_edits_endpoint() {
let settings = PuzzleVectorEngineSettings {
@@ -131,6 +159,8 @@ fn puzzle_reference_image_sources_are_deduped_and_limited() {
"data:image/png;base64,e".to_string(),
"data:image/png;base64,f".to_string(),
],
None,
&[],
);
assert_eq!(sources.len(), 5);
@@ -139,6 +169,62 @@ fn puzzle_reference_image_sources_are_deduped_and_limited() {
assert!(!sources.contains(&"data:image/png;base64,f".to_string()));
}
#[test]
fn puzzle_reference_image_sources_prefer_asset_object_ids() {
let sources = collect_puzzle_reference_image_sources(
Some("data:image/png;base64,legacy"),
&["/generated-puzzle-assets/legacy.png".to_string()],
Some("asset-main-1"),
&[
"asset-main-1".to_string(),
"asset-prompt-1".to_string(),
"asset-prompt-2".to_string(),
],
);
assert_eq!(
sources,
vec![
"asset-object:asset-main-1".to_string(),
"asset-object:asset-prompt-1".to_string(),
"asset-object:asset-prompt-2".to_string(),
"data:image/png;base64,legacy".to_string(),
"/generated-puzzle-assets/legacy.png".to_string(),
]
);
}
#[test]
fn puzzle_asset_object_reference_requires_matching_owner() {
let asset_object = module_assets::AssetObjectRecord {
asset_object_id: "assetobj_reference_1".to_string(),
bucket: "genarrative-assets".to_string(),
object_key: "generated-puzzle-assets/reference/image.png".to_string(),
access_policy: module_assets::AssetObjectAccessPolicy::Private,
content_type: Some("image/png".to_string()),
content_length: 1024,
content_hash: None,
version: 1,
source_job_id: None,
owner_user_id: Some("user-other".to_string()),
profile_id: None,
entity_id: None,
asset_kind: "puzzle_cover_image".to_string(),
created_at: "2026-05-21T00:00:00Z".to_string(),
updated_at: "2026-05-21T00:00:00Z".to_string(),
};
let error = validate_puzzle_reference_asset_object(
&asset_object,
Some("user-current"),
"genarrative-assets",
)
.expect_err("其他账号的参考图资产应被拒绝");
assert_eq!(error.status_code(), StatusCode::FORBIDDEN);
assert!(error.body_text().contains("不属于当前账号"));
}
#[test]
fn puzzle_vector_engine_timeout_maps_to_gateway_timeout() {
let error = map_puzzle_vector_engine_request_error(
@@ -250,6 +336,8 @@ fn puzzle_image_generation_builds_fallback_session_from_levels_snapshot() {
prompt_text: None,
reference_image_src: None,
reference_image_srcs: Vec::new(),
reference_image_asset_object_id: None,
reference_image_asset_object_ids: Vec::new(),
image_model: Some(PUZZLE_IMAGE_MODEL_GPT_IMAGE_2.to_string()),
ai_redraw: None,
candidate_count: Some(1),
@@ -383,6 +471,7 @@ fn puzzle_uploaded_cover_can_reuse_resolved_history_image() {
mime_type: "image/png".to_string(),
bytes_len: 8,
bytes: b"pngbytes".to_vec(),
signed_read_url: None,
};
let downloaded = PuzzleDownloadedImage::from_resolved_reference_image(resolved);
@@ -410,6 +499,8 @@ fn puzzle_first_level_name_snapshot_defaults_work_title() {
prompt_text: None,
reference_image_src: None,
reference_image_srcs: Vec::new(),
reference_image_asset_object_id: None,
reference_image_asset_object_ids: Vec::new(),
image_model: Some(PUZZLE_IMAGE_MODEL_GPT_IMAGE_2.to_string()),
ai_redraw: None,
candidate_count: Some(1),
@@ -614,7 +705,9 @@ fn puzzle_ui_background_fields_roundtrip_between_response_and_module_json() {
#[test]
fn puzzle_work_summary_response_keeps_levels_for_shelf_cover() {
let state = AppState::new(crate::config::AppConfig::default()).expect("state should build");
let app_state = crate::state::AppState::new(crate::config::AppConfig::default())
.expect("state should build");
let state: PuzzleApiState = axum::extract::FromRef::from_ref(&app_state);
let level = PuzzleDraftLevelRecord {
level_id: "puzzle-level-1".to_string(),
level_name: "雨夜猫街".to_string(),

275
server-rs/crates/api-server/src/puzzle/vector_engine.rs
View File

@@ -37,6 +37,7 @@ pub(crate) struct PuzzleResolvedReferenceImage {
pub(crate) mime_type: String,
pub(crate) bytes_len: usize,
pub(crate) bytes: Vec<u8>,
pub(crate) signed_read_url: Option<String>,
}
pub(crate) struct GeneratedPuzzleImageCandidate {
@@ -109,13 +110,9 @@ pub(crate) fn resolve_puzzle_image_model(value: Option<&str>) -> PuzzleImageMode
}
pub(crate) fn require_puzzle_vector_engine_settings(
state: &AppState,
state: &PuzzleApiState,
) -> Result<PuzzleVectorEngineSettings, AppError> {
let base_url = state
.config
.vector_engine_base_url
.trim()
.trim_end_matches('/');
let base_url = state.vector_engine_base_url().trim().trim_end_matches('/');
if base_url.is_empty() {
return Err(
AppError::from_status(StatusCode::SERVICE_UNAVAILABLE).with_details(json!({
@@ -127,9 +124,7 @@ pub(crate) fn require_puzzle_vector_engine_settings(
}
let api_key = state
.config
.vector_engine_api_key
.as_deref()
.vector_engine_api_key()
.map(str::trim)
.filter(|value| !value.is_empty())
.ok_or_else(|| {
@@ -147,11 +142,11 @@ pub(crate) fn require_puzzle_vector_engine_settings(
}
pub(crate) fn build_puzzle_image_http_client(
state: &AppState,
state: &PuzzleApiState,
image_model: PuzzleImageModel,
) -> Result<reqwest::Client, AppError> {
let provider = image_model.provider_name();
let request_timeout_ms = state.config.vector_engine_image_request_timeout_ms;
let request_timeout_ms = state.vector_engine_image_request_timeout_ms();
reqwest::Client::builder()
.timeout(Duration::from_millis(request_timeout_ms.max(1)))
@@ -397,11 +392,19 @@ pub(crate) fn build_puzzle_vector_engine_image_request_body(
("n".to_string(), json!(candidate_count.clamp(1, 1))),
("size".to_string(), Value::String(size.to_string())),
]);
if let Some(reference_image) = reference_image
&& let Some(reference_data_url) =
if let Some(reference_image) = reference_image {
if let Some(signed_read_url) = reference_image
.signed_read_url
.as_deref()
.map(str::trim)
.filter(|value| !value.is_empty())
{
body.insert("image".to_string(), json!([signed_read_url]));
} else if let Some(reference_data_url) =
build_puzzle_generation_reference_image_data_url(reference_image)
{
body.insert("image".to_string(), json!([reference_data_url]));
{
body.insert("image".to_string(), json!([reference_data_url]));
}
}
Value::Object(body)
@@ -462,6 +465,48 @@ pub(crate) fn has_puzzle_reference_image(reference_image_src: Option<&str>) -> b
pub(crate) fn collect_puzzle_reference_image_sources(
legacy_reference_image_src: Option<&str>,
reference_image_srcs: &[String],
reference_image_asset_object_id: Option<&str>,
reference_image_asset_object_ids: &[String],
) -> Vec<String> {
let mut sources = Vec::new();
for source in reference_image_asset_object_id
.into_iter()
.chain(reference_image_asset_object_ids.iter().map(String::as_str))
.map(|asset_object_id| {
asset_object_id
.trim()
.strip_prefix("asset-object:")
.unwrap_or_else(|| asset_object_id.trim())
})
.filter(|asset_object_id| !asset_object_id.is_empty())
.map(|asset_object_id| format!("asset-object:{asset_object_id}"))
.chain(
legacy_reference_image_src
.into_iter()
.chain(reference_image_srcs.iter().map(String::as_str))
.map(str::to_string),
)
{
let normalized = source.trim();
if normalized.is_empty() {
continue;
}
if !sources
.iter()
.any(|existing: &String| existing == normalized)
{
sources.push(normalized.to_string());
}
if sources.len() >= PUZZLE_REFERENCE_IMAGE_SOURCE_LIMIT {
break;
}
}
sources
}
pub(crate) fn collect_legacy_puzzle_reference_image_sources(
legacy_reference_image_src: Option<&str>,
reference_image_srcs: &[String],
) -> Vec<String> {
let mut sources = Vec::new();
for source in legacy_reference_image_src
@@ -488,9 +533,16 @@ pub(crate) fn collect_puzzle_reference_image_sources(
pub(crate) fn has_puzzle_reference_images(
legacy_reference_image_src: Option<&str>,
reference_image_srcs: &[String],
reference_image_asset_object_id: Option<&str>,
reference_image_asset_object_ids: &[String],
) -> bool {
!collect_puzzle_reference_image_sources(legacy_reference_image_src, reference_image_srcs)
.is_empty()
!collect_puzzle_reference_image_sources(
legacy_reference_image_src,
reference_image_srcs,
reference_image_asset_object_id,
reference_image_asset_object_ids,
)
.is_empty()
}
pub(crate) fn should_use_puzzle_reference_image_edit(
@@ -546,10 +598,19 @@ pub(crate) async fn download_puzzle_images_from_urls(
Ok(PuzzleGeneratedImages { task_id, images })
}
pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
state: &AppState,
pub(crate) fn parse_puzzle_asset_object_reference(source: &str) -> Option<&str> {
source
.trim()
.strip_prefix("asset-object:")
.map(str::trim)
.filter(|value| !value.is_empty())
}
pub(crate) async fn resolve_puzzle_reference_image(
state: &PuzzleApiState,
http_client: &reqwest::Client,
source: &str,
owner_user_id: Option<&str>,
) -> Result<PuzzleResolvedReferenceImage, AppError> {
let trimmed = source.trim();
if trimmed.is_empty() {
@@ -562,6 +623,16 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
);
}
if let Some(asset_object_id) = parse_puzzle_asset_object_reference(trimmed) {
return resolve_puzzle_reference_asset_object(
state,
http_client,
asset_object_id,
owner_user_id,
)
.await;
}
if let Some(parsed) = parse_puzzle_image_data_url(trimmed) {
let bytes_len = parsed.bytes.len();
if bytes_len > PUZZLE_REFERENCE_IMAGE_MAX_BYTES {
@@ -579,6 +650,7 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
mime_type: parsed.mime_type,
bytes_len,
bytes: parsed.bytes,
signed_read_url: None,
});
}
@@ -587,7 +659,7 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
"provider": "puzzle",
"field": "referenceImageSrc",
"message": "参考图必须是 Data URL 或 /generated-* 旧路径。",
"message": "参考图必须是 assetObjectId、Data URL 或 /generated-* 旧路径。",
})),
);
}
@@ -598,7 +670,7 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
"provider": "puzzle",
"field": "referenceImageSrc",
"message": "参考图当前只支持 /generated-* 旧路径。",
"message": "参考图当前只支持 assetObjectId 或 /generated-* 旧路径。",
})),
);
}
@@ -615,8 +687,159 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
expire_seconds: Some(60),
})
.map_err(map_puzzle_asset_oss_error)?;
let signed_read_url = signed.signed_url;
download_signed_puzzle_reference_image(
http_client,
signed_read_url,
object_key,
None,
"referenceImageSrc",
)
.await
}
pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
state: &PuzzleApiState,
http_client: &reqwest::Client,
source: &str,
) -> Result<PuzzleResolvedReferenceImage, AppError> {
resolve_puzzle_reference_image(state, http_client, source, None).await
}
async fn resolve_puzzle_reference_asset_object(
state: &PuzzleApiState,
http_client: &reqwest::Client,
asset_object_id: &str,
owner_user_id: Option<&str>,
) -> Result<PuzzleResolvedReferenceImage, AppError> {
let asset_object = state
.spacetime_client()
.get_asset_object(asset_object_id.to_string())
.await
.map_err(map_puzzle_client_error)?
.ok_or_else(|| {
AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
"provider": "asset-object",
"field": "referenceImageAssetObjectId",
"assetObjectId": asset_object_id,
"message": "参考图资产不存在或当前账号不可见。",
}))
})?;
let oss_client = state.oss_client().ok_or_else(|| {
AppError::from_status(StatusCode::SERVICE_UNAVAILABLE).with_details(json!({
"provider": "aliyun-oss",
"reason": "OSS 未完成环境变量配置",
}))
})?;
validate_puzzle_reference_asset_object(
&asset_object,
owner_user_id,
oss_client.config_bucket(),
)?;
let signed = oss_client
.sign_get_object_url(OssSignedGetObjectUrlRequest {
object_key: asset_object.object_key.clone(),
expire_seconds: Some(60),
})
.map_err(map_puzzle_asset_oss_error)?;
let content_type = asset_object.content_type.clone();
download_signed_puzzle_reference_image(
http_client,
signed.signed_url,
asset_object.object_key.as_str(),
content_type.as_deref(),
"referenceImageAssetObjectId",
)
.await
}
pub(crate) fn validate_puzzle_reference_asset_object(
asset_object: &module_assets::AssetObjectRecord,
owner_user_id: Option<&str>,
oss_bucket: &str,
) -> Result<(), AppError> {
if asset_object.bucket.trim() != oss_bucket.trim() {
return Err(
AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
"provider": "asset-object",
"field": "referenceImageAssetObjectId",
"assetObjectId": asset_object.asset_object_id,
"message": "参考图资产 bucket 与当前服务 OSS 配置不一致。",
})),
);
}
if asset_object.asset_kind.trim() != "puzzle_cover_image" {
return Err(
AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
"provider": "asset-object",
"field": "referenceImageAssetObjectId",
"assetObjectId": asset_object.asset_object_id,
"message": "参考图资产类型不属于拼图图片。",
})),
);
}
let content_type = asset_object
.content_type
.as_deref()
.map(str::trim)
.unwrap_or_default();
if !content_type.starts_with("image/") {
return Err(
AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
"provider": "asset-object",
"field": "referenceImageAssetObjectId",
"assetObjectId": asset_object.asset_object_id,
"message": "参考图资产不是图片类型。",
})),
);
}
if asset_object.content_length == 0
|| asset_object.content_length > PUZZLE_REFERENCE_IMAGE_MAX_BYTES as u64
{
return Err(
AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
"provider": "asset-object",
"field": "referenceImageAssetObjectId",
"assetObjectId": asset_object.asset_object_id,
"message": "参考图资产大小不符合拼图生成要求。",
"maxBytes": PUZZLE_REFERENCE_IMAGE_MAX_BYTES,
"actualBytes": asset_object.content_length,
})),
);
}
if let Some(expected_owner_user_id) = owner_user_id
.map(str::trim)
.filter(|value| !value.is_empty())
{
let actual_owner_user_id = asset_object
.owner_user_id
.as_deref()
.map(str::trim)
.filter(|value| !value.is_empty());
if actual_owner_user_id != Some(expected_owner_user_id) {
return Err(
AppError::from_status(StatusCode::FORBIDDEN).with_details(json!({
"provider": "asset-object",
"field": "referenceImageAssetObjectId",
"assetObjectId": asset_object.asset_object_id,
"message": "参考图资产不属于当前账号。",
})),
);
}
}
Ok(())
}
async fn download_signed_puzzle_reference_image(
http_client: &reqwest::Client,
signed_read_url: String,
object_key: &str,
fallback_content_type: Option<&str>,
field: &str,
) -> Result<PuzzleResolvedReferenceImage, AppError> {
let response = http_client
.get(signed.signed_url)
.get(signed_read_url.as_str())
.send()
.await
.map_err(|error| map_puzzle_image_request_error(format!("读取拼图参考图失败：{error}")))?;
@@ -625,6 +848,7 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
.headers()
.get(reqwest::header::CONTENT_TYPE)
.and_then(|value| value.to_str().ok())
.or(fallback_content_type)
.unwrap_or("image/png")
.to_string();
let body = response.bytes().await.map_err(|error| {
@@ -636,6 +860,7 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
"provider": "aliyun-oss",
"message": format!("读取参考图失败，状态码：{status}"),
"objectKey": object_key,
"field": field,
})),
);
}
@@ -645,6 +870,7 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
"provider": "aliyun-oss",
"message": "读取参考图失败：对象内容为空",
"objectKey": object_key,
"field": field,
})),
);
}
@@ -655,6 +881,7 @@ pub(crate) async fn resolve_puzzle_reference_image_as_data_url(
mime_type,
bytes_len,
bytes: body.to_vec(),
signed_read_url: Some(signed_read_url),
})
}
@@ -693,7 +920,7 @@ pub(crate) async fn download_puzzle_remote_image(
}
pub(crate) async fn persist_puzzle_generated_asset(
state: &AppState,
state: &PuzzleApiState,
owner_user_id: &str,
session_id: &str,
level_name: &str,
@@ -805,7 +1032,7 @@ pub(crate) async fn persist_puzzle_generated_asset(
}
pub(crate) async fn persist_puzzle_ui_background_image(
state: &AppState,
state: &PuzzleApiState,
owner_user_id: &str,
session_id: &str,
level_name: &str,