xinyin025/one-api
1
0
Fork 0
mirror of https://github.com/songquanpeng/one-api.git synced 2025-11-22 07:56:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'songquanpeng/main'

Browse Source 
# Conflicts:
#	controller/relay-text.go
#	middleware/distributor.go
This commit is contained in:
quzard
2023-06-20 20:15:57 +08:00
parent f882958928 b179c2f208
commit bd7a9b6576
22 changed files with 245 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
middleware/distributor.go
View File

@@ -17,7 +17,7 @@ type ModelRequest struct {
func Distribute() func(c *gin.Context) {
return func(c *gin.Context) {
userId := c.GetInt("id")
userGroup, _ := model.GetUserGroup(userId)
userGroup, _ := model.CacheGetUserGroup(userId)
c.Set("group", userGroup)
var channel *model.Channel
channelId, ok := c.Get("channelId")
@@ -76,7 +76,7 @@ func Distribute() func(c *gin.Context) {
if strings.HasPrefix(modelRequest.Model, "gpt-35-turbo") {
modelRequest.Model = strings.Replace(modelRequest.Model, "gpt-35-turbo", "gpt-3.5-turbo", 1)
}
channel, err = model.GetRandomSatisfiedChannel(userGroup, modelRequest.Model)
channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, modelRequest.Model)
if err != nil {
c.JSON(200, gin.H{
"error": gin.H{