Ecosystem/ai-gateway
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: reorganize billing related package

Browse Source
This commit is contained in:
JustSong 2024-04-06 01:09:23 +08:00
parent 2ab7d25a80
commit cd2707692f
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
relay/billing/group-ratio.go → relay/billing/group.go
View File

2
relay/constant/image.go → relay/billing/image.go
View File

@ -1,4 +1,4 @@
package constant package billing
var ImageSizeRatios = map[string]map[string]float64{ var ImageSizeRatios = map[string]map[string]float64{
"dall-e-2": { "dall-e-2": {

0
relay/billing/model-ratio.go → relay/billing/model.go
View File

1
relay/constant/relay_mode.go
View File

@ -1 +0,0 @@
package constant

7
relay/controller/helper.go
View File

@ -12,7 +12,6 @@ import (
"github.com/songquanpeng/one-api/relay/billing" "github.com/songquanpeng/one-api/relay/billing"
"github.com/songquanpeng/one-api/relay/channel/openai" "github.com/songquanpeng/one-api/relay/channel/openai"
"github.com/songquanpeng/one-api/relay/channeltype" "github.com/songquanpeng/one-api/relay/channeltype"
"github.com/songquanpeng/one-api/relay/constant"
relaymodel "github.com/songquanpeng/one-api/relay/model" relaymodel "github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/relaymode" "github.com/songquanpeng/one-api/relay/relaymode"
"github.com/songquanpeng/one-api/relay/util" "github.com/songquanpeng/one-api/relay/util"
@ -61,12 +60,12 @@ func isValidImageSize(model string, size string) bool {
if model == "cogview-3" { if model == "cogview-3" {
return true return true
} }
_, ok := constant.ImageSizeRatios[model][size] _, ok := billing.ImageSizeRatios[model][size]
return ok return ok
} }
func getImageSizeRatio(model string, size string) float64 { func getImageSizeRatio(model string, size string) float64 {
ratio, ok := constant.ImageSizeRatios[model][size] ratio, ok := billing.ImageSizeRatios[model][size]
if !ok { if !ok {
return 1 return 1
} }
@ -83,7 +82,7 @@ func validateImageRequest(imageRequest *relaymodel.ImageRequest, meta *util.Rela
if imageRequest.Prompt == "" { if imageRequest.Prompt == "" {
return openai.ErrorWrapper(errors.New("prompt is required"), "prompt_missing", http.StatusBadRequest) return openai.ErrorWrapper(errors.New("prompt is required"), "prompt_missing", http.StatusBadRequest)
} }
if len(imageRequest.Prompt) > constant.ImagePromptLengthLimitations[imageRequest.Model] { if len(imageRequest.Prompt) > billing.ImagePromptLengthLimitations[imageRequest.Model] {
return openai.ErrorWrapper(errors.New("prompt is too long"), "prompt_too_long", http.StatusBadRequest) return openai.ErrorWrapper(errors.New("prompt is too long"), "prompt_too_long", http.StatusBadRequest)
} }
// Number of generated images validation // Number of generated images validation

7
relay/controller/image.go
View File

@ -12,7 +12,6 @@ import (
"github.com/songquanpeng/one-api/relay/billing" "github.com/songquanpeng/one-api/relay/billing"
"github.com/songquanpeng/one-api/relay/channel/openai" "github.com/songquanpeng/one-api/relay/channel/openai"
"github.com/songquanpeng/one-api/relay/channeltype" "github.com/songquanpeng/one-api/relay/channeltype"
"github.com/songquanpeng/one-api/relay/constant"
"github.com/songquanpeng/one-api/relay/helper" "github.com/songquanpeng/one-api/relay/helper"
relaymodel "github.com/songquanpeng/one-api/relay/model" relaymodel "github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/util" "github.com/songquanpeng/one-api/relay/util"
@ -21,11 +20,11 @@ import (
) )
func isWithinRange(element string, value int) bool { func isWithinRange(element string, value int) bool {
if _, ok := constant.ImageGenerationAmounts[element]; !ok { if _, ok := billing.ImageGenerationAmounts[element]; !ok {
return false return false
} }
min := constant.ImageGenerationAmounts[element][0] min := billing.ImageGenerationAmounts[element][0]
max := constant.ImageGenerationAmounts[element][1] max := billing.ImageGenerationAmounts[element][1]
return value >= min && value <= max return value >= min && value <= max
} }