zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-08-02 05:47:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Test: release Go-proxy RESTful contract tests verified passing in Go mode (#17468)

Browse Source 
### Summary

Aligns Go and Python error codes/messages so both backends honor the
same RESTful API contract, removing implementation-specific error leaks
(MySQL errors, `ValueError`, `AttributeError`, Gin validator format) in
favor of clean business error codes.

**Chat list** — invalid `orderby` now returns code 101 (was: raw Python
`AttributeError` code 100); invalid `page`/`page_size` values fall back
to defaults (was: raw `ValueError`/`ProgrammingError` code 100).

**Dataset create/update/delete** — adds UUID validation (101),
extra-field rejection (101), duplicate-id detection (101), content-type
/ JSON-syntax / object-shape checks (101), and "lacks permission" for
nonexistent datasets (IDOR). Create auto-deduplicates dataset names.
Pagerank updates tolerate a missing ES index. List response includes
`parser_config` and `pagerank`.

**Session list/update** — adds filtering, sorting, and pagination
support. Empty payloads are valid no-ops. Authorization errors map to
code 109.

**Chunk list** — doc object uses Python key names (`chunk_count`,
`dataset_id`, `chunk_method`, run text status). Add validates list
element types.

**Document update** — adds `chunk_method` alias, pydantic-style Field
error messages, metadata index auto-create with refresh, and "These
documents do not belong to dataset" messages. List validates
`metadata_condition` and reports ownership errors for unmatched name/id
filters.

**Search completion** — `kb_ids` ownership failure returns code 102
instead of 109.

Released 31 contract tests from `GO_ONLY_SKIPS` (all verified passing on
both Go and Python backends with real LLM keys).
This commit is contained in:
euvre
2026-07-30 19:58:49 +08:00
committed by GitHub
parent 75ac8cec2e
commit 8fc20dd9ca
53 changed files with 1138 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
internal/handler/chat_session.go
View File

@@ -19,9 +19,11 @@ package handler
import (
"encoding/json"
"errors"
"fmt"
"io"
"net/http"
"ragflow/internal/common"
"strconv"
"strings"
"github.com/gin-gonic/gin"
@@ -67,13 +69,45 @@ func (h *ChatSessionHandler) ListChatSessions(c *gin.Context) {
return
}
// Mirror Python's list_sessions query handling: invalid/negative page
// values fall back to the default; page_size 0 yields an empty list and a
// negative page_size disables pagination.
page := 1
if pageStr := c.Query("page"); pageStr != "" {
if p, err := strconv.Atoi(pageStr); err == nil && p > 0 {
page = p
}
}
pageSize := 30
if pageSizeStr := c.Query("page_size"); pageSizeStr != "" {
if ps, err := strconv.Atoi(pageSizeStr); err == nil {
pageSize = ps
}
}
orderby := "create_time"
if queryOrderby := c.Query("orderby"); queryOrderby != "" {
switch queryOrderby {
case "create_time", "update_time", "name":
orderby = queryOrderby
default:
common.ResponseWithCodeData(c, common.CodeArgumentError, nil, fmt.Sprintf("invalid orderby field: %s", queryOrderby))
return
}
}
desc := true
if descStr := c.Query("desc"); descStr != "" {
desc = !strings.EqualFold(descStr, "false")
}
// Call service to list chat sessions
ctx := c.Request.Context()
result, err := h.chatSessionService.ListChatSessions(ctx, userID, chatID)
result, err := h.chatSessionService.ListChatSessions(ctx, userID, chatID, c.Query("id"), c.Query("name"), orderby, desc, page, pageSize)
if err != nil {
// Check if it's an authorization error
if err.Error() == "Only owner of dialog authorized for this operation" {
common.ResponseWithHttpCodeData(c, http.StatusForbidden, 403, false, err.Error())
// Mirror Python: ownership failures return code 109 "No authorization."
if strings.Contains(err.Error(), "No authorization") {
common.ResponseWithCodeData(c, common.CodeAuthenticationError, false, "No authorization.")
return
}
common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, 500, nil, err.Error())
@@ -231,6 +265,11 @@ func (h *ChatSessionHandler) ChatCompletions(c *gin.Context) {
false, nil,
)
if err != nil {
var codedErr *common.CodedError
if errors.As(err, &codedErr) {
common.ErrorWithCode(c, codedErr.Code, codedErr.Message)
return
}
common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, 500, nil, err.Error())
return
}
@@ -282,7 +321,8 @@ func (h *ChatSessionHandler) CreateSession(c *gin.Context) {
if errors.Is(err, io.EOF) {
req = map[string]interface{}{}
} else {
common.ResponseWithCodeData(c, common.CodeArgumentError, nil, err.Error())
// Mirror Python's malformed-JSON contract message.
common.ResponseWithCodeData(c, common.CodeArgumentError, nil, "Malformed JSON syntax: Missing commas/brackets or invalid encoding")
return
}
}
@@ -329,7 +369,8 @@ func (h *ChatSessionHandler) DeleteSessions(c *gin.Context) {
if errors.Is(err, io.EOF) {
req = map[string]interface{}{}
} else {
common.ResponseWithCodeData(c, common.CodeArgumentError, nil, err.Error())
// Mirror Python's malformed-JSON contract message.
common.ResponseWithCodeData(c, common.CodeArgumentError, nil, "Malformed JSON syntax: Missing commas/brackets or invalid encoding")
return
}
}
@@ -361,20 +402,12 @@ func (h *ChatSessionHandler) UpdateSession(c *gin.Context) {
userID := user.ID
chatID, sessionID := c.Param("chat_id"), c.Param("session_id")
// An empty payload is a valid no-op (mirrors Python's update_session).
req := map[string]any{}
if err := c.ShouldBindJSON(&req); err != nil {
if errors.Is(err, io.EOF) {
common.ResponseWithCodeData(c, common.CodeArgumentError, nil,
"Request body cannot be empty")
return
}
if err := c.ShouldBindJSON(&req); err != nil && !errors.Is(err, io.EOF) {
common.ResponseWithCodeData(c, common.CodeArgumentError, nil, "Invalid request: "+err.Error())
return
}
if len(req) == 0 {
common.ResponseWithCodeData(c, common.CodeArgumentError, nil, "Request body cannot be empty")
return
}
ctx := c.Request.Context()
result, code, err := h.chatSessionService.UpdateSession(ctx, userID, chatID, sessionID, req)