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

fix: auto ban

Browse Source
This commit is contained in:
CaIon
2025-07-29 23:08:16 +08:00
parent 010f27678d
commit 95d46d1dfc
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controller/channel-test.go
View File

@@ -209,7 +209,7 @@ func testChannel(channel *model.Channel, testModel string) testResult {
return testResult{ return testResult{
context: c, context: c,
localErr: err, localErr: err,
newAPIError: types.NewError(err, types.ErrorCodeDoRequestFailed), newAPIError: types.NewOpenAIError(err, types.ErrorCodeDoRequestFailed, http.StatusInternalServerError),
} }
} }
var httpResp *http.Response var httpResp *http.Response
@@ -220,7 +220,7 @@ func testChannel(channel *model.Channel, testModel string) testResult {
return testResult{ return testResult{
context: c, context: c,
localErr: err, localErr: err,
newAPIError: types.NewError(err, types.ErrorCodeBadResponse), newAPIError: types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError),
} }
} }
} }
@@ -236,7 +236,7 @@ func testChannel(channel *model.Channel, testModel string) testResult {
return testResult{ return testResult{
context: c, context: c,
localErr: errors.New("usage is nil"), localErr: errors.New("usage is nil"),
newAPIError: types.NewError(errors.New("usage is nil"), types.ErrorCodeBadResponseBody), newAPIError: types.NewOpenAIError(errors.New("usage is nil"), types.ErrorCodeBadResponseBody, http.StatusInternalServerError),
} }
} }
usage := usageA.(*dto.Usage) usage := usageA.(*dto.Usage)
@@ -246,7 +246,7 @@ func testChannel(channel *model.Channel, testModel string) testResult {
return testResult{ return testResult{
context: c, context: c,
localErr: err, localErr: err,
newAPIError: types.NewError(err, types.ErrorCodeReadResponseBodyFailed), newAPIError: types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError),
} }
} }
info.PromptTokens = usage.PromptTokens info.PromptTokens = usage.PromptTokens
@@ -417,7 +417,7 @@ func testAllChannels(notify bool) error {
if common.AutomaticDisableChannelEnabled && !shouldBanChannel { if common.AutomaticDisableChannelEnabled && !shouldBanChannel {
if milliseconds > disableThreshold { if milliseconds > disableThreshold {
err := errors.New(fmt.Sprintf("响应时间 %.2fs 超过阈值 %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0)) err := errors.New(fmt.Sprintf("响应时间 %.2fs 超过阈值 %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0))
newAPIError = types.NewError(err, types.ErrorCodeChannelResponseTimeExceeded) newAPIError = types.NewOpenAIError(err, types.ErrorCodeChannelResponseTimeExceeded, http.StatusRequestTimeout)
shouldBanChannel = true shouldBanChannel = true
} }
} }

3
service/error.go
View File

@@ -1,7 +1,6 @@
package service package service
import ( import (
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"io" "io"
@@ -112,7 +111,7 @@ func ResetStatusCode(newApiErr *types.NewAPIError, statusCodeMappingStr string)
return return
} }
statusCodeMapping := make(map[string]string) statusCodeMapping := make(map[string]string)
err := json.Unmarshal([]byte(statusCodeMappingStr), &statusCodeMapping) err := common.Unmarshal([]byte(statusCodeMappingStr), &statusCodeMapping)
if err != nil { if err != nil {
return return
} }