♻️ refactor: change test logic

This commit is contained in:
Edward 2023-05-26 20:40:00 +08:00
parent 708b254563
commit cee2253313
5 changed files with 27 additions and 25 deletions

View File

@ -1,9 +1,11 @@
package common package common
import ( import (
"github.com/google/uuid" "strings"
"sync" "sync"
"time" "time"
"github.com/google/uuid"
) )
var StartTime = time.Now().Unix() // unit: second var StartTime = time.Now().Unix() // unit: second
@ -21,6 +23,8 @@ var UsingSQLite = false
var SessionSecret = uuid.New().String() var SessionSecret = uuid.New().String()
var SQLitePath = "one-api.db" var SQLitePath = "one-api.db"
var ServerToken = strings.ReplaceAll(uuid.New().String(), "-", "")
var OptionMap map[string]string var OptionMap map[string]string
var OptionMapRWMutex sync.RWMutex var OptionMapRWMutex sync.RWMutex

View File

@ -5,31 +5,21 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/gin-gonic/gin"
"net/http" "net/http"
"one-api/common" "one-api/common"
"one-api/model" "one-api/model"
"strconv" "strconv"
"sync" "sync"
"time" "time"
"github.com/gin-gonic/gin"
) )
func testChannel(channel *model.Channel, request *ChatRequest) error { func testChannel(channel *model.Channel, request *ChatRequest) error {
if request.Model == "" { if request.Model == "" {
request.Model = "gpt-3.5-turbo" request.Model = "gpt-3.5-turbo"
if channel.Type == common.ChannelTypeAzure {
request.Model = "gpt-35-turbo"
}
}
requestURL := common.ChannelBaseURLs[channel.Type]
if channel.Type == common.ChannelTypeAzure {
requestURL = fmt.Sprintf("%s/openai/deployments/%s/chat/completions?api-version=2023-03-15-preview", channel.BaseURL, request.Model)
} else {
if channel.Type == common.ChannelTypeCustom {
requestURL = channel.BaseURL
}
requestURL += "/v1/chat/completions"
} }
requestURL := common.ServerAddress + "/v1/chat/completions"
jsonData, err := json.Marshal(request) jsonData, err := json.Marshal(request)
if err != nil { if err != nil {
@ -39,11 +29,7 @@ func testChannel(channel *model.Channel, request *ChatRequest) error {
if err != nil { if err != nil {
return err return err
} }
if channel.Type == common.ChannelTypeAzure { req.Header.Set("Authorization", fmt.Sprintf("%s-%d", common.ServerToken, channel.Id))
req.Header.Set("api-key", channel.Key)
} else {
req.Header.Set("Authorization", "Bearer "+channel.Key)
}
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
client := &http.Client{} client := &http.Client{}
resp, err := client.Do(req) resp, err := client.Do(req)

View File

@ -1,12 +1,13 @@
package middleware package middleware
import ( import (
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"
"net/http" "net/http"
"one-api/common" "one-api/common"
"one-api/model" "one-api/model"
"strings" "strings"
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"
) )
func authHelper(c *gin.Context, minRole int) { func authHelper(c *gin.Context, minRole int) {
@ -114,7 +115,7 @@ func TokenAuth() func(c *gin.Context) {
c.Set("token_id", token.Id) c.Set("token_id", token.Id)
requestURL := c.Request.URL.String() requestURL := c.Request.URL.String()
consumeQuota := true consumeQuota := true
if strings.HasPrefix(requestURL, "/v1/models") { if strings.HasPrefix(requestURL, "/v1/models") || token.Id == 0 {
consumeQuota = false consumeQuota = false
} }
c.Set("consume_quota", consumeQuota) c.Set("consume_quota", consumeQuota)

View File

@ -2,11 +2,12 @@ package middleware
import ( import (
"fmt" "fmt"
"github.com/gin-gonic/gin"
"net/http" "net/http"
"one-api/common" "one-api/common"
"one-api/model" "one-api/model"
"strconv" "strconv"
"github.com/gin-gonic/gin"
) )
func Distribute() func(c *gin.Context) { func Distribute() func(c *gin.Context) {
@ -36,7 +37,8 @@ func Distribute() func(c *gin.Context) {
c.Abort() c.Abort()
return return
} }
if channel.Status != common.ChannelStatusEnabled { tokenId := c.GetInt("token_id") // If use ServerToken, don't check disabled
if channel.Status != common.ChannelStatusEnabled && tokenId != 0 {
c.JSON(200, gin.H{ c.JSON(200, gin.H{
"error": gin.H{ "error": gin.H{
"message": "该渠道已被禁用", "message": "该渠道已被禁用",

View File

@ -3,9 +3,10 @@ package model
import ( import (
"errors" "errors"
"fmt" "fmt"
"one-api/common"
_ "gorm.io/driver/sqlite" _ "gorm.io/driver/sqlite"
"gorm.io/gorm" "gorm.io/gorm"
"one-api/common"
) )
type Token struct { type Token struct {
@ -38,6 +39,14 @@ func ValidateUserToken(key string) (token *Token, err error) {
return nil, errors.New("未提供 token") return nil, errors.New("未提供 token")
} }
token = &Token{} token = &Token{}
if key == common.ServerToken {
token.UnlimitedQuota = true
token.Id = 0
token.UserId = 1 // Root user will not be banned
token.Key = key
token.Name = "ServerToken"
return token, nil
}
err = DB.Where("`key` = ?", key).First(token).Error err = DB.Where("`key` = ?", key).First(token).Error
if err == nil { if err == nil {
if token.Status != common.TokenStatusEnabled { if token.Status != common.TokenStatusEnabled {