diff --git a/controller/relay.go b/controller/relay.go index f3d2772..911a7c5 100644 --- a/controller/relay.go +++ b/controller/relay.go @@ -38,7 +38,7 @@ func Relay(c *gin.Context) { retryTimes = common.RetryTimes } if retryTimes > 0 { - c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s?retry=%d&error=%s", c.Request.URL.Path, retryTimes-1, err.Error.Message)) + c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s?retry=%d", c.Request.URL.Path, retryTimes-1)) } else { if err.StatusCode == http.StatusTooManyRequests { //err.Error.Message = "当前分组上游负载已饱和,请稍后再试" diff --git a/model/redemption.go b/model/redemption.go index 5e44817..122661f 100644 --- a/model/redemption.go +++ b/model/redemption.go @@ -8,16 +8,17 @@ import ( ) type Redemption struct { - Id int `json:"id"` - UserId int `json:"user_id"` - Key string `json:"key" gorm:"type:char(32);uniqueIndex"` - Status int `json:"status" gorm:"default:1"` - Name string `json:"name" gorm:"index"` - Quota int `json:"quota" gorm:"default:100"` - CreatedTime int64 `json:"created_time" gorm:"bigint"` - RedeemedTime int64 `json:"redeemed_time" gorm:"bigint"` - Count int `json:"count" gorm:"-:all"` // only for api request - UsedUserId int `json:"used_user_id"` + Id int `json:"id"` + UserId int `json:"user_id"` + Key string `json:"key" gorm:"type:char(32);uniqueIndex"` + Status int `json:"status" gorm:"default:1"` + Name string `json:"name" gorm:"index"` + Quota int `json:"quota" gorm:"default:100"` + CreatedTime int64 `json:"created_time" gorm:"bigint"` + RedeemedTime int64 `json:"redeemed_time" gorm:"bigint"` + Count int `json:"count" gorm:"-:all"` // only for api request + UsedUserId int `json:"used_user_id"` + DeletedAt gorm.DeletedAt `gorm:"index"` } func GetAllRedemptions(startIdx int, num int) ([]*Redemption, error) { diff --git a/relay/relay-text.go b/relay/relay-text.go index bd24642..c5f79b6 100644 --- a/relay/relay-text.go +++ b/relay/relay-text.go @@ -60,7 +60,6 @@ func getAndValidateTextRequest(c *gin.Context, relayInfo *relaycommon.RelayInfo) } } relayInfo.IsStream = textRequest.Stream - relayInfo.UpstreamModelName = textRequest.Model return textRequest, nil } @@ -86,9 +85,11 @@ func TextHelper(c *gin.Context) *dto.OpenAIErrorWithStatusCode { } if modelMap[textRequest.Model] != "" { textRequest.Model = modelMap[textRequest.Model] + // set upstream model name isModelMapped = true } } + relayInfo.UpstreamModelName = textRequest.Model modelPrice := common.GetModelPrice(textRequest.Model, false) groupRatio := common.GetGroupRatio(relayInfo.Group)