Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controller/relay.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func Relay(c *gin.Context) {
common.LogError(c, fmt.Sprintf("origin 429 error: %s", openaiErr.Error.Message))
openaiErr.Error.Message = "当前分组上游负载已饱和,请稍后再试"
}

// 处理自定义的 NewAPI batch 错误码
if openaiErr.StatusCode == dto.StatusNewAPIBatchRateLimitExceeded {
common.LogError(c, fmt.Sprintf("origin %d error: %s", openaiErr.StatusCode, openaiErr.Error.Message))
Expand Down
2 changes: 1 addition & 1 deletion middleware/request-logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func RequestLogger() gin.HandlerFunc {
// 构建日志信息
logInfo := fmt.Sprintf("Request: %s %s\tClient IP: %s\tHeaders: %s\t",
c.Request.Method,
c.Request.URL.Path,
c.Request.URL.String(),
c.ClientIP(),
formatMap(headers),
)
Expand Down
2 changes: 2 additions & 0 deletions relay/constant/relay_mode.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ func Path2RelayMode(path string) int {
relayMode = RelayModeRerank
} else if strings.HasPrefix(path, "/v1/realtime") {
relayMode = RelayModeRealtime
} else if strings.HasPrefix(path, "/v1/responses") {
relayMode = RelayModeChatCompletions
}
return relayMode
}
Expand Down
2 changes: 1 addition & 1 deletion relay/relay-text.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func getAndValidateTextRequest(c *gin.Context, relayInfo *relaycommon.RelayInfo)
return nil, errors.New("field prompt is required")
}
case relayconstant.RelayModeChatCompletions:
if len(textRequest.Messages) == 0 {
if len(textRequest.Messages) == 0 && textRequest.Input == nil {
return nil, errors.New("field messages is required")
}
case relayconstant.RelayModeEmbeddings:
Expand Down
1 change: 1 addition & 0 deletions router/relay-router.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ func SetRelayRouter(router *gin.Engine) {
httpRouter.Use(middleware.Distribute())
httpRouter.POST("/completions", controller.Relay)
httpRouter.POST("/chat/completions", controller.Relay)
httpRouter.POST("/responses", controller.Relay)
httpRouter.POST("/edits", controller.Relay)
httpRouter.POST("/images/generations", controller.Relay)
httpRouter.POST("/images/edits", controller.RelayNotImplemented)
Expand Down
2 changes: 1 addition & 1 deletion service/token_counter.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func getImageToken(info *relaycommon.RelayInfo, imageUrl *dto.MessageImageUrl, m
}

func CountTokenChatRequest(ctx *gin.Context, info *relaycommon.RelayInfo, request dto.GeneralOpenAIRequest) (int, error) {
if request.Messages == nil {
if request.Messages == nil && request.Input == nil {
return 0, errors.New("messages is required")
}
tkm := 0
Expand Down