feat: 添加全局人设与头像设置并优化对话及弹窗交互
This commit is contained in:
@@ -22,6 +22,7 @@ class ProviderFactory:
|
||||
from contextlib import aclosing
|
||||
from uuid import uuid4
|
||||
from app.providers.context_budget import prepare_context
|
||||
from app.services.persona_settings import apply_global_persona
|
||||
from app.providers.base import ProviderError
|
||||
from app.contracts import ModelEvent, ModelEventType
|
||||
from datetime import datetime, timezone
|
||||
@@ -29,7 +30,7 @@ class ProviderFactory:
|
||||
async def complete_with_trace(request):
|
||||
token = usage_context.set({"request_id": uuid4().hex, "run_id": request.metadata.get("run_id")})
|
||||
try:
|
||||
request = await prepare_context(request, config, complete)
|
||||
request = await prepare_context(apply_global_persona(request), config, complete)
|
||||
return await complete(request)
|
||||
finally:
|
||||
usage_context.reset(token)
|
||||
@@ -38,7 +39,7 @@ class ProviderFactory:
|
||||
token = usage_context.set({"request_id": uuid4().hex, "run_id": request.metadata.get("run_id")})
|
||||
try:
|
||||
original = request
|
||||
request = await prepare_context(request, config, complete, stream=True)
|
||||
request = await prepare_context(apply_global_persona(request), config, complete, stream=True)
|
||||
if request.messages != original.messages:
|
||||
yield ModelEvent(event=ModelEventType.context_status, sequence=sequence, timestamp=datetime.now(timezone.utc), data={"message": "本次请求已压缩旧对话;原始记录保留,摘要生成计入用量。"})
|
||||
sequence += 1
|
||||
|
||||
@@ -10,6 +10,7 @@ from fastapi.responses import StreamingResponse
|
||||
|
||||
from app.agent import AgentCapacityError, AgentRunNotFoundError
|
||||
from app.container import container
|
||||
from app.services.persona_settings import PersonaSettings, load_persona, save_persona
|
||||
from app.contracts import (
|
||||
AgentRun,
|
||||
AgentRunCreateRequest,
|
||||
@@ -102,6 +103,7 @@ from app.agent import AgentCapacityError, AgentRunNotFoundError
|
||||
from app.benchmarks import datasets as benchmark_datasets
|
||||
from app.benchmarks import service as benchmark_service
|
||||
from app.container import container
|
||||
from app.services.persona_settings import PersonaSettings, load_persona, save_persona
|
||||
from app.errors import ApiError
|
||||
from app.extensions import ExtensionError
|
||||
from app.extensions.mcp_registry import McpRegistryError
|
||||
@@ -1469,3 +1471,15 @@ async def get_benchmark_report(run_id: str) -> BenchmarkReport:
|
||||
404, "BENCHMARK_RUN_NOT_FOUND", "benchmark report not found", {"run_id": run_id}
|
||||
)
|
||||
return report
|
||||
|
||||
|
||||
|
||||
|
||||
@router.get("/settings/persona", response_model=PersonaSettings, tags=["Settings"])
|
||||
async def get_global_persona():
|
||||
return load_persona()
|
||||
|
||||
|
||||
@router.put("/settings/persona", response_model=PersonaSettings, tags=["Settings"])
|
||||
async def put_global_persona(request: PersonaSettings):
|
||||
return save_persona(request)
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
"""One persistent persona for all configured chat/agent providers on this AI Core."""
|
||||
from contextlib import closing
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from app.database.db import connect
|
||||
|
||||
|
||||
class DialoguePair(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid")
|
||||
user: str = Field(default="", max_length=8000)
|
||||
assistant: str = Field(default="", max_length=8000)
|
||||
|
||||
|
||||
class PersonaSettings(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid")
|
||||
version: int = Field(default=0, ge=0)
|
||||
name: str = Field(default="", max_length=128)
|
||||
system_prompt: str = Field(default="", max_length=16000)
|
||||
dialogue_pairs: list[DialoguePair] = Field(default_factory=list, max_length=20)
|
||||
|
||||
|
||||
def connection():
|
||||
conn = connect()
|
||||
conn.execute("CREATE TABLE IF NOT EXISTS global_persona (id INTEGER PRIMARY KEY CHECK(id=1), data TEXT NOT NULL)")
|
||||
return conn
|
||||
|
||||
|
||||
def load_persona():
|
||||
with closing(connection()) as conn:
|
||||
row = conn.execute("SELECT data FROM global_persona WHERE id=1").fetchone()
|
||||
return PersonaSettings.model_validate_json(row[0]) if row else PersonaSettings()
|
||||
|
||||
|
||||
def save_persona(settings):
|
||||
from app.errors import ApiError
|
||||
with closing(connection()) as conn:
|
||||
conn.execute("BEGIN IMMEDIATE")
|
||||
try:
|
||||
row = conn.execute("SELECT data FROM global_persona WHERE id=1").fetchone()
|
||||
current = PersonaSettings.model_validate_json(row[0]) if row else PersonaSettings()
|
||||
if current.version != settings.version:
|
||||
raise ApiError(409, "PERSONA_VERSION_CONFLICT", "全局人设已被修改,请重新打开表单后保存。")
|
||||
updated = settings.model_copy(update={"version": current.version + 1})
|
||||
conn.execute("INSERT OR REPLACE INTO global_persona(id,data) VALUES(1,?)", (updated.model_dump_json(),))
|
||||
conn.commit()
|
||||
return updated
|
||||
except BaseException:
|
||||
conn.rollback()
|
||||
raise
|
||||
|
||||
|
||||
def apply_global_persona(request):
|
||||
settings = load_persona()
|
||||
parts = [request.system or ""]
|
||||
if settings.system_prompt.strip():
|
||||
parts.append("全局人设 / Global persona\n" + settings.system_prompt.strip())
|
||||
examples = []
|
||||
for pair in settings.dialogue_pairs:
|
||||
lines = []
|
||||
if pair.user.strip(): lines.append("User: " + pair.user.strip())
|
||||
if pair.assistant.strip(): lines.append("Assistant: " + pair.assistant.strip())
|
||||
if lines: examples.append("\n".join(lines))
|
||||
if examples:
|
||||
parts.append("预设对话示例 / Example dialogue\n" + "\n\n".join(examples))
|
||||
system = "\n\n".join(part for part in parts if part.strip())
|
||||
return request.model_copy(update={"system": system or None})
|
||||
@@ -0,0 +1,48 @@
|
||||
import asyncio
|
||||
import pytest
|
||||
from app.contracts import ModelRequest, Message, ProviderConfig
|
||||
from app.errors import ApiError
|
||||
from app.services.persona_settings import PersonaSettings, DialoguePair, save_persona, load_persona, apply_global_persona
|
||||
|
||||
|
||||
def request():
|
||||
return ModelRequest(provider_id="p", model="test", system="任务要求", messages=[Message(role="user", content="hello")])
|
||||
|
||||
|
||||
def test_global_persona_persists_and_keeps_task_prompt():
|
||||
save_persona(PersonaSettings(name="老师", system_prompt="耐心解释", dialogue_pairs=[DialoguePair(user="问题", assistant="回答"), DialoguePair()]))
|
||||
assert load_persona().version == 1
|
||||
original = request()
|
||||
assembled = apply_global_persona(original)
|
||||
assert assembled.system == "任务要求\n\n全局人设 / Global persona\n耐心解释\n\n预设对话示例 / Example dialogue\nUser: 问题\nAssistant: 回答"
|
||||
assert original.system == "任务要求"
|
||||
with pytest.raises(ApiError):
|
||||
save_persona(PersonaSettings())
|
||||
|
||||
|
||||
def test_empty_persona_omits_all_global_sections():
|
||||
save_persona(PersonaSettings(system_prompt=" ", dialogue_pairs=[DialoguePair(user=" ")]))
|
||||
assert apply_global_persona(request()).system == "任务要求"
|
||||
|
||||
|
||||
def test_existing_provider_reads_latest_global_persona_for_complete_and_stream(monkeypatch):
|
||||
from app.providers.factory import ProviderFactory
|
||||
from app.providers.base import ProviderTurn
|
||||
seen = []
|
||||
class Adapter:
|
||||
async def complete(self, req):
|
||||
seen.append(req.system)
|
||||
return ProviderTurn(text="ok")
|
||||
async def stream(self, req):
|
||||
seen.append(req.system)
|
||||
if False: yield
|
||||
factory = ProviderFactory(None)
|
||||
monkeypatch.setattr(factory, "_build", lambda _: Adapter())
|
||||
adapter = factory.build(ProviderConfig(provider_id="p",name="test",provider_type="openai_compatible"))
|
||||
save_persona(PersonaSettings(system_prompt="全局人设"))
|
||||
async def run():
|
||||
await adapter.complete(request())
|
||||
async for _ in adapter.stream(request()): pass
|
||||
asyncio.run(run())
|
||||
assert len(seen) == 2
|
||||
assert all(text.count("全局人设 / Global persona") == 1 for text in seen)
|
||||
Reference in New Issue
Block a user