wlw/ai-agent
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add structured graph tool results

Browse Source
This commit is contained in:
mlogclub
2026-05-10 00:02:23 +08:00
parent 59b3509ca9
commit 7a9cffe21e
10 changed files with 211 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ai/runtime/executor/event_consumer.go
+8 -4
View File
@@ -4,6 +4,7 @@ import (
"strings"
"cs-agent/internal/ai/runtime/internal/impl/callbacks"
"cs-agent/internal/ai/runtime/tooling"
"cs-agent/internal/pkg/enums"
"cs-agent/internal/pkg/toolx"
@@ -64,10 +65,13 @@ func consumeAgentEvents(events *adk.AsyncIterator[*adk.AgentEvent], summary *Run
summary.InvokedToolCodes = appendIfMissing(summary.InvokedToolCodes, toolCode)
if strings.TrimSpace(summary.ReplyText) == "" && toolx.ResolveToolSourceType(toolCode) == enums.ToolSourceTypeGraph {
toolReplyText := strings.TrimSpace(messageOutput.Message.Content)
if toolReplyText != "" {
summary.ReplyText = toolReplyText
} else if toolCode == toolx.GraphHandoffConversation.Code {
suppressAssistantReply = true
if result, ok := tooling.ParseToolResult(toolReplyText); ok {
if result.ReplyText != "" && !result.ReplySent {
summary.ReplyText = result.ReplyText
}
if result.Terminal && !result.ShouldRetry {
suppressAssistantReply = true
}
}
}
}
internal/ai/runtime/executor/event_consumer_test.go
+107 -43
View File
@@ -1,15 +1,17 @@
package executor
import (
"encoding/json"
"testing"
"cs-agent/internal/ai/runtime/tooling"
"cs-agent/internal/pkg/toolx"
"github.com/cloudwego/eino/adk"
"github.com/cloudwego/eino/schema"
)
func TestConsumeAgentEventsUsesGraphToolTextAsReplyFallback(t *testing.T) {
func TestConsumeAgentEventsIgnoresPlainGraphToolText(t *testing.T) {
summary := &RunResult{
Status: "started",
InvokedToolCodes: make([]string, 0),
@@ -32,7 +34,7 @@ func TestConsumeAgentEventsUsesGraphToolTextAsReplyFallback(t *testing.T) {
toolx.GraphHandoffConversation.Name: toolx.GraphHandoffConversation.Code,
})
if summary.ReplyText != "已为你转接人工客服，请稍候。，请稍候。" {
if summary.ReplyText != "" {
t.Fatalf("unexpected reply text: %q", summary.ReplyText)
}
if summary.Status != "completed" {
@@ -40,6 +42,109 @@ func TestConsumeAgentEventsUsesGraphToolTextAsReplyFallback(t *testing.T) {
}
}
func TestConsumeAgentEventsUsesGraphToolResultReplyText(t *testing.T) {
summary := &RunResult{
Status: "started",
InvokedToolCodes: make([]string, 0),
}
payload, err := json.Marshal(tooling.ToolResult{
Handled: true,
Terminal: true,
Action: "off_hours_handoff",
ReplyText: "当前暂不在人工客服服务时间内，你可以先继续描述问题。",
ShouldRetry: false,
})
if err != nil {
t.Fatalf("marshal graph tool result: %v", err)
}
events, gen := adk.NewAsyncIteratorPair[*adk.AgentEvent]()
gen.Send(&adk.AgentEvent{
Output: &adk.AgentOutput{
MessageOutput: &adk.MessageVariant{
Role: schema.Tool,
ToolName: toolx.GraphHandoffConversation.Name,
Message: &schema.Message{
Content: string(payload),
},
},
},
})
gen.Send(&adk.AgentEvent{
Output: &adk.AgentOutput{
MessageOutput: &adk.MessageVariant{
Role: schema.Assistant,
Message: &schema.Message{
Content: "我再试一次转人工。",
},
},
},
})
gen.Close()
consumeAgentEvents(events, summary, nil, map[string]string{
toolx.GraphHandoffConversation.Name: toolx.GraphHandoffConversation.Code,
})
if summary.ReplyText != "当前暂不在人工客服服务时间内，你可以先继续描述问题。" {
t.Fatalf("unexpected reply text: %q", summary.ReplyText)
}
if summary.Status != "completed" {
t.Fatalf("unexpected summary status: %q", summary.Status)
}
}
func TestConsumeAgentEventsSuppressesGraphToolResultWhenReplyAlreadySent(t *testing.T) {
summary := &RunResult{
Status: "started",
InvokedToolCodes: make([]string, 0),
}
payload, err := json.Marshal(tooling.ToolResult{
Handled: true,
Terminal: true,
Action: "off_hours_handoff",
ReplyText: "当前暂不在人工客服服务时间内，你可以先继续描述问题。",
ReplySent: true,
ShouldRetry: false,
})
if err != nil {
t.Fatalf("marshal graph tool result: %v", err)
}
events, gen := adk.NewAsyncIteratorPair[*adk.AgentEvent]()
gen.Send(&adk.AgentEvent{
Output: &adk.AgentOutput{
MessageOutput: &adk.MessageVariant{
Role: schema.Tool,
ToolName: toolx.GraphHandoffConversation.Name,
Message: &schema.Message{
Content: string(payload),
},
},
},
})
gen.Send(&adk.AgentEvent{
Output: &adk.AgentOutput{
MessageOutput: &adk.MessageVariant{
Role: schema.Assistant,
Message: &schema.Message{
Content: "我再试一次转人工。",
},
},
},
})
gen.Close()
consumeAgentEvents(events, summary, nil, map[string]string{
toolx.GraphHandoffConversation.Name: toolx.GraphHandoffConversation.Code,
})
if summary.ReplyText != "" {
t.Fatalf("expected no committed reply because graph already sent it, got %q", summary.ReplyText)
}
if summary.Status != "completed" {
t.Fatalf("unexpected summary status: %q", summary.Status)
}
}
func TestConsumeAgentEventsCompletesGraphToolWithNoVisibleReply(t *testing.T) {
summary := &RunResult{
Status: "started",
@@ -70,44 +175,3 @@ func TestConsumeAgentEventsCompletesGraphToolWithNoVisibleReply(t *testing.T) {
t.Fatalf("unexpected summary status: %q", summary.Status)
}
}
func TestConsumeAgentEventsSuppressesAssistantReplyAfterSilentHandoffTool(t *testing.T) {
summary := &RunResult{
Status: "started",
InvokedToolCodes: make([]string, 0),
}
events, gen := adk.NewAsyncIteratorPair[*adk.AgentEvent]()
gen.Send(&adk.AgentEvent{
Output: &adk.AgentOutput{
MessageOutput: &adk.MessageVariant{
Role: schema.Tool,
ToolName: toolx.GraphHandoffConversation.Name,
Message: &schema.Message{
Content: "",
},
},
},
})
gen.Send(&adk.AgentEvent{
Output: &adk.AgentOutput{
MessageOutput: &adk.MessageVariant{
Role: schema.Assistant,
Message: &schema.Message{
Content: "好的，已为您发起转接人工客服的请求。系统正在为您确认，请稍候。",
},
},
},
})
gen.Close()
consumeAgentEvents(events, summary, nil, map[string]string{
toolx.GraphHandoffConversation.Name: toolx.GraphHandoffConversation.Code,
})
if summary.ReplyText != "" {
t.Fatalf("expected assistant reply after silent handoff to be suppressed, got %q", summary.ReplyText)
}
if summary.Status != "completed" {
t.Fatalf("unexpected summary status: %q", summary.Status)
}
}
internal/ai/runtime/graphs/create_ticket_graph.go
+15 -2
View File
@@ -6,6 +6,7 @@ import (
"fmt"
"strings"
"cs-agent/internal/ai/runtime/tooling"
"cs-agent/internal/models"
"cs-agent/internal/pkg/dto"
"cs-agent/internal/pkg/dto/request"
@@ -84,9 +85,21 @@ func (g *CreateTicketGraph) Run(ctx context.Context, argumentsInJSON string) (st
if err != nil {
return "", err
}
return fmt.Sprintf("工单已创建，工单号：%s，标题：%s。", strings.TrimSpace(item.TicketNo), strings.TrimSpace(item.Title)), nil
return tooling.MarshalToolResult(tooling.ToolResult{
Handled: true,
Terminal: true,
Action: "ticket_created",
ReplyText: fmt.Sprintf("工单已创建，工单号：%s，标题：%s。", strings.TrimSpace(item.TicketNo), strings.TrimSpace(item.Title)),
ShouldRetry: false,
}), nil
case ConfirmationDecisionCancel:
return CancelCreateTicketReply, nil
return tooling.MarshalToolResult(tooling.ToolResult{
Handled: true,
Terminal: true,
Action: "ticket_cancelled",
ReplyText: CancelCreateTicketReply,
ShouldRetry: false,
}), nil
default:
info := CreateTicketGraphInterruptInfo{
Type: InterruptTypeTicketCreationConfirmation,
internal/ai/runtime/graphs/handoff_graph.go
+23 -3
View File
@@ -6,6 +6,7 @@ import (
"fmt"
"strings"
"cs-agent/internal/ai/runtime/tooling"
"cs-agent/internal/models"
"cs-agent/internal/services"
@@ -53,7 +54,14 @@ func (g *HandoffGraph) Run(ctx context.Context, argumentsInJSON string) (string,
handled, err := services.ConversationService.TryOffHoursHandoffByAI(g.conversation.ID, g.aiAgent, reason)
if err != nil || handled {
if handled && err == nil {
return services.HandoffOffHoursMessage, nil
return tooling.MarshalToolResult(tooling.ToolResult{
Handled: true,
Terminal: true,
Action: "off_hours_handoff",
ReplyText: services.HandoffOffHoursMessage,
ReplySent: true,
ShouldRetry: false,
}), nil
}
return "", err
}
@@ -87,9 +95,21 @@ func (g *HandoffGraph) Run(ctx context.Context, argumentsInJSON string) (string,
return "", err
}
// ConversationService sends the customer-visible handoff notice according to the dispatch decision.
return "", nil
return tooling.MarshalToolResult(tooling.ToolResult{
Handled: true,
Terminal: true,
Action: "handoff_confirmed",
ReplySent: true,
ShouldRetry: false,
}), nil
case ConfirmationDecisionCancel:
return CancelHandoffReply, nil
return tooling.MarshalToolResult(tooling.ToolResult{
Handled: true,
Terminal: true,
Action: "handoff_cancelled",
ReplyText: CancelHandoffReply,
ShouldRetry: false,
}), nil
default:
info := HandoffGraphInterruptInfo{
Type: InterruptTypeHandoffConfirmation,
internal/ai/runtime/graphs/handoff_graph_test.go
+14 -2
View File
@@ -2,10 +2,12 @@ package graphs
import (
"context"
"encoding/json"
"strings"
"testing"
"time"
"cs-agent/internal/ai/runtime/tooling"
"cs-agent/internal/models"
"cs-agent/internal/pkg/enums"
"cs-agent/internal/services"
@@ -25,8 +27,18 @@ func TestHandoffGraphOffHoursSendsNoticeWithoutConfirmation(t *testing.T) {
if err != nil {
t.Fatalf("Run() error = %v", err)
}
if reply != services.HandoffOffHoursMessage {
t.Fatalf("expected off-hours graph reply, got %q", reply)
var result tooling.ToolResult
if err := json.Unmarshal([]byte(reply), &result); err != nil {
t.Fatalf("expected graph tool result JSON, got %q: %v", reply, err)
}
if !result.Handled || !result.Terminal || result.ShouldRetry {
t.Fatalf("unexpected graph result flags: %+v", result)
}
if !result.ReplySent {
t.Fatalf("expected graph result to mark replySent, got %+v", result)
}
if result.Action != "off_hours_handoff" || result.ReplyText != services.HandoffOffHoursMessage {
t.Fatalf("unexpected off-hours graph result: %+v", result)
}
message := services.MessageService.FindOne(sqls.NewCnd().Eq("conversation_id", conversation.ID).Desc("id"))
internal/ai/runtime/tooling/tool_result.go
+42
View File
@@ -0,0 +1,42 @@
package tooling
import (
"encoding/json"
"strings"
)
type ToolResult struct {
Handled bool `json:"handled"`
Terminal bool `json:"terminal"`
Action string `json:"action"`
ReplyText string `json:"replyText,omitempty"`
ReplySent bool `json:"replySent,omitempty"`
ShouldRetry bool `json:"shouldRetry"`
}
func MarshalToolResult(result ToolResult) string {
result.Action = strings.TrimSpace(result.Action)
result.ReplyText = strings.TrimSpace(result.ReplyText)
buf, err := json.Marshal(result)
if err != nil {
return ""
}
return string(buf)
}
func ParseToolResult(raw string) (ToolResult, bool) {
raw = strings.TrimSpace(raw)
if raw == "" {
return ToolResult{}, false
}
var result ToolResult
if err := json.Unmarshal([]byte(raw), &result); err != nil {
return ToolResult{}, false
}
result.Action = strings.TrimSpace(result.Action)
result.ReplyText = strings.TrimSpace(result.ReplyText)
if result.Action == "" && result.ReplyText == "" && !result.Handled && !result.Terminal {
return ToolResult{}, false
}
return result, true
}
internal/ai/runtime/tools/handoff_graph_tool.go
+1 -1
View File
@@ -52,7 +52,7 @@ func (t *HandoffGraphTool) Build(ctx registry.Context) (einotool.BaseTool, error
func (t *HandoffGraphTool) Info(ctx context.Context) (*schema.ToolInfo, error) {
return &schema.ToolInfo{
Name: toolx.GraphHandoffConversation.Name,
Desc: "Graph Tool。用于封装转人工原因整理、用户确认、真正转人工和结果返回的确定性流程。仅在用户明确要求人工客服，或你已确认必须转人工处理时调用。",
Desc: "Graph Tool。用于封装转人工原因整理、用户确认、真正转人工和结果返回的确定性流程。仅在用户明确要求人工客服，或你已确认必须转人工处理时调用；若结果标记 terminal=true 且 shouldRetry=false，不要重复调用。",
ParamsOneOf: schema.NewParamsOneOfByJSONSchema(&einojsonschema.Schema{
Version: einojsonschema.Version,
Type: "object",