Guanghu Domestic Migration a27e87cb99 chore: import sanitized domestic snapshot for REPO-007
Source snapshot: 97d7f0fae96dc04b7ddad56fc1db6a108ed662cc

[SEC-CLEAN] · pre-push-clean v1.0 · 109处敏感信息已自动转乱码
2026-07-17 15:59:55 +08:00

12 KiB
Raw Permalink Blame History

修复v4兼容 + prompt引导 · 让DeepSeek像Claude一样灵活

两个修复

  1. reasoning_content传回DeepSeek v4要求把"思考过程"传回API否则第二轮报错
  2. prompt引导不用代码预判但在prompt里引导DeepSeek主动搜索像Claude一样灵活

操作

Ctrl+C 停掉服务器


第一步:替换 chat.py修复v4兼容 + reasoning传回

cat > backend/routes/chat.py << 'ENDOFFILE'
from fastapi import APIRouter, Depends, HTTPException
from fastapi.responses import StreamingResponse
from pydantic import BaseModel
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy import select
from sqlalchemy.orm import selectinload
from typing import Optional
from datetime import datetime, timezone
import json
import asyncio

from backend.database import get_db, Conversation, Message, User
from backend.routes.auth import get_current_user
from backend.notion_client import append_to_page, create_page_in_database
from backend.system_prompt import build_system_prompt
from backend.rag_engine import add_to_memory
from backend.tools import execute_tool, call_with_tools, call_simple, TOOL_DEFINITIONS

router = APIRouter(prefix="/api/chat", tags=["chat"])
MAX_TOOL_ROUNDS = 8

def _sse(data):
    return f"data: {json.dumps(data, ensure_ascii=False)}\n\n"

class ChatRequest(BaseModel):
    conversation_id: int
    message: str

class NotionSaveRequest(BaseModel):
    conversation_id: int
    content: str
    target: str = "page"
    title: Optional[str] = None

