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

fix: enhance error handling for invalid request types in relay handlers

Browse Source
This commit is contained in:
CaIon
2025-08-23 13:34:56 +08:00
parent 2c6a9245ee
commit 94536be9be
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/gin.go
View File

@@ -2,12 +2,13 @@ package common
import ( import (
"bytes" "bytes"
"github.com/gin-gonic/gin"
"io" "io"
"net/http" "net/http"
"one-api/constant" "one-api/constant"
"strings" "strings"
"time" "time"
"github.com/gin-gonic/gin"
) )
const KeyRequestBody = "key_request_body" const KeyRequestBody = "key_request_body"

2
relay/claude_handler.go
View File

@@ -24,7 +24,7 @@ func ClaudeHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *typ
claudeReq, ok := info.Request.(*dto.ClaudeRequest) claudeReq, ok := info.Request.(*dto.ClaudeRequest)
if !ok { if !ok {
common.FatalLog(fmt.Sprintf("invalid request type, expected *dto.ClaudeRequest, got %T", info.Request)) return types.NewErrorWithStatusCode(fmt.Errorf("invalid request type, expected *dto.ClaudeRequest, got %T", info.Request), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
} }
request, err := common.DeepCopy(claudeReq) request, err := common.DeepCopy(claudeReq)

3
relay/compatible_handler.go
View File

@@ -29,8 +29,7 @@ func TextHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *types
textReq, ok := info.Request.(*dto.GeneralOpenAIRequest) textReq, ok := info.Request.(*dto.GeneralOpenAIRequest)
if !ok { if !ok {
//return types.NewErrorWithStatusCode(errors.New("invalid request type"), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry()) return types.NewErrorWithStatusCode(fmt.Errorf("invalid request type, expected dto.GeneralOpenAIRequest, got %T", info.Request), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
common.FatalLog("invalid request type, expected dto.GeneralOpenAIRequest, got %T", info.Request)
} }
request, err := common.DeepCopy(textReq) request, err := common.DeepCopy(textReq)

2
relay/embedding_handler.go
View File

@@ -20,7 +20,7 @@ func EmbeddingHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *
embeddingReq, ok := info.Request.(*dto.EmbeddingRequest) embeddingReq, ok := info.Request.(*dto.EmbeddingRequest)
if !ok { if !ok {
common.FatalLog(fmt.Sprintf("invalid request type, expected *dto.EmbeddingRequest, got %T", info.Request)) return types.NewErrorWithStatusCode(fmt.Errorf("invalid request type, expected *dto.EmbeddingRequest, got %T", info.Request), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
} }
request, err := common.DeepCopy(embeddingReq) request, err := common.DeepCopy(embeddingReq)

2
relay/gemini_handler.go
View File

@@ -55,7 +55,7 @@ func GeminiHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *typ
geminiReq, ok := info.Request.(*dto.GeminiChatRequest) geminiReq, ok := info.Request.(*dto.GeminiChatRequest)
if !ok { if !ok {
common.FatalLog(fmt.Sprintf("invalid request type, expected *dto.GeminiChatRequest, got %T", info.Request)) return types.NewErrorWithStatusCode(fmt.Errorf("invalid request type, expected *dto.GeminiChatRequest, got %T", info.Request), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
} }
request, err := common.DeepCopy(geminiReq) request, err := common.DeepCopy(geminiReq)

2
relay/image_handler.go
View File

@@ -24,7 +24,7 @@ func ImageHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *type
imageReq, ok := info.Request.(*dto.ImageRequest) imageReq, ok := info.Request.(*dto.ImageRequest)
if !ok { if !ok {
common.FatalLog(fmt.Sprintf("invalid request type, expected dto.ImageRequest, got %T", info.Request)) return types.NewErrorWithStatusCode(fmt.Errorf("invalid request type, expected dto.ImageRequest, got %T", info.Request), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
} }
request, err := common.DeepCopy(imageReq) request, err := common.DeepCopy(imageReq)

2
relay/rerank_handler.go
View File

@@ -21,7 +21,7 @@ func RerankHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *typ
rerankReq, ok := info.Request.(*dto.RerankRequest) rerankReq, ok := info.Request.(*dto.RerankRequest)
if !ok { if !ok {
common.FatalLog(fmt.Sprintf("invalid request type, expected dto.RerankRequest, got %T", info.Request)) return types.NewErrorWithStatusCode(fmt.Errorf("invalid request type, expected dto.RerankRequest, got %T", info.Request), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
} }
request, err := common.DeepCopy(rerankReq) request, err := common.DeepCopy(rerankReq)

2
relay/responses_handler.go
View File

@@ -22,7 +22,7 @@ func ResponsesHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *
responsesReq, ok := info.Request.(*dto.OpenAIResponsesRequest) responsesReq, ok := info.Request.(*dto.OpenAIResponsesRequest)
if !ok { if !ok {
common.FatalLog(fmt.Sprintf("invalid request type, expected dto.OpenAIResponsesRequest, got %T", info.Request)) return types.NewErrorWithStatusCode(fmt.Errorf("invalid request type, expected dto.OpenAIResponsesRequest, got %T", info.Request), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
} }
request, err := common.DeepCopy(responsesReq) request, err := common.DeepCopy(responsesReq)