Update app.py

app.py

@@ -8,6 +8,7 @@ import traceback
 import gradio as gr
 from huggingface_hub import InferenceClient
 
+# 假设这些是你上传的 storywriter 库
 from storywriter import (
     OutlineAgent,
     PlanningAgent,
@@ -24,7 +25,7 @@ from storywriter.planning_agent import (
 class ImageGenerator:
     def __init__(self, token=None):
         self.token = token
-        self.model_id = "cagliostrolab/animagine-xl-3.1" 
+        self.model_id = "cagliostrolab/animagine-xl-3.1"
         self.client = InferenceClient(model=self.model_id, token=token)
 
     def _translate_prompt(self, text):
@@ -75,7 +76,7 @@ class ImageGenerator:
                 time.sleep(2)
 
 # ==========================================
-# UI 渲染辅助函数
+# UI 渲染辅助函数 (人物卡片)
 # ==========================================
 def render_persona_html(personas_data, image_map=None, generation_started=False):
     if not personas_data: return ""
@@ -85,24 +86,25 @@ def render_persona_html(personas_data, image_map=None, generation_started=False)
     html = """
     <style>
         .persona-container { display: flex; flex-wrap: wrap; gap: 20px; justify-content: center; font-family: 'Noto Sans SC', sans-serif; }
-        .persona-card { width: 320px; background: #fff; border-radius: 16px; box-shadow: 0 4px 12px rgba(0,0,0,0.08); overflow: hidden; border: 1px solid #f3f4f6; transition: transform 0.2s, box-shadow 0.2s; display: flex; flex-direction: column; }
+        .persona-card { width: 300px; background: #fff; border-radius: 12px; box-shadow: 0 4px 12px rgba(0,0,0,0.08); overflow: hidden; border: 1px solid #f3f4f6; transition: transform 0.2s, box-shadow 0.2s; display: flex; flex-direction: column; }
         .persona-card:hover { transform: translateY(-4px); box-shadow: 0 12px 20px rgba(0,0,0,0.12); }
-        .card-img-wrapper { width: 100%; height: 380px; background: #f9fafb; display: flex; align-items: center; justify-content: center; overflow: hidden; border-bottom: 1px solid #eee; }
+        .card-img-wrapper { width: 100%; height: 360px; background: #f9fafb; display: flex; align-items: center; justify-content: center; overflow: hidden; border-bottom: 1px solid #eee; }
         .card-img { width: 100%; height: 100%; object-fit: cover; transition: transform 0.5s ease; }
         .card-img:hover { transform: scale(1.03); }
         .card-placeholder { color: #9ca3af; font-size: 0.9rem; font-style: italic; text-align: center; padding: 20px; }
-        .card-content { padding: 20px; flex-grow: 1; display: flex; flex-direction: column; }
+        .card-content { padding: 15px; flex-grow: 1; display: flex; flex-direction: column; }
         .card-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 8px; }
-        .card-name { font-size: 1.4rem; font-weight: 800; color: #111827; }
-        .card-age { font-size: 0.85rem; color: #6b7280; background: #f3f4f6; padding: 2px 8px; border-radius: 12px; }
-        .card-role-badge { align-self: flex-start; display: inline-block; padding: 4px 10px; border-radius: 6px; background: #e0e7ff; color: #4f46e5; font-size: 0.8rem; font-weight: 600; margin-bottom: 12px; }
-        .card-tags { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 16px; }
-        .card-tag { font-size: 0.75rem; background: #f3f4f6; color: #4b5563; padding: 2px 8px; border-radius: 99px; border: 1px solid #e5e7eb; }
-        .card-section { margin-bottom: 8px; font-size: 0.9rem; color: #374151; line-height: 1.6; }
+        .card-name { font-size: 1.3rem; font-weight: 800; color: #111827; }
+        .card-age { font-size: 0.8rem; color: #6b7280; background: #f3f4f6; padding: 2px 8px; border-radius: 12px; }
+        .card-role-badge { align-self: flex-start; display: inline-block; padding: 3px 8px; border-radius: 6px; background: #e0e7ff; color: #4f46e5; font-size: 0.75rem; font-weight: 600; margin-bottom: 10px; }
+        .card-tags { display: flex; flex-wrap: wrap; gap: 4px; margin-bottom: 12px; }
+        .card-tag { font-size: 0.7rem; background: #f3f4f6; color: #4b5563; padding: 2px 6px; border-radius: 99px; border: 1px solid #e5e7eb; }
+        .card-section { margin-bottom: 6px; font-size: 0.85rem; color: #374151; line-height: 1.5; }
         .label { font-weight: 700; color: #1f2937; margin-right: 4px; }
     </style>
     <div class='persona-container'>
     """
+    
     MAX_IMAGES = 3
     for idx, p in enumerate(personas_list):
         name = p.get("name", "Unknown")
@@ -113,50 +115,38 @@ def render_persona_html(personas_data, image_map=None, generation_started=False)
         tags_html = "".join([f"<span class='card-tag'>#{t}</span>" for t in archetypes[:4]])
 
         img_src = image_map.get(name, "") if image_map else ""
-        placeholder_text = "No Image" if idx >= MAX_IMAGES else ("Generating Art..." if generation_started else "Waiting for Art...")
+        placeholder_text = "No Image" if idx >= MAX_IMAGES else ("Generating Art..." if generation_started else "Waiting...")
         img_html = f"<div class='card-img-wrapper'><img src='{img_src}' class='card-img' alt='{name}'></div>" if img_src else f"<div class='card-img-wrapper'><div class='card-placeholder'>{placeholder_text}</div></div>"
 
         html += f"""
         <div class="persona-card">{img_html}<div class="card-content">
             <div class="card-header"><div class="card-name">{name}</div><div class="card-age">{age} {gender}</div></div>
             <div class="card-role-badge">{role}</div><div class="card-tags">{tags_html}</div>
-            <div class="card-section"><span class="label">外貌:</span>{appearance[:50]}...</div>
+            <div class="card-section"><span class="label">外貌:</span>{appearance[:40]}...</div>
         </div></div>"""
     return html + "</div>"
 
-# --- 电子书渲染逻辑 (核心功能) ---
+# ==========================================
+# UI 渲染辅助函数 (电子书)
+# ==========================================
 def render_book_page(story_data, page_index):
-    """
-    story_data: List[Dict] -> [{"title": "Chapter 1", "content": "..."}]
-    page_index: int
-    """
     if not story_data or not isinstance(story_data, list) or len(story_data) == 0:
         return "<div style='text-align:center; padding: 50px; color: #999;'><i>等待故事生成...</i></div>"
     
-    # 边界检查
     page_index = max(0, min(page_index, len(story_data) - 1))
     chapter = story_data[page_index]
-    
     title = chapter.get("title", f"Chapter {page_index + 1}")
     content = chapter.get("content", "")
     
-    # 将换行符转换为 HTML 段落
     paragraphs = content.split('\n')
     content_html = "".join([f"<p>{p.strip()}</p>" for p in paragraphs if p.strip()])
 
     html = f"""
     <style>
         .book-wrapper {{
-            background-color: #fdf6e3; /* 羊皮纸色 */
-            padding: 60px 80px;
-            border-radius: 8px;
-            box-shadow: 0 10px 30px rgba(0,0,0,0.1);
-            font-family: 'Noto Serif SC', serif;
-            color: #2c3e50;
-            min-height: 600px;
-            max-width: 800px;
-            margin: 0 auto;
-            position: relative;
+            background-color: #fdf6e3; padding: 60px 80px; border-radius: 8px;
+            box-shadow: 0 10px 30px rgba(0,0,0,0.1); font-family: 'Noto Serif SC', serif;
+            color: #2c3e50; min-height: 600px; max-width: 800px; margin: 0 auto; position: relative;
         }}
         .book-wrapper::before {{
             content: ''; position: absolute; left: 0; top: 0; bottom: 0; width: 4px;
@@ -169,9 +159,7 @@ def render_book_page(story_data, page_index):
         .chapter-content p {{
             font-size: 1.15em; line-height: 1.8; margin-bottom: 1.2em; text-align: justify; text-indent: 2em;
         }}
-        .page-number {{
-            text-align: center; margin-top: 40px; font-size: 0.9em; color: #888;
-        }}
+        .page-number {{ text-align: center; margin-top: 40px; font-size: 0.9em; color: #888; }}
     </style>
     <div class="book-wrapper">
         <div class="chapter-title">{title}</div>
@@ -182,7 +170,7 @@ def render_book_page(story_data, page_index):
     return html
 
 # ==========================================
-# 主逻辑
+# 核心生成逻辑
 # ==========================================
 def generate_novel(premise):
     msg = "🚀 [Backend] Process initialized...\n"
@@ -192,10 +180,9 @@ def generate_novel(premise):
     current_outline = None
     current_plan = None
     current_personas = None 
-    current_story = None # 这里将存储结构化的章节列表
+    current_story = None # 将存储结构化数据
     persona_images_map = {}
 
-    # 初始化 yield
     yield current_log, current_outline, current_plan, current_personas, current_story
 
     if not premise or not premise.strip():
@@ -207,7 +194,7 @@ def generate_novel(premise):
     hf_token = os.environ.get("HF_TOKEN")
     img_gen = ImageGenerator(token=hf_token)
 
-    # --- Phase 1 ---
+    # --- Phase 1: Outline & Art ---
     msg = f"📝 [1/5] Generating outline & initial profiles...\n"
     print(msg.strip())
     current_log += msg
@@ -234,10 +221,8 @@ def generate_novel(premise):
         current_log += msg
         yield current_log, current_outline, current_plan, current_personas, current_story
 
+        # 生成图片 (Phase 1)
         if hf_token and isinstance(personas_raw_data, dict):
-            msg = "🎨 [Art] Generating initial character images (Top 3)...\n"
-            print(msg.strip())
-            current_log += msg
             p_list = personas_raw_data.get("personas", [])
             if isinstance(p_list, list):
                 for i, p in enumerate(p_list[:3]):
@@ -258,7 +243,7 @@ def generate_novel(premise):
                             print(msg.strip())
                             current_log += msg
         elif not hf_token:
-            msg = "⚠️ [Art] HF_TOKEN not configured. Skipping Image Generation.\n"
+            msg = "⚠️ [Art] HF_TOKEN missing. Skipping Art.\n"
             print(msg.strip())
             current_log += msg
             yield current_log, current_outline, current_plan, current_personas, current_story
@@ -271,7 +256,7 @@ def generate_novel(premise):
         yield current_log, current_outline, current_plan, current_personas, current_story
         return
 
-    # --- Phase 2 ---
+    # --- Phase 2: Plan ---
     msg = "📅 [2/5] Splitting events into sub-events...\n"
     print(msg.strip())
     current_log += msg
@@ -298,8 +283,8 @@ def generate_novel(premise):
         yield current_log, current_outline, current_plan, current_personas, current_story
         return
 
-    # --- Phase 3 ---
-    msg = "👥 [3/5] Refining Personas (Text Only)... Images preserved.\n"
+    # --- Phase 3: Persona Refinement ---
+    msg = "👥 [3/5] Refining Personas (Text Only)...\n"
     print(msg.strip())
     current_log += msg
     yield current_log, current_outline, current_plan, current_personas, current_story
@@ -326,23 +311,21 @@ def generate_novel(premise):
         yield current_log, current_outline, current_plan, current_personas, current_story
         return
 
-    # --- Phase 4: Writing (结构化输出) ---
+    # --- Phase 4: Writing (结构化 JSON 输出) ---
     msg = "✍️ [4/5] Writing chapters (Stream starting)...\n"
     print(msg.strip())
     current_log += msg
-    # 临时状态
-    current_story = [{"title": "系统消息", "content": "正在撰写正文，请稍候..."}] 
+    current_story = [{"title": "系统消息", "content": "正在撰写正文，请稍候... (Writing in progress)"}]
     yield current_log, current_outline, current_plan, current_personas, current_story
 
     try:
         writer = WritingAgent()
         outputs = writer.write_from_subevents_json(events_json=current_outline, subevents_json=current_plan, personas=personas_data if 'personas_data' in locals() else {}, max_turns=500)
         
-        # --- 关键修改：将输出格式化为章节列表 ---
         structured_story = []
         if isinstance(outputs, dict):
             for title, content in outputs.items():
-                structured_story.append({"title": title, "content": str(content)})
+                structured_story.append({"title": str(title), "content": str(content)})
         elif isinstance(outputs, list):
             for i, content in enumerate(outputs):
                 structured_story.append({"title": f"Chapter {i+1}", "content": str(content)})
@@ -364,13 +347,12 @@ def generate_novel(premise):
         yield current_log, current_outline, current_plan, current_personas, current_story
 
 # ==========================================
-# Debug UI (展示如何实现阅读器功能)
+# Debug UI
 # ==========================================
 with gr.Blocks(title="Backend Service") as demo:
     gr.Markdown("## 🔒 LongStory Backend API")
     premise_in = gr.Textbox(label="Input Premise")
     
-    # 状态管理
     story_state = gr.State([])
     page_state = gr.State(0)
 
@@ -379,27 +361,19 @@ with gr.Blocks(title="Backend Service") as demo:
             log_box = gr.Textbox(label="Logs", lines=10)
             outline_box = gr.JSON(label="Outline", visible=False)
             plan_box = gr.JSON(label="Plan", visible=False)
-            # Personas 仍然是 HTML
             persona_box = gr.HTML(label="Personas Card")
             
         with gr.Column(scale=2):
             gr.Markdown("### 📖 故事预览 (E-Reader Mode)")
-            # 阅读器显示区域
             story_display = gr.HTML(label="Story Reader", min_height=600)
-            
-            # 翻页控制
             with gr.Row():
                 prev_btn = gr.Button("← 上一章")
                 next_btn = gr.Button("下一章 →")
 
-    # API 输出组件 (Hidden JSON to store story data)
     story_json_connector = gr.JSON(visible=False, label="Story Data Connector")
 
     btn = gr.Button("Run Generation", variant="primary")
     
-    # 1. 运行生成
-    # 注意：outputs 的顺序必须和 yield 一致
-    # [log, outline, plan, personas, story_json]
     btn.click(
         fn=generate_novel, 
         inputs=premise_in, 
@@ -407,18 +381,15 @@ with gr.Blocks(title="Backend Service") as demo:
         api_name="generate_novel"
     )
 
-    # 2. 监听数据变化，更新阅读器
     def update_reader(story_data, page):
         return render_book_page(story_data, page)
 
-    # 当后端返回新的故事数据时，重置页码并渲染第一页
     story_json_connector.change(
         fn=lambda x: (x, 0, render_book_page(x, 0)),
         inputs=[story_json_connector],
         outputs=[story_state, page_state, story_display]
     )
 
-    # 3. 翻页逻辑
     def go_prev(story, page):
         new_page = max(0, page - 1)
         return new_page, render_book_page(story, new_page)