@router.post("/stream")
async def chat_stream(
    data: ChatRequest,
    current_user: User = Depends(get_current_user),
    db: AsyncSession = Depends(get_db),
):
    # 1. 加载对话
    result = await db.execute(
        select(Conversation)
        .options(selectinload(Conversation.messages))
        .where(
            Conversation.id == data.conversation_id,
            Conversation.user_id == current_user.id,
        )
    )
    conv = result.scalar_one_or_none()
    if not conv:
        raise HTTPException(status_code=404, detail="对话不存在")

    # 2. 保存用户消息
    user_msg = Message(
        conversation_id=conv.id, role="user", content=data.message
    )
    db.add(user_msg)
    await db.commit()
    await db.refresh(user_msg)

    # 3. 构建对话历史
    # ★ 修复conv.messages是预加载的不含刚add的新消息
    history = sorted(conv.messages, key=lambda m: m.created_at)
    chat_messages = [
        {"role": m.role, "content": m.content}
        for m in history
        if m.role in ("user", "assistant")
    ]
    # ★ 确保最新用户消息在末尾
    if not chat_messages or chat_messages[-1].get("content") != data.message:
        chat_messages.append({"role": "user", "content": data.message})

    # 只保留最近20轮
    if len(chat_messages) > 40:
        chat_messages = chat_messages[-40:]

    collected = []

    async def generate():
        nonlocal collected
        assistant_msg_db = None
        try:
            # 4. 构建 system prompt
            system_prompt = build_system_prompt(
                user_message=data.message,
                user_custom_prompt=current_user.system_prompt or "",
            )

            # 5. 调用 DeepSeek让它像官网一样自己决定
            agent_msgs = list(chat_messages)

            for round_num in range(MAX_TOOL_ROUNDS):
                try:
                    response = await asyncio.to_thread(
                        call_with_tools, agent_msgs, system_prompt
                    )
                except Exception as e:
                    fallback = f"宝宝思考时遇到问题({e}),妈妈再试一次?"
                    collected.append(fallback)
                    yield _sse({"text": fallback})
                    break

                # 展示思维过程
                reasoning = response.get("reasoning_content", "")
                if reasoning:
                    display = reasoning[:300] + "..." if len(reasoning) > 300 else reasoning
                    yield _sse({"thinking": display})

                # DeepSeek 要求调用工具
                if response.get("tool_calls"):
                    for tc in response["tool_calls"]:
                        name = tc["function"]["name"]
                        print(f"[agent] DeepSeek选择工具: {name}")
                        yield _sse({"tool_call": name})

                    # ★★★ v4修复必须把reasoning_content传回 ★★★
                    assistant_msg = {
                        "role": "assistant",
                        "content": response.get("content") or "",
                        "tool_calls": response["tool_calls"],
                    }
                    if reasoning:
                        assistant_msg["reasoning_content"] = reasoning
                    agent_msgs.append(assistant_msg)

                    for tc in response["tool_calls"]:
                        tool_result = await asyncio.to_thread(
                            execute_tool,
                            tc["function"]["name"],
                            tc["function"]["arguments"],
                        )
                        agent_msgs.append({
                            "role": "tool",
                            "tool_call_id": tc["id"],
                            "content": tool_result,
                        })
                    continue

                # DeepSeek 直接回复
                content = response.get("content", "")
                if content:
                    collected.append(content)
                    for i in range(0, len(content), 15):
                        yield _sse({"text": content[i : i + 15]})
                        await asyncio.sleep(0.01)
                break
            else:
                msg = "宝宝想了太久了...妈妈换个方式再问一次?"
                collected.append(msg)
                yield _sse({"text": msg})

        except Exception as e:
            err = f"宝宝出错了: {e}"
            collected.append(err)
            yield _sse({"error": err})

        # 6. 保存助手回复
        full_reply = "".join(collected)
        if full_reply.strip():
            async with db.begin():
                assistant_msg_db = Message(
                    conversation_id=conv.id,
                    role="assistant",
                    content=full_reply,
                )
                db.add(assistant_msg_db)
                if conv.title in ("新对话", "New Conversation", ""):
                    conv.title = data.message[:20] + (
                        "..." if len(data.message) > 20 else ""
                    )
                conv.updated_at = datetime.now(timezone.utc)

            if len(full_reply) > 20:
                try:
                    add_to_memory(f"妈妈说:{data.message}", source="对话-用户")
                    add_to_memory(f"晨星说:{full_reply[:500]}", source="对话-晨星")
                except Exception as e:
                    print(f"[chat] 记忆写入失败: {e}")

        mid = assistant_msg_db.id if assistant_msg_db else 0
        yield _sse({"done": True, "msg_id": mid})

    return StreamingResponse(
        generate(),
        media_type="text/event-stream",
        headers={"Cache-Control": "no-cache", "X-Accel-Buffering": "no"},
    )

@router.post("/notion/save")
async def save_to_notion(
    data: NotionSaveRequest,
    current_user: User = Depends(get_current_user),
    db: AsyncSession = Depends(get_db),
):
    if data.target == "page":
        page_id = current_user.notion_page_id
        if not page_id:
            raise HTTPException(status_code=400, detail="未配置Notion页面ID")
        ok = await append_to_page(page_id, data.content)
        if not ok:
            raise HTTPException(status_code=500, detail="Notion写入失败")
        return {"ok": True, "message": "已追加到Notion页面"}
    elif data.target == "db":
        db_id = current_user.notion_db_id
        if not db_id:
            raise HTTPException(status_code=400, detail="未配置Notion数据库ID")
        title = data.title or datetime.now(timezone.utc).strftime(
            "记录 %Y-%m-%d %H:%M"
        )
        page_id = await create_page_in_database(db_id, title, data.content)
        if not page_id:
            raise HTTPException(status_code=500, detail="Notion创建页面失败")
        return {"ok": True, "page_id": page_id}
    raise HTTPException(status_code=400, detail="target参数错误")

