feat(persona,model,loop): 人格 thinking 配置 + 5 个死字段接线 + 推理旋钮(按 provider 映射)
按 DevDocs/design/01 §2.1/§2.2 与 design/04 §3.2 实现(规格含联网核过的官方依据:思考内容刻意不角色化、不写分步思考指令、思考控制只走参数级)。
- 人格 schema 新增 thinking:budgetTokens / effort / showToUser(*bool,省略=nil=保持现行为,显式 false=只落库) / mode(default|on|off→Enable 三态);非法 mode/负预算 → ErrInvalidThinking(不静默)
- 5 个死字段接上注入:personality→values→speechStyle→catchphrase→background 拼为独立段落(带【】小标题,空值不拼);**全空时输出与旧实现逐字节一致**(有专门测试)
- model.Request 新增 Thinking{ BudgetTokens, Enable } 与 ReasoningEffort;新增 model/reasoning.go:厂商识别(模型名→baseURL 兜底)、取值白名单(OpenAI 系 none…max / DeepSeek low|high|max)、非法值降级+WARN、**不支持一律 WARN 而非静默**;Anthropic 映射 thinking{budget_tokens} 并**保证 budget<max_tokens**(不足时抬高 max_tokens+WARN,正是历史上思考吃光预算→空回复那个坑)
- loop:新增 Options.ThinkingShowToUser(*bool) 仅门控 thinking_* 帧(正文/工具帧不受影响);场景级 mute 语义不变
- 补一处任务清单外但必需的接线:persona→model.Request 的 thinking 映射(否则 budget/effort/mode 会变成新的死字段);showToUser 刻意不产生 Thinking(纯呈现开关)
- 管理端:personaUpsertRequest 补 thinking DTO + 校验(400);PUT 省略时**保留已存块**(防旧客户端抹配置);写侧 yaml round-trip 已验证
- Docs/api-client v0.40→v0.41(可选请求字段)
- 测试:26 个新用例(loader 解析/拼接逐字节/映射、anthropic 非流式+流式预算约束、openai 透传/降级/丢弃、Qwen 诚实 WARN、loop 门控、DTO round-trip);3 次变异验证(省略与 false 混同 / 去掉预算约束 / 短路门控 各自 FAIL)
- 验收:go build/vet/test 全绿(含 57 包)+ linux/darwin 交叉编译 + 前端 build;唯一 FAIL 是既有 flake TestInterruptCancelsTurnAndClearsPending(3/20 新代码 vs 3/20 纯 HEAD,已归因非本次引入)
This commit is contained in:
1 parent
e4e18ce2a2
commit
38a403afca
22 files changed
+1714
-56
No files matched your search
@@ -0,0 +1,136 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"git.yeij.top/AskaEth/Cyrene_v2/internal/persona/loader"
|
||||
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
||||
)
|
||||
|
||||
// Section headers for the persona fields that design/01 §2.2 lists as previously
|
||||
// inert. They are appended as separate system-prompt sections after the identity
|
||||
// block so each one can be tuned without touching the identity text.
|
||||
const (
|
||||
personalityHeader = "【性格】"
|
||||
valuesHeader = "【价值观】"
|
||||
speechStyleHeader = "【说话风格】"
|
||||
catchphraseHeader = "【口头禅】"
|
||||
backgroundHeader = "【背景】"
|
||||
)
|
||||
|
||||
// personaSection is one appended block: a bracketed header plus its body.
|
||||
type personaSection struct {
|
||||
header string
|
||||
body string
|
||||
}
|
||||
|
||||
// defaultPersona returns the default character's persona, or false when no
|
||||
// character/persona is registered.
|
||||
func (a *app) defaultPersona() (*loader.Persona, bool) {
|
||||
c, ok := a.personas.DefaultCharacter()
|
||||
if !ok {
|
||||
return nil, false
|
||||
}
|
||||
p, ok := a.personas.Persona(c.PersonaID)
|
||||
if !ok || p == nil {
|
||||
return nil, false
|
||||
}
|
||||
return p, true
|
||||
}
|
||||
|
||||
// identityInstructionFor returns the persona's identity block — the only part
|
||||
// injected before design/01 §2.2: identity.systemPrompt, else identity.role, else
|
||||
// the minimal fallback.
|
||||
func identityInstructionFor(p *loader.Persona) string {
|
||||
if p.Identity.SystemPrompt != "" {
|
||||
return p.Identity.SystemPrompt
|
||||
}
|
||||
if p.Identity.Role != "" {
|
||||
return p.Identity.Role
|
||||
}
|
||||
return fallbackInstruction
|
||||
}
|
||||
|
||||
// instructionsFromPersona builds the persona's system instruction: the identity
|
||||
// block, followed by the personality/values/speechStyle/catchphrase/background
|
||||
// sections that used to have no consumer (design/01 §2.2). Blank fields are
|
||||
// skipped so no empty section is emitted, and a persona with none of them yields
|
||||
// exactly the identity block — byte for byte the pre-existing output.
|
||||
func instructionsFromPersona(p *loader.Persona) string {
|
||||
base := identityInstructionFor(p)
|
||||
sections := personaSections(p)
|
||||
if len(sections) == 0 {
|
||||
return base
|
||||
}
|
||||
var b strings.Builder
|
||||
b.WriteString(base)
|
||||
for _, s := range sections {
|
||||
b.WriteString("\n\n")
|
||||
b.WriteString(s.header)
|
||||
b.WriteString("\n")
|
||||
b.WriteString(s.body)
|
||||
}
|
||||
return b.String()
|
||||
}
|
||||
|
||||
// personaSections renders the five optional sections in their fixed order
|
||||
// (personality → values → speechStyle → catchphrase → background), skipping any
|
||||
// that is blank.
|
||||
func personaSections(p *loader.Persona) []personaSection {
|
||||
out := make([]personaSection, 0, 5)
|
||||
appendSection := func(header, body string) {
|
||||
if body = strings.TrimSpace(body); body == "" {
|
||||
return
|
||||
}
|
||||
out = append(out, personaSection{header: header, body: body})
|
||||
}
|
||||
appendSection(personalityHeader, p.Personality)
|
||||
appendSection(valuesHeader, bulletList(p.Values))
|
||||
appendSection(speechStyleHeader, p.SpeechStyle)
|
||||
appendSection(catchphraseHeader, p.Catchphrase)
|
||||
appendSection(backgroundHeader, p.Background)
|
||||
return out
|
||||
}
|
||||
|
||||
// bulletList renders string items as a markdown bullet list, skipping blanks; an
|
||||
// all-blank list yields "" so its section disappears entirely.
|
||||
func bulletList(items []string) string {
|
||||
lines := make([]string, 0, len(items))
|
||||
for _, item := range items {
|
||||
if item = strings.TrimSpace(item); item != "" {
|
||||
lines = append(lines, "- "+item)
|
||||
}
|
||||
}
|
||||
return strings.Join(lines, "\n")
|
||||
}
|
||||
|
||||
// defaultThinkingOptions returns the reasoning knobs the loop should inject for
|
||||
// the default persona: the thinking directive, the reasoning_effort value and the
|
||||
// thinking-broadcast switch.
|
||||
//
|
||||
// The thinking directive is non-nil only when the persona configures something
|
||||
// that affects the request (a budget, an effort, or an explicit on/off mode).
|
||||
// showToUser deliberately does NOT create one: it is a presentation switch, and a
|
||||
// non-nil directive with no switch would enable provider thinking as a side
|
||||
// effect. All three are zero when no persona is registered, which leaves the
|
||||
// loop's pre-existing behavior untouched.
|
||||
func (a *app) defaultThinkingOptions() (*model.Thinking, string, *bool) {
|
||||
p, ok := a.defaultPersona()
|
||||
if !ok {
|
||||
return nil, "", nil
|
||||
}
|
||||
thinking, effort := personaThinking(p)
|
||||
return thinking, effort, p.Thinking.ShowToUser
|
||||
}
|
||||
|
||||
// personaThinking maps the persona's `thinking` section onto the model-layer
|
||||
// knobs (design/01 §2.1 / design/04 §3.2). It returns (nil, "") when nothing
|
||||
// affects the request.
|
||||
func personaThinking(p *loader.Persona) (*model.Thinking, string) {
|
||||
effort := strings.TrimSpace(p.Thinking.Effort)
|
||||
enable := p.Thinking.Enable()
|
||||
if p.Thinking.BudgetTokens == 0 && effort == "" && enable == nil {
|
||||
return nil, ""
|
||||
}
|
||||
return &model.Thinking{BudgetTokens: p.Thinking.BudgetTokens, Enable: enable}, effort
|
||||
}
|
||||
Reference in new issue
Block a user