Update app.py

app.py

@@ -1,7 +1,7 @@
-import json, os, html, random
+import os, json, html, re
 import gradio as gr
 
-# =============== 新增：DeepSeek 客户端（OpenAI 兼容） ===============
+# =============== DeepSeek 客户端（OpenAI 兼容） ===============
 try:
     from openai import OpenAI
     _HAS_OPENAI = True
@@ -11,51 +11,11 @@ try:
     )
 except Exception:
     _HAS_OPENAI = False
-# ================================================================
+# ============================================================
 
 APP_TITLE = "孙子你好"
-DATA_FILE = "playbook.json"
-
-# 读取固定答案库
-def load_kb():
-    if not os.path.exists(DATA_FILE):
-        raise RuntimeError("未找到 playbook.json，请先上传。")
-    with open(DATA_FILE, "r", encoding="utf-8") as f:
-        data = json.load(f)
-    # 章节小副标（可根据需要增补）
-    chap_hint = {
-        "计篇":"先算后战","作战篇":"速战速决","谋攻篇":"上兵伐谋","军形篇":"先固己势",
-        "兵势篇":"势能制胜","虚实篇":"避实击虚","军争篇":"抢占先机","九变篇":"因变制胜",
-        "行军篇":"察情定位","地形篇":"因地用兵","九地篇":"九地九策","火攻篇":"借势放大",
-        "用间篇":"情报为先","始计篇":"先计而后战"
-    }
-    for item in data:
-        item["chapter_hint"] = chap_hint.get(item.get("chapter",""), "")
-        item["triggers"] = item.get("triggers", [])
-    return data
-
-KB = load_kb()
 
