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

Refactor AI Agent and AI Config handling across multiple files

Browse Source 
- Updated function signatures to accept AI Agent and AI Config as non-pointer types for better clarity and safety.
- Modified instances where AI Agent and AI Config were dereferenced to improve code readability.
- Removed unnecessary nil checks for AI Agent and AI Config, simplifying the logic.
- Adjusted related tests and services to align with the new function signatures.
- Cleaned up code in runtime, skills, and executor packages to ensure consistency in handling AI configurations.
This commit is contained in:
mlogclub
2026-04-17 17:57:01 +08:00
parent 3b062c327c
commit 976b9defde
36 changed files with 102 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ai/skills/candidate_loader.go
+1 -4
View File
@@ -20,10 +20,7 @@ func (l *candidateLoader) findManualSkillDefinition(skillCode string) *models.Sk
return repositories.SkillDefinitionRepository.GetByCode(sqls.DB(), skillCode)
}
func (l *candidateLoader) loadCandidateSkills(aiAgent *models.AIAgent) []models.SkillDefinition {
if aiAgent == nil {
return nil
}
func (l *candidateLoader) loadCandidateSkills(aiAgent models.AIAgent) []models.SkillDefinition {
skillIDs := utils.SplitInt64s(aiAgent.SkillIDs)
skills := repositories.SkillDefinitionRepository.GetByIDs(sqls.DB(), skillIDs)
ret := make([]models.SkillDefinition, 0, len(skillIDs))
internal/ai/skills/log_test.go
+6 -6
View File
@@ -11,16 +11,16 @@ import (
func TestBuildRunLogMatchedPlan(t *testing.T) {
log := BuildRunLog(
RuntimeContext{
AIAgent: &models.AIAgent{ID: 22},
AIConfig: &models.AIConfig{ID: 33},
AIAgent: models.AIAgent{ID: 22},
AIConfig: models.AIConfig{ID: 33},
ConversationID: 11,
ManualSkillCode: "manual_refund",
IntentCode: "refund",
UserMessage: "我要退款",
},
&ExecutionPlan{
AIAgent: &models.AIAgent{ID: 22},
AIConfig: &models.AIConfig{
AIAgent: models.AIAgent{ID: 22},
AIConfig: models.AIConfig{
ID: 33,
ModelName: "gpt-test",
Provider: enums.AIProviderOpenAI,
@@ -55,7 +55,7 @@ func TestBuildRunLogMatchedPlan(t *testing.T) {
func TestBuildRunLogNotMatchedAndError(t *testing.T) {
log := BuildRunLog(
RuntimeContext{
AIAgent: &models.AIAgent{ID: 22},
AIAgent: models.AIAgent{ID: 22},
UserMessage: "随便问问",
},
nil,
@@ -74,7 +74,7 @@ func TestBuildRunLogNotMatchedAndError(t *testing.T) {
}
noMatchLog := BuildRunLog(
RuntimeContext{AIAgent: &models.AIAgent{ID: 22}, UserMessage: "随便问问"},
RuntimeContext{AIAgent: models.AIAgent{ID: 22}, UserMessage: "随便问问"},
&ExecutionPlan{MatchReason: ""},
&ExecutionTrace{Status: "not_matched"},
nil,
internal/ai/skills/matcher.go
+3 -3
View File
@@ -16,7 +16,7 @@ type intentTriggerConfig struct {
}
// MatchSkill 对单个 SkillDefinition 执行命中判断。
func MatchSkill(execCtx context.Context, ctx RuntimeContext, aiAgent *models.AIAgent, aiConfig *models.AIConfig) (*models.SkillDefinition, string, *RouteTrace, error) {
func MatchSkill(execCtx context.Context, ctx RuntimeContext) (*models.SkillDefinition, string, *RouteTrace, error) {
loader := newCandidateLoader()
if strs.IsNotBlank(ctx.ManualSkillCode) {
skill := loader.findManualSkillDefinition(ctx.ManualSkillCode)
@@ -29,7 +29,7 @@ func MatchSkill(execCtx context.Context, ctx RuntimeContext, aiAgent *models.AIA
}, nil
}
candidates := loader.loadCandidateSkills(aiAgent)
candidates := loader.loadCandidateSkills(ctx.AIAgent)
trace := &RouteTrace{
Status: "started",
CandidateSkillCodes: make([]string, 0, len(candidates)),
@@ -53,7 +53,7 @@ func MatchSkill(execCtx context.Context, ctx RuntimeContext, aiAgent *models.AIA
}
}
selected, routeTrace, err := routeSkillWithLLM(execCtx, aiConfig, ctx.UserMessage, candidates)
selected, routeTrace, err := routeSkillWithLLM(execCtx, ctx.AIConfig, ctx.UserMessage, candidates)
if routeTrace != nil {
trace.Status = routeTrace.Status
trace.SelectedSkillCode = routeTrace.SelectedSkillCode
internal/ai/skills/plan_service.go
+1 -9
View File
@@ -3,8 +3,6 @@ package skills
import (
"context"
"strings"
"cs-agent/internal/pkg/errorsx"
)
func newPlanService() *planService {
@@ -15,13 +13,7 @@ type planService struct{}
// BuildExecutionPlan 构建当前请求的 Skill 执行计划。
func (s *planService) BuildExecutionPlan(execCtx context.Context, ctx RuntimeContext) (*ExecutionPlan, error) {
if ctx.AIAgent == nil {
return nil, errorsx.InvalidParam("AIAgent不能为空")
}
if ctx.AIConfig == nil {
return nil, errorsx.InvalidParam("AIConfig不能为空")
}
skill, matchReason, routeTrace, err := MatchSkill(execCtx, ctx, ctx.AIAgent, ctx.AIConfig)
skill, matchReason, routeTrace, err := MatchSkill(execCtx, ctx)
if err != nil {
return nil, err
}
internal/ai/skills/router.go
+1 -7
View File
@@ -9,16 +9,10 @@ import (
"cs-agent/internal/ai"
"cs-agent/internal/models"
"cs-agent/internal/pkg/errorsx"
)
func routeSkillWithLLM(ctx context.Context, aiConfig *models.AIConfig, userMessage string, candidates []models.SkillDefinition) (*models.SkillDefinition, *RouteTrace, error) {
func routeSkillWithLLM(ctx context.Context, aiConfig models.AIConfig, userMessage string, candidates []models.SkillDefinition) (*models.SkillDefinition, *RouteTrace, error) {
trace := &RouteTrace{Status: "started"}
if aiConfig == nil {
trace.Status = "config_error"
trace.Error = "ai config is nil"
return nil, trace, errorsx.InvalidParam("Skill 路由依赖的 AI 配置不可用")
}
if len(candidates) == 0 {
trace.Status = "no_candidate"
return nil, trace, nil
internal/ai/skills/runlog_service.go
+5 -16
View File
@@ -20,7 +20,7 @@ type RunLogService struct{}
func (s *RunLogService) Build(ctx RuntimeContext, plan *ExecutionPlan, trace *ExecutionTrace, err error) *models.SkillRunLog {
log := &models.SkillRunLog{
ConversationID: ctx.ConversationID,
AIAgentID: resolveRuntimeAIAgentID(ctx, plan),
AIAgentID: ctx.AIAgent.ID,
ManualSkillCode: ctx.ManualSkillCode,
IntentCode: ctx.IntentCode,
UserMessage: ctx.UserMessage,
@@ -28,11 +28,10 @@ func (s *RunLogService) Build(ctx RuntimeContext, plan *ExecutionPlan, trace *Ex
CreatedAt: time.Now(),
}
if plan != nil {
if plan.AIConfig != nil {
log.AIConfigID = plan.AIConfig.ID
log.UsedModel = plan.AIConfig.ModelName
log.UsedProvider = plan.AIConfig.Provider
}
log.AIConfigID = plan.AIConfig.ID
log.UsedModel = plan.AIConfig.ModelName
log.UsedProvider = plan.AIConfig.Provider
if plan.Skill != nil {
log.SkillDefinitionID = plan.Skill.ID
log.SkillCode = plan.Skill.Code
@@ -53,16 +52,6 @@ func (s *RunLogService) Build(ctx RuntimeContext, plan *ExecutionPlan, trace *Ex
return log
}
func resolveRuntimeAIAgentID(ctx RuntimeContext, plan *ExecutionPlan) int64 {
if ctx.AIAgent != nil {
return ctx.AIAgent.ID
}
if plan != nil && plan.AIAgent != nil {
return plan.AIAgent.ID
}
return 0
}
// Write 写入 Skill 路由日志。
func (s *RunLogService) Write(log *models.SkillRunLog) error {
if log == nil {
internal/ai/skills/types.go
+8 -8
View File
@@ -4,18 +4,18 @@ import "cs-agent/internal/models"
// RuntimeContext 表示一次 Skill 运行的输入上下文。
type RuntimeContext struct {
AIAgent *models.AIAgent // AIAgent 为当前请求所属的 AI Agent，必填。
AIConfig *models.AIConfig // AIConfig 为当前请求实际使用的模型配置，必填。
UserMessage string // UserMessage 为当前用户输入。
ConversationID int64 // ConversationID 为当前会话 ID，无会话上下文时为 0。
ManualSkillCode string // ManualSkillCode 为显式指定的 Skill 编码。
IntentCode string // IntentCode 为上游识别出的意图编码。
AIAgent models.AIAgent // AIAgent 为当前请求所属的 AI Agent，必填。
AIConfig models.AIConfig // AIConfig 为当前请求实际使用的模型配置，必填。
UserMessage string // UserMessage 为当前用户输入。
ConversationID int64 // ConversationID 为当前会话 ID，无会话上下文时为 0。
ManualSkillCode string // ManualSkillCode 为显式指定的 Skill 编码。
IntentCode string // IntentCode 为上游识别出的意图编码。
}
// ExecutionPlan 表示 Skill Runtime 计算出的最终路由结果。
type ExecutionPlan struct {
AIAgent *models.AIAgent // AIAgent 为本次请求所属的 AI Agent。
AIConfig *models.AIConfig // AIConfig 为本次请求实际使用的模型配置。
AIAgent models.AIAgent // AIAgent 为本次请求所属的 AI Agent。
AIConfig models.AIConfig // AIConfig 为本次请求实际使用的模型配置。
Skill *models.SkillDefinition // Skill 为最终命中的 Skill，未命中时为空。
MatchReason string // MatchReason 为命中原因。
RouteTrace *RouteTrace // RouteTrace 为匹配阶段的路由追踪。