xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-18 00:16:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: 优化relay代码

Browse Source
This commit is contained in:
CalciumIon 2024-08-03 17:12:16 +08:00
parent fbe6cd75b1
commit dd12a0052f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
controller/relay.go
View File

@ -2,6 +2,7 @@ package controller
import ( import (
"bytes" "bytes"
"errors"
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"io" "io"
@ -47,14 +48,9 @@ func Relay(c *gin.Context) {
for i := 0; i <= common.RetryTimes; i++ { for i := 0; i <= common.RetryTimes; i++ {
channel, err := getChannel(c, group, originalModel, i) channel, err := getChannel(c, group, originalModel, i)
if err != nil { if err != nil {
errMsg := fmt.Sprintf("获取渠道出错: %s", err.Error()) common.LogError(c, err.Error())
common.LogError(c, errMsg)
openaiErr = service.OpenAIErrorWrapperLocal(err, "get_channel_failed", http.StatusInternalServerError) openaiErr = service.OpenAIErrorWrapperLocal(err, "get_channel_failed", http.StatusInternalServerError)
openaiErr.Error.Message = common.MessageWithRequestId(errMsg, requestId) break
c.JSON(openaiErr.StatusCode, gin.H{
"error": openaiErr.Error,
})
return
} }
openaiErr = relayRequest(c, relayMode, channel) openaiErr = relayRequest(c, relayMode, channel)
@ -72,7 +68,7 @@ func Relay(c *gin.Context) {
useChannel := c.GetStringSlice("use_channel") useChannel := c.GetStringSlice("use_channel")
if len(useChannel) > 1 { if len(useChannel) > 1 {
retryLogStr := fmt.Sprintf("重试：%s", strings.Trim(strings.Join(strings.Fields(fmt.Sprint(useChannel)), "->"), "[]")) retryLogStr := fmt.Sprintf("重试：%s", strings.Trim(strings.Join(strings.Fields(fmt.Sprint(useChannel)), "->"), "[]"))
common.LogInfo(c.Request.Context(), retryLogStr) common.LogInfo(c, retryLogStr)
} }
if openaiErr != nil { if openaiErr != nil {
@ -109,7 +105,7 @@ func getChannel(c *gin.Context, group, originalModel string, retryCount int) (*m
} }
channel, err := model.CacheGetRandomSatisfiedChannel(group, originalModel, retryCount) channel, err := model.CacheGetRandomSatisfiedChannel(group, originalModel, retryCount)
if err != nil { if err != nil {
return nil, err return nil, errors.New(fmt.Sprintf("获取重试渠道失败: %s", err.Error()))
} }
middleware.SetupContextForSelectedChannel(c, channel, originalModel) middleware.SetupContextForSelectedChannel(c, channel, originalModel)
return channel, nil return channel, nil