Sync ling-space changes from GitHub commit c4aec86

smart_writer_kit/agent_for_inspiration_expansion.py

@@ -83,6 +83,49 @@ def fetch_inspiration_agent(prompt: str, editor_content: str, style: str, kb_df:
         return gr.update(visible=True), error_message, "请检查日志", "请检查日志"
 
 
+def fetch_paragraph_continuation_agent(prompt: str, editor_content: str, style: str, kb_df: pd.DataFrame, short_outline_df: pd.DataFrame, long_outline_df: pd.DataFrame):
+    """
+    Agent for fetching a single paragraph continuation (Ribbon UI version).
+    """
+    print("\n[Agent][fetch_paragraph_continuation_agent] === 推理类型：整段续写 (Single) ===")
+    try:
+        # 1. Format context
+        style_context = f"### 整体章程\n{style}\n\n"
+        kb_context = _format_df_to_string(kb_df, "知识库")
+        short_outline_context = _format_df_to_string(short_outline_df, "当前章节大纲")
+        long_outline_context = _format_df_to_string(long_outline_df, "故事总纲")
+
+        # 2. Build System Prompt
+        system_prompt = (
+            "你是一个富有创意的长篇小说家。请根据提供的背景设定和当前文本，自然地续写一段高质量的剧情。\n"
+            "请直接输出续写内容，不要包含任何解释、前缀或后缀。"
+        )
+        
+        # 3. Build User Prompt
+        full_context = style_context + kb_context + long_outline_context + short_outline_context
+        user_prompt = (
+            f"### 背景设定与大纲\n{full_context}\n"
+            f"### 当前已写内容 (末尾部分)\n{editor_content[-2000:]}\n\n"
+            f"### 用户指令\n{prompt if prompt else '请基于当前内容，自然地延续剧情，写一个完整的段落。'}"
+        )
+
+        # 4. Call LLM
+        model_handler = ModelHandler()
+        response_generator = model_handler.generate_code(
+            system_prompt=system_prompt,
+            user_prompt=user_prompt,
+            model_choice=LING_1T
+        )
+        
+        full_response = "".join(chunk for chunk in response_generator)
+        return full_response.strip()
+
+    except Exception as e:
+        print(f"[Agent] Error fetching paragraph continuation: {e}")
+        return f"获取续写时出错: {e}"
+
+
+
 def apply_inspiration_agent(current_text: str, inspiration_text: str):
     """
     Agent for applying selected inspiration to the editor.

tab_smart_writer.py

@@ -1,39 +1,34 @@
 import gradio as gr
 import time
 from smart_writer_kit.agent_for_streaming_completion import fetch_flow_suggestion_agent, accept_flow_suggestion_agent
-from smart_writer_kit.agent_for_inspiration_expansion import fetch_inspiration_agent, apply_inspiration_agent
+from smart_writer_kit.agent_for_inspiration_expansion import fetch_inspiration_agent, apply_inspiration_agent, fetch_paragraph_continuation_agent
 from smart_writer_kit.agent_for_outline_update import update_outline_status_agent
 from smart_writer_kit.agent_for_kb_update import suggest_new_kb_terms_agent
 
 # --- Mock Data (for UI population only) ---
 
-MOCK_STYLE = """风格：赛博朋克 / 黑色电影
-视角：第三人称限制视角（主角：凯）
-基调：阴郁、压抑、霓虹闪烁的高科技低生活
-核心规则：
-1. 强调感官描写，特别是光影和声音。
-2. 避免过多的心理独白，通过行动展现心理。
+MOCK_STYLE = """故事：人类逐渐走向消亡时，人形机器人的休闲生活。
+风格：自然平淡，文字细腻，描绘未来的荒凉与宁静交织的景象。
+主题：探索人类与机器的界限，记忆与身份的意义。
 """
 
 MOCK_KNOWLEDGE_BASE = [
-    ["凯 (Kai)", "主角，前黑客，现在是义体医生。左臂是老式的军用义体。"],
-    ["夜之城 (Night City)", "故事发生的舞台，一座永夜的巨型都市，被企业掌控。"],
-    ["荒坂塔 (Arasaka Tower)", "市中心的最高建筑，象征着绝对的权力。"],
-    ["赛博精神病 (Cyberpsychosis)", "过度改装义体导致的解离性精神障碍。"],
-    ["网络监察 (NetWatch)", "负责维护网络安全的组织，被黑客们视为走狗。"]
+    ["Alpha", "故事的主角，女性人形机器人，外表与人类无异。性格有线"],
+    ["横滨", "故事发生的主要城市。由于海平面上升，城市部分地区被淹没，形成独特的水上景观。"]
 ]
 
 MOCK_SHORT_TERM_OUTLINE = [
-    [True, "凯接到一个神秘电话，对方声称知道他失踪妹妹的下落。"],
-    [False, "凯前往'来生'酒吧与接头人见面。"],
-    [False, "在酒吧遇到旧识，引发一场关于过去的争执。"],
-    [False, "接头人出现，但似乎被跟踪了。"]
+    [False, "故事的场景设定：海平面上升后的城市景观。"],
+    [False, "介绍主角 Alpha 的日常生活和她与其他机器人的互动。"],
+    [False, "Alpha 发现了一张旧照片，勾起了她对过去人类生活的好奇心。"],
+    [False, "奶油蛋糕的制作方法。"]
 ]
 
+## 按日常向动画剧情走向写的长纲要。具体。
 MOCK_LONG_TERM_OUTLINE = [
-    [False, "揭露夜之城背后的惊天阴谋。"],
-    [False, "凯找回妹妹，或者接受她已经改变的事实。"],
-    [False, "与荒坂公司的最终决战。"]
+    [False, "介绍故事背景。人类逐渐减少，机器人和人的互动。"],
+    [False, "Alpha 决定离开居住地，到东京寻找失散的朋友。"],
+    [False, "月亮变成了一个巨大的 Disco 灯球。机器人不受控制地开始跳舞，导致全球范围内的混乱。"],
 ]
 
 # --- UI Helper Functions ---
@@ -45,51 +40,46 @@ def get_stats(text):
     read_time = max(1, words // 200) # Average reading speed
     return f"{words} Words | ~{read_time} mins"
 
-def dismiss_inspiration():
-    return gr.update(visible=False)
-
 # --- UI Construction ---
 
 def create_smart_writer_tab():
     debounce_state = gr.State({"last_change": 0, "active": False, "style": "", "kb": [], "short_outline": [], "long_outline": []})
-    debounce_timer = gr.Timer(0.5, active=False)
+    debounce_timer = gr.Timer(0.1, active=True)
+    
 
     with gr.Row(equal_height=False, elem_id="indicator-writing-tab"):
         # --- Left Column: Entity Console ---
-        with gr.Column(scale=0, min_width=384) as left_panel:
-            gr.Markdown("### 🧠 核心实体控制台")
+        with gr.Column(scale=1) as left_panel:
             
-            with gr.Accordion("整体章程 (Style)", open=True):
-                style_input = gr.Textbox(
-                    label="整体章程", 
-                    lines=8, 
-                    value=MOCK_STYLE,
-                    interactive=True
-                )
+            style_input = gr.Textbox(
+                label="整体故事和风格", 
+                lines=8, 
+                value=MOCK_STYLE,
+                interactive=True
+            )
             
-            with gr.Accordion("知识库 (Knowledge Base)", open=True):
+            with gr.Accordion("写作知识库", open=True):
+                
                 kb_input = gr.Dataframe(
-                    headers=["Term", "Description"],
+                    headers=["名称", "说明"],
                     datatype=["str", "str"],
                     value=MOCK_KNOWLEDGE_BASE,
                     interactive=True,
-                    label="知识库",
                     wrap=True
                 )
                 with gr.Row():
                     btn_suggest_kb = gr.Button("🔍 提取新词条", size="sm")
                 
-                md_suggested_terms_header = gr.Markdown("#### 推荐词条", visible=False) # Placeholder for suggested terms
                 suggested_kb_dataframe = gr.Dataframe(
                     headers=["Term", "Description"],
                     datatype=["str", "str"],
-                    visible=False, # Initially hidden
+                    visible=False, 
                     interactive=False,
                     label="推荐词条"
                 )
 
+            with gr.Accordion("当前章节大纲", open=True):
                 
-            with gr.Accordion("当前章节大纲 (Short-Term)", open=True):
                 short_outline_input = gr.Dataframe(
                     headers=["Done", "Task"],
                     datatype=["bool", "str"],
@@ -101,7 +91,7 @@ def create_smart_writer_tab():
                 with gr.Row():
                     btn_sync_outline = gr.Button("🔄 同步状态", size="sm")
 
-            with gr.Accordion("故事总纲 (Long-Term)", open=False):
+            with gr.Accordion("故事整体大纲", open=False):
                 long_outline_input = gr.Dataframe(
                     headers=["Done", "Task"],
                     datatype=["bool", "str"],
@@ -112,82 +102,69 @@ def create_smart_writer_tab():
                 )
 
         # --- Right Column: Writing Canvas ---
-        with gr.Column(scale=1) as right_panel:
-            # Toolbar
+        with gr.Column(scale=5):
+            
+            # --- RIBBON AREA (Top of Editor) ---
+            with gr.Row(variant="panel", elem_classes=["ribbon-container"]):
+                
+                # Area 1: Real-time Continuation (Flow)
+                with gr.Column(scale=1, min_width=200):
+                    gr.Markdown("#### ⚡️ 实时续写")
+                    with gr.Row():
+                        btn_accept_flow = gr.Button("采纳续写 (Tab)", size="sm", variant="primary", elem_id='btn-action-accept-flow')
+                        btn_change_flow = gr.Button("换一个 (Shift+Tab)", size="sm", elem_id='btn-action-change-flow')
+                    
+                    flow_suggestion_display = gr.Textbox(
+                        show_label=False,
+                        placeholder="（等待输入或点击“换一个”...）",
+                        lines=3,
+                        interactive=False,
+                        elem_classes=["flow-suggestion-box"]
+                    )
+                    # Debounce Progress Indicator
+                    debounce_progress = gr.HTML(value="", visible=False)
+
+                # Area 2: Paragraph Continuation (Inspiration)
+                with gr.Column(scale=1, min_width=200):
+                    gr.Markdown("#### ✨ 整段续写")
+                    with gr.Row():
+                        btn_generate_para = gr.Button("整段续写 (Cmd+Enter)", size="sm", variant="primary", elem_id="btn-action-create-paragraph")
+                        btn_change_para = gr.Button("换一个", size="sm")
+                        btn_accept_para = gr.Button("采纳", size="sm")
+
+                    para_suggestion_display = gr.Textbox(
+                        show_label=False,
+                        placeholder="（点击“整段续写”生成内容...）",
+                        lines=3,
+                        interactive=False
+                    )
+                
+                # Area 3: Adjust/Polish (Placeholder)
+                with gr.Column(scale=1, min_width=200):
+                    gr.Markdown("#### 🛠️ 调整润色")
+                    gr.Markdown("(Coming Soon)")
+
+            # --- TOOLBAR ---
             with gr.Row(elem_classes=["toolbar"]):
                 stats_display = gr.Markdown("0 Words | 0 mins")
-                inspiration_btn = gr.Button("✨ 继续整段 (Cmd/Ctrl+Enter)", size="sm", variant="primary", elem_id="btn-action-create-paragraph")
             
-            # 主要编辑器区域
+            # --- EDITOR ---
             editor = gr.Textbox(
                 label="沉浸写作画布", 
                 placeholder="开始你的创作...", 
-                lines=30, 
+                lines=25, # Reduced lines slightly to accommodate ribbon
                 elem_classes=["writing-editor"],
                 elem_id="writing-editor",
                 show_label=False,
             )
 
-            # Flow Suggestion
-            with gr.Row(variant="panel"):
-                flow_suggestion_display = gr.Textbox(
-                    label="AI 实时续写建议 (按 Tab 采纳)",
-                    value="（等待输入...）",
-                    interactive=False,
-                    scale=4,
-                    elem_classes=["flow-suggestion-box"]
-                )
-                accept_flow_btn = gr.Button("采纳(Tab)", scale=1, elem_id='btn-action-accept-flow')
-                refresh_flow_btn = gr.Button("换一个(Shift+Tab)", scale=1, elem_id='btn-action-change-flow')
-
-            # Debounce Progress
-            debounce_progress = gr.HTML(value="", visible=False)
-
-            # Inspiration Modal
-            with gr.Group(visible=False) as inspiration_modal:
-                gr.Markdown("### 💡 灵感选项 (由 Ling 模型生成)")
-                
-                inspiration_prompt_input = gr.Textbox(
-                    label="设定脉络 (可选)",
-                    placeholder="例如：写一段激烈的打斗 / 描写赛博朋克夜景...",
-                    lines=1
-                )
-                refresh_inspiration_btn = gr.Button("生成选项(Shift+Enter)")
-
-                with gr.Row():
-                    opt1_btn = gr.Button("...", elem_classes=["inspiration-card"])
-                    opt2_btn = gr.Button("...", elem_classes=["inspiration-card"])
-                    opt3_btn = gr.Button("...", elem_classes=["inspiration-card"])
-                cancel_insp_btn = gr.Button("取消")
 
     # --- Interactions ---
 
     # 1. Stats
     editor.change(fn=get_stats, inputs=editor, outputs=stats_display)
 
-    # 2. Inspiration Workflow
-    # Open Modal (triggered by visible button or hidden trigger button for Cmd+Enter)
-    open_inspiration_modal_fn = lambda: (gr.update(visible=True), "")
-    inspiration_btn.click(fn=open_inspiration_modal_fn, outputs=[inspiration_modal, inspiration_prompt_input])
-    
-    # Generate Options based on Prompt
-    refresh_inspiration_btn.click(
-        fn=fetch_inspiration_agent,
-        inputs=[inspiration_prompt_input, editor, style_input, kb_input, short_outline_input, long_outline_input],
-        outputs=[inspiration_modal, opt1_btn, opt2_btn, opt3_btn]
-    )
-
-    # Apply Option
-    for btn in [opt1_btn, opt2_btn, opt3_btn]:
-        btn.click(
-            fn=apply_inspiration_agent,
-            inputs=[editor, btn],
-            outputs=[editor, inspiration_modal, inspiration_prompt_input]
-        )
-    
-    cancel_insp_btn.click(fn=dismiss_inspiration, outputs=inspiration_modal, show_progress="hidden")
-
-    # 3. Flow Suggestion with Debounce
+    # 2. Flow Suggestion Logic
     def start_debounce(editor_content, style, kb, short_outline, long_outline):
         return {"last_change": time.time(), "active": True, "style": style, "kb": kb, "short_outline": short_outline, "long_outline": long_outline}, gr.update(active=True), gr.update(visible=True, value="<progress value='0' max='100'></progress> 补全中... 3.0s")
 
@@ -206,12 +183,40 @@ def create_smart_writer_tab():
 
     editor.change(fn=start_debounce, inputs=[editor, style_input, kb_input, short_outline_input, long_outline_input], outputs=[debounce_state, debounce_timer, debounce_progress])
     debounce_timer.tick(fn=update_debounce, inputs=[debounce_state, editor], outputs=[debounce_progress, flow_suggestion_display, debounce_state, debounce_timer])
-    refresh_flow_btn.click(fn=fetch_flow_suggestion_agent, inputs=[editor, style_input, kb_input, short_outline_input, long_outline_input], outputs=flow_suggestion_display)
+    
+    btn_change_flow.click(fn=fetch_flow_suggestion_agent, inputs=[editor, style_input, kb_input, short_outline_input, long_outline_input], outputs=flow_suggestion_display)
 
-    # Accept Flow (Triggered by visible Button or hidden Tab Key trigger)
     accept_flow_fn_inputs = [editor, flow_suggestion_display]
-    accept_flow_fn_outputs = [editor]
-    accept_flow_btn.click(fn=accept_flow_suggestion_agent, inputs=accept_flow_fn_inputs, outputs=accept_flow_fn_outputs, show_progress="hidden")
+    # accept_flow_suggestion_agent returns modified editor text
+    btn_accept_flow.click(
+        fn=lambda e, s: (accept_flow_suggestion_agent(e, s), ""), # Accept and clear suggestion
+        inputs=accept_flow_fn_inputs, 
+        outputs=[editor, flow_suggestion_display], 
+        show_progress="hidden"
+    )
+
+    # 3. Paragraph Continuation Logic
+    def generate_paragraph_wrapper(editor_val, style, kb, short, long_):
+        return fetch_paragraph_continuation_agent(None, editor_val, style, kb, short, long_)
+
+    for btn in [btn_generate_para, btn_change_para]:
+        btn.click(
+            fn=generate_paragraph_wrapper,
+            inputs=[editor, style_input, kb_input, short_outline_input, long_outline_input],
+            outputs=[para_suggestion_display]
+        )
+    
+    def accept_para_wrapper(curr, new):
+        # Reuse apply_inspiration_agent but extract text. 
+        # It returns (new_text, modal_update, empty_string)
+        res = apply_inspiration_agent(curr, new)
+        return res[0], ""
+
+    btn_accept_para.click(
+        fn=accept_para_wrapper,
+        inputs=[editor, para_suggestion_display],
+        outputs=[editor, para_suggestion_display]
+    )
 
     # 4. Agent-based Context Updates
     btn_sync_outline.click(
@@ -222,5 +227,5 @@ def create_smart_writer_tab():
     btn_suggest_kb.click(
         fn=suggest_new_kb_terms_agent,
         inputs=[kb_input, editor],
-        outputs=[suggested_kb_dataframe, md_suggested_terms_header]
+        outputs=[suggested_kb_dataframe]
     )