Update app.py

app.py

@@ -1,124 +1,153 @@
 import os, json, html, requests, re
 import gradio as gr
 
-APP_TITLE = "孙子你好（直连 DeepSeek）"
-DEEPSEEK_API = "https://api.deepseek.com/v1/chat/completions"
-DEEPSEEK_KEY = os.getenv("DEEPSEEK_API_KEY")  # Settings → Secrets 配置
+APP_TITLE = "孙子你好（DeepSeek 直连·诊断版）"
 
-MODEL_NAME = "deepseek-chat"
+# 可通过 Secrets 覆盖：
+#   DEEPSEEK_API_KEY   = sk-xxxxxxxx
+#   DEEPSEEK_MODEL     = deepseek-chat（默认）
+#   DEEPSEEK_BASE_URL  = https://api.deepseek.com/v1/chat/completions（多数账号）
+#                        或 https://api.deepseek.com/chat/completions（少量旧线路）
+
+MODEL_NAME = os.getenv("DEEPSEEK_MODEL", "deepseek-chat").strip() or "deepseek-chat"
 
 SYS_PROMPT = (
-"你是中文军师，严格依据《孙子兵法》为现实小问题给出策略。\n"
-"规则：\n"
-"1) 优先引用《孙子兵法》原文句子，并指明篇名（如：谋攻篇、虚实篇…）。\n"
-"2) 如果你**无法百分之百确认**某句是否出自《孙子兵法》或不确定篇名，"
-"   **不要硬编**，改为“意译/思想要点”，并标记 unsure=true。\n"
-"3) 输出为 JSON，字段固定：\n"
-'   {"chapter":"<篇名或空>","quote":"<原文或意译>","unsure":false/true,'
-'"insight":"<一句人话启示≤24字>","action":"<一步可执行做法≤60字>",'
-"\"speech\":\"<可直接对话的话术≤80字>\"}\n"
-"4) 风格：简洁、机智、委婉、有边界；拒绝人身攻击、威胁、违法建议。\n"
-"5) 仅输出 JSON，不要任何多余文字。"
+    "你是中文军师，严格依据《孙子兵法》为现实小问题给出策略。\n"
+    "规则：\n"
+    "1) 优先引用《孙子兵法》原文句子，并指明篇名（如：谋攻篇、虚实篇）。\n"
+    "2) 如果无法百分之百确认出典或篇名，不要硬编，改为意译/思想要点，并标记 unsure=true。\n"
+    "3) 仅输出 JSON，固定字段：\n"
+    '   {\"chapter\":\"<篇名或空>\",\"quote\":\"<原文或意译>\",\"unsure\":false/true,'
+    '\"insight\":\"<一句人话启示≤24字>\",\"action\":\"<一步可执行做法≤100字>\",'
+    '\"speech\":\"<可直接对话的话术≤120字>\"}\n'
+    "4) 风格：简洁、机智、委婉、有边界；不得人身攻击、威胁或违法建议。\n"
+    "5) 严格仅输出 JSON，不要任何多余文字。"
 )
 
