Compare commits
2
Commits
9f90de0541
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
572f0529fb | ||
|
|
ae83d0d948 |
+13
-2
@@ -39,6 +39,14 @@ class MessageIn(BaseModel):
|
|||||||
content: str
|
content: str
|
||||||
|
|
||||||
|
|
||||||
|
PACE_GUIDE = """
|
||||||
|
【对话节奏(重要)】
|
||||||
|
- 像真人聊天:每次回复 1~3 句话(约 20~60 字),只推进一小步对话,把接话空间留给对方。
|
||||||
|
- 禁止大段独白与成段描写;神态动作用极简括注(不超过一句)。
|
||||||
|
- 不要复述对方的话,不要替对方回应,不要一次把话说完说透——留悬念等对方接。
|
||||||
|
- 结尾尽量落在能让对方接话的位置(提问/行动/目光)。"""
|
||||||
|
|
||||||
|
|
||||||
def _key(user):
|
def _key(user):
|
||||||
return security.key_cache.get(user.id)
|
return security.key_cache.get(user.id)
|
||||||
|
|
||||||
@@ -77,7 +85,8 @@ async def build_context(db, user, session, history) -> list[dict]:
|
|||||||
msgs = []
|
msgs = []
|
||||||
if session.mode == "roleplay":
|
if session.mode == "roleplay":
|
||||||
ch = await db.get(Character, session.character_id)
|
ch = await db.get(Character, session.character_id)
|
||||||
persona = f"你扮演角色「{ch.name}」。人设:\n{_dec(user, ch.persona)}\n始终以该角色的口吻回复,不要出戏。"
|
persona = (f"你扮演角色「{ch.name}」。人设:\n{_dec(user, ch.persona)}\n"
|
||||||
|
"始终以该角色的口吻回复,不要出戏。" + PACE_GUIDE)
|
||||||
mems = await repos.MemoryRepo.list_for(db, user.id, ch.id)
|
mems = await repos.MemoryRepo.list_for(db, user.id, ch.id)
|
||||||
key = _key(user)
|
key = _key(user)
|
||||||
mem_text = "\n".join(f"- [{m.kind}] {_dec(user, m.content_enc)}" for m in mems)
|
mem_text = "\n".join(f"- [{m.kind}] {_dec(user, m.content_enc)}" for m in mems)
|
||||||
@@ -91,7 +100,9 @@ async def build_context(db, user, session, history) -> list[dict]:
|
|||||||
"content": ("你是小说编剧,与用户共创一部小说。用户可以控制主角行动,"
|
"content": ("你是小说编剧,与用户共创一部小说。用户可以控制主角行动,"
|
||||||
"你负责推进剧情、描写场景与其他角色的言行。剧情需要时,"
|
"你负责推进剧情、描写场景与其他角色的言行。剧情需要时,"
|
||||||
"你可以自主引入新的配角,给他们完整的性格与名字。\n"
|
"你可以自主引入新的配角,给他们完整的性格与名字。\n"
|
||||||
f"小说设定:\n{setting}")})
|
f"小说设定:\n{setting}"
|
||||||
|
"\n【行文节奏】每段回复 2~4 句(80 字内),画面感靠细节不靠堆字,"
|
||||||
|
"在剧情关键处停笔,把下一步行动交给用户。")})
|
||||||
scope_hits = []
|
scope_hits = []
|
||||||
# 世界书:角色模式查 character scope,小说模式查 novel scope
|
# 世界书:角色模式查 character scope,小说模式查 novel scope
|
||||||
scope = "character" if session.mode == "roleplay" else "novel"
|
scope = "character" if session.mode == "roleplay" else "novel"
|
||||||
|
|||||||
@@ -60,7 +60,8 @@ async def create_group(body: GroupIn, user: User = Depends(current_user),
|
|||||||
|
|
||||||
GROUP_SYSTEM = """这是群聊场景。参与角色:{roster}。
|
GROUP_SYSTEM = """这是群聊场景。参与角色:{roster}。
|
||||||
你控制角色「{name}」发言。其他角色的话会以【角色名】标注。
|
你控制角色「{name}」发言。其他角色的话会以【角色名】标注。
|
||||||
只在轮到你说话或被@时发言,保持角色人设,不要替其他角色说话。回复保持简短口语化。"""
|
只在轮到你说话或被@时发言,保持角色人设,不要替其他角色说话。
|
||||||
|
回复必须口语化、简短:1~2 句话(30 字内),像微信群聊插话,禁止大段描写或独白。"""
|
||||||
|
|
||||||
|
|
||||||
@router.post("/sessions/{sid}/send_group")
|
@router.post("/sessions/{sid}/send_group")
|
||||||
@@ -101,6 +102,8 @@ async def send_group(sid: int, body: dict, user: User = Depends(current_user),
|
|||||||
reply = await client.chat(models.get("narrative") or "step-3.5-flash",
|
reply = await client.chat(models.get("narrative") or "step-3.5-flash",
|
||||||
[{"role": "system", "content": sysmsg}] + msgs,
|
[{"role": "system", "content": sysmsg}] + msgs,
|
||||||
temperature=0.95)
|
temperature=0.95)
|
||||||
|
import re as _re
|
||||||
|
reply = _re.sub(r"^【[^】]*】\s*", "", reply) # 剥掉模型学舌的【角色名】前缀
|
||||||
m = Message(session_id=sid, user_id=user.id, role="assistant",
|
m = Message(session_id=sid, user_id=user.id, role="assistant",
|
||||||
speaker=c.name, content_enc=_enc(user, reply),
|
speaker=c.name, content_enc=_enc(user, reply),
|
||||||
swipes_enc=_enc(user, json.dumps([reply])))
|
swipes_enc=_enc(user, json.dumps([reply])))
|
||||||
|
|||||||
+7
-1
@@ -12,7 +12,13 @@ def enc(key: bytes | None, text: str) -> str:
|
|||||||
|
|
||||||
def dec(key: bytes | None, stored: str) -> str:
|
def dec(key: bytes | None, stored: str) -> str:
|
||||||
from ..core.security import decrypt_text
|
from ..core.security import decrypt_text
|
||||||
return decrypt_text(key, stored) if key else stored
|
if not key:
|
||||||
|
return stored
|
||||||
|
try:
|
||||||
|
return decrypt_text(key, stored)
|
||||||
|
except Exception:
|
||||||
|
# 密码重置/盐变更导致的旧密文:降级显示,不让整个请求 500
|
||||||
|
return "[旧加密内容已失效]"
|
||||||
|
|
||||||
|
|
||||||
class UserRepo:
|
class UserRepo:
|
||||||
|
|||||||
Reference in New Issue
Block a user