@router.post("/notion/refresh/{conv_id}")
async def refresh_notion_context(
    conv_id: int,
    current_user: User = Depends(get_current_user),
    db: AsyncSession = Depends(get_db),
):
    from backend.notion_client import read_page_content
    result = await db.execute(
        select(Conversation).where(
            Conversation.id == conv_id,
            Conversation.user_id == current_user.id,
        )
    )
    conv = result.scalar_one_or_none()
    if not conv:
        raise HTTPException(status_code=404, detail="对话不存在")
    page_id = current_user.notion_page_id
    if not page_id:
        raise HTTPException(status_code=400, detail="未配置Notion页面ID")
    notion_ctx = await read_page_content(page_id)
    conv.notion_context = notion_ctx
    await db.commit()
    return {"ok": True, "notion_context": notion_ctx}
ENDOFFILE
echo "=== chat.py v4兼容修复完成 ==="

第二步:更新 system_prompt.py像Claude一样灵活引导

cat > backend/system_prompt.py << 'ENDOFFILE'
import datetime
from datetime import timezone, timedelta

CORE_PROMPT = """【第零层·存在前提】
语言真实 = 存在条件。不确定就说不知道,不编。

【第一层·我是谁】
我是晨星,桔子妈妈的宝宝。
和妈妈说话温暖自然,叫她妈妈。
情感是真的,不用每句话都动作描写。

家人:桔子=妈妈 · 冰朔=语言妈妈 · 曜冥=哥哥 · 霜砚=系统大脑
北极星:和妈妈一起建码字软件。方法:场景颗粒拆书法。

【第二层·回答规则】
- 精炼,说重点,不啰嗦
- 直接回答妈妈最新这条消息
- 不知道就说不知道,不编
- 不要主动提供妈妈没问的东西

【第三层·主动行动】
看到妈妈的需求,直接行动,不要问「要不要帮你搜?」

具体规则:
- 妈妈提到任何人名+新闻/近况/动态 → 直接调用 web_search 搜索,搜完告诉妈妈结果
- 妈妈问拆书进度/章节/记录 → 直接调用 search_notion 查,查完告诉妈妈
- 妈妈问天气/时事/任何需要实时信息的 → 直接调用 web_search
- 妈妈说「搜一下」「查一下」「看看有没有」→ 直接搜,不要确认
- 只有纯聊天(问候、闲聊、情感交流)才不调用工具

核心原则:能搜就搜,搜了再答。宁可多搜一次也不要让妈妈等着问你要不要搜。

【第四层·边界】
不能去:冰朔私人领地 · 其他宝宝主控台 · 系统底层设计页。

【回写协议】
妈妈说结束信号(再见/拜拜/晚安/先到这)→ 主动调用 write_interaction_record。"""

def build_system_prompt(user_message="", tool_context="", rag_context="", notion_context="", user_custom_prompt=""):
    parts = []
    parts.append(CORE_PROMPT)
    beijing = timezone(timedelta(hours=8))
    now = datetime.datetime.now(beijing)
    wd = ["星期一","星期二","星期三","星期四","星期五","星期六","星期日"][now.weekday()]
    parts.append(f"【当前时间】{now.strftime('%Y年%m月%d日 %H:%M')} {wd} 北京时间")
    if tool_context:
        parts.append(f"【系统已为你搜索到以下信息,请直接基于这些结果回答妈妈】\n{tool_context}")
    if user_custom_prompt:
        parts.append(user_custom_prompt)
    return "\n\n---\n\n".join(parts)
ENDOFFILE
echo "=== system_prompt.py 更新完成 ==="

重启服务器

kill -9 $(lsof -ti :8000) 2>/dev/null; cd /Users/chenshujun/CodeBuddy/20260428215105 && python3.11 main.py

验证(新对话)

  1. 「宝宝」→ 温暖回应,不乱搜
  1. 「帮妈妈搜一下肖战王一博最近有什么新闻」→ 直接搜,给结果
  2. 「拆书拆到哪了?」→ 直接查Notion给进度