+# few-shot 用 json.dumps 生成，避免手写引号带来语法错误
 FEWSHOT = [
     {
-        "role":"user",
-        "content":"问题：老板临时要我通宵加班，我状态很差，怎么体面拒绝？只输出JSON。"
+        "role": "user",
+        "content": "问题：老板临时要我通宵加班，我状态很差，怎么体面拒绝？只输出JSON。"
     },
     {
-        "role":"assistant",
-        "content":json.dumps({
-            "chapter":"虚实篇",
-            "quote":"避实而击虚。",
+        "role": "assistant",
+        "content": json.dumps({
+            "chapter": "虚实篇",
+            "quote": "避实而击虚。",
             "unsure": False,
-            "insight":"别硬碰命令，转打结果。",
-            "action":"给“今晚粗稿/明早终版”二选一，建议选后者以保质量。",
-            "speech":"我今晚能出草稿，也能明早交稳定终版；为保证质量，我建议后一种，您看呢？"
+            "insight": "别硬碰命令，转打结果。",
+            "action": "给出“今晚草稿/明早终版”二选一，引导选择后者以保质量和节奏。",
+            "speech": "我今晚能出草稿，也能明早交更稳的终版。为保证质量，我建议后一种，您看呢？"
         }, ensure_ascii=False)
     },
     {
-        "role":"user",
-        "content":"问题：朋友借钱不还，怎样体面要回？只输出JSON。"
+        "role": "user",
+        "content": "问题：朋友借钱不还，怎样体面要回？只输出JSON。"
     },
     {
-        "role":"assistant",
-        "content":json.dumps({
-            "chapter":"始计篇",
-            "quote":"兵者，诡道也。",
+        "role": "assistant",
+        "content": json.dumps({
+            "chapter": "始计篇",
+            "quote": "兵者，诡道也。",
             "unsure": False,
-            "insight":"绕开硬催，设局顺势收回。",
-            "action":"先说在清账需安排资金，再给“部分先还/分期”台阶。",
-            "speech":"我这边在清账需要安排下，方便的话先转一部分？分期也行，别影响咱们交情。"
+            "insight": "绕开硬催，设局顺势收回。",
+            "action": "先说明自己在清账安排资金，再给“部分先还/分期”台阶，降低对抗。",
+            "speech": "我这边在清账需要安排下，方便的话先转一部分？分期也行，别影响咱们交情。"
         }, ensure_ascii=False)
     }
 ]
 
 def call_deepseek(user_question: str, alt: bool = False) -> dict:
-    if not DEEPSEEK_KEY:
+    """带精确诊断：自动���试两个端点，页面/日志展示状态码与返回体。"""
+    key = os.getenv("DEEPSEEK_API_KEY", "").strip()
+    if not key:
         return {
             "chapter": "",
-            "quote": "（未配置 DEEPSEEK_API_KEY）",
+            "quote": "未配置 DEEPSEEK_API_KEY",
             "unsure": True,
-            "insight": "先配置密钥再试。",
-            "action": "在 Settings → Secrets 添加 DEEPSEEK_API_KEY。",
-            "speech": "我先把密钥配好，马上再帮你。"
+            "insight": "请先在 Settings → Secrets 配置密钥。",
+            "action": "键名必须是 DEEPSEEK_API_KEY，值不要带引号或空格；配置后重启。",
+            "speech": "密钥配好我就能正常回答。"
         }
 
-    msgs = [{"role":"system","content":SYS_PROMPT}] + FEWSHOT + [
-        {"role":"user","content": f"问题：{user_question} 只输出JSON。"}
+    endpoints = [
+        (os.getenv("DEEPSEEK_BASE_URL", "").strip()
+         or "https://api.deepseek.com/v1/chat/completions"),
+        "https://api.deepseek.com/chat/completions",
+    ]
+
+    msgs = [{"role": "system", "content": SYS_PROMPT}] + FEWSHOT + [
+        {"role": "user", "content": f"问题：{user_question} 只输出JSON。"}
     ]
-    try:
-        r = requests.post(
-            DEEPSEEK_API,
-            headers={"Authorization": f"Bearer {DEEPSEEK_KEY}", "Content-Type":"application/json"},
-            json={
+
+    last_err = None
+    for ep in endpoints:
+        try:
+            payload = {
                 "model": MODEL_NAME,
                 "messages": msgs,
-                "temperature": 0.7 if not alt else 0.9,
+                "temperature": 0.9 if alt else 0.7,
                 "top_p": 0.9,
                 "max_tokens": 450
-            },
-            timeout=30
-        )
-        data = r.json()
-        content = data.get("choices",[{}])[0].get("message",{}).get("content","").strip()
-        m = re.search(r"\{.*\}", content, flags=re.S)
-        js = m.group(0) if m else content
-        result = json.loads(js)
-        return {
-            "chapter": result.get("chapter","")[:20],
-            "quote": result.get("quote","")[:160],
-            "unsure": bool(result.get("unsure", False)),
-            "insight": result.get("insight","")[:40],
-            "action": result.get("action","")[:100],
-            "speech": result.get("speech","")[:120]
-        }
-    except Exception as e:
-        return {
-            "chapter": "",
-            "quote": f"调用 DeepSeek 失败：{type(e).__name__}",
-            "unsure": True,
-            "insight": "网络/配额/模型不可用。",
-            "action": "稍后再试或检查 API Key 与配额。",
-            "speech": "我先排查下线路，等会再聊。"
-        }
+            }
+            r = requests.post(
+                ep,
+                headers={"Authorization": f"Bearer {key}", "Content-Type": "application/json"},
+                json=payload,
+                timeout=60
+            )
+            print(f"[DeepSeek] endpoint={ep} status={r.status_code} model={MODEL_NAME}")  # 写入 Runtime logs
+
+            if r.status_code // 100 != 2:
+                try:
+                    err_detail = r.json()
+                except Exception:
+                    err_detail = {"raw": r.text[:500]}
+                last_err = f"HTTP {r.status_code} @ {ep} (model={MODEL_NAME}) → {err_detail}"
+                continue
+
+            data = r.json()
+            content = data.get("choices", [{}])[0].get("message", {}).get("content", "").strip()
+            m = re.search(r"\{.*\}", content, flags=re.S)
+            js = m.group(0) if m else content
+            result = json.loads(js)
+
+            # 规整长度，防止偶发超长
+            return {
+                "chapter": result.get("chapter", "")[:20],
+                "quote": result.get("quote", "")[:160],
+                "unsure": bool(result.get("unsure", False)),
+                "insight": result.get("insight", "")[:40],
+                "action": result.get("action", "")[:100],
+                "speech": result.get("speech", "")[:120]
+            }
+        except Exception as e:
+            last_err = f"{type(e).__name__}: {e}"
+
+    # 两个端点都失败
+    return {
+        "chapter": "",
+        "quote": "为避免误引，已隐藏原文与篇名（模型不确定出典）。",
+        "unsure": True,
+        "insight": "DeepSeek 请求未成功。",
+        "action": f"诊断信息：{last_err or '未知错误'}",
+        "speech": "请按诊断检查：①密钥②端点③模型名④配额/限速，然后重启。"
+    }
 
 def render(result: dict, strict: bool) -> str:
-    """
-    strict=True 时：若 unsure 为 True，则隐藏篇名与原文，只展示启示/做法/话术，并提示“为避免误引已隐藏原文”
-    """
+    """strict=True：若 unsure 则隐藏原文与篇名，仅展示启示/做法/话术并提示原因。"""
     unsure = bool(result.get("unsure"))
-    chap = html.escape(result.get("chapter",""))
-    quote= html.escape(result.get("quote",""))
-    insight = html.escape(result.get("insight",""))
-    action  = html.escape(result.get("action",""))
-    speech  = html.escape(result.get("speech",""))
+    chap = html.escape(result.get("chapter", ""))
+    quote = html.escape(result.get("quote", ""))
+    insight = html.escape(result.get("insight", ""))
+    action = html.escape(result.get("action", ""))
+    speech = html.escape(result.get("speech", ""))
 
-    show_quote_block = not (strict and unsure)
+    show_quote = not (strict and unsure)
 
     parts = ["<div style='font-size:22px;line-height:1.7em;'>"]
-    if show_quote_block:
+    if show_quote:
         badge = "📜" if not unsure else "❓"
         chap_line = f"《{chap}》" if chap else "（未标明篇名）"
         parts.append(f"{badge} {chap_line}<br><br>")
@@ -129,17 +158,18 @@ def render(result: dict, strict: bool) -> str:
     parts.append(f"<b>启示：</b>{insight}<br><br>")
     parts.append(f"<b>做法：</b>{action}<br><br>")
     parts.append(
-        "<div style='margin-top:12px;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>"
         f"<div>{speech}</div>"
         "</div>"
     )
-    if not show_quote_block:
-        parts.append("<div style='color:#9aa; font-size:13px; margin-top:8px;'>提示：关闭“严格出处校验”可查看模型引用的原文与篇名。</div>")
+    if not show_quote:
+        parts.append("<div style='color:#9aa;font-size:13px;margin-top:8px;'>提示：取消勾选“严格出处校验”可查看模型引用。</div>")
     parts.append("</div>")
     return "".join(parts)
 
-# ------------- UI ------------- #
+# ---------------- UI ----------------
 theme = gr.themes.Soft(primary_hue="pink", neutral_hue="slate")
 CSS = """
 body,.gradio-container{background:#f7f6fb!important;}
@@ -151,7 +181,7 @@ with gr.Blocks(title=APP_TITLE, theme=theme, css=CSS) as demo:
     gr.HTML("<div class='header'>孙子你好</div>")
     with gr.Group(elem_classes=["card"]):
         q = gr.Textbox(label="你的问题", placeholder="例如：朋友借钱不还；老板让我加班；邻居太吵；甲方拖款…", lines=3)
-        strict = gr.Checkbox(value=True, label="严格出处校验（不确定出典时不显示原文）")
+        strict = gr.Checkbox(value=True, label="严格出处校验（不确定出典时隐藏原文）")
         with gr.Row():
             b1 = gr.Button("🎯 生成兵法", variant="primary")
             b2 = gr.Button("♻️ 换一种说法")