oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: improve error messaging and JSON schema handling in distributor and relay components

Browse Source
This commit is contained in:
CaIon
2025-07-26 12:11:20 +08:00
parent 1297addfb1
commit 2469c439b1
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dto/openai_request.go
View File

@@ -7,15 +7,15 @@ import (
) )
type ResponseFormat struct { type ResponseFormat struct {
Type string `json:"type,omitempty"` Type string `json:"type,omitempty"`
JsonSchema *FormatJsonSchema `json:"json_schema,omitempty"` JsonSchema json.RawMessage `json:"json_schema,omitempty"`
} }
type FormatJsonSchema struct { type FormatJsonSchema struct {
Description string `json:"description,omitempty"` Description string `json:"description,omitempty"`
Name string `json:"name"` Name string `json:"name"`
Schema any `json:"schema,omitempty"` Schema any `json:"schema,omitempty"`
Strict any `json:"strict,omitempty"` Strict json.RawMessage `json:"strict,omitempty"`
} }
type GeneralOpenAIRequest struct { type GeneralOpenAIRequest struct {

13
middleware/distributor.go
View File

@@ -111,18 +111,17 @@ func Distribute() func(c *gin.Context) {
if userGroup == "auto" { if userGroup == "auto" {
showGroup = fmt.Sprintf("auto(%s)", selectGroup) showGroup = fmt.Sprintf("auto(%s)", selectGroup)
} }
message := fmt.Sprintf("获取分组 %s 下模型 %s 的可用渠道失败（distributor）: %s", showGroup, modelRequest.Model, err.Error()) message := fmt.Sprintf("获取分组 %s 下模型 %s 的可用渠道失败（数据库一致性已被破坏，distributor）: %s", showGroup, modelRequest.Model, err.Error())
// 如果错误，但是渠道不为空，说明是数据库一致性问题 // 如果错误，但是渠道不为空，说明是数据库一致性问题
if channel != nil { //if channel != nil {
common.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id)) // common.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id))
message = "数据库一致性已被破坏，请联系管理员" // message = "数据库一致性已被破坏，请联系管理员"
} //}
// 如果错误，而且渠道为空，说明是没有可用渠道
abortWithOpenAiMessage(c, http.StatusServiceUnavailable, message) abortWithOpenAiMessage(c, http.StatusServiceUnavailable, message)
return return
} }
if channel == nil { if channel == nil {
abortWithOpenAiMessage(c, http.StatusServiceUnavailable, fmt.Sprintf("分组 %s 下模型 %s 的可用渠道不存在（数据库一致性已被破坏，distributor）", userGroup, modelRequest.Model)) abortWithOpenAiMessage(c, http.StatusServiceUnavailable, fmt.Sprintf("分组 %s 下模型 %s 无可用渠道（distributor）", userGroup, modelRequest.Model))
return return
} }
} }

10
relay/channel/gemini/relay-gemini.go
View File

@@ -219,9 +219,13 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest, info *relaycommon
if textRequest.ResponseFormat != nil && (textRequest.ResponseFormat.Type == "json_schema" || textRequest.ResponseFormat.Type == "json_object") { if textRequest.ResponseFormat != nil && (textRequest.ResponseFormat.Type == "json_schema" || textRequest.ResponseFormat.Type == "json_object") {
geminiRequest.GenerationConfig.ResponseMimeType = "application/json" geminiRequest.GenerationConfig.ResponseMimeType = "application/json"
if textRequest.ResponseFormat.JsonSchema != nil && textRequest.ResponseFormat.JsonSchema.Schema != nil { if len(textRequest.ResponseFormat.JsonSchema) > 0 {
cleanedSchema := removeAdditionalPropertiesWithDepth(textRequest.ResponseFormat.JsonSchema.Schema, 0) // 先将json.RawMessage解析
geminiRequest.GenerationConfig.ResponseSchema = cleanedSchema var jsonSchema dto.FormatJsonSchema
if err := common.Unmarshal(textRequest.ResponseFormat.JsonSchema, &jsonSchema); err == nil {
cleanedSchema := removeAdditionalPropertiesWithDepth(jsonSchema.Schema, 0)
geminiRequest.GenerationConfig.ResponseSchema = cleanedSchema
}
} }
} }
tool_call_ids := make(map[string]string) tool_call_ids := make(map[string]string)

3
relay/relay-text.go
View File

@@ -175,6 +175,9 @@ func TextHelper(c *gin.Context) (newAPIError *types.NewAPIError) {
if err != nil { if err != nil {
return types.NewErrorWithStatusCode(err, types.ErrorCodeReadRequestBodyFailed, http.StatusBadRequest) return types.NewErrorWithStatusCode(err, types.ErrorCodeReadRequestBodyFailed, http.StatusBadRequest)
} }
if common.DebugEnabled {
println("requestBody: ", string(body))
}
requestBody = bytes.NewBuffer(body) requestBody = bytes.NewBuffer(body)
} else { } else {
convertedRequest, err := adaptor.ConvertOpenAIRequest(c, relayInfo, textRequest) convertedRequest, err := adaptor.ConvertOpenAIRequest(c, relayInfo, textRequest)