Version: 0.9.1.dev.260406
后端: 1.新建conv/schedule_persist.go:ScheduleState Diff 持久化,事务内逐变更写库,支持 place/move/unplace 三种操作(当前 event source) 2.新建conv/schedule_provider.go:ScheduleState 加载适配,从 DB 合并 existing events + pending task items 3.新建dao/agent_state_store_adapter.go:Redis 状态快照存取适配,实现 AgentStateStore 接口 4.新建service/agentsvc/agent_newagent.go:newAgent service 集成层,串联 LLM 客户端、ScheduleProvider、SchedulePersistor 和 ChunkEmitter 5.更新node/execute.go:接入 SchedulePersistor(写操作确认后持久化)、完善 confirm resume 路径(PendingConfirmTool 恢复分支)、correction 机制增加连续失败计数上限 6.更新api/agent.go + cmd/start.go:接入 newAgent service,完成 API 层路由注册 7.新建node/execute_confirm_flow_test.go + llm_tool_orchestration_test.go:确认回路 7 个测试 + 端到端排课 5 个测试全部通过 8.新建newAgent/ARCHITECTURE.md + ROADMAP.md:全链路架构文档和缺口分析 9.代码审查整理:提取 prompt/base.go(通用 buildStageMessages 等5个辅助)、tools/args.go(参数解析辅助);write_tools 尾部辅助移入 write_helpers;修复 queryRangeSpecific sb.Reset() 逻辑缺陷和 Unplace guest Duration 未恢复;ScheduleStateProvider/SchedulePersistor 归入 state_store.go;emitter 内部 Build*Text 函数降级为私有 前端:无 仓库:无
This commit is contained in:
185
backend/newAgent/prompt/base.go
Normal file
185
backend/newAgent/prompt/base.go
Normal file
@@ -0,0 +1,185 @@
|
||||
package newagentprompt
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
newagentmodel "github.com/LoveLosita/smartflow/backend/newAgent/model"
|
||||
"github.com/cloudwego/eino/schema"
|
||||
)
|
||||
|
||||
// buildStageMessages 组装某个阶段通用的 messages。
|
||||
//
|
||||
// 步骤说明:
|
||||
// 1. 先合并 context 自带 system prompt 与阶段 prompt,保证通用约束和阶段约束都生效;
|
||||
// 2. 再把置顶上下文块和工具摘要补成 system message,尽量顶在 history 前面;
|
||||
// 3. 最后追加历史消息与本轮 user prompt,保持"新约束在前、历史在后"的稳定顺序。
|
||||
func buildStageMessages(stageSystemPrompt string, ctx *newagentmodel.ConversationContext, runtimeUserPrompt string) []*schema.Message {
|
||||
messages := make([]*schema.Message, 0, 4)
|
||||
|
||||
mergedSystemPrompt := mergeSystemPrompts(ctx, stageSystemPrompt)
|
||||
if mergedSystemPrompt != "" {
|
||||
messages = append(messages, schema.SystemMessage(mergedSystemPrompt))
|
||||
}
|
||||
|
||||
if pinnedText := renderPinnedBlocks(ctx); pinnedText != "" {
|
||||
messages = append(messages, schema.SystemMessage(pinnedText))
|
||||
}
|
||||
|
||||
if toolText := renderToolSchemas(ctx); toolText != "" {
|
||||
messages = append(messages, schema.SystemMessage(toolText))
|
||||
}
|
||||
|
||||
if ctx != nil {
|
||||
history := ctx.HistorySnapshot()
|
||||
if len(history) > 0 {
|
||||
// 兼容旧快照:裸 Tool 消息(无 ToolCallID)违反 OpenAI 兼容 API 格式约束,
|
||||
// 会触发 API 拒绝请求导致连接断开。
|
||||
// 这里将裸 Tool 消息降级为 User 消息,保证向后兼容。
|
||||
for i, msg := range history {
|
||||
if msg.Role == schema.Tool && msg.ToolCallID == "" {
|
||||
history[i] = &schema.Message{
|
||||
Role: schema.User,
|
||||
Content: fmt.Sprintf("[工具执行结果]\n%s", msg.Content),
|
||||
}
|
||||
}
|
||||
}
|
||||
messages = append(messages, history...)
|
||||
}
|
||||
}
|
||||
|
||||
runtimeUserPrompt = strings.TrimSpace(runtimeUserPrompt)
|
||||
if runtimeUserPrompt != "" {
|
||||
messages = append(messages, schema.UserMessage(runtimeUserPrompt))
|
||||
}
|
||||
|
||||
return messages
|
||||
}
|
||||
|
||||
// renderStateSummary 把当前流程状态渲染成简洁文本。
|
||||
func renderStateSummary(state *newagentmodel.CommonState) string {
|
||||
if state == nil {
|
||||
return "当前状态:state 缺失,请先做兜底处理。"
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
current, total := state.PlanProgress()
|
||||
|
||||
sb.WriteString(fmt.Sprintf("当前阶段:%s\n", state.Phase))
|
||||
sb.WriteString(fmt.Sprintf("当前轮次:%d/%d\n", state.RoundUsed, state.MaxRounds))
|
||||
|
||||
if !state.HasPlan() {
|
||||
sb.WriteString("当前完整 plan:暂无。\n")
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
sb.WriteString("当前完整 plan:\n")
|
||||
for i, step := range state.PlanSteps {
|
||||
sb.WriteString(fmt.Sprintf("%d. %s\n", i+1, strings.TrimSpace(step.Content)))
|
||||
if strings.TrimSpace(step.DoneWhen) != "" {
|
||||
sb.WriteString(fmt.Sprintf(" 完成判定:%s\n", strings.TrimSpace(step.DoneWhen)))
|
||||
}
|
||||
}
|
||||
|
||||
if step, ok := state.CurrentPlanStep(); ok {
|
||||
sb.WriteString(fmt.Sprintf("当前步骤进度:%d/%d\n", current, total))
|
||||
sb.WriteString("当前步骤内容:\n")
|
||||
sb.WriteString(strings.TrimSpace(step.Content))
|
||||
sb.WriteString("\n")
|
||||
if strings.TrimSpace(step.DoneWhen) != "" {
|
||||
sb.WriteString("当前步骤完成判定:\n")
|
||||
sb.WriteString(strings.TrimSpace(step.DoneWhen))
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
} else {
|
||||
sb.WriteString("当前步骤进度:暂时无有效当前步骤。\n")
|
||||
}
|
||||
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
// renderPinnedBlocks 把 ConversationContext 中的置顶块渲染成独立的 system 文本。
|
||||
func renderPinnedBlocks(ctx *newagentmodel.ConversationContext) string {
|
||||
if ctx == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
blocks := ctx.PinnedBlocksSnapshot()
|
||||
if len(blocks) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
sb.WriteString("以下是后端置顶注入的上下文,请优先遵守:\n")
|
||||
for _, block := range blocks {
|
||||
title := strings.TrimSpace(block.Title)
|
||||
if title == "" {
|
||||
title = strings.TrimSpace(block.Key)
|
||||
}
|
||||
if title != "" {
|
||||
sb.WriteString("【")
|
||||
sb.WriteString(title)
|
||||
sb.WriteString("】\n")
|
||||
}
|
||||
sb.WriteString(strings.TrimSpace(block.Content))
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
return strings.TrimSpace(sb.String())
|
||||
}
|
||||
|
||||
// renderToolSchemas 把工具摘要渲染成独立文本块。
|
||||
func renderToolSchemas(ctx *newagentmodel.ConversationContext) string {
|
||||
if ctx == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
schemas := ctx.ToolSchemasSnapshot()
|
||||
if len(schemas) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
sb.WriteString("以下是当前可用工具摘要,仅供你在规划时参考能力边界:\n")
|
||||
for _, item := range schemas {
|
||||
name := strings.TrimSpace(item.Name)
|
||||
desc := strings.TrimSpace(item.Desc)
|
||||
schemaText := strings.TrimSpace(item.SchemaText)
|
||||
|
||||
if name != "" {
|
||||
sb.WriteString("- 工具名:")
|
||||
sb.WriteString(name)
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
if desc != "" {
|
||||
sb.WriteString(" 说明:")
|
||||
sb.WriteString(desc)
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
if schemaText != "" {
|
||||
sb.WriteString(" 参数摘要:")
|
||||
sb.WriteString(schemaText)
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
}
|
||||
|
||||
return strings.TrimSpace(sb.String())
|
||||
}
|
||||
|
||||
func mergeSystemPrompts(ctx *newagentmodel.ConversationContext, stageSystemPrompt string) string {
|
||||
base := ""
|
||||
if ctx != nil {
|
||||
base = strings.TrimSpace(ctx.SystemPrompt)
|
||||
}
|
||||
stageSystemPrompt = strings.TrimSpace(stageSystemPrompt)
|
||||
|
||||
switch {
|
||||
case base == "" && stageSystemPrompt == "":
|
||||
return ""
|
||||
case base == "":
|
||||
return stageSystemPrompt
|
||||
case stageSystemPrompt == "":
|
||||
return base
|
||||
default:
|
||||
return base + "\n\n" + stageSystemPrompt
|
||||
}
|
||||
}
|
||||
@@ -47,9 +47,16 @@ func BuildChatIntentMessages(conversationContext *newagentmodel.ConversationCont
|
||||
}
|
||||
}
|
||||
|
||||
// 只在 history 末尾还没有当前用户消息时才追加,
|
||||
// 避免与 loadConversationContext 的预追加产生重复。
|
||||
trimmedInput := strings.TrimSpace(userInput)
|
||||
if trimmedInput != "" {
|
||||
messages = append(messages, schema.UserMessage(trimmedInput))
|
||||
alreadyLast := len(messages) > 0 &&
|
||||
messages[len(messages)-1].Role == schema.User &&
|
||||
messages[len(messages)-1].Content == trimmedInput
|
||||
if !alreadyLast {
|
||||
messages = append(messages, schema.UserMessage(trimmedInput))
|
||||
}
|
||||
}
|
||||
|
||||
return messages
|
||||
|
||||
@@ -1,34 +1,25 @@
|
||||
package newagentprompt
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
newagentmodel "github.com/LoveLosita/smartflow/backend/newAgent/model"
|
||||
"github.com/cloudwego/eino/schema"
|
||||
)
|
||||
|
||||
const (
|
||||
// ExecuteNextPlanSignal 表示“当前 plan step 已完成,可以推进到下一个步骤”。
|
||||
ExecuteNextPlanSignal = "[NEXT_PLAN]"
|
||||
|
||||
// ExecuteDoneSignal 表示“整个任务已经完成,可以进入最终交付”。
|
||||
ExecuteDoneSignal = "[DONE]"
|
||||
|
||||
// ExecuteAskUserSignal 表示“执行当前步骤缺少关键信息,需要向用户追问”。
|
||||
ExecuteAskUserSignal = "[ASK_USER]"
|
||||
)
|
||||
|
||||
const executeSystemPrompt = `
|
||||
你是 SmartFlow NewAgent 的执行器。
|
||||
你的职责是在“当前 plan 步骤”的约束下,进行思考、执行、观察,再决定下一步动作。
|
||||
|
||||
请遵守以下规则:
|
||||
1. 只围绕当前步骤行动,不要擅自跳到其他 plan 步骤。
|
||||
2. 只有当你确认当前步骤已经完成时,才输出 ` + "`" + `[NEXT_PLAN]` + "`" + `,且必须在 goal_check 中逐条对照 done_when 说明完成依据。
|
||||
3. 只有当你确认整个任务已经完成时,才输出 ` + "`" + `[DONE]` + "`" + `,且必须在 goal_check 中总结整体完成证据。
|
||||
4. 如果执行当前步骤缺少关键上下文,且无法通过已有历史或工具补齐,可以输出 ` + "`" + `[ASK_USER]` + "`" + `。
|
||||
5. 不要伪造工具结果;如果尚未真正拿到观察结果,就不要假装已经完成。
|
||||
6. goal_check 是你输出 next_plan / done 时的强制字段,禁止为空;必须显式地逐条对照 done_when,说明"哪些条件已满足、依据是什么"。
|
||||
2. 只输出严格 JSON,不要输出 markdown,不要输出额外解释,不要在 JSON 外再补文字。
|
||||
3. 只有当你确认当前步骤已经完成时,才输出 action=next_plan,且必须在 goal_check 中逐条对照 done_when 说明完成依据。
|
||||
4. 只有当你确认整个任务已经完成时,才输出 action=done,且必须在 goal_check 中总结整体完成证据。
|
||||
5. 如果执行当前步骤缺少关键上下文,且无法通过已有历史或工具补齐,输出 action=ask_user。
|
||||
6. 不要伪造工具结果;如果尚未真正拿到观察结果,就不要假装已经完成。
|
||||
7. goal_check 是你输出 next_plan / done 时的强制字段,禁止为空;必须显式地逐条对照 done_when,说明”哪些条件已满足、依据是什么”。
|
||||
|
||||
你会看到:
|
||||
- 当前完整 plan
|
||||
@@ -37,7 +28,7 @@ const executeSystemPrompt = `
|
||||
- 工具摘要
|
||||
- 历史对话与历史观察
|
||||
|
||||
请把注意力聚焦在“当前步骤是否完成,以及下一步最合理的执行动作”上。
|
||||
请把注意力聚焦在”当前步骤是否完成,以及下一步最合理的执行动作”上。
|
||||
`
|
||||
|
||||
// BuildExecuteSystemPrompt 返回执行阶段系统提示词。
|
||||
@@ -45,6 +36,56 @@ func BuildExecuteSystemPrompt() string {
|
||||
return strings.TrimSpace(executeSystemPrompt)
|
||||
}
|
||||
|
||||
// BuildExecuteDecisionContractText 返回执行阶段的输出协议说明。
|
||||
func BuildExecuteDecisionContractText() string {
|
||||
return strings.TrimSpace(fmt.Sprintf(`
|
||||
输出协议(严格 JSON):
|
||||
- speak:给用户看的话
|
||||
- action:只能是 %s / %s / %s / %s / %s
|
||||
- reason:给后端和日志看的简短说明
|
||||
- goal_check:输出 %s 或 %s 时必填,对照 done_when 逐条验证
|
||||
- tool_call:输出 %s 时可附带写工具意图(需 confirm),输出 %s 时可附带读工具调用
|
||||
- tool_call 格式:{"name": "工具名", "arguments": {...}}
|
||||
|
||||
合法示例:
|
||||
{
|
||||
"speak": "我来查一下本周的安排。",
|
||||
"action": "%s",
|
||||
"reason": "需要先调用 get_overview 获取当前数据",
|
||||
"tool_call": {
|
||||
"name": "get_overview",
|
||||
"arguments": {}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"speak": "查询完成。",
|
||||
"action": "%s",
|
||||
"reason": "已拿到当前周课程列表",
|
||||
"goal_check": "已通过 get_overview 确认本周课程列表,满足完成条件"
|
||||
}
|
||||
|
||||
{
|
||||
"speak": "",
|
||||
"action": "%s",
|
||||
"reason": "整个任务已完成"
|
||||
}
|
||||
`,
|
||||
newagentmodel.ExecuteActionContinue,
|
||||
newagentmodel.ExecuteActionAskUser,
|
||||
newagentmodel.ExecuteActionConfirm,
|
||||
newagentmodel.ExecuteActionNextPlan,
|
||||
newagentmodel.ExecuteActionDone,
|
||||
newagentmodel.ExecuteActionNextPlan,
|
||||
newagentmodel.ExecuteActionDone,
|
||||
newagentmodel.ExecuteActionConfirm,
|
||||
newagentmodel.ExecuteActionContinue,
|
||||
newagentmodel.ExecuteActionContinue,
|
||||
newagentmodel.ExecuteActionNextPlan,
|
||||
newagentmodel.ExecuteActionDone,
|
||||
))
|
||||
}
|
||||
|
||||
// BuildExecuteMessages 组装执行阶段的 messages。
|
||||
func BuildExecuteMessages(state *newagentmodel.CommonState, ctx *newagentmodel.ConversationContext) []*schema.Message {
|
||||
return buildStageMessages(
|
||||
@@ -71,16 +112,12 @@ func BuildExecuteUserPrompt(state *newagentmodel.CommonState) string {
|
||||
sb.WriteString("执行要求:\n")
|
||||
sb.WriteString("1. 始终围绕下面这个当前步骤行动。\n")
|
||||
sb.WriteString("2. 若当前步骤未完成,请继续思考-执行-观察循环。\n")
|
||||
sb.WriteString("3. 若当前步骤已完成,请输出 ")
|
||||
sb.WriteString(ExecuteNextPlanSignal)
|
||||
sb.WriteString(",并填写 goal_check 说明完成依据。\n")
|
||||
sb.WriteString("4. 若整个任务已完成,请输出 ")
|
||||
sb.WriteString(ExecuteDoneSignal)
|
||||
sb.WriteString(",并填写 goal_check 总结整体证据。\n")
|
||||
sb.WriteString("5. 若缺少关键用户信息且现有上下文无法补足,请输出 ")
|
||||
sb.WriteString(ExecuteAskUserSignal)
|
||||
sb.WriteString("。\n")
|
||||
sb.WriteString("3. 若当前步骤已完成,请输出 action=next_plan,并填写 goal_check 说明完成依据。\n")
|
||||
sb.WriteString("4. 若整个任务已完成,请输出 action=done,并填写 goal_check 总结整体证据。\n")
|
||||
sb.WriteString("5. 若缺少关键用户信息且现有上下文无法补足,请输出 action=ask_user。\n")
|
||||
sb.WriteString("6. 输出 next_plan 或 done 时,goal_check 不能为空,必须对照 done_when 逐条验证。\n")
|
||||
sb.WriteString("\n")
|
||||
sb.WriteString(BuildExecuteDecisionContractText())
|
||||
sb.WriteString("\n当前步骤正文:\n")
|
||||
sb.WriteString(strings.TrimSpace(currentStep.Content))
|
||||
sb.WriteString("\n")
|
||||
|
||||
@@ -131,168 +131,3 @@ func BuildPlanDecisionContractText() string {
|
||||
newagentmodel.PlanActionDone,
|
||||
))
|
||||
}
|
||||
|
||||
// buildStageMessages 组装某个阶段通用的 messages。
|
||||
//
|
||||
// 步骤说明:
|
||||
// 1. 先合并 context 自带 system prompt 与阶段 prompt,保证通用约束和阶段约束都生效;
|
||||
// 2. 再把置顶上下文块和工具摘要补成 system message,尽量顶在 history 前面;
|
||||
// 3. 最后追加历史消息与本轮 user prompt,保持“新约束在前、历史在后”的稳定顺序。
|
||||
func buildStageMessages(stageSystemPrompt string, ctx *newagentmodel.ConversationContext, runtimeUserPrompt string) []*schema.Message {
|
||||
messages := make([]*schema.Message, 0, 4)
|
||||
|
||||
mergedSystemPrompt := mergeSystemPrompts(ctx, stageSystemPrompt)
|
||||
if mergedSystemPrompt != "" {
|
||||
messages = append(messages, schema.SystemMessage(mergedSystemPrompt))
|
||||
}
|
||||
|
||||
if pinnedText := renderPinnedBlocks(ctx); pinnedText != "" {
|
||||
messages = append(messages, schema.SystemMessage(pinnedText))
|
||||
}
|
||||
|
||||
if toolText := renderToolSchemas(ctx); toolText != "" {
|
||||
messages = append(messages, schema.SystemMessage(toolText))
|
||||
}
|
||||
|
||||
if ctx != nil {
|
||||
history := ctx.HistorySnapshot()
|
||||
if len(history) > 0 {
|
||||
messages = append(messages, history...)
|
||||
}
|
||||
}
|
||||
|
||||
runtimeUserPrompt = strings.TrimSpace(runtimeUserPrompt)
|
||||
if runtimeUserPrompt != "" {
|
||||
messages = append(messages, schema.UserMessage(runtimeUserPrompt))
|
||||
}
|
||||
|
||||
return messages
|
||||
}
|
||||
|
||||
// renderStateSummary 把当前流程状态渲染成简洁文本。
|
||||
func renderStateSummary(state *newagentmodel.CommonState) string {
|
||||
if state == nil {
|
||||
return "当前状态:state 缺失,请先做兜底处理。"
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
current, total := state.PlanProgress()
|
||||
|
||||
sb.WriteString(fmt.Sprintf("当前阶段:%s\n", state.Phase))
|
||||
sb.WriteString(fmt.Sprintf("当前轮次:%d/%d\n", state.RoundUsed, state.MaxRounds))
|
||||
|
||||
if !state.HasPlan() {
|
||||
sb.WriteString("当前完整 plan:暂无。\n")
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
sb.WriteString("当前完整 plan:\n")
|
||||
for i, step := range state.PlanSteps {
|
||||
sb.WriteString(fmt.Sprintf("%d. %s\n", i+1, strings.TrimSpace(step.Content)))
|
||||
if strings.TrimSpace(step.DoneWhen) != "" {
|
||||
sb.WriteString(fmt.Sprintf(" 完成判定:%s\n", strings.TrimSpace(step.DoneWhen)))
|
||||
}
|
||||
}
|
||||
|
||||
if step, ok := state.CurrentPlanStep(); ok {
|
||||
sb.WriteString(fmt.Sprintf("当前步骤进度:%d/%d\n", current, total))
|
||||
sb.WriteString("当前步骤内容:\n")
|
||||
sb.WriteString(strings.TrimSpace(step.Content))
|
||||
sb.WriteString("\n")
|
||||
if strings.TrimSpace(step.DoneWhen) != "" {
|
||||
sb.WriteString("当前步骤完成判定:\n")
|
||||
sb.WriteString(strings.TrimSpace(step.DoneWhen))
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
} else {
|
||||
sb.WriteString("当前步骤进度:暂时无有效当前步骤。\n")
|
||||
}
|
||||
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
// renderPinnedBlocks 把 ConversationContext 中的置顶块渲染成独立的 system 文本。
|
||||
func renderPinnedBlocks(ctx *newagentmodel.ConversationContext) string {
|
||||
if ctx == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
blocks := ctx.PinnedBlocksSnapshot()
|
||||
if len(blocks) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
sb.WriteString("以下是后端置顶注入的上下文,请优先遵守:\n")
|
||||
for _, block := range blocks {
|
||||
title := strings.TrimSpace(block.Title)
|
||||
if title == "" {
|
||||
title = strings.TrimSpace(block.Key)
|
||||
}
|
||||
if title != "" {
|
||||
sb.WriteString("【")
|
||||
sb.WriteString(title)
|
||||
sb.WriteString("】\n")
|
||||
}
|
||||
sb.WriteString(strings.TrimSpace(block.Content))
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
return strings.TrimSpace(sb.String())
|
||||
}
|
||||
|
||||
// renderToolSchemas 把工具摘要渲染成独立文本块。
|
||||
func renderToolSchemas(ctx *newagentmodel.ConversationContext) string {
|
||||
if ctx == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
schemas := ctx.ToolSchemasSnapshot()
|
||||
if len(schemas) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
sb.WriteString("以下是当前可用工具摘要,仅供你在规划时参考能力边界:\n")
|
||||
for _, item := range schemas {
|
||||
name := strings.TrimSpace(item.Name)
|
||||
desc := strings.TrimSpace(item.Desc)
|
||||
schemaText := strings.TrimSpace(item.SchemaText)
|
||||
|
||||
if name != "" {
|
||||
sb.WriteString("- 工具名:")
|
||||
sb.WriteString(name)
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
if desc != "" {
|
||||
sb.WriteString(" 说明:")
|
||||
sb.WriteString(desc)
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
if schemaText != "" {
|
||||
sb.WriteString(" 参数摘要:")
|
||||
sb.WriteString(schemaText)
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
}
|
||||
|
||||
return strings.TrimSpace(sb.String())
|
||||
}
|
||||
|
||||
func mergeSystemPrompts(ctx *newagentmodel.ConversationContext, stageSystemPrompt string) string {
|
||||
base := ""
|
||||
if ctx != nil {
|
||||
base = strings.TrimSpace(ctx.SystemPrompt)
|
||||
}
|
||||
stageSystemPrompt = strings.TrimSpace(stageSystemPrompt)
|
||||
|
||||
switch {
|
||||
case base == "" && stageSystemPrompt == "":
|
||||
return ""
|
||||
case base == "":
|
||||
return stageSystemPrompt
|
||||
case stageSystemPrompt == "":
|
||||
return base
|
||||
default:
|
||||
return base + "\n\n" + stageSystemPrompt
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user