Resolve spacetime client binding merge conflicts

server-rs/crates/api-server/src/character_visual_assets.rs

@@ -32,7 +32,12 @@ use shared_contracts::assets::{
 use spacetime_client::SpacetimeClientError;
 
 use crate::{
-    api_response::json_success_body, http_error::AppError, request_context::RequestContext,
+    api_response::json_success_body,
+    custom_world_asset_prompts::{
+        build_character_visual_negative_prompt, build_character_visual_prompt,
+    },
+    http_error::AppError,
+    request_context::RequestContext,
     state::AppState,
 };
 use tokio::time::sleep;
@@ -671,58 +676,8 @@ fn build_character_visual_job_payload(task: AiTaskSnapshot) -> CharacterAssetJob
     }
 }
 
-fn build_character_visual_prompt(prompt_text: &str, character_brief_text: Option<&str>) -> String {
-    let merged = [character_brief_text.unwrap_or_default(), prompt_text]
-        .into_iter()
-        .map(str::trim)
-        .filter(|value| !value.is_empty())
-        .collect::<Vec<_>>()
-        .join("\n");
-
-    format!(
-        "{}\n单人全身，右向斜侧身，3 到 4 头身，像素动作角色，纯绿色背景，服装完整，轮廓清晰，不要复杂背景。",
-        if merged.is_empty() {
-            "自定义世界角色，服装完整，姿态自然。"
-        } else {
-            merged.as_str()
-        }
-    )
-}
-
-fn build_character_visual_negative_prompt() -> String {
-    [
-        "正面视角",
-        "左朝向",
-        "完全 90 度纯右视图",
-        "镜头透视",
-        "半身像",
-        "脚被裁切",
-        "头顶被裁切",
-        "多角色",
-        "复杂背景",
-        "建筑场景",
-        "漂浮物",
-        "烟雾环境",
-        "武器消失",
-        "武器换手",
-        "额外手臂",
-        "额外腿",
-        "服装变化",
-        "脸部变化",
-        "模糊",
-        "运动模糊",
-        "文字",
-        "水印",
-        "UI 元素",
-        "软萌 Q版大头贴",
-        "儿童绘本风",
-        "厚涂插画感",
-        "低对比柔边",
-    ]
-    .join("，")
-}
-
 fn require_dashscope_settings(state: &AppState) -> Result<DashScopeSettings, AppError> {
+    // Stage 2 的真实图片生成统一走 DashScope，这里先把配置缺失拦在业务入口前。
     let base_url = state.config.dashscope_base_url.trim().trim_end_matches('/');
     if base_url.is_empty() {
         return Err(
@@ -752,7 +707,6 @@ fn require_dashscope_settings(state: &AppState) -> Result<DashScopeSettings, App
         request_timeout_ms: state.config.dashscope_image_request_timeout_ms.max(1),
     })
 }
-
 fn build_dashscope_http_client(settings: &DashScopeSettings) -> Result<reqwest::Client, AppError> {
     reqwest::Client::builder()
         .timeout(Duration::from_millis(settings.request_timeout_ms))