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

Refactor error handling in services to use internationalized error messages

Browse Source 
- Updated OSSStorage validation errors to use internationalized messages.
- Changed error messages in provider.go for unsupported file storage types.
- Refactored tag_service.go to replace hardcoded error messages with internationalized versions.
- Updated ticket_service.go to use internationalized error messages for various validation checks.
- Refactored ticket_tag_service.go to use internationalized error messages for tag validation.
- Changed ticket_view_service.go to use internationalized error messages for view validation.
- Updated tool_catalog_service.go to use internationalized error messages for tool code validation.
- Refactored user_service.go to replace error messages with internationalized versions.
- Updated ws_service.go to use internationalized error messages for WebSocket handling.
- Refactored wxwork_kf_inbound_service.go to use internationalized error messages for message handling.
- Updated wxwork_kf_outbound_service.go to use internationalized error messages for outbound message handling.
- Refactored wxwork_login_service.go to use internationalized error messages for login handling.
- Updated login.go in wxwork package to use internationalized error messages for login state and ticket validation.
This commit is contained in:
mlogclub
2026-06-02 20:51:13 +08:00
parent 77be1b4f5e
commit 0b4a1b4594
103 changed files with 1688 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ai/embedding.go
+2 -2
View File
@@ -32,7 +32,7 @@ func (s *embedding) GetModel(ctx context.Context) (*models.AIConfig, error) {
func (s *embedding) GenerateEmbedding(ctx context.Context, text string) (*EmbeddingResult, error) {
if text == "" {
return nil, errorsx.InvalidParam("文本内容不能为空")
return nil, errorsx.InvalidParamI18n("error.e0215")
}
result, err := s.callEmbeddingAPI(ctx, text)
@@ -45,7 +45,7 @@ func (s *embedding) GenerateEmbedding(ctx context.Context, text string) (*Embedd
func (s *embedding) GenerateBatchEmbeddings(ctx context.Context, texts []string) ([]EmbeddingResult, error) {
if len(texts) == 0 {
return nil, errorsx.InvalidParam("文本列表不能为空")
return nil, errorsx.InvalidParamI18n("error.e0216")
}
results := make([]EmbeddingResult, 0, len(texts))
internal/ai/mcps/client.go
+7 -7
View File
@@ -2,12 +2,12 @@ package mcps
import (
"context"
"fmt"
"net/http"
"strings"
"time"
"agent-desk/internal/pkg/errorsx"
"agent-desk/internal/pkg/i18nx"
"github.com/modelcontextprotocol/go-sdk/mcp"
)
@@ -52,7 +52,7 @@ func (c *Client) ListTools(ctx context.Context, cfg ServerConfig) ([]ToolInfo, e
result, err := session.ListTools(ctx, nil)
if err != nil {
return nil, fmt.Errorf("列出 MCP 工具失败: %w", err)
return nil, i18nx.Errorf("error.mcp.listToolsFailed", err)
}
ret := make([]ToolInfo, 0, len(result.Tools))
for _, tool := range result.Tools {
@@ -70,7 +70,7 @@ func (c *Client) ListTools(ctx context.Context, cfg ServerConfig) ([]ToolInfo, e
func (c *Client) CallTool(ctx context.Context, cfg ServerConfig, toolName string, arguments map[string]any) (*ToolCallResult, error) {
toolName = strings.TrimSpace(toolName)
if toolName == "" {
return nil, errorsx.InvalidParam("toolName不能为空")
return nil, errorsx.InvalidParamI18n("error.e0076")
}
session, closeFn, err := c.connect(ctx, cfg)
@@ -84,7 +84,7 @@ func (c *Client) CallTool(ctx context.Context, cfg ServerConfig, toolName string
Arguments: arguments,
})
if err != nil {
return nil, fmt.Errorf("调用 MCP 工具失败: %w", err)
return nil, i18nx.Errorf("error.mcp.callToolFailed", err)
}
return &ToolCallResult{
ServerCode: cfg.Code,
@@ -97,10 +97,10 @@ func (c *Client) CallTool(ctx context.Context, cfg ServerConfig, toolName string
func (c *Client) connect(ctx context.Context, cfg ServerConfig) (*mcp.ClientSession, func(), error) {
if strings.TrimSpace(cfg.Code) == "" {
return nil, nil, errorsx.InvalidParam("serverCode不能为空")
return nil, nil, errorsx.InvalidParamI18n("error.e0070")
}
if strings.TrimSpace(cfg.Endpoint) == "" {
return nil, nil, errorsx.InvalidParam("MCP endpoint不能为空")
return nil, nil, errorsx.InvalidParamI18n("error.e0032")
}
timeout := time.Duration(cfg.TimeoutMS) * time.Millisecond
@@ -128,7 +128,7 @@ func (c *Client) connect(ctx context.Context, cfg ServerConfig) (*mcp.ClientSess
session, err := client.Connect(connCtx, transport, nil)
if err != nil {
cancel()
return nil, nil, fmt.Errorf("连接 MCP Server 失败: %w", err)
return nil, nil, i18nx.Errorf("error.mcp.connectServerFailed", err)
}
return session, func() {
_ = session.Close()
internal/ai/mcps/runtime.go
+4 -4
View File
@@ -39,18 +39,18 @@ func (s *RuntimeService) ListTools(ctx context.Context, serverCode string) ([]To
func (s *RuntimeService) resolveServer(serverCode string) (ServerConfig, error) {
cfg := config.Current()
if !cfg.MCP.Enabled {
return ServerConfig{}, errorsx.InvalidParam("MCP未启用")
return ServerConfig{}, errorsx.InvalidParamI18n("error.e0035")
}
serverCode = strings.TrimSpace(serverCode)
if serverCode == "" {
return ServerConfig{}, errorsx.InvalidParam("serverCode不能为空")
return ServerConfig{}, errorsx.InvalidParamI18n("error.e0070")
}
server, ok := cfg.MCP.Servers[serverCode]
if !ok {
return ServerConfig{}, errorsx.InvalidParam("MCP服务配置不存在")
return ServerConfig{}, errorsx.InvalidParamI18n("error.e0034")
}
if !server.Enabled {
return ServerConfig{}, errorsx.InvalidParam("MCP服务未启用")
return ServerConfig{}, errorsx.InvalidParamI18n("error.e0033")
}
return ServerConfig{
Code: serverCode,
internal/ai/rag/answer.go
+3 -3
View File
@@ -25,7 +25,7 @@ var Answer = &answer{}
func (s *answer) DebugSearch(ctx context.Context, req request.KnowledgeSearchRequest) (*response.KnowledgeSearchResponse, error) {
if strings.TrimSpace(req.Question) == "" {
return nil, errorsx.InvalidParam("问题不能为空")
return nil, errorsx.InvalidParamI18n("error.e0340")
}
startedAt := time.Now()
results, err := s.retrieve(req, ctx)
@@ -60,7 +60,7 @@ func (s *answer) DebugSearch(ctx context.Context, req request.KnowledgeSearchReq
func (s *answer) DebugAnswer(ctx context.Context, req request.KnowledgeAnswerRequest, operator *dto.AuthPrincipal) (*response.KnowledgeAnswerResponse, error) {
if strings.TrimSpace(req.Question) == "" {
return nil, errorsx.InvalidParam("问题不能为空")
return nil, errorsx.InvalidParamI18n("error.e0340")
}
startedAt := time.Now()
@@ -276,7 +276,7 @@ func (s *answer) BuildDocumentIndex(ctx context.Context, documentID int64) error
func (s *answer) retrieve(req request.KnowledgeSearchRequest, ctx context.Context) ([]RetrieveResult, error) {
if len(normalizeKnowledgeBaseIDs(req.KnowledgeBaseIDs)) == 0 {
return nil, errorsx.InvalidParam("知识库不能为空")
return nil, errorsx.InvalidParamI18n("error.e0284")
}
knowledgeBases := s.loadKnowledgeBases(req.KnowledgeBaseIDs)
internal/ai/runtime/debug_run.go
+10 -10
View File
@@ -22,16 +22,16 @@ func init() {
func DebugRunSkill(ctx context.Context, req request.SkillDebugRunRequest) (*response.SkillDebugRunResponse, error) {
aiAgent := svc.AIAgentService.Get(req.AIAgentID)
if aiAgent == nil || aiAgent.Status != enums.StatusOk {
return nil, errorsx.InvalidParam("AI Agent不存在或未启用")
return nil, errorsx.InvalidParamI18n("error.e0007")
}
aiConfig := svc.AIConfigService.Get(aiAgent.AIConfigID)
if aiConfig == nil {
return nil, errorsx.InvalidParam("AI Agent关联的AI配置不存在")
return nil, errorsx.InvalidParamI18n("error.e0008")
}
var conversation *models.Conversation
if req.ConversationID > 0 {
if conversation = svc.ConversationService.Get(req.ConversationID); conversation == nil {
return nil, errorsx.InvalidParam("会话不存在")
return nil, errorsx.InvalidParamI18n("error.e0116")
}
} else {
conversation = &models.Conversation{ID: req.ConversationID, AIAgentID: req.AIAgentID}
@@ -57,32 +57,32 @@ func DebugRunSkill(ctx context.Context, req request.SkillDebugRunRequest) (*resp
func DebugResumeSkill(ctx context.Context, req request.SkillDebugResumeRequest) (*response.SkillDebugRunResponse, error) {
aiAgent := svc.AIAgentService.Get(req.AIAgentID)
if aiAgent == nil || aiAgent.Status != enums.StatusOk {
return nil, errorsx.InvalidParam("AI Agent不存在或未启用")
return nil, errorsx.InvalidParamI18n("error.e0007")
}
aiConfig := svc.AIConfigService.Get(aiAgent.AIConfigID)
if aiConfig == nil {
return nil, errorsx.InvalidParam("AI Agent关联的AI配置不存在")
return nil, errorsx.InvalidParamI18n("error.e0008")
}
pendingInterrupt := svc.ConversationInterruptService.GetByCheckPointID(strings.TrimSpace(req.CheckPointID))
if pendingInterrupt == nil {
return nil, errorsx.InvalidParam("CheckPoint 不存在")
return nil, errorsx.InvalidParamI18n("error.e0014")
}
if pendingInterrupt.AIAgentID > 0 && pendingInterrupt.AIAgentID != req.AIAgentID {
return nil, errorsx.InvalidParam("CheckPoint 与 AI Agent 不匹配")
return nil, errorsx.InvalidParamI18n("error.e0015")
}
conversationID := req.ConversationID
if conversationID <= 0 {
conversationID = pendingInterrupt.ConversationID
}
if conversationID <= 0 {
return nil, errorsx.InvalidParam("会话不存在")
return nil, errorsx.InvalidParamI18n("error.e0116")
}
conversation := svc.ConversationService.Get(conversationID)
if conversation == nil {
return nil, errorsx.InvalidParam("会话不存在")
return nil, errorsx.InvalidParamI18n("error.e0116")
}
if conversation.AIAgentID > 0 && conversation.AIAgentID != req.AIAgentID {
return nil, errorsx.InvalidParam("会话与 AI Agent 不匹配")
return nil, errorsx.InvalidParamI18n("error.e0117")
}
resumeText := strings.TrimSpace(req.UserMessage)
summary, err := Service.Resume(ctx, applicationruntime.ResumeRequest{
internal/ai/runtime/tools/tool_search_tool.go
+3 -2
View File
@@ -10,6 +10,7 @@ import (
"agent-desk/internal/ai/mcps"
impladapter "agent-desk/internal/ai/runtime/internal/impl/adapter"
"agent-desk/internal/ai/runtime/registry"
"agent-desk/internal/pkg/i18nx"
"agent-desk/internal/pkg/toolx"
einotool "github.com/cloudwego/eino/components/tool"
@@ -161,10 +162,10 @@ func (t *ToolSearchTool) invokeTargetTool(ctx context.Context, toolCode string,
toolCode = strings.TrimSpace(toolCode)
serverCode, toolName := toolx.SplitMCPToolCode(toolCode)
if serverCode == "" || toolName == "" {
return "", fmt.Errorf("tool_search 只支持调用 MCP toolCode")
return "", i18nx.Errorf("error.e0077")
}
if !containsToolCode(t.allowedToolCodes, toolCode) {
return "", fmt.Errorf("目标工具未被当前会话授权")
return "", i18nx.Errorf("error.e0279")
}
result, err := mcps.Runtime.CallTool(ctx, serverCode, toolName, cloneArguments(arguments))
if err != nil {
internal/ai/skills/matcher.go
+1 -1
View File
@@ -21,7 +21,7 @@ func MatchSkill(execCtx context.Context, ctx RuntimeContext) (*models.SkillDefin
if strs.IsNotBlank(ctx.ManualSkillCode) {
skill := loader.findManualSkillDefinition(ctx.ManualSkillCode)
if skill == nil || skill.Status != enums.StatusOk {
return nil, "", nil, errorsx.InvalidParam("Skill 不存在或未启用")
return nil, "", nil, errorsx.InvalidParamI18n("error.e0054")
}
return skill, "manual_skill_code", &RouteTrace{
Status: "manual_selected",