diff --git a/controller/channel-test.go b/controller/channel-test.go index 8465d51d..4acb2e3b 100644 --- a/controller/channel-test.go +++ b/controller/channel-test.go @@ -174,7 +174,7 @@ func testAllChannels(notify bool) error { err = errors.New(fmt.Sprintf("响应时间 %.2fs 超过阈值 %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0)) disableChannel(channel.Id, channel.Name, err.Error()) } - if shouldDisableChannel(openaiErr) { + if shouldDisableChannel(openaiErr, -1) { disableChannel(channel.Id, channel.Name, err.Error()) } channel.UpdateResponseTime(milliseconds) diff --git a/controller/relay-utils.go b/controller/relay-utils.go index 5b3e0274..aaf579ab 100644 --- a/controller/relay-utils.go +++ b/controller/relay-utils.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/gin-gonic/gin" "github.com/pkoukk/tiktoken-go" + "net/http" "one-api/common" ) @@ -95,13 +96,16 @@ func errorWrapper(err error, code string, statusCode int) *OpenAIErrorWithStatus } } -func shouldDisableChannel(err *OpenAIError) bool { +func shouldDisableChannel(err *OpenAIError, statusCode int) bool { if !common.AutomaticDisableChannelEnabled { return false } if err == nil { return false } + if statusCode == http.StatusUnauthorized { + return true + } if err.Type == "insufficient_quota" || err.Code == "invalid_api_key" || err.Code == "account_deactivated" { return true } diff --git a/controller/relay.go b/controller/relay.go index 86f16c45..1eaa2c26 100644 --- a/controller/relay.go +++ b/controller/relay.go @@ -185,7 +185,7 @@ func Relay(c *gin.Context) { channelId := c.GetInt("channel_id") common.SysError(fmt.Sprintf("relay error (channel #%d): %s", channelId, err.Message)) // https://platform.openai.com/docs/guides/error-codes/api-errors - if shouldDisableChannel(&err.OpenAIError) { + if shouldDisableChannel(&err.OpenAIError, err.StatusCode) { channelId := c.GetInt("channel_id") channelName := c.GetString("channel_name") disableChannel(channelId, channelName, err.Message)