refactor: remove graph tools references and related logic from AIAgent and workflows
This commit is contained in:
@@ -2,9 +2,7 @@ package runtime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
|
||||
"agent-desk/internal/ai/workflow/compiler"
|
||||
"agent-desk/internal/ai/workflow/dsl"
|
||||
"agent-desk/internal/models"
|
||||
"agent-desk/internal/pkg/enums"
|
||||
@@ -16,7 +14,6 @@ import (
|
||||
|
||||
type resolvedWorkflow struct {
|
||||
Definition dsl.Definition
|
||||
Compiled compiler.Result
|
||||
WorkflowID int64
|
||||
VersionID int64
|
||||
}
|
||||
@@ -35,7 +32,6 @@ func resolveAgentWorkflow(aiAgent models.AIAgent) (resolvedWorkflow, error) {
|
||||
}
|
||||
return resolvedWorkflow{
|
||||
Definition: def,
|
||||
Compiled: compiler.Compile(def),
|
||||
WorkflowID: version.WorkflowID,
|
||||
VersionID: version.ID,
|
||||
}, nil
|
||||
@@ -46,15 +42,5 @@ func prepareWorkflowAgent(aiAgent models.AIAgent) (models.AIAgent, resolvedWorkf
|
||||
if err != nil {
|
||||
return aiAgent, resolvedWorkflow{}, err
|
||||
}
|
||||
if strings.TrimSpace(workflow.Compiled.Appendix) == "" {
|
||||
return aiAgent, workflow, nil
|
||||
}
|
||||
prompt := strings.TrimSpace(aiAgent.SystemPrompt)
|
||||
appendix := strings.TrimSpace(workflow.Compiled.Appendix)
|
||||
if prompt == "" {
|
||||
aiAgent.SystemPrompt = appendix
|
||||
return aiAgent, workflow, nil
|
||||
}
|
||||
aiAgent.SystemPrompt = prompt + "\n\n" + appendix
|
||||
return aiAgent, workflow, nil
|
||||
}
|
||||
|
||||
@@ -46,6 +46,40 @@ func TestToWorkflowSummaryPreservesInterruptCheckpoint(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrepareWorkflowAgentDoesNotInjectWorkflowAppendix(t *testing.T) {
|
||||
db := setupWorkflowResumeTestDB(t)
|
||||
definitionJSON := mustMarshalDefinition(t, dsl.Definition{
|
||||
SchemaVersion: 1,
|
||||
EntryNodeID: "start",
|
||||
Nodes: []dsl.Node{
|
||||
{ID: "start", Type: workflowregistry.NodeTypeStart, Name: "Start"},
|
||||
{ID: "handoff", Type: workflowregistry.NodeTypeHandoffToHuman, Name: "Handoff"},
|
||||
},
|
||||
Edges: []dsl.Edge{{ID: "edge_start_handoff", Source: "start", Target: "handoff"}},
|
||||
})
|
||||
version := models.AIWorkflowVersion{
|
||||
WorkflowID: 1,
|
||||
Version: 1,
|
||||
Status: enums.StatusOk,
|
||||
Definition: definitionJSON,
|
||||
}
|
||||
if err := db.Create(&version).Error; err != nil {
|
||||
t.Fatalf("create workflow version: %v", err)
|
||||
}
|
||||
|
||||
agent, _, err := prepareWorkflowAgent(models.AIAgent{
|
||||
ID: 1,
|
||||
SystemPrompt: "保持简洁回答。",
|
||||
WorkflowVersionID: version.ID,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("prepareWorkflowAgent() error = %v", err)
|
||||
}
|
||||
if agent.SystemPrompt != "保持简洁回答。" {
|
||||
t.Fatalf("expected system prompt to stay unchanged, got %q", agent.SystemPrompt)
|
||||
}
|
||||
}
|
||||
|
||||
func TestServiceResumeUsesWorkflowCheckpointData(t *testing.T) {
|
||||
db := setupWorkflowResumeTestDB(t)
|
||||
def := runtimeHumanConfirmDefinition()
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
package compiler
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"agent-desk/internal/ai/workflow/dsl"
|
||||
workflowregistry "agent-desk/internal/ai/workflow/registry"
|
||||
"agent-desk/internal/pkg/toolx"
|
||||
)
|
||||
|
||||
type Result struct {
|
||||
ToolCodes []string
|
||||
Appendix string
|
||||
}
|
||||
|
||||
func Compile(def dsl.Definition) Result {
|
||||
toolCodes := make([]string, 0)
|
||||
lines := make([]string, 0, len(def.Nodes)+2)
|
||||
if strings.TrimSpace(def.EntryNodeID) != "" {
|
||||
lines = append(lines, fmt.Sprintf("Workflow entry node: %s.", strings.TrimSpace(def.EntryNodeID)))
|
||||
}
|
||||
for _, node := range def.Nodes {
|
||||
nodeType := strings.TrimSpace(node.Type)
|
||||
if code := graphToolCodeForNodeType(nodeType); code != "" {
|
||||
toolCodes = append(toolCodes, code)
|
||||
}
|
||||
nodeName := strings.TrimSpace(node.Name)
|
||||
if nodeName == "" {
|
||||
nodeName = strings.TrimSpace(node.ID)
|
||||
}
|
||||
if nodeName == "" {
|
||||
continue
|
||||
}
|
||||
lines = append(lines, fmt.Sprintf("- %s: %s", nodeName, nodeType))
|
||||
}
|
||||
appendix := ""
|
||||
if len(lines) > 0 {
|
||||
appendix = "Published customer-service workflow:\n" + strings.Join(lines, "\n")
|
||||
}
|
||||
return Result{
|
||||
ToolCodes: toolx.NormalizeToolCodes(toolCodes),
|
||||
Appendix: appendix,
|
||||
}
|
||||
}
|
||||
|
||||
func graphToolCodeForNodeType(nodeType string) string {
|
||||
switch strings.TrimSpace(nodeType) {
|
||||
case workflowregistry.NodeTypeAnalyzeConversation:
|
||||
return toolx.GraphAnalyzeConversation.Code
|
||||
case workflowregistry.NodeTypePrepareTicketDraft:
|
||||
return toolx.GraphPrepareTicketDraft.Code
|
||||
case workflowregistry.NodeTypeCreateTicket:
|
||||
return toolx.GraphCreateTicketConfirm.Code
|
||||
case workflowregistry.NodeTypeHandoffToHuman:
|
||||
return toolx.GraphHandoffConversation.Code
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package compiler
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"agent-desk/internal/ai/workflow/dsl"
|
||||
workflowregistry "agent-desk/internal/ai/workflow/registry"
|
||||
"agent-desk/internal/pkg/toolx"
|
||||
)
|
||||
|
||||
func TestCompileMapsWorkflowNodesToGraphTools(t *testing.T) {
|
||||
result := Compile(dsl.Definition{
|
||||
EntryNodeID: "start",
|
||||
Nodes: []dsl.Node{
|
||||
{ID: "start", Type: workflowregistry.NodeTypeStart, Name: "Start"},
|
||||
{ID: "analyze", Type: workflowregistry.NodeTypeAnalyzeConversation, Name: "Analyze"},
|
||||
{ID: "draft", Type: workflowregistry.NodeTypePrepareTicketDraft, Name: "Draft"},
|
||||
{ID: "create", Type: workflowregistry.NodeTypeCreateTicket, Name: "Create"},
|
||||
{ID: "handoff", Type: workflowregistry.NodeTypeHandoffToHuman, Name: "Handoff"},
|
||||
},
|
||||
})
|
||||
want := []string{
|
||||
toolx.GraphAnalyzeConversation.Code,
|
||||
toolx.GraphPrepareTicketDraft.Code,
|
||||
toolx.GraphCreateTicketConfirm.Code,
|
||||
toolx.GraphHandoffConversation.Code,
|
||||
}
|
||||
if len(result.ToolCodes) != len(want) {
|
||||
t.Fatalf("expected %d tool codes, got %d: %#v", len(want), len(result.ToolCodes), result.ToolCodes)
|
||||
}
|
||||
for i, item := range want {
|
||||
if result.ToolCodes[i] != item {
|
||||
t.Fatalf("tool code[%d] = %s, want %s", i, result.ToolCodes[i], item)
|
||||
}
|
||||
}
|
||||
if result.Appendix == "" {
|
||||
t.Fatalf("expected workflow appendix")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user