From 0b01171a86426be9935aa33a7297303d51b9b321 Mon Sep 17 00:00:00 2001 From: Jin Hai Date: Fri, 10 Jul 2026 14:26:54 +0800 Subject: [PATCH] Go: Update response message (#16803) ### Summary As title. --------- Signed-off-by: Jin Hai --- cmd/ragflow_server.go | 10 +- internal/admin/enterprise_handler.go | 36 +++---- internal/admin/handler.go | 18 ++-- internal/common/response.go | 20 ++-- internal/development.md | 10 +- internal/handler/agent.go | 20 ++-- internal/handler/agent_component.go | 12 +-- internal/handler/agent_test.go | 4 +- internal/handler/agent_upload.go | 12 +-- internal/handler/agent_wait_for_user_test.go | 2 +- internal/handler/bot.go | 42 +++----- internal/handler/chat.go | 22 ++-- internal/handler/chat_channel.go | 10 +- internal/handler/chat_recommendation.go | 2 +- internal/handler/chat_session.go | 28 ++--- internal/handler/chunk.go | 24 ++--- internal/handler/connector.go | 52 ++++----- internal/handler/dataset.go | 92 ++++++++-------- internal/handler/document.go | 74 ++++++------- internal/handler/file.go | 28 ++--- internal/handler/file_commit.go | 20 ++-- internal/handler/langfuse.go | 8 +- internal/handler/llm.go | 6 +- internal/handler/mcp.go | 24 ++--- internal/handler/mcp_server.go | 2 +- internal/handler/memory.go | 28 ++--- internal/handler/plugin.go | 2 +- internal/handler/providers.go | 88 +++++++-------- internal/handler/search.go | 22 ++-- internal/handler/searchbot.go | 6 +- internal/handler/skill_search.go | 44 ++++---- internal/handler/stats.go | 4 +- internal/handler/system.go | 6 +- internal/handler/tenant.go | 36 +++---- internal/handler/user.go | 8 +- internal/router/router.go | 10 +- internal/service/agent.go | 14 +-- internal/service/chat.go | 108 +++++++++---------- internal/service/chat_rest_update_test.go | 6 +- 39 files changed, 462 insertions(+), 498 deletions(-) diff --git a/cmd/ragflow_server.go b/cmd/ragflow_server.go index 8cecdf89c4..07e716adf5 100644 --- a/cmd/ragflow_server.go +++ b/cmd/ragflow_server.go @@ -735,11 +735,11 @@ func startServer(config *server.Config) { // (ragflow_retrieval, ragflow_list_datasets, ragflow_list_chats) to // external AI clients via JSON-RPC over HTTP. mcpServerHandler := handler.NewMCPServerHandler( - func(userID string, page, pageSize int, orderby string, desc bool) ([]map[string]interface{}, int64, error) { - return handler.MCPListDatasets(datasetsService, userID, page, pageSize, orderby, desc) + func(userID string, page, pageSize int, orderBy string, desc bool) ([]map[string]interface{}, int64, error) { + return handler.MCPListDatasets(datasetsService, userID, page, pageSize, orderBy, desc) }, - func(userID string, page, pageSize int, orderby string, desc bool) ([]map[string]interface{}, int64, error) { - return handler.MCPListChats(chatService, userID, page, pageSize, orderby, desc) + func(userID string, page, pageSize int, orderBy string, desc bool) ([]map[string]interface{}, int64, error) { + return handler.MCPListChats(chatService, userID, page, pageSize, orderBy, desc) }, func(userID string, req mcp.RetrievalRequest) (string, error) { return handler.MCPRetrieval(datasetsService, userID, req) @@ -765,7 +765,7 @@ func startServer(config *server.Config) { // Public chatbot/agentbot endpoints (api/v1/chatbots/..., // api/v1/agentbots/...) and the agent attachment download. - // BotService delegates the agentbot completion to agentService so + // BotService delegates the agentBot completion to agentService so // both paths share the same canvas runner. Reuse the llmService // already constructed above (line 222) — do NOT redeclare with // `:=` since the variable is in scope. diff --git a/internal/admin/enterprise_handler.go b/internal/admin/enterprise_handler.go index 1a605abab2..2650174664 100644 --- a/internal/admin/enterprise_handler.go +++ b/internal/admin/enterprise_handler.go @@ -332,7 +332,7 @@ func (h *Handler) ShowProvider(c *gin.Context) { provider, err := dao.GetModelProviderManager().GetProviderByName(providerName) if err != nil { - common.ErrorWithCode(c, int(common.CodeNotFound), err.Error()) + common.ErrorWithCode(c, common.CodeNotFound, err.Error()) return } common.SuccessWithData(c, provider, "success") @@ -368,7 +368,7 @@ func (h *Handler) ListModels(c *gin.Context) { } models, err := dao.GetModelProviderManager().ListModels(providerName) if err != nil { - common.ErrorWithCode(c, int(common.CodeNotFound), err.Error()) + common.ErrorWithCode(c, common.CodeNotFound, err.Error()) return } @@ -388,7 +388,7 @@ func (h *Handler) ShowProviderModel(c *gin.Context) { } model, err := dao.GetModelProviderManager().GetModelByName(providerName, modelName) if err != nil { - common.ErrorWithCode(c, int(common.CodeNotFound), err.Error()) + common.ErrorWithCode(c, common.CodeNotFound, err.Error()) return } common.SuccessWithData(c, model, "success") @@ -528,13 +528,13 @@ func (h *Handler) AlterProviderInstance(c *gin.Context) { var req AlterProviderInstanceRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } userID := c.GetString("user_id") if userID == "" { - common.ErrorWithCode(c, int(common.CodeUnauthorized), "Unauthorized") + common.ErrorWithCode(c, common.CodeUnauthorized, "Unauthorized") return } @@ -588,7 +588,7 @@ func (h *Handler) DeleteModelInstance(c *gin.Context) { var req DropModelInstanceRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -648,7 +648,7 @@ func (h *Handler) EnableOrDisableModel(c *gin.Context) { var req EnableOrDisableModelRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -724,7 +724,7 @@ func (h *Handler) DeleteModels(c *gin.Context) { var req DropModelsRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -759,7 +759,7 @@ func (h *Handler) SetSystemLicense(c *gin.Context) { var req SetSystemLicenseRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -800,7 +800,7 @@ func (h *Handler) UpdateSystemLicenseConfig(c *gin.Context) { var req SetSystemLicenseConfigRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } result, err := h.service.UpdateSystemLicenseConfig(req.TimeRecordSaveInterval, req.TimeRecordTaskDuration) @@ -821,7 +821,7 @@ func (h *Handler) ShowUserActivity(c *gin.Context) { var req ShowUserActivityRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } userActivity, err := h.service.ShowUserActivity(req.Email, req.Days) @@ -846,7 +846,7 @@ func (h *Handler) ShowUserDatasetSummary(c *gin.Context) { var req ShowUserDatasetSummaryRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1296,7 +1296,7 @@ func (h *Handler) ShowUsersActivity(c *gin.Context) { var req ShowUsersActivityRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } usersActivity, err := h.service.ShowUsersActivity(req.Days, req.Window) @@ -1323,7 +1323,7 @@ func (h *Handler) ListUsersReports(c *gin.Context) { var req ListUsersReportsRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1503,7 +1503,7 @@ func (h *Handler) ListUsersQuota(c *gin.Context) { var request ListUsersQuotaRequest if err := c.ShouldBindJSON(&request); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1662,7 +1662,7 @@ func (h *Handler) PurgeOrphanData(c *gin.Context) { var request PurgeOrphanDataRequest if err := c.ShouldBindJSON(&request); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } result, err := h.service.PurgeOrphanData(request.Preview) @@ -1687,7 +1687,7 @@ func (h *Handler) PurgeUserData(c *gin.Context) { var request PurgeUserDataRequest if err := c.ShouldBindJSON(&request); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } encodedUsername := c.Param("username") @@ -1726,7 +1726,7 @@ func (h *Handler) PurgeUsersData(c *gin.Context) { var request PurgeUsersDataRequest if err := c.ShouldBindJSON(&request); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } diff --git a/internal/admin/handler.go b/internal/admin/handler.go index ed6b082aed..83813c2183 100644 --- a/internal/admin/handler.go +++ b/internal/admin/handler.go @@ -85,25 +85,25 @@ func (h *Handler) Login(c *gin.Context) { // This allows default admin account to log in admin system user, code, err := h.userService.LoginByEmail(&req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } // Check if user is superuser (admin) if user.IsSuperuser == nil || !*user.IsSuperuser { - common.ErrorWithCode(c, int(common.CodeForbidden), "Only superuser can login admin system") + common.ErrorWithCode(c, common.CodeForbidden, "Only superuser can login admin system") return } secretKey, err := server.GetSecretKey(redis.Get()) if err != nil { - common.ErrorWithCode(c, int(common.CodeServerError), fmt.Sprintf("Failed to get secret key: %s", err.Error())) + common.ErrorWithCode(c, common.CodeServerError, fmt.Sprintf("Failed to get secret key: %s", err.Error())) return } authToken, err := utility.DumpAccessToken(*user.AccessToken, secretKey) if err != nil { - common.ErrorWithCode(c, int(common.CodeServerError), fmt.Sprintf("Failed to generate auth token: %s", err.Error())) + common.ErrorWithCode(c, common.CodeServerError, fmt.Sprintf("Failed to generate auth token: %s", err.Error())) return } @@ -1192,11 +1192,11 @@ func (h *Handler) Reports(c *gin.Context) { // Handle the heartbeat errCode, message := h.service.HandleHeartbeat(&req) if errCode != common.CodeLicenseValid { - common.ErrorWithCode(c, int(errCode), message) + common.ErrorWithCode(c, errCode, message) return } - common.ErrorWithCode(c, int(errCode), message) + common.ErrorWithCode(c, errCode, message) } func (h *Handler) ListAllModels(c *gin.Context) { @@ -1256,14 +1256,14 @@ func (h *Handler) ShowModel(c *gin.Context) { func (h *Handler) PingStore(c *gin.Context) { storageImpl := storage.GetStorageFactory().GetStorage() if storageImpl == nil { - common.ErrorWithCode(c, int(common.CodeServerError), "storage not initialized") + common.ErrorWithCode(c, common.CodeServerError, "storage not initialized") return } if storageImpl.Health() { common.SuccessNoMessage(c, "SUCCESS") } else { - common.ErrorWithCode(c, int(common.CodeServerError), "storage health check failed") + common.ErrorWithCode(c, common.CodeServerError, "storage health check failed") } } @@ -1272,7 +1272,7 @@ func (h *Handler) PingCache(c *gin.Context) { if redisClient.Health() { common.SuccessNoMessage(c, "SUCCESS") } else { - common.ErrorWithCode(c, int(common.CodeServerError), "cache health check failed") + common.ErrorWithCode(c, common.CodeServerError, "cache health check failed") } } diff --git a/internal/common/response.go b/internal/common/response.go index 62c4df302e..e7adffe74c 100644 --- a/internal/common/response.go +++ b/internal/common/response.go @@ -23,21 +23,21 @@ import ( ) type response struct { - Code int `json:"code"` - Message interface{} `json:"message"` + Code ErrorCode `json:"code"` Data interface{} `json:"data"` + Message interface{} `json:"message"` } // errorResponse error response type errorResponse struct { - Code int `json:"code"` + Code ErrorCode `json:"code"` Message interface{} `json:"message"` } // SuccessWithData returns success response with data func SuccessWithData(c *gin.Context, data interface{}, message interface{}) { c.JSON(http.StatusOK, response{ - Code: int(CodeSuccess), + Code: CodeSuccess, Data: data, Message: message, }) @@ -46,7 +46,7 @@ func SuccessWithData(c *gin.Context, data interface{}, message interface{}) { // SuccessNoMessage returns success response without message func SuccessNoMessage(c *gin.Context, data interface{}) { c.JSON(http.StatusOK, response{ - Code: int(CodeSuccess), + Code: CodeSuccess, Data: data, }) } @@ -54,7 +54,7 @@ func SuccessNoMessage(c *gin.Context, data interface{}) { // SuccessNoData returns success response without data func SuccessNoData(c *gin.Context, message interface{}) { c.JSON(http.StatusOK, response{ - Code: int(CodeSuccess), + Code: CodeSuccess, Data: nil, Message: message, }) @@ -63,13 +63,13 @@ func SuccessNoData(c *gin.Context, message interface{}) { // SuccessWithMessage returns success response with message only func SuccessWithMessage(c *gin.Context, message string) { c.JSON(http.StatusOK, response{ - Code: int(CodeSuccess), + Code: CodeSuccess, Message: message, }) } // ErrorWithCode returns error response with code and message -func ErrorWithCode(c *gin.Context, code int, message string) { +func ErrorWithCode(c *gin.Context, code ErrorCode, message string) { c.JSON(http.StatusOK, errorResponse{ Code: code, Message: message, @@ -78,7 +78,7 @@ func ErrorWithCode(c *gin.Context, code int, message string) { func ResponseWithCodeData(c *gin.Context, code ErrorCode, data interface{}, message string) { c.JSON(http.StatusOK, response{ - Code: int(code), + Code: code, Data: data, Message: message, }) @@ -86,7 +86,7 @@ func ResponseWithCodeData(c *gin.Context, code ErrorCode, data interface{}, mess func ResponseWithHttpCodeData(c *gin.Context, httpCode int, code ErrorCode, data interface{}, message string) { c.JSON(httpCode, response{ - Code: int(code), + Code: code, Data: data, Message: message, }) diff --git a/internal/development.md b/internal/development.md index 84f52ecea5..61fb300aa2 100644 --- a/internal/development.md +++ b/internal/development.md @@ -30,7 +30,7 @@ sudo ln -s /usr/bin/ld.lld-20 /usr/bin/ld.lld ```shell wget https://go.dev/dl/go1.25.4.linux-amd64.tar.gz sudo rm -rf /usr/local/go -sudo tar -C /usr/local -xzf go1.23.4.linux-amd64.tar.gz +sudo tar -C /usr/local -xzf go1.25.4.linux-amd64.tar.gz echo 'export PATH=$PATH:/usr/local/go/bin' >> ~/.bashrc source ~/.bashrc go version @@ -126,11 +126,11 @@ After updating or implementing an API, update the frontend development environme ### 4.1 Proxy Schemes -| Scheme | Description | -|--------|-------------| -| `python` | All API requests from the frontend are routed to the Python server | +| Scheme | Description | +|----------|---------------------------------------------------------------------------------------| +| `python` | All API requests from the frontend are routed to the Python server | | `hybrid` | API requests are partially routed to the Go server and partially to the Python server | -| `go` | All API requests from the frontend are routed to the Go server | +| `go` | All API requests from the frontend are routed to the Go server | ## 5. RAGFlow commands diff --git a/internal/handler/agent.go b/internal/handler/agent.go index 5c5538ed0f..611ae44799 100644 --- a/internal/handler/agent.go +++ b/internal/handler/agent.go @@ -130,7 +130,7 @@ func NewAgentHandler(agentService *service.AgentService, fileService *service.Fi func (h *AgentHandler) ListAgents(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -241,7 +241,7 @@ func mapAgentError(err error) (common.ErrorCode, string) { func (h *AgentHandler) CreateAgent(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } var req service.CreateAgentRequest @@ -252,7 +252,7 @@ func (h *AgentHandler) CreateAgent(c *gin.Context) { req.UserID = user.ID row, code, err := h.agentService.CreateAgent(c.Request.Context(), &req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, row, "success") @@ -355,7 +355,7 @@ func (h *AgentHandler) DeleteAgent(c *gin.Context) { // @Router /api/v1/agents/templates [get] func (h *AgentHandler) ListTemplates(c *gin.Context) { if _, errorCode, errorMessage := GetUser(c); errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -712,7 +712,7 @@ func (h *AgentHandler) ListAgentSessions(c *gin.Context) { IncludeDSL: includeDSL, }) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, resp.Data, "success") @@ -743,7 +743,7 @@ func (h *AgentHandler) CreateAgentSession(c *gin.Context) { DSL: body.DSL, }) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, row, "success") @@ -760,7 +760,7 @@ func (h *AgentHandler) GetAgentSession(c *gin.Context) { sessionID := c.Param("session_id") row, code, err := h.agentService.GetAgentSession(user.ID, canvasID, sessionID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, row, "success") @@ -782,7 +782,7 @@ func (h *AgentHandler) DeleteAgentSession(c *gin.Context) { if sessionID != "" { ok, code, err := h.agentService.DeleteAgentSessionItem(user.ID, canvasID, sessionID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, ok, "success") @@ -800,7 +800,7 @@ func (h *AgentHandler) DeleteAgentSession(c *gin.Context) { } result, code, err := h.agentService.DeleteAgentSessions(user.ID, canvasID, ids, deleteAll) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, result, "success") @@ -1242,7 +1242,7 @@ func (h *AgentHandler) TestDBConnection(c *gin.Context) { } code, err := h.agentService.TestDBConnection(user.ID, &req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, true, "success") diff --git a/internal/handler/agent_component.go b/internal/handler/agent_component.go index 7022c76a75..b7c6cbf801 100644 --- a/internal/handler/agent_component.go +++ b/internal/handler/agent_component.go @@ -72,11 +72,7 @@ func (h *AgentHandler) GetComponentInputForm(c *gin.Context) { mapDSLError(c, componentID, err) return } - c.JSON(200, gin.H{ - "code": common.CodeSuccess, - "data": form, - "message": "success", - }) + common.SuccessWithData(c, form, "success") } // componentInputForm returns the input-form schema for a single component. @@ -227,11 +223,7 @@ func (h *AgentHandler) DebugComponent(c *gin.Context) { return } - c.JSON(200, gin.H{ - "code": common.CodeSuccess, - "data": outputs, - "message": "success", - }) + common.SuccessWithData(c, outputs, "success") } // mapDSLError translates a dsl extractor error into a 102 envelope. diff --git a/internal/handler/agent_test.go b/internal/handler/agent_test.go index b0c0f98928..82bf8eb09e 100644 --- a/internal/handler/agent_test.go +++ b/internal/handler/agent_test.go @@ -332,7 +332,7 @@ type agentHandlerTestable struct { func (h *agentHandlerTestable) listAgents(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } result, code, err := h.svc.ListAgents(user.ID, "", 0, 0, "create_time", true, nil, "", nil) @@ -345,7 +345,7 @@ func (h *agentHandlerTestable) listAgents(c *gin.Context) { func (h *agentHandlerTestable) listTemplates(c *gin.Context) { if _, errorCode, errorMessage := GetUser(c); errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } templates, err := h.svc.ListTemplates() diff --git a/internal/handler/agent_upload.go b/internal/handler/agent_upload.go index 09e8c11bb6..9d4a5d2435 100644 --- a/internal/handler/agent_upload.go +++ b/internal/handler/agent_upload.go @@ -122,11 +122,7 @@ func (h *AgentHandler) UploadAgentFile(c *gin.Context) { common.ResponseWithCodeData(c, common.CodeServerError, nil, err.Error()) return } - c.JSON(200, gin.H{ - "code": common.CodeSuccess, - "data": uploaded, - "message": "success", - }) + common.SuccessWithData(c, uploaded, "success") return } @@ -149,9 +145,5 @@ func (h *AgentHandler) UploadAgentFile(c *gin.Context) { } else { payload = results } - c.JSON(200, gin.H{ - "code": common.CodeSuccess, - "data": payload, - "message": "success", - }) + common.SuccessWithData(c, payload, "success") } diff --git a/internal/handler/agent_wait_for_user_test.go b/internal/handler/agent_wait_for_user_test.go index 9360ad8083..6eee7a8b85 100644 --- a/internal/handler/agent_wait_for_user_test.go +++ b/internal/handler/agent_wait_for_user_test.go @@ -155,7 +155,7 @@ func waitForUserRoutes(svc *waitFakeAgentService) *gin.Engine { if err != nil { // We never expect a non-nil err from the fake, // but be defensive. - common.ErrorWithCode(c, int(common.CodeServerError), err.Error()) + common.ErrorWithCode(c, common.CodeServerError, err.Error()) return } c.Writer.Header().Set("Content-Type", "text/event-stream") diff --git a/internal/handler/bot.go b/internal/handler/bot.go index a63bac3818..09dabf5a0d 100644 --- a/internal/handler/bot.go +++ b/internal/handler/bot.go @@ -78,17 +78,13 @@ func (h *BotHandler) ChatbotInfo(c *gin.Context) { common.ResponseWithCodeData(c, ec, nil, err.Error()) return } - c.JSON(200, gin.H{ - "code": common.CodeSuccess, - "data": gin.H{ - "title": title, - "avatar": avatar, - "prologue": prologue, - "has_tavily_key": hasTavily, - "llm_id": llmID, - }, - "message": "success", - }) + common.SuccessWithData(c, gin.H{ + "title": title, + "avatar": avatar, + "prologue": prologue, + "has_tavily_key": hasTavily, + "llm_id": llmID, + }, "success") } // AgentbotInputs GET /api/v1/agentbots//inputs @@ -112,17 +108,13 @@ func (h *BotHandler) AgentbotInputs(c *gin.Context) { common.ResponseWithCodeData(c, ec, nil, err.Error()) return } - c.JSON(200, gin.H{ - "code": common.CodeSuccess, - "data": gin.H{ - "title": title, - "avatar": avatar, - "inputs": inputs, - "prologue": prologue, - "mode": mode, - }, - "message": "success", - }) + common.SuccessWithData(c, gin.H{ + "title": title, + "avatar": avatar, + "inputs": inputs, + "prologue": prologue, + "mode": mode, + }, "success") } // AgentbotCompletion POST /api/v1/agentbots//completions @@ -315,9 +307,5 @@ func (h *BotHandler) GetAgentbotLogs(c *gin.Context) { return } } - c.JSON(200, gin.H{ - "code": common.CodeSuccess, - "data": data, - "message": "success", - }) + common.SuccessWithData(c, data, "success") } diff --git a/internal/handler/chat.go b/internal/handler/chat.go index b2271dcc3a..f7f49aaa20 100644 --- a/internal/handler/chat.go +++ b/internal/handler/chat.go @@ -73,7 +73,7 @@ type ChatMindMapRequest struct { func (h *ChatHandler) ListChats(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -124,7 +124,7 @@ func (h *ChatHandler) ListChats(c *gin.Context) { func (h *ChatHandler) Create(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -141,7 +141,7 @@ func (h *ChatHandler) Create(c *gin.Context) { result, code, err := h.chatService.Create(user.ID, req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -160,7 +160,7 @@ func (h *ChatHandler) Create(c *gin.Context) { func (h *ChatHandler) MindMap(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -219,7 +219,7 @@ func (h *ChatHandler) MindMap(c *gin.Context) { func (h *ChatHandler) DeleteChat(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -235,7 +235,7 @@ func (h *ChatHandler) DeleteChat(c *gin.Context) { common.ResponseWithCodeData(c, common.CodeDataError, false, "No authorization") return } - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) return } @@ -246,7 +246,7 @@ func (h *ChatHandler) DeleteChat(c *gin.Context) { func (h *ChatHandler) BulkDeleteChats(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -282,7 +282,7 @@ func (h *ChatHandler) BulkDeleteChats(c *gin.Context) { result, err := h.chatService.BulkDeleteChats(userID, &req) if err != nil { - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) return } @@ -312,7 +312,7 @@ func (h *ChatHandler) GetChat(c *gin.Context) { // Get current user from context (same as Python current_user) user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -334,7 +334,7 @@ func (h *ChatHandler) GetChat(c *gin.Context) { return } // Not found error - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) return } @@ -386,7 +386,7 @@ func (h *ChatHandler) PatchChat(c *gin.Context) { func (h *ChatHandler) updateChatByMethod(c *gin.Context, patch bool) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/chat_channel.go b/internal/handler/chat_channel.go index e100d29866..ec4838f681 100644 --- a/internal/handler/chat_channel.go +++ b/internal/handler/chat_channel.go @@ -56,7 +56,7 @@ type CreateChatChannelRequest struct { func (h *ChatChannelHandler) CreateChatChannel(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -84,7 +84,7 @@ func (h *ChatChannelHandler) CreateChatChannel(c *gin.Context) { func (h *ChatChannelHandler) ListChatChannel(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -100,7 +100,7 @@ func (h *ChatChannelHandler) ListChatChannel(c *gin.Context) { func (h *ChatChannelHandler) GetChatChannel(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -129,7 +129,7 @@ func (h *ChatChannelHandler) GetChatChannel(c *gin.Context) { func (h *ChatChannelHandler) UpdateChatChannel(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -164,7 +164,7 @@ func (h *ChatChannelHandler) UpdateChatChannel(c *gin.Context) { func (h *ChatChannelHandler) DeleteChatChannel(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/chat_recommendation.go b/internal/handler/chat_recommendation.go index db761ff04c..b47ed6609e 100644 --- a/internal/handler/chat_recommendation.go +++ b/internal/handler/chat_recommendation.go @@ -43,7 +43,7 @@ type ChatRecommendationRequest struct { func (h *ChatHandler) Recommendation(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/chat_session.go b/internal/handler/chat_session.go index 8f4a3669ce..ca96c3e7fb 100644 --- a/internal/handler/chat_session.go +++ b/internal/handler/chat_session.go @@ -55,7 +55,7 @@ func NewChatSessionHandler(chatSessionService *service.ChatSessionService, userS func (h *ChatSessionHandler) ListChatSessions(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -115,7 +115,7 @@ type ChatCompletionsRequest struct { func (h *ChatSessionHandler) ChatCompletions(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -240,7 +240,7 @@ func (h *ChatSessionHandler) ChatCompletions(c *gin.Context) { func (h *ChatSessionHandler) GetSession(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -249,7 +249,7 @@ func (h *ChatSessionHandler) GetSession(c *gin.Context) { result, code, err := h.chatSessionService.GetSession(userID, chatID, sessionID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, result, "success") @@ -259,7 +259,7 @@ func (h *ChatSessionHandler) GetSession(c *gin.Context) { func (h *ChatSessionHandler) CreateSession(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -294,7 +294,7 @@ func (h *ChatSessionHandler) CreateSession(c *gin.Context) { common.ResponseWithCodeData(c, code, false, err.Error()) return } - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -305,7 +305,7 @@ func (h *ChatSessionHandler) CreateSession(c *gin.Context) { func (h *ChatSessionHandler) DeleteSessions(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -340,7 +340,7 @@ func (h *ChatSessionHandler) DeleteSessions(c *gin.Context) { common.ResponseWithCodeData(c, code, false, err.Error()) return } - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -350,7 +350,7 @@ func (h *ChatSessionHandler) DeleteSessions(c *gin.Context) { func (h *ChatSessionHandler) UpdateSession(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -374,7 +374,7 @@ func (h *ChatSessionHandler) UpdateSession(c *gin.Context) { result, code, err := h.chatSessionService.UpdateSession(userID, chatID, sessionID, req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, result, "success") @@ -383,7 +383,7 @@ func (h *ChatSessionHandler) UpdateSession(c *gin.Context) { func (h *ChatSessionHandler) DeleteSessionMessage(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -395,7 +395,7 @@ func (h *ChatSessionHandler) DeleteSessionMessage(c *gin.Context) { common.ResponseWithCodeData(c, code, false, err.Error()) return } - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, result, "success") @@ -404,7 +404,7 @@ func (h *ChatSessionHandler) DeleteSessionMessage(c *gin.Context) { func (h *ChatSessionHandler) UpdateMessageFeedback(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -432,7 +432,7 @@ func (h *ChatSessionHandler) UpdateMessageFeedback(c *gin.Context) { common.ResponseWithCodeData(c, code, false, err.Error()) return } - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, result, "success") diff --git a/internal/handler/chunk.go b/internal/handler/chunk.go index ed74e5efee..5c9d61f4ed 100644 --- a/internal/handler/chunk.go +++ b/internal/handler/chunk.go @@ -69,7 +69,7 @@ func NewChunkHandler(chunkService chunkService, userService *service.UserService func (h *ChunkHandler) RetrievalTest(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -149,7 +149,7 @@ func (h *ChunkHandler) RetrievalTest(c *gin.Context) { func (h *ChunkHandler) Get(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -176,7 +176,7 @@ func (h *ChunkHandler) Get(c *gin.Context) { func (h *ChunkHandler) Parse(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -210,7 +210,7 @@ func (h *ChunkHandler) Parse(c *gin.Context) { func (h *ChunkHandler) ListChunks(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -285,7 +285,7 @@ func parseAvailableQuery(raw string) (int, bool, error) { func (h *ChunkHandler) StopParsing(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -339,7 +339,7 @@ func (h *ChunkHandler) StopParsing(c *gin.Context) { func (h *ChunkHandler) List(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -373,7 +373,7 @@ func (h *ChunkHandler) List(c *gin.Context) { func (h *ChunkHandler) SwitchChunks(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -490,7 +490,7 @@ func parseAvailableBody(rawBody map[string]interface{}) (int, error) { func (h *ChunkHandler) UpdateChunk(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -589,10 +589,6 @@ func (h *ChunkHandler) UpdateChunk(c *gin.Context) { switch coded.Code() { case common.CodeArgumentError, common.CodeBadRequest, common.CodeDataError: common.ResponseWithHttpCodeData(c, http.StatusBadRequest, coded.Code(), nil, err.Error()) - c.JSON(http.StatusBadRequest, gin.H{ - "code": coded.Code(), - "message": err.Error(), - }) return } } @@ -616,7 +612,7 @@ func (h *ChunkHandler) UpdateChunk(c *gin.Context) { func (h *ChunkHandler) RemoveChunks(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -704,7 +700,7 @@ func addChunkResponseMessage(code common.ErrorCode, err error) string { func (h *ChunkHandler) AddChunk(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/connector.go b/internal/handler/connector.go index 685c0bfe29..99d5a532ab 100644 --- a/internal/handler/connector.go +++ b/internal/handler/connector.go @@ -72,7 +72,7 @@ func NewConnectorHandler(connectorService *service.ConnectorService, userService func (h *ConnectorHandler) ListConnectors(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -117,13 +117,13 @@ func connectorErrorResponse(c *gin.Context, err error) bool { func (h *ConnectorHandler) GetConnector(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } connector, code, err := h.connectorService.GetConnector(c.Param("connector_id"), user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -134,19 +134,19 @@ func (h *ConnectorHandler) GetConnector(c *gin.Context) { func (h *ConnectorHandler) UpdateConnector(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } req, err := decodeUpdateConnectorRequest(c) if err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } connector, code, err := h.connectorService.UpdateConnector(c.Param("connector_id"), user.ID, req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -191,7 +191,7 @@ func decodeUpdateConnectorRequest(c *gin.Context) (*service.UpdateConnectorReque func (h *ConnectorHandler) ListLogs(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -199,7 +199,7 @@ func (h *ConnectorHandler) ListLogs(c *gin.Context) { if rawPage := strings.TrimSpace(c.DefaultQuery("page", "1")); rawPage != "" { parsedPage, err := strconv.Atoi(rawPage) if err != nil { - common.ErrorWithCode(c, int(common.CodeArgumentError), "page must be an integer") + common.ErrorWithCode(c, common.CodeArgumentError, "page must be an integer") return } page = parsedPage @@ -209,7 +209,7 @@ func (h *ConnectorHandler) ListLogs(c *gin.Context) { if rawPageSize := strings.TrimSpace(c.DefaultQuery("page_size", "15")); rawPageSize != "" { parsedPageSize, err := strconv.Atoi(rawPageSize) if err != nil { - common.ErrorWithCode(c, int(common.CodeArgumentError), "page_size must be an integer") + common.ErrorWithCode(c, common.CodeArgumentError, "page_size must be an integer") return } pageSize = parsedPageSize @@ -217,7 +217,7 @@ func (h *ConnectorHandler) ListLogs(c *gin.Context) { logs, total, code, err := h.connectorService.ListLog(c.Param("connector_id"), user.ID, page, pageSize) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } if logs == nil { @@ -238,7 +238,7 @@ func (h *ConnectorHandler) ListLogs(c *gin.Context) { func (h *ConnectorHandler) CreateConnector(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -280,7 +280,7 @@ func (h *ConnectorHandler) CreateConnector(c *gin.Context) { func (h *ConnectorHandler) TestConnector(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -315,13 +315,13 @@ func (h *ConnectorHandler) TestConnector(c *gin.Context) { func (h *ConnectorHandler) DeleteConnector(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } ok, code, err := h.connectorService.DeleteConnector(c.Param("connector_id"), user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -339,7 +339,7 @@ func (h *ConnectorHandler) DeleteConnector(c *gin.Context) { func (h *ConnectorHandler) RebuildConnector(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -359,7 +359,7 @@ func (h *ConnectorHandler) RebuildConnector(c *gin.Context) { ok, code, err := h.connectorService.RebuildConnector(c.Param("connector_id"), user.ID, req.KbID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -369,7 +369,7 @@ func (h *ConnectorHandler) RebuildConnector(c *gin.Context) { func (h *ConnectorHandler) StartGoogleWebOAuth(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -381,7 +381,7 @@ func (h *ConnectorHandler) StartGoogleWebOAuth(c *gin.Context) { data, code, err := h.connectorService.StartGoogleWebOAuth(user.ID, c.DefaultQuery("type", "google-drive"), &req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -391,7 +391,7 @@ func (h *ConnectorHandler) StartGoogleWebOAuth(c *gin.Context) { func (h *ConnectorHandler) PollGoogleWebOAuthResult(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -403,7 +403,7 @@ func (h *ConnectorHandler) PollGoogleWebOAuthResult(c *gin.Context) { data, code, err := h.connectorService.PollGoogleWebOAuthResult(user.ID, c.Query("type"), &req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -436,17 +436,17 @@ func (h *ConnectorHandler) googleWebOAuthCallback(c *gin.Context, source string) func (h *ConnectorHandler) StartBoxWebOAuth(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } var req service.StartBoxWebOAuthRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } resp, code, err := h.connectorService.StartBoxWebOAuth(user.ID, &req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.ResponseWithCodeData(c, code, resp, "success") @@ -466,17 +466,17 @@ func (h *ConnectorHandler) BoxWebOAuthCallback(c *gin.Context) { func (h *ConnectorHandler) PollBoxWebOAuthResult(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } var req service.PollBoxWebOAuthResultRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } resp, code, err := h.connectorService.PollBoxWebOAuthResult(user.ID, &req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.ResponseWithCodeData(c, code, resp, "success") diff --git a/internal/handler/dataset.go b/internal/handler/dataset.go index ed376ad554..a0504a5913 100644 --- a/internal/handler/dataset.go +++ b/internal/handler/dataset.go @@ -71,7 +71,7 @@ func NewDatasetsHandler(datasetsService *service.DatasetService, metadataService func (h *DatasetsHandler) ListDatasets(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -128,7 +128,7 @@ func (h *DatasetsHandler) ListDatasets(c *gin.Context) { user.ID, ) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -143,7 +143,7 @@ func (h *DatasetsHandler) ListDatasets(c *gin.Context) { func (h *DatasetsHandler) CreateDataset(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -155,7 +155,7 @@ func (h *DatasetsHandler) CreateDataset(c *gin.Context) { result, code, err := h.datasetsService.CreateDataset(&req, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -166,14 +166,14 @@ func (h *DatasetsHandler) CreateDataset(c *gin.Context) { func (h *DatasetsHandler) GetDataset(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } datasetID := c.Param("dataset_id") result, code, err := h.datasetsService.GetDataset(datasetID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -184,7 +184,7 @@ func (h *DatasetsHandler) GetDataset(c *gin.Context) { func (h *DatasetsHandler) UpdateDataset(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -208,7 +208,7 @@ func (h *DatasetsHandler) UpdateDataset(c *gin.Context) { result, code, err := h.datasetsService.UpdateDataset(datasetID, userID, req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } if code != common.CodeSuccess { @@ -222,14 +222,14 @@ func (h *DatasetsHandler) UpdateDataset(c *gin.Context) { func (h *DatasetsHandler) GetMetadataConfig(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } datasetID := c.Param("dataset_id") result, code, err := h.datasetsService.GetMetadataConfig(datasetID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -239,7 +239,7 @@ func (h *DatasetsHandler) GetMetadataConfig(c *gin.Context) { func (h *DatasetsHandler) UpdateMetadataConfig(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -252,7 +252,7 @@ func (h *DatasetsHandler) UpdateMetadataConfig(c *gin.Context) { result, code, err := h.datasetsService.UpdateMetadataConfig(datasetID, user.ID, &req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -263,14 +263,14 @@ func (h *DatasetsHandler) UpdateMetadataConfig(c *gin.Context) { func (h *DatasetsHandler) GetIngestionSummary(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } datasetID := c.Param("dataset_id") result, code, err := h.datasetsService.GetIngestionSummary(datasetID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -281,7 +281,7 @@ func (h *DatasetsHandler) GetIngestionSummary(c *gin.Context) { func (h *DatasetsHandler) ListIngestionLogs(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -320,7 +320,7 @@ func (h *DatasetsHandler) ListIngestionLogs(c *gin.Context) { result, code, err := h.datasetsService.ListIngestionLogs(datasetID, user.ID, page, pageSize, orderby, desc, operationStatus, createDateFrom, createDateTo, logType, keywords) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -331,7 +331,7 @@ func (h *DatasetsHandler) ListIngestionLogs(c *gin.Context) { func (h *DatasetsHandler) GetIngestionLog(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -339,7 +339,7 @@ func (h *DatasetsHandler) GetIngestionLog(c *gin.Context) { logID := c.Param("log_id") result, code, err := h.datasetsService.GetIngestionLog(datasetID, user.ID, logID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -350,7 +350,7 @@ func (h *DatasetsHandler) GetIngestionLog(c *gin.Context) { func (h *DatasetsHandler) DeleteDatasets(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -372,7 +372,7 @@ func (h *DatasetsHandler) DeleteDatasets(c *gin.Context) { result, code, err := h.datasetsService.DeleteDatasets(ids, req.DeleteAll, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -383,7 +383,7 @@ func (h *DatasetsHandler) DeleteDatasets(c *gin.Context) { func (h *DatasetsHandler) GetKnowledgeGraph(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -395,7 +395,7 @@ func (h *DatasetsHandler) GetKnowledgeGraph(c *gin.Context) { dataset, code, err := h.datasetsService.GetDataset(datasetID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -490,14 +490,14 @@ func (h *DatasetsHandler) GetKnowledgeGraph(c *gin.Context) { func (h *DatasetsHandler) ListTags(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } datasetID := strings.TrimSpace(c.Param("dataset_id")) result, code, err := h.datasetsService.ListTags(datasetID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -512,7 +512,7 @@ type renameTagRequest struct { func (h *DatasetsHandler) RenameTag(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } datasetID := strings.TrimSpace(c.Param("dataset_id")) @@ -542,7 +542,7 @@ func (h *DatasetsHandler) RenameTag(c *gin.Context) { result, code, err := h.datasetsService.RenameTag(datasetID, user.ID, req.FromTag, req.ToTag) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -553,7 +553,7 @@ func (h *DatasetsHandler) RenameTag(c *gin.Context) { func (h *DatasetsHandler) DeleteKnowledgeGraph(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -565,7 +565,7 @@ func (h *DatasetsHandler) DeleteKnowledgeGraph(c *gin.Context) { dataset, code, err := h.datasetsService.GetDataset(datasetID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -607,7 +607,7 @@ func (h *DatasetsHandler) DeleteKnowledgeGraph(c *gin.Context) { func (h *DatasetsHandler) RemoveTags(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -619,7 +619,7 @@ func (h *DatasetsHandler) RemoveTags(c *gin.Context) { dataset, code, err := h.datasetsService.GetDataset(datasetID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -667,7 +667,7 @@ func (h *DatasetsHandler) RemoveTags(c *gin.Context) { func (h *DatasetsHandler) RunEmbedding(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -697,7 +697,7 @@ func (h *DatasetsHandler) RunEmbedding(c *gin.Context) { func (h *DatasetsHandler) CheckEmbedding(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -729,7 +729,7 @@ func (h *DatasetsHandler) CheckEmbedding(c *gin.Context) { common.ResponseWithCodeData(c, code, data, err.Error()) return } - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, data, "success") @@ -747,7 +747,7 @@ func (h *DatasetsHandler) CheckEmbedding(c *gin.Context) { func (h *DatasetsHandler) AggregateTags(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -767,7 +767,7 @@ func (h *DatasetsHandler) AggregateTags(c *gin.Context) { result, code, err := h.datasetsService.AggregateTags(datasetIDs, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, result, "success") @@ -777,7 +777,7 @@ func (h *DatasetsHandler) AggregateTags(c *gin.Context) { func (h *DatasetsHandler) RunIndex(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -796,7 +796,7 @@ func (h *DatasetsHandler) RunIndex(c *gin.Context) { indexType := strings.ToLower(strings.TrimSpace(c.Query("type"))) data, code, err := h.datasetsService.RunIndex(userID, datasetID, indexType) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -807,7 +807,7 @@ func (h *DatasetsHandler) RunIndex(c *gin.Context) { func (h *DatasetsHandler) TraceIndex(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -826,7 +826,7 @@ func (h *DatasetsHandler) TraceIndex(c *gin.Context) { indexType := strings.ToLower(strings.TrimSpace(c.Query("type"))) result, code, err := h.datasetsService.TraceIndex(datasetID, userID, indexType) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } if result == nil { @@ -841,7 +841,7 @@ func (h *DatasetsHandler) TraceIndex(c *gin.Context) { func (h *DatasetsHandler) DeleteIndex(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -871,7 +871,7 @@ func (h *DatasetsHandler) DeleteIndex(c *gin.Context) { code, err := h.datasetsService.DeleteIndex(userID, datasetID, indexType, wipe) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -890,7 +890,7 @@ func (h *DatasetsHandler) DeleteIndex(c *gin.Context) { func (h *DatasetsHandler) ListMetadataFlattened(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -933,7 +933,7 @@ func (h *DatasetsHandler) ListMetadataFlattened(c *gin.Context) { func (h *DatasetsHandler) UpdateDocumentMetadataConfig(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -961,7 +961,7 @@ func (h *DatasetsHandler) UpdateDocumentMetadataConfig(c *gin.Context) { data, code, err := h.datasetsService.UpdateDocumentMetadataConfig(userID, datasetID, documentID, req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -980,7 +980,7 @@ func (h *DatasetsHandler) UpdateDocumentMetadataConfig(c *gin.Context) { func (h *DatasetsHandler) SearchDatasets(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1057,7 +1057,7 @@ func (h *DatasetsHandler) SearchDatasets(c *gin.Context) { func (h *DatasetsHandler) SearchDataset(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/document.go b/internal/handler/document.go index 2ef146a010..a309803e9c 100644 --- a/internal/handler/document.go +++ b/internal/handler/document.go @@ -109,7 +109,7 @@ func NewDocumentHandler(documentService documentServiceIface, datasetService *se func (h *DocumentHandler) CreateDocument(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -144,7 +144,7 @@ func (h *DocumentHandler) CreateDocument(c *gin.Context) { func (h *DocumentHandler) GetDocumentByID(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -173,7 +173,7 @@ func (h *DocumentHandler) GetDocumentByID(c *gin.Context) { func (h *DocumentHandler) GetThumbnail(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -258,7 +258,7 @@ func (h *DocumentHandler) GetDocumentArtifact(c *gin.Context) { case errors.Is(err, service.ErrArtifactInvalidFilename), errors.Is(err, service.ErrArtifactInvalidFileType), errors.Is(err, service.ErrArtifactNotFound): - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) default: common.ResponseWithCodeData(c, common.CodeExceptionError, nil, err.Error()) @@ -286,7 +286,7 @@ func (h *DocumentHandler) GetDocumentPreview(c *gin.Context) { preview, err := h.documentService.GetDocumentPreview(docID) if err != nil { - common.ErrorWithCode(c, int(common.CodeDataError), "Document not found!") + common.ErrorWithCode(c, common.CodeDataError, "Document not found!") return } @@ -314,7 +314,7 @@ func (h *DocumentHandler) GetDocumentPreview(c *gin.Context) { func (h *DocumentHandler) UpdateDocument(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -366,7 +366,7 @@ func (h *DocumentHandler) UpdateDocument(c *gin.Context) { func (h *DocumentHandler) DeleteDocument(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -404,7 +404,7 @@ func (h *DocumentHandler) DeleteDocument(c *gin.Context) { func (h *DocumentHandler) DeleteDocuments(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -832,7 +832,7 @@ func normalizeRunStatusFilter(statuses []string) []string { func (h *DocumentHandler) UploadDocuments(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } tenantID := user.ID @@ -951,7 +951,7 @@ func (h *DocumentHandler) uploadEmptyDocument(c *gin.Context, kb *entity.Knowled } data, code, err := h.documentService.UploadEmptyDocument(kb, tenantID, name) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessNoMessage(c, mapDocKeysWithRunStatus(data)) @@ -978,7 +978,7 @@ func (h *DocumentHandler) uploadWebDocument(c *gin.Context, kb *entity.Knowledge } data, code, err := h.documentService.UploadWebDocument(kb, tenantID, name, rawURL) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessNoMessage(c, mapDocKeysWithRunStatus(data)) @@ -1018,18 +1018,18 @@ func (h *DocumentHandler) DownloadDocument(c *gin.Context) { docID := c.Param("document_id") if docID == "" { - common.ErrorWithCode(c, int(common.CodeDataError), "Specify document_id please.") + common.ErrorWithCode(c, common.CodeDataError, "Specify document_id please.") return } if datasetID == "" { - common.ErrorWithCode(c, int(common.CodeDataError), fmt.Sprintf("The dataset not own the document %s.", docID)) + common.ErrorWithCode(c, common.CodeDataError, fmt.Sprintf("The dataset not own the document %s.", docID)) return } res, err := h.documentService.DownloadDocument(datasetID, docID) if err != nil { - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) return } @@ -1140,7 +1140,7 @@ func stringValue(value *string) string { func (h *DocumentHandler) MetadataSummary(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1188,7 +1188,7 @@ type SetMetaRequest struct { func (h *DocumentHandler) SetMeta(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1273,7 +1273,7 @@ func (h *DocumentHandler) SetMeta(c *gin.Context) { func (h *DocumentHandler) Ingest(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1285,12 +1285,12 @@ func (h *DocumentHandler) Ingest(c *gin.Context) { var req service.IngestDocumentRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } if code, err := h.documentService.Ingest(userID, &req); err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -1317,7 +1317,7 @@ type DeleteMetaRequest struct { func (h *DocumentHandler) DeleteMeta(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1391,7 +1391,7 @@ type ListIngestionsRequest struct { func (h *DocumentHandler) ListIngestionTasks(c *gin.Context) { var req ListIngestionsRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1423,7 +1423,7 @@ type StartParseDocumentsRequest struct { func (h *DocumentHandler) StartIngestionTask(c *gin.Context) { var req StartParseDocumentsRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1450,7 +1450,7 @@ type StopIngestionsRequest struct { func (h *DocumentHandler) StopIngestionTasks(c *gin.Context) { var req StopIngestionsRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1471,7 +1471,7 @@ type RemoveIngestionsRequest struct { func (h *DocumentHandler) RemoveIngestionTasks(c *gin.Context) { var req RemoveIngestionsRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1499,7 +1499,7 @@ func (h *DocumentHandler) ParseDocuments(c *gin.Context) { var req ParseDocumentRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1527,12 +1527,12 @@ func (h *DocumentHandler) StopParseDocuments(c *gin.Context) { var req StopParseDocumentRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } if len(req.DocumentIDs) == 0 { - common.ErrorWithCode(c, int(common.CodeBadRequest), "`document_ids` is required") + common.ErrorWithCode(c, common.CodeBadRequest, "`document_ids` is required") return } @@ -1554,17 +1554,17 @@ func (h *DocumentHandler) StopParseDocuments(c *gin.Context) { func (h *DocumentHandler) MetadataSummaryByDataset(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } datasetID := c.Param("dataset_id") if datasetID == "" { - common.ErrorWithCode(c, int(common.CodeServerError), "dataset_id is required") + common.ErrorWithCode(c, common.CodeServerError, "dataset_id is required") return } if !h.datasetService.Accessible(datasetID, user.ID) { - common.ErrorWithCode(c, int(common.CodeServerError), "You don't own the dataset "+datasetID) + common.ErrorWithCode(c, common.CodeServerError, "You don't own the dataset "+datasetID) return } @@ -1585,7 +1585,7 @@ func (h *DocumentHandler) MetadataSummaryByDataset(c *gin.Context) { func (h *DocumentHandler) UpdateDatasetDocument(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1622,7 +1622,7 @@ func (h *DocumentHandler) UpdateDatasetDocument(c *gin.Context) { data, code, err := h.documentService.UpdateDatasetDocument(user.ID, datasetID, documentID, &req, present) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -1632,7 +1632,7 @@ func (h *DocumentHandler) UpdateDatasetDocument(c *gin.Context) { func (h *DocumentHandler) UploadInfo(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1660,7 +1660,7 @@ func (h *DocumentHandler) UploadInfo(c *gin.Context) { if rawURL != "" { data, code, err := h.documentService.UploadDocumentInfoByURL(user.ID, rawURL) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, data, "success") @@ -1669,7 +1669,7 @@ func (h *DocumentHandler) UploadInfo(c *gin.Context) { data, code, err := h.documentService.UploadDocumentInfos(user.ID, fileHeaders) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -1699,7 +1699,7 @@ func (h *DocumentHandler) UpdateDocumentMetadatas(c *gin.Context) { func (h *DocumentHandler) handleBatchUpdateDocumentMetadatas(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1730,7 +1730,7 @@ func (h *DocumentHandler) handleBatchUpdateDocumentMetadatas(c *gin.Context) { resp, code, err := h.documentService.BatchUpdateDocumentMetadatas(datasetID, req.Selector, req.Updates, req.Deletes) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.SuccessWithData(c, resp, "success") diff --git a/internal/handler/file.go b/internal/handler/file.go index a6ea6591ac..09ecfb067a 100644 --- a/internal/handler/file.go +++ b/internal/handler/file.go @@ -65,7 +65,7 @@ func NewFileHandler(fileService *service.FileService, userService *service.UserS func (h *FileHandler) ListFiles(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -126,7 +126,7 @@ func (h *FileHandler) ListFiles(c *gin.Context) { func (h *FileHandler) GetRootFolder(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -153,7 +153,7 @@ func (h *FileHandler) GetRootFolder(c *gin.Context) { func (h *FileHandler) GetParentFolder(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -187,7 +187,7 @@ func (h *FileHandler) GetParentFolder(c *gin.Context) { func (h *FileHandler) GetAllParentFolders(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -221,7 +221,7 @@ func (h *FileHandler) GetAllParentFolders(c *gin.Context) { func (h *FileHandler) GetFileAncestors(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -262,7 +262,7 @@ type CreateFolderRequest struct { func (h *FileHandler) UploadFile(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -306,7 +306,7 @@ func (h *FileHandler) UploadFile(c *gin.Context) { result, err := h.fileService.UploadFile(userID, parentID, files) if err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -333,7 +333,7 @@ func (h *FileHandler) UploadFile(c *gin.Context) { result, err := h.fileService.CreateFolder(userID, req.Name, parentID, req.Type) if err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -361,13 +361,13 @@ type DeleteFileRequest struct { func (h *FileHandler) DeleteFiles(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } var req DeleteFileRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -403,13 +403,13 @@ type MoveFileRequest struct { func (h *FileHandler) MoveFiles(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } var req MoveFileRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -446,7 +446,7 @@ func (h *FileHandler) MoveFiles(c *gin.Context) { func (h *FileHandler) Download(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -533,7 +533,7 @@ func (h *FileHandler) Download(c *gin.Context) { func (h *FileHandler) LinkToDatasets(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/file_commit.go b/internal/handler/file_commit.go index 4ce4731a42..4866bd2464 100644 --- a/internal/handler/file_commit.go +++ b/internal/handler/file_commit.go @@ -124,7 +124,7 @@ type CreateCommitRequest struct { func (h *FileCommitHandler) CreateCommit(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -136,7 +136,7 @@ func (h *FileCommitHandler) CreateCommit(c *gin.Context) { var req CreateCommitRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -179,7 +179,7 @@ func (h *FileCommitHandler) CreateCommit(c *gin.Context) { func (h *FileCommitHandler) ListCommits(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -256,7 +256,7 @@ func (h *FileCommitHandler) ListCommits(c *gin.Context) { func (h *FileCommitHandler) GetCommit(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -313,7 +313,7 @@ func (h *FileCommitHandler) GetCommit(c *gin.Context) { func (h *FileCommitHandler) ListCommitFiles(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -357,7 +357,7 @@ func (h *FileCommitHandler) ListCommitFiles(c *gin.Context) { func (h *FileCommitHandler) DiffCommits(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -405,7 +405,7 @@ func (h *FileCommitHandler) DiffCommits(c *gin.Context) { func (h *FileCommitHandler) GetUncommittedChanges(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -437,7 +437,7 @@ func (h *FileCommitHandler) GetUncommittedChanges(c *gin.Context) { func (h *FileCommitHandler) GetCommitTree(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -481,7 +481,7 @@ func (h *FileCommitHandler) GetCommitTree(c *gin.Context) { func (h *FileCommitHandler) GetCommitFileContent(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -525,7 +525,7 @@ func (h *FileCommitHandler) GetCommitFileContent(c *gin.Context) { func (h *FileCommitHandler) GetFileVersionHistory(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/langfuse.go b/internal/handler/langfuse.go index 6aa424d8ee..272c608889 100644 --- a/internal/handler/langfuse.go +++ b/internal/handler/langfuse.go @@ -59,7 +59,7 @@ type SetLangfuseRequest struct { func (h *LangfuseHandler) SetAPIKey(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -71,7 +71,7 @@ func (h *LangfuseHandler) SetAPIKey(c *gin.Context) { row, code, err := h.langfuseService.SetAPIKey(user.ID, req.SecretKey, req.PublicKey, req.Host) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -88,7 +88,7 @@ func (h *LangfuseHandler) SetAPIKey(c *gin.Context) { func (h *LangfuseHandler) GetAPIKey(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -104,7 +104,7 @@ func (h *LangfuseHandler) GetAPIKey(c *gin.Context) { func (h *LangfuseHandler) DeleteAPIKey(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/llm.go b/internal/handler/llm.go index d744ad8945..71ed22d5af 100644 --- a/internal/handler/llm.go +++ b/internal/handler/llm.go @@ -60,7 +60,7 @@ func NewLLMHandler(llmService *service.LLMService, userService *service.UserServ func (h *LLMHandler) GetMyLLMs(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -90,7 +90,7 @@ func (h *LLMHandler) GetMyLLMs(c *gin.Context) { func (h *LLMHandler) SetAPIKey(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -128,7 +128,7 @@ func (h *LLMHandler) SetAPIKey(c *gin.Context) { func (h *LLMHandler) ListApp(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/mcp.go b/internal/handler/mcp.go index b338291428..6beacb8939 100644 --- a/internal/handler/mcp.go +++ b/internal/handler/mcp.go @@ -71,7 +71,7 @@ func NewMCPHandler(mcpService *service.MCPService) *MCPHandler { func (h *MCPHandler) CreateMCPServer(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -83,7 +83,7 @@ func (h *MCPHandler) CreateMCPServer(c *gin.Context) { result, code, err := h.mcpService.CreateMCPServer(user.ID, req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -94,7 +94,7 @@ func (h *MCPHandler) CreateMCPServer(c *gin.Context) { func (h *MCPHandler) ListMCPServers(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -120,7 +120,7 @@ func (h *MCPHandler) ListMCPServers(c *gin.Context) { common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, code, nil, err.Error()) return } - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -130,7 +130,7 @@ func (h *MCPHandler) ListMCPServers(c *gin.Context) { func (h *MCPHandler) GetMCPServer(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -155,7 +155,7 @@ func (h *MCPHandler) GetMCPServer(c *gin.Context) { func mcpDetailError(c *gin.Context, code common.ErrorCode, err error) { if code == common.CodeDataError { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } common.ResponseWithCodeData(c, common.CodeExceptionError, nil, err.Error()) @@ -165,7 +165,7 @@ func mcpDetailError(c *gin.Context, code common.ErrorCode, err error) { func (h *MCPHandler) UpdateMCPServer(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -178,7 +178,7 @@ func (h *MCPHandler) UpdateMCPServer(c *gin.Context) { result, code, err := h.mcpService.UpdateMCPServer(user.ID, mcpID, req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -189,13 +189,13 @@ func (h *MCPHandler) UpdateMCPServer(c *gin.Context) { func (h *MCPHandler) DeleteMCPServer(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } result, code, err := h.mcpService.DeleteMCPServer(user.ID, c.Param("mcp_id")) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -278,7 +278,7 @@ type ImportMCPRequest struct { func (h *MCPHandler) ImportMCPServers(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -341,7 +341,7 @@ func (h *MCPHandler) ImportMCPServers(c *gin.Context) { func (h *MCPHandler) TestMCPServer(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/mcp_server.go b/internal/handler/mcp_server.go index 6d4de5af12..38c01a3522 100644 --- a/internal/handler/mcp_server.go +++ b/internal/handler/mcp_server.go @@ -72,7 +72,7 @@ func NewMCPServerHandler( func (h *MCPServerHandler) HandleMCP(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/memory.go b/internal/handler/memory.go index 291e322f1b..b6dca6ee8a 100644 --- a/internal/handler/memory.go +++ b/internal/handler/memory.go @@ -92,7 +92,7 @@ func (h *MemoryHandler) CreateMemory(c *gin.Context) { // GetUser is a context value set by the authentication middleware user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -206,7 +206,7 @@ func (h *MemoryHandler) UpdateMemory(c *gin.Context) { // Get current logged-in user information user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -306,7 +306,7 @@ func (h *MemoryHandler) ListMemories(c *gin.Context) { // Get current logged-in user information user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -422,7 +422,7 @@ func (h *MemoryHandler) GetMemoryConfig(c *gin.Context) { func (h *MemoryHandler) GetMemoryMessages(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -525,7 +525,7 @@ type AddMessageRequest struct { func (h *MemoryHandler) AddMessage(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -587,7 +587,7 @@ func (h *MemoryHandler) AddMessage(c *gin.Context) { func (h *MemoryHandler) ForgetMessage(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -656,7 +656,7 @@ func parseMemoryMessagePath(memoryMessage string) (string, int64, error) { func (h *MemoryHandler) UpdateMessage(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -668,7 +668,7 @@ func (h *MemoryHandler) UpdateMessage(c *gin.Context) { memoryID, messageID, err := parseMemoryMessagePath(c.Param("memory_message")) if err != nil { - common.ErrorWithCode(c, int(common.CodeArgumentError), err.Error()) + common.ErrorWithCode(c, common.CodeArgumentError, err.Error()) return } @@ -712,7 +712,7 @@ func (h *MemoryHandler) UpdateMessage(c *gin.Context) { func (h *MemoryHandler) GetMessageContent(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -724,7 +724,7 @@ func (h *MemoryHandler) GetMessageContent(c *gin.Context) { memoryID, messageID, err := parseMemoryMessagePath(c.Param("memory_message")) if err != nil { - common.ErrorWithCode(c, int(common.CodeArgumentError), err.Error()) + common.ErrorWithCode(c, common.CodeArgumentError, err.Error()) return } @@ -761,7 +761,7 @@ func (h *MemoryHandler) GetMessageContent(c *gin.Context) { func (h *MemoryHandler) SearchMessage(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -812,7 +812,7 @@ func (h *MemoryHandler) SearchMessage(c *gin.Context) { res, code, err := h.memoryService.SearchMessage(c.Request.Context(), userID, filterDict, params) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -834,7 +834,7 @@ func (h *MemoryHandler) SearchMessage(c *gin.Context) { func (h *MemoryHandler) GetMessages(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -870,7 +870,7 @@ func (h *MemoryHandler) GetMessages(c *gin.Context) { data, code, err := h.memoryService.GetMessages(c.Request.Context(), memoryIDs, userID, agentID, sessionID, limit) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } diff --git a/internal/handler/plugin.go b/internal/handler/plugin.go index 51f570e730..c719f3316a 100644 --- a/internal/handler/plugin.go +++ b/internal/handler/plugin.go @@ -47,7 +47,7 @@ func NewPluginHandler(pluginService *service.PluginService) *PluginHandler { // @Router /v1/plugin/tools [get] func (h *PluginHandler) ListLLMTools(c *gin.Context) { if _, errorCode, errorMessage := GetUser(c); errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/providers.go b/internal/handler/providers.go index a4034b15f9..e674b8b6d8 100644 --- a/internal/handler/providers.go +++ b/internal/handler/providers.go @@ -58,7 +58,7 @@ func (h *ProviderHandler) ListProviders(c *gin.Context) { // list pool providers providers, err := dao.GetModelProviderManager().ListProviders() if err != nil { - common.ErrorWithCode(c, int(common.CodeNotFound), err.Error()) + common.ErrorWithCode(c, common.CodeNotFound, err.Error()) return } @@ -100,7 +100,7 @@ func (h *ProviderHandler) AddProvider(c *gin.Context) { errorCode, err := h.modelProviderService.AddModelProvider(req.ProviderName, userID) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -118,7 +118,7 @@ func (h *ProviderHandler) DeleteProvider(c *gin.Context) { errorCode, err := h.modelProviderService.DeleteModelProvider(userID, providerName) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -134,7 +134,7 @@ func (h *ProviderHandler) ShowProvider(c *gin.Context) { provider, err := dao.GetModelProviderManager().GetProviderByName(providerName) if err != nil { - common.ErrorWithCode(c, int(common.CodeNotFound), err.Error()) + common.ErrorWithCode(c, common.CodeNotFound, err.Error()) return } common.SuccessWithData(c, provider, "success") @@ -148,7 +148,7 @@ func (h *ProviderHandler) ListModels(c *gin.Context) { } providerModels, err := dao.GetModelProviderManager().ListModels(providerName) if err != nil { - common.ErrorWithCode(c, int(common.CodeNotFound), err.Error()) + common.ErrorWithCode(c, common.CodeNotFound, err.Error()) return } common.SuccessWithData(c, providerModels, "success") @@ -167,7 +167,7 @@ func (h *ProviderHandler) ShowModel(c *gin.Context) { } model, err := dao.GetModelProviderManager().GetModelByName(providerName, modelName) if err != nil { - common.ErrorWithCode(c, int(common.CodeNotFound), err.Error()) + common.ErrorWithCode(c, common.CodeNotFound, err.Error()) return } @@ -190,7 +190,7 @@ func (h *ProviderHandler) CreateProviderInstance(c *gin.Context) { var req CreateProviderInstanceRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -198,7 +198,7 @@ func (h *ProviderHandler) CreateProviderInstance(c *gin.Context) { _, err := h.modelProviderService.CreateProviderInstance(providerName, req.InstanceName, req.APIKey, req.BaseURL, req.Region, userID) if err != nil { - common.ErrorWithCode(c, int(common.CodeServerError), err.Error()) + common.ErrorWithCode(c, common.CodeServerError, err.Error()) return } @@ -216,7 +216,7 @@ func (h *ProviderHandler) ListProviderInstances(c *gin.Context) { instances, errorCode, err := h.modelProviderService.ListProviderInstances(providerName, userID) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -241,7 +241,7 @@ func (h *ProviderHandler) ShowProviderInstance(c *gin.Context) { // Get tenant ID from user instance, errorCode, err := h.modelProviderService.ShowProviderInstance(providerName, instanceName, userID) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -266,7 +266,7 @@ func (h *ProviderHandler) ShowInstanceBalance(c *gin.Context) { // Get tenant ID from user balance, errorCode, err := h.modelProviderService.ShowInstanceBalance(providerName, instanceName, userID) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -289,7 +289,7 @@ func (h *ProviderHandler) CheckConnection(c *gin.Context) { userID := c.GetString("user_id") errCode, err := h.modelProviderService.CheckConnection(providerName, req.APIKey, req.Region, req.BaseURL, userID) if err != nil { - common.ErrorWithCode(c, int(errCode), err.Error()) + common.ErrorWithCode(c, errCode, err.Error()) return } @@ -313,7 +313,7 @@ func (h *ProviderHandler) CheckInstanceConnection(c *gin.Context) { instanceInfo, code, err := h.modelProviderService.ShowProviderInstance(providerName, instanceName, userID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -324,7 +324,7 @@ func (h *ProviderHandler) CheckInstanceConnection(c *gin.Context) { // Get tenant ID from user errorCode, err := h.modelProviderService.CheckConnection(providerName, apikey, region, baseURL, userID) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -349,7 +349,7 @@ func (h *ProviderHandler) ListTasks(c *gin.Context) { // Get tenant ID from user listTaskResponse, errorCode, err := h.modelProviderService.ListTasks(providerName, instanceName, userID) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -380,7 +380,7 @@ func (h *ProviderHandler) ShowTask(c *gin.Context) { // Get tenant ID from user taskResponse, errorCode, err := h.modelProviderService.ShowTask(providerName, instanceName, taskID, userID) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -413,13 +413,13 @@ func (h *ProviderHandler) AlterProviderInstance(c *gin.Context) { userID := c.GetString("user_id") if userID == "" { - common.ErrorWithCode(c, int(common.CodeUnauthorized), "Unauthorized") + common.ErrorWithCode(c, common.CodeUnauthorized, "Unauthorized") return } code, err := h.modelProviderService.AlterProviderInstance(userID, providerName, instanceName, req.InstanceName, req.APIKey) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -438,7 +438,7 @@ func (h *ProviderHandler) DropProviderInstance(c *gin.Context) { } var req DropProviderInstanceRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -446,7 +446,7 @@ func (h *ProviderHandler) DropProviderInstance(c *gin.Context) { code, err := h.modelProviderService.DropProviderInstances(providerName, userID, req.Instances) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -477,7 +477,7 @@ func (h *ProviderHandler) ListInstanceModels(c *gin.Context) { modelList, err := h.modelProviderService.ListSupportedModels(providerName, instanceName, c.GetString("user_id")) if err != nil { - common.ErrorWithCode(c, int(common.CodeServerError), err.Error()) + common.ErrorWithCode(c, common.CodeServerError, err.Error()) return } @@ -487,7 +487,7 @@ func (h *ProviderHandler) ListInstanceModels(c *gin.Context) { modelInstances, err := h.modelProviderService.ListInstanceModels(providerName, instanceName, c.GetString("user_id")) if err != nil { - common.ErrorWithCode(c, int(common.CodeNotFound), err.Error()) + common.ErrorWithCode(c, common.CodeNotFound, err.Error()) return } common.SuccessWithData(c, modelInstances, "success") @@ -514,7 +514,7 @@ func (h *ProviderHandler) EnableOrDisableModel(c *gin.Context) { var req EnableOrDisableModelRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -535,7 +535,7 @@ func (h *ProviderHandler) EnableOrDisableModel(c *gin.Context) { code, err := h.modelProviderService.UpdateModelStatus(providerName, instanceName, modelName, userID, modelID, status) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -603,11 +603,11 @@ func (h *ProviderHandler) AddModel(c *gin.Context) { code, err := h.modelProviderService.AddModel(&req, userID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } - common.ErrorWithCode(c, int(code), "success") + common.ErrorWithCode(c, code, "success") } type DropInstanceModelRequest struct { @@ -629,7 +629,7 @@ func (h *ProviderHandler) DropInstanceModels(c *gin.Context) { var req DropInstanceModelRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } if len(req.ModelIDs) == 0 && len(req.Models) == 0 { @@ -641,7 +641,7 @@ func (h *ProviderHandler) DropInstanceModels(c *gin.Context) { code, err := h.modelProviderService.DropInstanceModels(providerName, instanceName, userID, req.ModelIDs, req.Models) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -664,7 +664,7 @@ func (h *ProviderHandler) ChatToModel(c *gin.Context) { var req ChatToModelRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -780,7 +780,7 @@ func (h *ProviderHandler) ChatToModel(c *gin.Context) { response, errorCode, err = h.modelProviderService.ChatToModelWithMessages(req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, messages, &apiConfig, &chatConfig) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -804,7 +804,7 @@ func (h *ProviderHandler) EmbedText(c *gin.Context) { var req EmbedTextRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -848,7 +848,7 @@ func (h *ProviderHandler) EmbedText(c *gin.Context) { response, errorCode, err = h.modelProviderService.EmbedText(req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Texts, &apiConfig, &embeddingConfig) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -869,7 +869,7 @@ func (h *ProviderHandler) RerankDocument(c *gin.Context) { var req RerankDocumentRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -913,7 +913,7 @@ func (h *ProviderHandler) RerankDocument(c *gin.Context) { response, errorCode, err = h.modelProviderService.RerankDocument(req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Query, req.Documents, &apiConfig, &rerankConfig) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } common.SuccessWithData(c, response.Data, "success") @@ -935,7 +935,7 @@ func (h *ProviderHandler) TranscribeAudio(c *gin.Context) { var req TranscribeAudioRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1021,7 +1021,7 @@ func (h *ProviderHandler) TranscribeAudio(c *gin.Context) { response, errorCode, err = h.modelProviderService.TranscribeAudio(req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.File, &apiConfig, &asrConfig) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -1042,7 +1042,7 @@ func (h *ProviderHandler) AudioSpeech(c *gin.Context) { var req AudioSpeechRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1128,7 +1128,7 @@ func (h *ProviderHandler) AudioSpeech(c *gin.Context) { response, errorCode, err = h.modelProviderService.AudioSpeech(req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Text, &apiConfig, &ttsConfig) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -1148,7 +1148,7 @@ func (h *ProviderHandler) OCRFile(c *gin.Context) { var req OCRFileRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1190,7 +1190,7 @@ func (h *ProviderHandler) OCRFile(c *gin.Context) { response, errorCode, err = h.modelProviderService.OCRFile(req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Content, req.URL, &apiConfig, &OCRConfig) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -1210,7 +1210,7 @@ func (h *ProviderHandler) ParseFile(c *gin.Context) { var req ParseFileRequest if err := c.ShouldBindJSON(&req); err != nil { println("JSON bind error: %v (type: %T)", err, err) - common.ErrorWithCode(c, int(common.CodeBadRequest), err.Error()) + common.ErrorWithCode(c, common.CodeBadRequest, err.Error()) return } @@ -1252,7 +1252,7 @@ func (h *ProviderHandler) ParseFile(c *gin.Context) { response, errorCode, err = h.modelProviderService.ParseFile(req.ProviderName, req.InstanceName, req.ModelName, req.ModelID, userID, req.Content, req.URL, &apiConfig, &parseFileConfig) if err != nil { - common.ErrorWithCode(c, int(errorCode), err.Error()) + common.ErrorWithCode(c, errorCode, err.Error()) return } @@ -1277,7 +1277,7 @@ func (h *ProviderHandler) ParseFile(c *gin.Context) { func (h *ProviderHandler) ListTenantAddedModels(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -1286,7 +1286,7 @@ func (h *ProviderHandler) ListTenantAddedModels(c *gin.Context) { addedModels, code, err := h.modelProviderService.ListTenantAddedModels(user.ID, ownerTenantID, modelType) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } diff --git a/internal/handler/search.go b/internal/handler/search.go index 2f850e4a45..948ab947f5 100644 --- a/internal/handler/search.go +++ b/internal/handler/search.go @@ -85,7 +85,7 @@ func getSearchOwnerIDs(c *gin.Context) []string { func (h *SearchHandler) ListSearches(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -156,7 +156,7 @@ func (h *SearchHandler) CreateSearch(c *gin.Context) { // Get current user from context (same as Python current_user) user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -169,7 +169,7 @@ func (h *SearchHandler) CreateSearch(c *gin.Context) { } if err := common.ValidateName(req.Name); err != nil { - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) return } @@ -197,7 +197,7 @@ func (h *SearchHandler) GetSearch(c *gin.Context) { // Get current user from context (same as Python current_user) user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -218,7 +218,7 @@ func (h *SearchHandler) GetSearch(c *gin.Context) { return } // Not found error - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) return } @@ -255,7 +255,7 @@ func (h *SearchHandler) DeleteSearch(c *gin.Context) { // Get current user from context (same as Python current_user) user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -276,7 +276,7 @@ func (h *SearchHandler) DeleteSearch(c *gin.Context) { return } // Delete failed error - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) return } @@ -298,7 +298,7 @@ func (h *SearchHandler) UpdateSearch(c *gin.Context) { // Get current user from context (same as Python current_user) user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } userID := user.ID @@ -319,7 +319,7 @@ func (h *SearchHandler) UpdateSearch(c *gin.Context) { // Validate name (same as Python validation) if err := common.ValidateName(req.Name); err != nil { - common.ErrorWithCode(c, int(common.CodeDataError), err.Error()) + common.ErrorWithCode(c, common.CodeDataError, err.Error()) return } @@ -367,7 +367,7 @@ func (h *SearchHandler) UpdateSearch(c *gin.Context) { func (h *SearchHandler) Completion(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -393,7 +393,7 @@ func (h *SearchHandler) Completion(c *gin.Context) { jsonInternalError(c, err) return } - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } if plan == nil { diff --git a/internal/handler/searchbot.go b/internal/handler/searchbot.go index 7a1a15181b..933b65ee12 100644 --- a/internal/handler/searchbot.go +++ b/internal/handler/searchbot.go @@ -133,7 +133,7 @@ func (h *SearchBotHandler) SetAskService(svc *service.AskService) { h.askSvc = s func (h *SearchBotHandler) Handle(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -225,7 +225,7 @@ func (h *SearchBotHandler) RetrievalTest(c *gin.Context) { func (h *SearchBotHandler) Ask(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -316,7 +316,7 @@ func (h *SearchBotHandler) Ask(c *gin.Context) { func (h *SearchBotHandler) MindMap(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/skill_search.go b/internal/handler/skill_search.go index 686ec5c66f..81b97033a7 100644 --- a/internal/handler/skill_search.go +++ b/internal/handler/skill_search.go @@ -59,7 +59,7 @@ func NewSkillSearchHandler(docEngine engine.DocEngine) *SkillSearchHandler { func (h *SkillSearchHandler) GetConfig(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -68,7 +68,7 @@ func (h *SkillSearchHandler) GetConfig(c *gin.Context) { result, code, err := h.searchService.GetConfig(user.ID, spaceID, embdID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -88,7 +88,7 @@ func (h *SkillSearchHandler) GetConfig(c *gin.Context) { func (h *SkillSearchHandler) UpdateConfig(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -102,7 +102,7 @@ func (h *SkillSearchHandler) UpdateConfig(c *gin.Context) { result, code, err := h.searchService.UpdateConfig(&req) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -122,7 +122,7 @@ func (h *SkillSearchHandler) UpdateConfig(c *gin.Context) { func (h *SkillSearchHandler) Search(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -136,7 +136,7 @@ func (h *SkillSearchHandler) Search(c *gin.Context) { result, code, err := h.searchService.Search(c.Request.Context(), &req, h.docEngine) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -163,7 +163,7 @@ type IndexSkillsRequest struct { func (h *SkillSearchHandler) IndexSkills(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -238,7 +238,7 @@ type ReindexRequest struct { func (h *SkillSearchHandler) Reindex(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -287,7 +287,7 @@ func (h *SkillSearchHandler) Reindex(c *gin.Context) { func (h *SkillSearchHandler) DeleteSkillIndex(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -321,7 +321,7 @@ func (h *SkillSearchHandler) DeleteSkillIndex(c *gin.Context) { func (h *SkillSearchHandler) InitializeIndex(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -354,13 +354,13 @@ func (h *SkillSearchHandler) InitializeIndex(c *gin.Context) { func (h *SkillSearchHandler) ListSpaces(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } result, code, err := h.spaceService.ListSpaces(user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -388,7 +388,7 @@ type CreateSpaceRequest struct { func (h *SkillSearchHandler) CreateSpace(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -406,7 +406,7 @@ func (h *SkillSearchHandler) CreateSpace(c *gin.Context) { RerankID: req.RerankID, }) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -426,7 +426,7 @@ func (h *SkillSearchHandler) CreateSpace(c *gin.Context) { func (h *SkillSearchHandler) GetSpace(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -438,7 +438,7 @@ func (h *SkillSearchHandler) GetSpace(c *gin.Context) { result, code, err := h.spaceService.GetSpace(spaceID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -468,7 +468,7 @@ type UpdateSpaceRequest struct { func (h *SkillSearchHandler) UpdateSpace(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -492,7 +492,7 @@ func (h *SkillSearchHandler) UpdateSpace(c *gin.Context) { TopK: req.TopK, }) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -512,7 +512,7 @@ func (h *SkillSearchHandler) UpdateSpace(c *gin.Context) { func (h *SkillSearchHandler) DeleteSpace(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -524,7 +524,7 @@ func (h *SkillSearchHandler) DeleteSpace(c *gin.Context) { code, err := h.spaceService.DeleteSpace(spaceID, user.ID, h.docEngine, c.Request.Context()) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -549,7 +549,7 @@ func (h *SkillSearchHandler) DeleteSpace(c *gin.Context) { func (h *SkillSearchHandler) GetSpaceByFolder(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -561,7 +561,7 @@ func (h *SkillSearchHandler) GetSpaceByFolder(c *gin.Context) { result, code, err := h.spaceService.GetSpaceByFolderID(folderID, user.ID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } diff --git a/internal/handler/stats.go b/internal/handler/stats.go index ce4c91847a..0d6b30898f 100644 --- a/internal/handler/stats.go +++ b/internal/handler/stats.go @@ -30,7 +30,7 @@ import ( func (h *SystemHandler) GetStats(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -53,7 +53,7 @@ func (h *SystemHandler) GetStats(c *gin.Context) { if errors.Is(err, service.ErrTenantNotFound) { code = common.CodeDataError } - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } diff --git a/internal/handler/system.go b/internal/handler/system.go index c5347bfdde..59993eef68 100644 --- a/internal/handler/system.go +++ b/internal/handler/system.go @@ -105,7 +105,7 @@ func (h *SystemHandler) GetConfigs(c *gin.Context) { func (h *SystemHandler) GetStatus(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -168,12 +168,12 @@ type SetLogLevelRequest struct { func (h *SystemHandler) SetLogLevel(c *gin.Context) { var req SetLogLevelRequest if err := c.ShouldBindJSON(&req); err != nil { - common.ErrorWithCode(c, int(common.CodeDataError), "pkg_name and level are required") + common.ErrorWithCode(c, common.CodeDataError, "pkg_name and level are required") return } if err := common.SetLevel(req.Level); err != nil { - common.ErrorWithCode(c, int(common.CodeDataError), "Invalid log level: "+req.Level) + common.ErrorWithCode(c, common.CodeDataError, "Invalid log level: "+req.Level) return } diff --git a/internal/handler/tenant.go b/internal/handler/tenant.go index ae7a798b87..d06f2ef683 100644 --- a/internal/handler/tenant.go +++ b/internal/handler/tenant.go @@ -63,7 +63,7 @@ type SetModelRequest struct { func (h *TenantHandler) setDefaultModels(c *gin.Context, wrapModels bool) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -96,7 +96,7 @@ func (h *TenantHandler) setDefaultModels(c *gin.Context, wrapModels bool) { func (h *TenantHandler) GetDefaultModels(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -128,7 +128,7 @@ func (h *TenantHandler) GetDefaultModels(c *gin.Context) { func (h *TenantHandler) TenantInfo(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -158,7 +158,7 @@ func (h *TenantHandler) TenantInfo(c *gin.Context) { func (h *TenantHandler) TenantList(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -183,7 +183,7 @@ func (h *TenantHandler) TenantList(c *gin.Context) { func (h *TenantHandler) CreateMetadataStore(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -192,7 +192,7 @@ func (h *TenantHandler) CreateMetadataStore(c *gin.Context) { code, err := h.tenantService.CreateMetadataStore(tenantID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -211,7 +211,7 @@ func (h *TenantHandler) CreateMetadataStore(c *gin.Context) { func (h *TenantHandler) DeleteMetadataStore(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -220,7 +220,7 @@ func (h *TenantHandler) DeleteMetadataStore(c *gin.Context) { code, err := h.tenantService.DeleteMetadataStore(tenantID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -246,7 +246,7 @@ type CreateChunkTableRequest struct { func (h *TenantHandler) CreateChunkStore(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -268,7 +268,7 @@ func (h *TenantHandler) CreateChunkStore(c *gin.Context) { } result, code, err := h.tenantService.CreateChunkStore(serviceReq) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -293,7 +293,7 @@ type DeleteChunkTableRequest struct { func (h *TenantHandler) DeleteChunkStore(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -311,7 +311,7 @@ func (h *TenantHandler) DeleteChunkStore(c *gin.Context) { code, err := h.tenantService.DeleteChunkStore(req.KBID) if err != nil { - common.ErrorWithCode(c, int(code), err.Error()) + common.ErrorWithCode(c, code, err.Error()) return } @@ -335,7 +335,7 @@ type InsertChunksFromFileRequest struct { func (h *TenantHandler) InsertChunksFromFile(c *gin.Context) { _, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -413,7 +413,7 @@ type InsertMetadataFromFileRequest struct { func (h *TenantHandler) InsertMetadataFromFile(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -477,7 +477,7 @@ func (h *TenantHandler) InsertMetadataFromFile(c *gin.Context) { func (h *TenantHandler) ListTenantMembers(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -506,7 +506,7 @@ func (h *TenantHandler) ListTenantMembers(c *gin.Context) { func (h *TenantHandler) AddTenantMember(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -541,7 +541,7 @@ func (h *TenantHandler) AddTenantMember(c *gin.Context) { func (h *TenantHandler) RemoveTenantMember(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -576,7 +576,7 @@ func (h *TenantHandler) RemoveTenantMember(c *gin.Context) { func (h *TenantHandler) AcceptTenantInvite(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/handler/user.go b/internal/handler/user.go index 18c52cd80b..d339836c49 100644 --- a/internal/handler/user.go +++ b/internal/handler/user.go @@ -307,7 +307,7 @@ func (h *UserHandler) Logout(c *gin.Context) { func (h *UserHandler) Info(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -330,7 +330,7 @@ func (h *UserHandler) Info(c *gin.Context) { func (h *UserHandler) Setting(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -368,7 +368,7 @@ func (h *UserHandler) Setting(c *gin.Context) { func (h *UserHandler) ChangePassword(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } @@ -420,7 +420,7 @@ func (h *UserHandler) GetLoginChannels(c *gin.Context) { func (h *UserHandler) SetTenantInfo(c *gin.Context) { user, errorCode, errorMessage := GetUser(c) if errorCode != common.CodeSuccess { - common.ErrorWithCode(c, int(errorCode), errorMessage) + common.ErrorWithCode(c, errorCode, errorMessage) return } diff --git a/internal/router/router.go b/internal/router/router.go index 636e6629eb..0523004294 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -197,11 +197,11 @@ func (r *Router) Setup(engine *gin.Engine) { apiBetaAuth := engine.Group("/api/v1") apiBetaAuth.Use(r.authHandler.BetaAuthMiddleware()) { - searchbotGroup := apiBetaAuth.Group("/searchbots") - searchbotGroup.POST("/related_questions", r.searchBotHandler.Handle) - searchbotGroup.POST("/retrieval_test", r.searchBotHandler.RetrievalTest) - searchbotGroup.POST("/ask", r.searchBotHandler.Ask) - searchbotGroup.POST("/mindmap", r.searchBotHandler.MindMap) + searchBotGroup := apiBetaAuth.Group("/searchbots") + searchBotGroup.POST("/related_questions", r.searchBotHandler.Handle) + searchBotGroup.POST("/retrieval_test", r.searchBotHandler.RetrievalTest) + searchBotGroup.POST("/ask", r.searchBotHandler.Ask) + searchBotGroup.POST("/mindmap", r.searchBotHandler.MindMap) if r.botHandler != nil { chatbotGroup := apiBetaAuth.Group("/chatbots") diff --git a/internal/service/agent.go b/internal/service/agent.go index 8a884bcdaf..c9875614bd 100644 --- a/internal/service/agent.go +++ b/internal/service/agent.go @@ -437,12 +437,12 @@ func (s *AgentService) UpdateAgent(ctx context.Context, userID, canvasID string, dslMap, ok := dsl.(map[string]interface{}) if !ok { if typed, ok := dsl.(entity.JSONMap); ok { - dslMap = map[string]interface{}(typed) + dslMap = typed } else { return fmt.Errorf("update agent %s: dsl must be an object", canvasID) } } - updates["dsl"] = entity.JSONMap(dslpkg.NormalizeForCanvas(entity.JSONMap(dslMap))) + updates["dsl"] = entity.JSONMap(dslpkg.NormalizeForCanvas(dslMap)) } _, err = s.canvasDAO.UpdateFields(canvasID, updates) @@ -488,7 +488,7 @@ func (s *AgentService) ResetAgent(ctx context.Context, userID, canvasID string) if err != nil { return nil, err } - reset := dslpkg.ResetForCanvas(map[string]any(row.DSL)) + reset := dslpkg.ResetForCanvas(row.DSL) // Re-normalize through the same entry point UpdateAgent uses so // any front-end that reads `graph.nodes` / `components[*].obj` // right after the response sees a renderable shape, not a partial @@ -524,10 +524,10 @@ func (s *AgentService) DeleteAgent(ctx context.Context, userID, canvasID string) return ErrAgentNotOwner } return dao.DB.Transaction(func(tx *gorm.DB) error { - if _, err := s.versionDAO.DeleteByCanvasIDTx(tx, canvasID); err != nil { + if _, err = s.versionDAO.DeleteByCanvasIDTx(tx, canvasID); err != nil { return fmt.Errorf("delete agent: cascade versions: %w", err) } - if err := s.canvasDAO.DeleteTx(tx, canvasID); err != nil { + if err = s.canvasDAO.DeleteTx(tx, canvasID); err != nil { return fmt.Errorf("delete agent %s: %w", canvasID, err) } return nil @@ -783,7 +783,7 @@ func (s *AgentService) RunAgent(ctx context.Context, userID, canvasID, sessionID // `get_agent_dsl_with_release(...release_mode=False)` // fallback in completion(). if len(canvasRow.DSL) > 0 { - dsl = dslpkg.NormalizeForRun(map[string]any(canvasRow.DSL)) + dsl = dslpkg.NormalizeForRun(canvasRow.DSL) } default: // Wrap DB-side errors with ErrAgentStorageError @@ -1340,7 +1340,7 @@ func normalisedDSLForRun(v *entity.UserCanvasVersion) map[string]any { if v == nil || len(v.DSL) == 0 { return nil } - return dslpkg.NormalizeForRun(map[string]any(v.DSL)) + return dslpkg.NormalizeForRun(v.DSL) } // CancelAgent signals the in-flight run (if any) for the given canvas to diff --git a/internal/service/chat.go b/internal/service/chat.go index bec2f57744..07665d8e25 100644 --- a/internal/service/chat.go +++ b/internal/service/chat.go @@ -76,13 +76,13 @@ type ListChatsResponse struct { } // ListChats list chats for a user -func (s *ChatService) ListChats(userID, status, keywords string, page, pageSize int, orderby string, desc bool) (*ListChatsResponse, error) { +func (s *ChatService) ListChats(userID, status, keywords string, page, pageSize int, orderBy string, desc bool) (*ListChatsResponse, error) { chats, total, err := s.chatDAO.ListByTenantIDs( nil, userID, page, pageSize, - orderby, + orderBy, desc, keywords, ) @@ -127,11 +127,11 @@ type CreateChatRequest struct { func (s *ChatService) Create(userID string, req map[string]interface{}) (map[string]interface{}, common.ErrorCode, error) { tenant, err := s.tenantDAO.GetByID(userID) if err != nil { - return nil, common.CodeDataError, errors.New("Tenant not found!") + return nil, common.CodeDataError, errors.New("tenant not found") } if tenantValue, ok := req["tenant_id"]; ok && isTruthy(tenantValue) { - return nil, common.CodeDataError, errors.New("`tenant_id` must not be provided.") + return nil, common.CodeDataError, errors.New("`tenant_id` must not be provided") } name, err := validateCreateChatName(req["name"]) @@ -174,13 +174,13 @@ func (s *ChatService) Create(userID string, req map[string]interface{}) (map[str if promptConfigValue, ok := req["prompt_config"]; ok { if _, ok := mapFromValue(promptConfigValue); !ok { - return nil, common.CodeDataError, errors.New("`prompt_config` should be an object.") + return nil, common.CodeDataError, errors.New("`prompt_config` should be an object") } } if metaDataFilterValue, ok := req["meta_data_filter"]; ok && metaDataFilterValue != nil { if _, ok := mapFromValue(metaDataFilterValue); !ok { - return nil, common.CodeDataError, errors.New("`meta_data_filter` should be an object.") + return nil, common.CodeDataError, errors.New("`meta_data_filter` should be an object") } } @@ -240,17 +240,17 @@ func (s *ChatService) Create(userID string, req map[string]interface{}) (map[str return nil, common.CodeServerError, err } if exists { - return nil, common.CodeDataError, errors.New("Duplicated chat name in creating chat.") + return nil, common.CodeDataError, errors.New("duplicated chat name in creating chat") } chat := buildCreateChatEntity(req, userID) if err = s.chatDAO.Create(chat); err != nil { - return nil, common.CodeDataError, errors.New("Failed to create chat.") + return nil, common.CodeDataError, errors.New("failed to create chat") } chat, err = s.chatDAO.GetByID(chat.ID) if err != nil { - return nil, common.CodeDataError, errors.New("Failed to retrieve created chat.") + return nil, common.CodeDataError, errors.New("failed to retrieve created chat") } response, err := s.buildCreateChatResponse(chat) @@ -262,18 +262,18 @@ func (s *ChatService) Create(userID string, req map[string]interface{}) (map[str func validateCreateChatName(value interface{}) (string, error) { if value == nil { - return "", errors.New("`name` is required.") + return "", errors.New("`name` is required") } name, ok := value.(string) if !ok { - return "", errors.New("Chat name must be a string.") + return "", errors.New("chat name must be a string") } name = strings.TrimSpace(name) if name == "" { - return "", errors.New("`name` is required.") + return "", errors.New("`name` is required") } if len([]byte(name)) > 255 { - return "", fmt.Errorf("Chat name length is %d which is larger than 255.", len([]byte(name))) + return "", fmt.Errorf("chat name length is %d which is larger than 255", len([]byte(name))) } return name, nil } @@ -284,7 +284,7 @@ func (s *ChatService) validateCreateDatasetIDs(value interface{}, tenantID strin } values, ok := listFromValue(value) if !ok { - return nil, errors.New("`dataset_ids` should be a list.") + return nil, errors.New("`dataset_ids` should be a list") } normalizedIDs := make([]string, 0, len(values)) @@ -299,14 +299,14 @@ func (s *ChatService) validateCreateDatasetIDs(value interface{}, tenantID strin for _, datasetID := range normalizedIDs { if !s.kbDAO.Accessible(datasetID, tenantID) { - return nil, fmt.Errorf("You don't own the dataset %s", datasetID) + return nil, fmt.Errorf("you don't own the dataset %s", datasetID) } kb, err := s.kbDAO.GetByID(datasetID) if err != nil { - return nil, fmt.Errorf("You don't own the dataset %s", datasetID) + return nil, fmt.Errorf("you don't own the dataset %s", datasetID) } if kb.ChunkNum == 0 { - return nil, fmt.Errorf("The dataset %s doesn't own parsed file", datasetID) + return nil, fmt.Errorf("the dataset %s doesn't own parsed file", datasetID) } kbs = append(kbs, kb) } @@ -535,7 +535,7 @@ func mapFromValue(value interface{}) (map[string]interface{}, bool) { case map[string]interface{}: return typed, true case entity.JSONMap: - return map[string]interface{}(typed), true + return typed, true default: return nil, false } @@ -561,7 +561,7 @@ func listFromValue(value interface{}) ([]interface{}, bool) { } return result, true case entity.JSONSlice: - return []interface{}(typed), true + return typed, true default: return nil, false } @@ -650,8 +650,8 @@ func isTruthy(value interface{}) bool { // getDatasetNamesAndIDs gets knowledge base names by IDs func (s *ChatService) getDatasetNamesAndIDs(kbIDs entity.JSONSlice) ([]string, []string) { - var names = make([]string, 0, 0) - var ids = make([]string, 0, 0) + var names = make([]string, 0, len(kbIDs)) + var ids = make([]string, 0, len(kbIDs)) for _, kbID := range kbIDs { kbIDStr, ok := kbID.(string) if !ok { @@ -686,17 +686,17 @@ const ( // splitModelNameAndFactory extracts the base model name by stripping // provider and instance suffixes, matching Python's rsplit("@", 2)[0]. -func (s *ChatService) splitModelNameAndFactory(embdID string) string { - if idx := strings.LastIndex(embdID, "@"); idx > 0 { +func (s *ChatService) splitModelNameAndFactory(embeddingModelID string) string { + if idx := strings.LastIndex(embeddingModelID, "@"); idx > 0 { // Strip the provider segment. - base := embdID[:idx] + base := embeddingModelID[:idx] // Strip the instance segment (second-to-last @). if idx2 := strings.LastIndex(base, "@"); idx2 > 0 { return base[:idx2] } return base } - return embdID + return embeddingModelID } func (s *ChatService) getOwnedValidChat(userID, chatID string) (*entity.Chat, error) { @@ -762,12 +762,12 @@ func (s *ChatService) updateChatREST(userID, chatID string, req map[string]inter if err != nil { return nil, err } - if _, err := s.tenantDAO.GetByID(userID); err != nil { - return nil, errors.New("Tenant not found!") + if _, err = s.tenantDAO.GetByID(userID); err != nil { + return nil, errors.New("tenant not found") } if !patch && isTruthy(req["tenant_id"]) { - return nil, errors.New("`tenant_id` must not be provided.") + return nil, errors.New("`tenant_id` must not be provided") } if value, ok := req["name"]; ok { @@ -797,7 +797,7 @@ func (s *ChatService) updateChatREST(userID, chatID string, req map[string]inter llmSettingProvided = true setting, ok := mapFromValue(value) if !ok { - return nil, errors.New("`llm_setting` should be an object.") + return nil, errors.New("`llm_setting` should be an object") } llmSetting = setting } @@ -827,7 +827,7 @@ func (s *ChatService) updateChatREST(userID, chatID string, req map[string]inter if value, ok := req["prompt_config"]; ok { promptConfig, ok := mapFromValue(value) if !ok { - return nil, errors.New("`prompt_config` should be an object.") + return nil, errors.New("`prompt_config` should be an object") } if patch { req["prompt_config"] = mergeJSONMap(currentChat.PromptConfig, promptConfig) @@ -850,7 +850,7 @@ func (s *ChatService) updateChatREST(userID, chatID string, req map[string]inter } else { metaDataFilter, ok := mapFromValue(value) if !ok { - return nil, errors.New("`meta_data_filter` should be an object.") + return nil, errors.New("`meta_data_filter` should be an object") } req["meta_data_filter"] = entity.JSONMap(metaDataFilter) } @@ -872,24 +872,24 @@ func (s *ChatService) updateChatREST(userID, chatID string, req map[string]inter } for _, existingName := range existingNames { if existingName == name { - return nil, errors.New("Duplicated chat name.") + return nil, errors.New("duplicated chat name") } } } } if len(updates) > 0 { - if err := s.chatDAO.UpdateByID(chatID, updates); err != nil { + if err = s.chatDAO.UpdateByID(chatID, updates); err != nil { if patch { - return nil, errors.New("Failed to update chat.") + return nil, errors.New("failed to update chat") } - return nil, errors.New("Chat not found!") + return nil, errors.New("chat not found") } } updatedChat, err := s.chatDAO.GetByID(chatID) if err != nil { - return nil, errors.New("Failed to retrieve updated chat.") + return nil, errors.New("failed to retrieve updated chat") } return s.buildRESTChatResponse(updatedChat), nil } @@ -897,23 +897,23 @@ func (s *ChatService) updateChatREST(userID, chatID string, req map[string]inter func validateRESTChatName(value interface{}, required bool) (string, bool, error) { if value == nil { if required { - return "", false, errors.New("`name` is required.") + return "", false, errors.New("`name` is required") } return "", false, nil } name, ok := value.(string) if !ok { - return "", false, errors.New("Chat name must be a string.") + return "", false, errors.New("chat name must be a string") } name = strings.TrimSpace(name) if name == "" { if required { - return "", false, errors.New("`name` is required.") + return "", false, errors.New("`name` is required") } - return "", false, errors.New("`name` cannot be empty.") + return "", false, errors.New("`name` cannot be empty") } if len([]byte(name)) > 255 { - return "", false, fmt.Errorf("Chat name length is %d which is larger than 255.", len([]byte(name))) + return "", false, fmt.Errorf("chat name length is %d which is larger than 255", len([]byte(name))) } return name, true, nil } @@ -924,7 +924,7 @@ func (s *ChatService) validateRESTDatasetIDs(value interface{}, userID string) ( } items, ok := value.([]interface{}) if !ok { - return nil, errors.New("`dataset_ids` should be a list.") + return nil, errors.New("`dataset_ids` should be a list") } var kbs []*entity.Knowledgebase @@ -935,27 +935,27 @@ func (s *ChatService) validateRESTDatasetIDs(value interface{}, userID string) ( } datasetID := fmt.Sprint(item) if !s.kbDAO.Accessible(datasetID, userID) { - return nil, fmt.Errorf("You don't own the dataset %s", datasetID) + return nil, fmt.Errorf("you don't own the dataset %s", datasetID) } kb, err := s.kbDAO.GetByID(datasetID) if err != nil || kb == nil { - return nil, fmt.Errorf("You don't own the dataset %s", datasetID) + return nil, fmt.Errorf("you don't own the dataset %s", datasetID) } if kb.ChunkNum == 0 { - return nil, fmt.Errorf("The dataset %s doesn't own parsed file", datasetID) + return nil, fmt.Errorf("the dataset %s doesn't own parsed file", datasetID) } kbs = append(kbs, kb) kbIDs = append(kbIDs, datasetID) } - embdIDs := make([]string, 0, len(kbs)) - seenEmbdIDs := make(map[string]struct{}) + embeddingModelIDs := make([]string, 0, len(kbs)) + seenEmbedIDs := make(map[string]struct{}) for _, kb := range kbs { - embdIDs = append(embdIDs, kb.EmbdID) - seenEmbdIDs[s.splitModelNameAndFactory(kb.EmbdID)] = struct{}{} + embeddingModelIDs = append(embeddingModelIDs, kb.EmbdID) + seenEmbedIDs[s.splitModelNameAndFactory(kb.EmbdID)] = struct{}{} } - if len(seenEmbdIDs) > 1 { - return nil, fmt.Errorf("Datasets use different embedding models: %v", embdIDs) + if len(seenEmbedIDs) > 1 { + return nil, fmt.Errorf("datasets use different embedding models: %v", embeddingModelIDs) } return kbIDs, nil } @@ -1075,7 +1075,7 @@ func (s *ChatService) DeleteChat(userID, chatID string) error { if err := s.chatDAO.UpdateByID(chatID, map[string]interface{}{ "status": string(entity.StatusInvalid), }); err != nil { - return fmt.Errorf("Failed to delete chat %s", chatID) + return fmt.Errorf("failed to delete chat %s", chatID) } return nil @@ -1165,10 +1165,6 @@ func strPtr(s string) *string { return &s } -func boolPtr(b bool) *bool { - return &b -} - // Helper to count UTF-8 characters (not bytes) func (s *ChatService) countRunes(str string) int { return utf8.RuneCountInString(str) diff --git a/internal/service/chat_rest_update_test.go b/internal/service/chat_rest_update_test.go index 35467227f0..e5b3299896 100644 --- a/internal/service/chat_rest_update_test.go +++ b/internal/service/chat_rest_update_test.go @@ -174,7 +174,7 @@ func TestChatServiceCreateRejectsInvalidMetaDataFilter(t *testing.T) { "name": "created chat", "meta_data_filter": []interface{}{"invalid"}, }) - if err == nil || err.Error() != "`meta_data_filter` should be an object." { + if err == nil || err.Error() != "`meta_data_filter` should be an object" { t.Fatalf("expected meta_data_filter error, got %v", err) } if code != common.CodeDataError { @@ -227,7 +227,7 @@ func TestChatServiceUpdateChatRejectsTenantID(t *testing.T) { _, err := svc.UpdateChat("user-1", "chat-1", map[string]interface{}{ "tenant_id": "tenant-2", }) - if err == nil || err.Error() != "`tenant_id` must not be provided." { + if err == nil || err.Error() != "`tenant_id` must not be provided" { t.Fatalf("expected tenant_id error, got %v", err) } } @@ -240,7 +240,7 @@ func TestChatServiceUpdateChatRejectsInvalidLLMSetting(t *testing.T) { _, err := svc.UpdateChat("user-1", "chat-1", map[string]interface{}{ "llm_setting": "invalid", }) - if err == nil || err.Error() != "`llm_setting` should be an object." { + if err == nil || err.Error() != "`llm_setting` should be an object" { t.Fatalf("expected llm_setting error, got %v", err) }