-def match_candidates(user_text: str):
-    """
-    简单触发词计分 → 取最高分 intent → 返回该 intent 的条目池（打乱顺序）。
-    若无匹配，返回空池和提示，交给 DeepSeek 回退生成。
-    """
-    text = (user_text or "").lower()
-    scored = []
-    for it in KB:
-        score = sum(1 for t in it.get("triggers", []) if t.lower() in text)
-        if score > 0:
-            scored.append((score, it))
-    if not scored:
-        return [], "（未匹配到明确场景，已用智能推荐生成）"
-    scored.sort(key=lambda x: -x[0])
-    top_intent = scored[0][1]["intent"]
-    pool = [it for _, it in scored if it["intent"] == top_intent]
-    random.shuffle(pool)
-    return pool, ""
-
-# =============== 新增：将 DeepSeek 输出为与本地条目一致的结构 ===============
+# 章节小副标（可按需修改）
 CHAP_HINT = {
     "计篇":"先算后战","作战篇":"速战速决","谋攻篇":"上兵伐谋","军形篇":"先固己势",
     "兵势篇":"势能制胜","虚实篇":"避实击虚","军争篇":"抢占先机","九变篇":"因变制胜",
@@ -63,83 +23,17 @@ CHAP_HINT = {
     "用间篇":"情报为先","始计篇":"先计而后战"
 }
 
-def ai_generate_item(user_text: str) -> dict:
-    """
-    调用 DeepSeek 让模型输出 JSON：
-    {"chapter": "...", "quote": "...", "idea": "...", "methods": ["...","...","..."], "speech": "..."}
-    如失败则返回一个简易兜底条目。
-    """
-    if not _HAS_OPENAI:
-        return {
-            "chapter": "始计篇",
-            "chapter_hint": CHAP_HINT.get("始计篇",""),
-            "quote": "先计而后战。",
-            "idea": "先捋清状况，再出手更稳。",
-            "methods": ["明确目标与约束","先礼后兵，给台阶","设期限与分步方案"],
-            "speech": "我先把情况梳理一下，给你两个可选方案，我们按这个节奏推进。"
-        }
-
-    sys = (
-        "你是中文军师，用《孙子兵法》给出策略。"
-        "请严格输出一个 JSON 对象，字段仅限："
-        "chapter（篇名，如“虚实篇/谋攻篇/始计篇”等）、"
-        "quote（兵法原文，尽量贴切）、"
-        "idea（思路，1-2句）、"
-        "methods（数组，3条以内，简短可执行）、"
-        "speech（一段可直接使用的话术，口吻礼貌、委婉、幽默有边界）。"
-    )
-    user = f"用户问题：{user_text}\n只输出 JSON。不要任何解释或前后缀。"
-    try:
-        resp = client.chat.completions.create(
-            model="deepseek-chat",
-            messages=[
-                {"role":"system","content":sys},
-                {"role":"user","content":user}
-            ],
-            temperature=0.6,
-            max_tokens=600
-        )
-        content = resp.choices[0].message.content.strip()
-        # 尝试提取 JSON
-        import json as _json, re as _re
-        # 清除围栏
-        m = _re.search(r"\{.*\}", content, flags=_re.S)
-        js = m.group(0) if m else content
-        data = _json.loads(js)
-        chapter = str(data.get("chapter","始计篇"))
-        item = {
-            "chapter": chapter,
-            "chapter_hint": CHAP_HINT.get(chapter, ""),
-            "quote": str(data.get("quote","先计而后战。")),
-            "idea": str(data.get("idea","先捋清状况，再出手更稳。")),
-            "methods": list(data.get("methods", []))[:3] or ["设清晰目标","给台阶与期限","分步推进"],
-            "speech": str(data.get("speech","我们这样推进最稳，也方便彼此配合。"))
-        }
-        return item
-    except Exception as e:
-        # 兜底
-        return {
-            "chapter": "虚实篇",
-            "chapter_hint": CHAP_HINT.get("虚实篇",""),
-            "quote": "避实而击虚。",
-            "idea": "避开正面冲突，转到对方更在意的点。",
-            "methods": ["承诺结果而非加班","给两个选项让其选择","设置温和期限"],
-            "speech": "我更关注把结果做好，不如按这个更稳的节奏来？您看哪种更合适。"
-        }
-# =================================================================
-
+# ---------- 渲染 ----------
 def render_plan(item, show_speech=False, tip_msg=""):
-    """渲染完整方案；show_speech=True 时附带话术卡片"""
     chap = html.escape(item.get("chapter",""))
-    hint = html.escape(item.get("chapter_hint",""))
+    hint = html.escape(CHAP_HINT.get(chap,""))
     quote= html.escape(item.get("quote",""))
-    idea = html.escape(item.get("idea",""))
-    methods = item.get("methods", [])
-    methods_html = "".join([f"<div>    {i+1}. {html.escape(m)}</div>" for i,m in enumerate(methods)])
+    insight = html.escape(item.get("insight",""))
+    action = html.escape(item.get("action",""))
     speech = html.escape(item.get("speech","")).replace("\n","<br>")
 
     speech_html = f"""
-    <div style="margin-top:10px;padding:12px 14px;border:1px dashed #e2d7f2;border-radius:10px;background:#fbf8ff;">
+    <div style="margin-top:12px;padding:12px 14px;border:1px dashed #e2d7f2;border-radius:10px;background:#fbf8ff;">
       <div style="font-weight:600;">💬 话术示例：</div>
       <div>{speech}</div>
     </div>
@@ -153,15 +47,13 @@ def render_plan(item, show_speech=False, tip_msg=""):
       🧠 《{chap}》：{hint}<br><br>
       「{quote}」<br><br>
       ⸻<br><br>
-      <span style="font-weight:600;">思路：</span>{idea}<br><br>
-      <span style="font-weight:600;">做法：</span>
-      {methods_html}
+      <span style="font-weight:600;">启示：</span>{insight}<br><br>
+      <span style="font-weight:600;">做法：</span>{action}
       {speech_html}
     </div>
     """
 
 def render_speech_only(item):
-    """只显示话术示例卡片"""
     speech = html.escape(item.get("speech","")).replace("\n", "<br>")
     return f"""
     <div style="font-size:22px;line-height:1.8em;padding:20px;background:#fbf8ff;border-radius:12px;border:1px solid #e2d7f2;">
@@ -170,7 +62,6 @@ def render_speech_only(item):
     </div>
     """
 
-# 为了控制按钮显隐，统一一个输出打包方法
 def pack_outputs(html_out, pool, idx, show_flag, show_switch, show_speech_btn, show_back, show_again, user_text_keep=True):
     return (
         html_out,
@@ -184,42 +75,125 @@ def pack_outputs(html_out, pool, idx, show_flag, show_switch, show_speech_btn, s
         (gr.update() if user_text_keep else gr.update(value=""))  # Textbox
     )
 
-# ---- 回调：生成 / 换兵法 / 只看话术 / 返回兵法 / 重新提问 ----
-def on_generate(user_text, state_pool, state_idx, state_show):
-    pool, tip = match_candidates(user_text)
+# ================= DeepSeek 生成（短模板） =================
+GEN_SYS = (
+    "你是中文军师，用《孙子兵法》给出极简、可执行的建议。"
+    "严格只输出一个 JSON 对象，字段仅限："
+    "chapter（篇名，如“虚实篇/谋攻篇/始计篇”等）、"
+    "quote（贴切原文，保留原句标点）、"
+    "insight（≤18字，人话，直白精炼）、"
+    "action（仅1条，≤40字，具体到动作/步骤/策略，不要泛泛而谈）、"
+    "speech（一段≤80字、可直接对对方说的话；礼貌、委婉、幽默有边界）。"
+    "不要输出除 JSON 以外的任何内容。"
+)
+
+# few-shot：锚定“短、实、口语化”
+GEN_FEWSHOT = [
+    {
+        "role":"user",
+        "content":"用户问题：老板让我临时加班但我状态很差，如何拒绝更体面？只输出JSON。"
+    },
+    {
+        "role":"assistant",
+        "content":json.dumps({
+            "chapter":"作战篇",
+            "quote":"夫兵久而国利者，未之有也。",
+            "insight":"别打消耗战，用质量说话。",
+            "action":"承诺结果与时间：给“今晚初稿/明早终版”两选项，让对方决定。",
+            "speech":"老板，我怕今晚赶出来质量不稳。不如我明早7:30交完整版本，保证更稳，您看可以吗？"
+        }, ensure_ascii=False)
+    }
+]
 
-    # 若没命中本地语料：调用 DeepSeek 生成一个“条目”，塞入池
-    if not pool:
-        ai_item = ai_generate_item(user_text)
-        pool = [ai_item]
+def _extract_json(text: str) -> dict:
+    m = re.search(r"\{.*\}", text, flags=re.S)
+    js = m.group(0) if m else text
+    return json.loads(js)
 
-    # 生成后：显示“换兵法”“显示话术示例”“问孙子其他问题”，不显示“返回兵法”
-    html_out = render_plan(pool[0], False, tip)
+def ai_generate_item(user_text: str, alt: bool=False) -> dict:
+    """
+    DeepSeek直生：给出 chapter/quote/insight/action/speech。
+    alt=True 时要求更换角度/章节，避免重复。
+    """
+    if not _HAS_OPENAI:
+        # 无 API 的兜底
+        return {
+            "chapter": "始计篇",
+            "quote": "先计而后战。",
+            "insight": "先摸清再出手。",
+            "action": "列两种可行方案并承诺时间点，让对方选。",
+            "speech": "我这边按更稳的节奏推进更安全。给您两个方案，咱们选一个最稳的。"
+        }
+
+    user = (
+        f"用户问题：{user_text}\n"
+        "请从《孙子兵法》全书挑选最贴切的一句原文，并按上述字段输出。"
+        "只输出 JSON。"
+    )
+    if alt:
+        user += "\n请更换角度或章节，避免与上一次重复；确保action是全新思路。"
+
+    msgs = [{"role":"system","content":GEN_SYS}] + GEN_FEWSHOT + [{"role":"user","content":user}]
+
+    resp = client.chat.completions.create(
+        model="deepseek-chat",
+        messages=msgs,
+        temperature=0.3 if not alt else 0.6,
+        max_tokens=480
+    )
+    content = resp.choices[0].message.content.strip()
+    try:
+        data = _extract_json(content)
+        chapter = str(data.get("chapter","始计篇")).strip()
+        item = {
+            "chapter": chapter,
+            "quote": str(data.get("quote","先计而后战。")).strip(),
+            "insight": str(data.get("insight","先捋清状况，再出手。")).strip(),
+            "action": str(data.get("action","给出两种稳妥方案并承诺时间点。")).strip(),
+            "speech": str(data.get("speech","我们按更稳的节奏推进，彼此都放心。")).strip()
+        }
+        return item
+    except Exception:
+        # 解析失败兜底
+        return {
+            "chapter": "虚实篇",
+            "quote": "避实而击虚。",
+            "insight": "绕开硬碰硬。",
+            "action": "承诺结果，改为更稳时间点完成，给对方选择权。",
+            "speech": "我更关注把结果做好。不如按这个更稳的节奏来？您看哪种合适。"
+        }
+
+# ----------------- 回调（沿用你的按钮逻辑） -----------------
+def on_generate(user_text, state_pool, state_idx, state_show):
+    user_text = (user_text or "").strip()
+    if not user_text:
+        return pack_outputs("<div style='font-size:20px;'>请先输入你的问题。</div>",
+                            [], 0, False, False, False, False, False, True)
+    item = ai_generate_item(user_text, alt=False)
+    pool = [item]
+    html_out = render_plan(item, False, "")
     return pack_outputs(html_out, pool, 0, False, True, True, False, True, True)
 
-def on_switch(state_pool, state_idx, state_show):
-    pool = state_pool or []
-    if not pool:
+def on_switch(state_pool, state_idx, state_show, user_text):
+    user_text = (user_text or "").strip()
+    if not user_text:
         return pack_outputs("<div style='font-size:20px;'>请先输入你的问题并点击生成兵法。</div>",
-                            pool, state_idx, state_show, False, False, False, False, True)
-    idx = (state_idx + 1) % len(pool)
-    # 切换后：仍显示“换兵法”“显示话术示例”“问孙子其他问题”，隐藏“返回兵法”
-    html_out = render_plan(pool[idx], False, "")
-    return pack_outputs(html_out, pool, idx, False, True, True, False, True, True)
+                            [], 0, False, False, False, False, False, True)
+    item = ai_generate_item(user_text, alt=True)
+    pool = [item]
+    html_out = render_plan(item, False, "")
+    return pack_outputs(html_out, pool, 0, False, True, True, False, True, True)
 
 def on_show_speech(state_pool, state_idx, state_show):
-    """只显示话术示例；此时需要出现“返回兵法”"""
     pool = state_pool or []
     if not pool:
         return pack_outputs("<div style='font-size:20px;'>请先输入你的问题并点击生成兵法。</div>",
                             pool, state_idx, state_show, False, False, False, False, True)
     idx = max(0, min(state_idx, len(pool)-1))
     html_out = render_speech_only(pool[idx])
-    # 此时：显示“返回兵法”“换兵法”“显示话术示例”“问孙子其他问题”都可以保留
     return pack_outputs(html_out, pool, idx, True, True, True, True, True, True)
 
 def on_back(state_pool, state_idx, state_show):
-    """从“只看话术”返回到完整兵法视图；隐藏‘返回兵法’"""
     pool = state_pool or []
     if not pool:
         return pack_outputs("<div style='font-size:20px;'>请先输入你的问题并点击生成兵法。</div>",
@@ -229,13 +203,9 @@ def on_back(state_pool, state_idx, state_show):
     return pack_outputs(html_out, pool, idx, False, True, True, False, True, True)
 
 def on_again(state_pool, state_idx, state_show):
-    """回到初始状态：清空输出与输入，只显示生成兵法"""
-    html_out = ""
-    empty_pool = []
-    # 初始：只有“生成兵法”可见（其它按钮隐藏）
-    return pack_outputs(html_out, empty_pool, 0, False, False, False, False, False, user_text_keep=False)
+    return pack_outputs("", [], 0, False, False, False, False, False, user_text_keep=False)
 
-# ---- UI ----
+# ----------------- UI（保持你的样式与顺序） -----------------
 theme = gr.themes.Soft(primary_hue="pink", neutral_hue="slate")
 CSS = """
 body,.gradio-container{background:#f7f6fb!important;}
@@ -257,16 +227,14 @@ with gr.Blocks(title=APP_TITLE, theme=theme, css=CSS, analytics_enabled=False) a
 
         out = gr.HTML()
 
-        # 状态：候选池、当前下标、是否处于“只看话术”
         state_pool  = gr.State([])
         state_idx   = gr.State(0)
         state_show  = gr.State(False)
 
-        # 事件绑定（注意输出多了按钮可见性与文本框）
         btn_gen.click(on_generate, inputs=[user_text, state_pool, state_idx, state_show],
                       outputs=[out, state_pool, state_idx, state_show, btn_switch, btn_speech, btn_back, btn_again, user_text])
 
-        btn_switch.click(on_switch, inputs=[state_pool, state_idx, state_show],
+        btn_switch.click(on_switch, inputs=[state_pool, state_idx, state_show, user_text],
                          outputs=[out, state_pool, state_idx, state_show, btn_switch, btn_speech, btn_back, btn_again, user_text])
 
         btn_speech.click(on_show_speech, inputs=[state_pool, state_idx, state_show],