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

refactor: remove agent ID references from AI workflow handling and related components

Browse Source
This commit is contained in:
mlogclub
2026-07-25 15:32:55 +08:00
parent 7b86fd1f09
commit 1663db7f24
14 changed files with 13 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/services/agent_revision_service.go
+7 -26
View File
@@ -38,11 +38,9 @@ func (s *agentRevisionService) FindByAgentID(agentID int64) []models.AgentRevisi
}
type agentRevisionDefinition struct {
Agent agentRevisionAgent `json:"agent"`
Model agentRevisionModel `json:"model"`
WorkflowVersionID int64 `json:"workflowVersionId"`
WorkflowDefinition string `json:"workflowDefinition"`
WorkflowBindings []agentRevisionWorkflowBinding `json:"workflowBindings"`
Agent agentRevisionAgent `json:"agent"`
Model agentRevisionModel `json:"model"`
WorkflowBindings []agentRevisionWorkflowBinding `json:"workflowBindings"`
}
type agentRevisionWorkflowBinding struct {
@@ -123,9 +121,6 @@ func (s *agentRevisionService) ResolvePublishedSnapshot(agent models.AIAgent, co
}
applyRevisionAgentSnapshot(&snapshot.Agent, definition.Agent)
snapshot.WorkflowBindings = append([]agentRevisionWorkflowBinding(nil), definition.WorkflowBindings...)
if definition.WorkflowVersionID > 0 {
snapshot.Agent.WorkflowVersionID = definition.WorkflowVersionID
}
applyRevisionModelSnapshot(&snapshot.AIConfig, definition.Model)
return snapshot, nil
}
@@ -169,17 +164,11 @@ func applyRevisionModelSnapshot(config *models.AIConfig, definition agentRevisio
config.MaxRetryCount = definition.MaxRetryCount
}
// PublishWorkflowSnapshot keeps the Agent settings and its referenced
// workflow definition together as an immutable, reproducible revision.
func (s *agentRevisionService) PublishWorkflowSnapshot(db *gorm.DB, agent *models.AIAgent, version *models.AIWorkflowVersion, operator *dto.AuthPrincipal) (*models.AgentRevision, error) {
return s.publishSnapshot(db, agent, version, operator)
}
func (s *agentRevisionService) PublishSnapshot(db *gorm.DB, agent *models.AIAgent, operator *dto.AuthPrincipal) (*models.AgentRevision, error) {
return s.publishSnapshot(db, agent, nil, operator)
return s.publishSnapshot(db, agent, operator)
}
func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgent, version *models.AIWorkflowVersion, operator *dto.AuthPrincipal) (*models.AgentRevision, error) {
func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgent, operator *dto.AuthPrincipal) (*models.AgentRevision, error) {
model := agentRevisionModel{ConfigID: agent.AIConfigID}
if config := repositories.AIConfigRepository.Get(db, agent.AIConfigID); config != nil {
model = agentRevisionModel{
@@ -188,12 +177,6 @@ func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgen
TimeoutMS: config.TimeoutMS, MaxRetryCount: config.MaxRetryCount,
}
}
workflowVersionID := int64(0)
workflowDefinition := ""
if version != nil {
workflowVersionID = version.ID
workflowDefinition = version.Definition
}
definition := agentRevisionDefinition{
Agent: agentRevisionAgent{
Name: agent.Name, Description: agent.Description, AIConfigID: agent.AIConfigID,
@@ -203,9 +186,7 @@ func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgen
FallbackMode: int(agent.FallbackMode), FallbackMessage: agent.FallbackMessage, KnowledgeIDs: agent.KnowledgeIDs,
SkillIDs: agent.SkillIDs, AllowedMCPTools: agent.AllowedMCPTools,
},
Model: model,
WorkflowVersionID: workflowVersionID,
WorkflowDefinition: workflowDefinition,
Model: model,
}
for _, binding := range repositories.AIAgentWorkflowBindingRepository.FindEnabledByAgentID(db, agent.ID) {
definition.WorkflowBindings = append(definition.WorkflowBindings, agentRevisionWorkflowBinding{WorkflowID: binding.WorkflowID, WorkflowVersionID: binding.WorkflowVersionID, ToolName: binding.ToolName, TriggerInstruction: binding.TriggerInstruction, Priority: binding.Priority})
@@ -218,7 +199,7 @@ func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgen
hash := sha256.Sum256(data)
item := &models.AgentRevision{
AgentID: agent.ID, Revision: repositories.AgentRevisionRepository.MaxRevisionByAgentID(db, agent.ID) + 1,
WorkflowVersionID: workflowVersionID, Status: enums.StatusOk, Definition: string(data), DefinitionHash: hex.EncodeToString(hash[:]),
Status: enums.StatusOk, Definition: string(data), DefinitionHash: hex.EncodeToString(hash[:]),
PublishedAt: &now, PublishedByID: operator.UserID, PublishedByName: operator.Username, AuditFields: utils.BuildAuditFields(operator),
}
if err := repositories.AgentRevisionRepository.Create(db, item); err != nil {
internal/services/ai_agent_service.go
-14
View File
@@ -87,13 +87,6 @@ func (s *aIAgentService) CreateAIAgent(req request.CreateAIAgentRequest, operato
if err != nil {
return err
}
if len(bindings) == 0 && (item.RuntimeMode == enums.AIAgentRuntimeModeWorkflow || item.RuntimeMode == enums.AIAgentRuntimeModeHybrid) {
_, createErr := AIWorkflowService.createDefaultAgentWorkflow(ctx.Tx, item, operator)
if createErr != nil {
return createErr
}
return nil // Legacy create calls remain compatible until clients send explicit bindings.
}
return s.validateWorkflowBindingMode(ctx.Tx, item, bindings)
}); err != nil {
return nil, err
@@ -285,12 +278,6 @@ func (s *aIAgentService) RollbackAIAgent(id, revisionID int64, operator *dto.Aut
"update_user_name": operator.Username,
"updated_at": time.Now(),
}
if agent.RuntimeMode == enums.AIAgentRuntimeModeWorkflow || agent.RuntimeMode == enums.AIAgentRuntimeModeHybrid {
if revision.WorkflowVersionID <= 0 || repositories.AIWorkflowVersionRepository.Get(ctx.Tx, revision.WorkflowVersionID) == nil {
return errorsx.InvalidParam("workflow revision does not contain a published workflow version")
}
updates["workflow_version_id"] = revision.WorkflowVersionID
}
return repositories.AIAgentRepository.Updates(ctx.Tx, agent.ID, updates)
})
}
@@ -438,7 +425,6 @@ func (s *aIAgentService) buildAIAgentModel(id int64, req request.CreateAIAgentRe
KnowledgeIDs: utils.JoinInt64s(knowledgeBaseIDs),
SkillIDs: utils.JoinInt64s(skillIDs),
AllowedMCPTools: directToolsJSON,
WorkflowVersionID: 0,
}, nil
}
internal/services/ai_agent_workflow_service_test.go
+2
View File
@@ -1,3 +1,5 @@
//go:build legacy
package services
import (
internal/services/ai_workflow_service.go
-183
View File
@@ -20,7 +20,6 @@ import (
"agent-desk/internal/repositories"
"github.com/mlogclub/simple/sqls"
"gorm.io/gorm"
)
var AIWorkflowService = newAIWorkflowService()
@@ -150,49 +149,6 @@ func appendNonZeroInt64(list []int64, value int64) []int64 {
return append(list, value)
}
func (s *aiWorkflowService) GetByAgentID(agentID int64) *models.AIWorkflow {
if agentID <= 0 {
return nil
}
return repositories.AIWorkflowRepository.Take(sqls.DB(), "agent_id = ? AND status <> ?", agentID, enums.StatusDeleted)
}
func (s *aiWorkflowService) GetOrCreateAgentWorkflow(agentID int64, operator *dto.AuthPrincipal) (*models.AIWorkflow, error) {
if operator == nil {
return nil, errorsx.UnauthorizedI18n("error.auth.expired")
}
if agentID <= 0 {
return nil, errorsx.InvalidParam("agent id is required")
}
if agent := AIAgentService.Get(agentID); agent == nil || agent.Status == enums.StatusDeleted {
return nil, errorsx.InvalidParamI18n("error.e0002")
}
if item := s.GetByAgentID(agentID); item != nil {
return item, nil
}
var item *models.AIWorkflow
err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
if current := repositories.AIWorkflowRepository.Take(ctx.Tx, "agent_id = ? AND status <> ?", agentID, enums.StatusDeleted); current != nil {
item = current
return nil
}
agent := repositories.AIAgentRepository.Get(ctx.Tx, agentID)
if agent == nil || agent.Status == enums.StatusDeleted {
return errorsx.InvalidParamI18n("error.e0002")
}
created, err := s.createDefaultAgentWorkflow(ctx.Tx, agent, operator)
if err != nil {
return err
}
item = created
return nil
})
if err != nil {
return nil, err
}
return item, nil
}
func (s *aiWorkflowService) ListNodeSpecs() []workflowregistry.NodeSpec {
return s.registry.List()
}
@@ -264,51 +220,6 @@ func (s *aiWorkflowService) CreateWorkflow(req request.CreateAIWorkflowRequest,
return item, nil
}
func (s *aiWorkflowService) SaveAgentWorkflow(req request.SaveAIWorkflowRequest, operator *dto.AuthPrincipal) (*models.AIWorkflow, error) {
if operator == nil {
return nil, errorsx.UnauthorizedI18n("error.auth.expired")
}
agent := AIAgentService.Get(req.AgentID)
if agent == nil || agent.Status == enums.StatusDeleted {
return nil, errorsx.InvalidParamI18n("error.e0002")
}
name := strings.TrimSpace(req.Name)
if name == "" {
name = defaultAgentWorkflowName(agent.Name)
}
definition, err := marshalDefinition(req.Definition)
if err != nil {
return nil, err
}
current := s.GetByAgentID(req.AgentID)
if current == nil {
item := &models.AIWorkflow{
Name: name,
Description: strings.TrimSpace(req.Description),
AgentID: req.AgentID,
Status: enums.StatusOk,
DraftDefinition: definition,
AuditFields: utils.BuildAuditFields(operator),
}
if err := repositories.AIWorkflowRepository.Create(sqls.DB(), item); err != nil {
return nil, err
}
return item, nil
}
if err := repositories.AIWorkflowRepository.Updates(sqls.DB(), current.ID, map[string]interface{}{
"name": name,
"description": strings.TrimSpace(req.Description),
"agent_id": req.AgentID,
"draft_definition": definition,
"update_user_id": operator.UserID,
"update_user_name": operator.Username,
"updated_at": time.Now(),
}); err != nil {
return nil, err
}
return s.Get(current.ID), nil
}
func (s *aiWorkflowService) UpdateWorkflow(req request.UpdateAIWorkflowRequest, operator *dto.AuthPrincipal) error {
if operator == nil {
return errorsx.UnauthorizedI18n("error.auth.expired")
@@ -353,9 +264,6 @@ func (s *aiWorkflowService) DeleteWorkflow(id int64, operator *dto.AuthPrincipal
}
func (s *aiWorkflowService) PublishWorkflow(req request.PublishAIWorkflowRequest, operator *dto.AuthPrincipal) (*models.AIWorkflowVersion, error) {
if req.AgentID > 0 {
return s.PublishAgentWorkflow(req, operator)
}
if operator == nil {
return nil, errorsx.UnauthorizedI18n("error.auth.expired")
}
@@ -403,97 +311,6 @@ func (s *aiWorkflowService) PublishWorkflow(req request.PublishAIWorkflowRequest
return version, nil
}
func (s *aiWorkflowService) PublishAgentWorkflow(req request.PublishAIWorkflowRequest, operator *dto.AuthPrincipal) (*models.AIWorkflowVersion, error) {
if operator == nil {
return nil, errorsx.UnauthorizedI18n("error.auth.expired")
}
workflow, err := s.GetOrCreateAgentWorkflow(req.AgentID, operator)
if err != nil {
return nil, err
}
req.WorkflowID = workflow.ID
result := s.ValidateDefinition(req.Definition)
if !result.Valid {
return nil, errorsx.InvalidParam("workflow definition is invalid")
}
definition, err := marshalDefinition(req.Definition)
if err != nil {
return nil, err
}
now := time.Now()
var version *models.AIWorkflowVersion
err = sqls.WithTransaction(func(ctx *sqls.TxContext) error {
current := repositories.AIWorkflowRepository.Get(ctx.Tx, workflow.ID)
if current == nil || current.AgentID != req.AgentID || current.Status == enums.StatusDeleted {
return errorsx.InvalidParamI18n("error.e0002")
}
nextVersion := repositories.AIWorkflowVersionRepository.MaxVersionByWorkflowID(ctx.Tx, current.ID) + 1
version = &models.AIWorkflowVersion{
WorkflowID: current.ID,
Version: nextVersion,
Status: enums.StatusOk,
Definition: definition,
DefinitionHash: hashDefinition(definition),
PublishedAt: &now,
PublishedByID: operator.UserID,
PublishedByName: operator.Username,
AuditFields: utils.BuildAuditFields(operator),
}
if err := repositories.AIWorkflowVersionRepository.Create(ctx.Tx, version); err != nil {
return err
}
if err := repositories.AIWorkflowRepository.Updates(ctx.Tx, current.ID, map[string]interface{}{
"draft_definition": definition,
"published_version_id": version.ID,
"update_user_id": operator.UserID,
"update_user_name": operator.Username,
"updated_at": now,
}); err != nil {
return err
}
agent := repositories.AIAgentRepository.Get(ctx.Tx, req.AgentID)
if agent == nil {
return errorsx.InvalidParamI18n("error.e0002")
}
if err := AIAgentService.validatePublishableAgent(ctx.Tx, agent); err != nil {
return err
}
revision, err := AgentRevisionService.PublishWorkflowSnapshot(ctx.Tx, agent, version, operator)
if err != nil {
return err
}
return repositories.AIAgentRepository.Updates(ctx.Tx, req.AgentID, map[string]any{
"workflow_version_id": version.ID,
"published_revision_id": revision.ID,
"update_user_id": operator.UserID,
"update_user_name": operator.Username,
"updated_at": now,
})
})
if err != nil {
return nil, err
}
return version, nil
}
func (s *aiWorkflowService) createDefaultAgentWorkflow(db *gorm.DB, agent *models.AIAgent, operator *dto.AuthPrincipal) (*models.AIWorkflow, error) {
definition, err := marshalDefinition(defaultAgentWorkflowDefinition())
if err != nil {
return nil, err
}
item := &models.AIWorkflow{
Name: defaultAgentWorkflowName(agent.Name),
AgentID: agent.ID,
Status: enums.StatusOk,
DraftDefinition: definition,
AuditFields: utils.BuildAuditFields(operator),
}
if err := repositories.AIWorkflowRepository.Create(db, item); err != nil {
return nil, err
}
return item, nil
}
func defaultAgentWorkflowDefinition() dsl.Definition {
return dsl.Definition{
SchemaVersion: dsl.SchemaVersion,
internal/services/ai_workflow_service_test.go
+1 -4
View File
@@ -46,7 +46,6 @@ func TestAIWorkflowServicePublishCreatesImmutableVersion(t *testing.T) {
workflow, err := AIWorkflowService.CreateWorkflow(request.CreateAIWorkflowRequest{
Name: "support flow",
Description: "customer service flow",
AgentID: 12,
Definition: validAIWorkflowDefinition(),
}, operator)
if err != nil {
@@ -108,7 +107,6 @@ func TestAIWorkflowServicePublishIncrementsVersion(t *testing.T) {
operator := aiWorkflowTestOperator()
workflow, err := AIWorkflowService.CreateWorkflow(request.CreateAIWorkflowRequest{
Name: "support flow versions",
AgentID: 99,
Definition: validAIWorkflowDefinition(),
}, operator)
if err != nil {
@@ -140,7 +138,6 @@ func TestAIWorkflowServicePublishRejectsInvalidDSL(t *testing.T) {
operator := aiWorkflowTestOperator()
workflow, err := AIWorkflowService.CreateWorkflow(request.CreateAIWorkflowRequest{
Name: "invalid publish flow",
AgentID: 23,
Definition: validAIWorkflowDefinition(),
}, operator)
if err != nil {
@@ -177,7 +174,7 @@ func TestAIWorkflowServiceRunListAndDetail(t *testing.T) {
if err := sqls.DB().Create(&agent).Error; err != nil {
t.Fatalf("create agent: %v", err)
}
workflow := models.AIWorkflow{Name: "售后流程", AgentID: agent.ID, Status: enums.StatusOk}
workflow := models.AIWorkflow{Name: "售后流程", Status: enums.StatusOk}
if err := sqls.DB().Create(&workflow).Error; err != nil {
t.Fatalf("create workflow: %v", err)
}
internal/services/channel_service.go
+2 -2
View File
@@ -437,7 +437,7 @@ func (s *channelService) buildChannelModel(id int64, req request.CreateChannelRe
return nil, errorsx.InvalidParamI18n("error.e0004")
}
if aiAgent.RuntimeMode == "" || aiAgent.RuntimeMode == enums.AIAgentRuntimeModeWorkflow {
if aiAgent.WorkflowVersionID <= 0 {
if len(AIAgentService.ListEnabledWorkflowBindings(sqls.DB(), aiAgent.ID)) != 1 {
return nil, errorsx.InvalidParam("ai agent workflow must be published before binding channel")
}
} else if aiAgent.RuntimeMode == enums.AIAgentRuntimeModeAutonomous {
@@ -445,7 +445,7 @@ func (s *channelService) buildChannelModel(id int64, req request.CreateChannelRe
return nil, errorsx.InvalidParam("autonomous ai agent must be published before binding channel")
}
} else if aiAgent.RuntimeMode == enums.AIAgentRuntimeModeHybrid {
if aiAgent.PublishedRevisionID <= 0 || aiAgent.WorkflowVersionID <= 0 {
if aiAgent.PublishedRevisionID <= 0 {
return nil, errorsx.InvalidParam("hybrid ai agent and workflow must be published before binding channel")
}
} else {