Update app.py

app.py

@@ -153,6 +153,7 @@ def generate_image(prompt, negative_prompt, steps, scale):
             torch.cuda.empty_cache()
         return None, f"错误：图像生成失败 - {e}"
 
+# --- Gradio 应用主逻辑 ---
 # --- Gradio 应用主逻辑 ---
 def process_input_and_generate(short_prompt_text, short_prompt_audio, negative_prompt, steps, scale):
     """
@@ -163,6 +164,8 @@ def process_input_and_generate(short_prompt_text, short_prompt_audio, negative_p
 
     final_short_prompt = ""
     status_updates = []
+    image_result = None # Initialize image result
+    detailed_prompt_result = None # Initialize detailed prompt result
 
     # 1. 确定输入源 (优先使用语音)
     if short_prompt_audio is not None:
@@ -170,7 +173,9 @@ def process_input_and_generate(short_prompt_text, short_prompt_audio, negative_p
         transcribed_text, status = transcribe_audio(short_prompt_audio)
         status_updates.append(status)
         if "错误" in transcribed_text:
-            yield None, None, None, f"状态：处理失败\n{status}"
+            # FIX: Separate f-string and newline concatenation
+            status_message = f"状态：处理失败\n{status}"
+            yield None, None, None, status_message
             return
         final_short_prompt = transcribed_text
         yield f"语音识别结果: {final_short_prompt}", None, None, "状态：语音识别完成"
@@ -186,26 +191,49 @@ def process_input_and_generate(short_prompt_text, short_prompt_audio, negative_p
          yield "错误：无法获取有效的简短描述。", None, None, "状态：错误 - 无有效输入"
          return
 
+    # --- Update the display of the short prompt used ---
+    # We yield the final_short_prompt along with other updates from now on
+    detailed_prompt_result = "正在生成详细提示词..."
+    yield final_short_prompt, detailed_prompt_result, image_result, f"状态：正在调用 LLM 生成详细提示词...\n{status_updates[-1] if status_updates else ''}" # Show last status
+
     # 2. 生成详细 Prompt
-    yield final_short_prompt, "正在生成详细提示词...", None, f"状态：正在调用 LLM 生成详细提示词...\n{'\n'.join(status_updates)}"
     detailed_prompt, status = generate_detailed_prompt(final_short_prompt)
     status_updates.append(status)
+    detailed_prompt_result = detailed_prompt # Update the result holder
     if "错误" in detailed_prompt:
-        yield final_short_prompt, detailed_prompt, None, f"状态：处理失败\n{'\n'.join(status_updates)}"
+        # FIX: Separate f-string and newline concatenation
+        joined_updates = "\n".join(status_updates)
+        status_message = f"状态：处理失败\n{joined_updates}"
+        yield final_short_prompt, detailed_prompt_result, image_result, status_message
         return
-    yield final_short_prompt, detailed_prompt, None, f"状态：详细提示词生成成功，准备生成图像...\n{'\n'.join(status_updates)}"
+    # FIX: Separate f-string and newline concatenation
+    joined_updates = "\n".join(status_updates)
+    status_message = f"状态：详细提示词生成成功，准备生成图像...\n{joined_updates}"
+    yield final_short_prompt, detailed_prompt_result, image_result, status_message # Keep image empty for now
 
     # 3. 生成图像
-    yield final_short_prompt, detailed_prompt, "正在生成图像...", f"状态：正在调用 Stable Diffusion...\n{'\n'.join(status_updates)}"
-    image, status = generate_image(detailed_prompt, negative_prompt, steps, scale)
+    image_result = "正在生成图像..." # Placeholder text while generating
+    # FIX: Separate f-string and newline concatenation
+    joined_updates = "\n".join(status_updates)
+    status_message = f"状态：正在调用 Stable Diffusion...\n{joined_updates}"
+    yield final_short_prompt, detailed_prompt_result, image_result, status_message
+
+    image, status = generate_image(detailed_prompt_result, negative_prompt, steps, scale)
     status_updates.append(status)
-    if image is None:
-        yield final_short_prompt, detailed_prompt, None, f"状态：处理失败\n{'\n'.join(status_updates)}"
+    image_result = image # Update with actual image or None
+    if image_result is None:
+        # FIX: Separate f-string and newline concatenation
+        joined_updates = "\n".join(status_updates)
+        status_message = f"状态：处理失败\n{joined_updates}"
+        # Yield the error message in the image spot temporarily? Or keep it None. Let's keep it None.
+        yield final_short_prompt, detailed_prompt_result, None, status_message
         return
 
     # 4. 显示最终结果
-    yield final_short_prompt, detailed_prompt, image, f"状态：完成!\n{'\n'.join(status_updates)}"
-
+    # FIX: Separate f-string and newline concatenation
+    joined_updates = "\n".join(status_updates)
+    status_message = f"状态：完成!\n{joined_updates}"
+    yield final_short_prompt, detailed_prompt_result, image_result, status_message
 
 # --- Gradio 界面构建 ---
 with gr.Blocks(theme=gr.themes.Soft()) as app: