From cd2707692fae1af393cb1d4fd77a7557c051e51e Mon Sep 17 00:00:00 2001
From: JustSong <songquanpeng@foxmail.com>
Date: Sat, 6 Apr 2024 01:09:23 +0800
Subject: [PATCH] chore: reorganize billing related package

---
 relay/billing/{group-ratio.go => group.go} | 0
 relay/{constant => billing}/image.go       | 2 +-
 relay/billing/{model-ratio.go => model.go} | 0
 relay/constant/relay_mode.go               | 1 -
 relay/controller/helper.go                 | 7 +++----
 relay/controller/image.go                  | 7 +++----
 6 files changed, 7 insertions(+), 10 deletions(-)
 rename relay/billing/{group-ratio.go => group.go} (100%)
 rename relay/{constant => billing}/image.go (98%)
 rename relay/billing/{model-ratio.go => model.go} (100%)
 delete mode 100644 relay/constant/relay_mode.go

diff --git a/relay/billing/group-ratio.go b/relay/billing/group.go
similarity index 100%
rename from relay/billing/group-ratio.go
rename to relay/billing/group.go
diff --git a/relay/constant/image.go b/relay/billing/image.go
similarity index 98%
rename from relay/constant/image.go
rename to relay/billing/image.go
index e3e3260a..92bfa48c 100644
--- a/relay/constant/image.go
+++ b/relay/billing/image.go
@@ -1,4 +1,4 @@
-package constant
+package billing
 
 var ImageSizeRatios = map[string]map[string]float64{
 	"dall-e-2": {
diff --git a/relay/billing/model-ratio.go b/relay/billing/model.go
similarity index 100%
rename from relay/billing/model-ratio.go
rename to relay/billing/model.go
diff --git a/relay/constant/relay_mode.go b/relay/constant/relay_mode.go
deleted file mode 100644
index 3f2495e1..00000000
--- a/relay/constant/relay_mode.go
+++ /dev/null
@@ -1 +0,0 @@
-package constant
diff --git a/relay/controller/helper.go b/relay/controller/helper.go
index 3d8fe7b9..4691ffcb 100644
--- a/relay/controller/helper.go
+++ b/relay/controller/helper.go
@@ -12,7 +12,6 @@ import (
 	"github.com/songquanpeng/one-api/relay/billing"
 	"github.com/songquanpeng/one-api/relay/channel/openai"
 	"github.com/songquanpeng/one-api/relay/channeltype"
-	"github.com/songquanpeng/one-api/relay/constant"
 	relaymodel "github.com/songquanpeng/one-api/relay/model"
 	"github.com/songquanpeng/one-api/relay/relaymode"
 	"github.com/songquanpeng/one-api/relay/util"
@@ -61,12 +60,12 @@ func isValidImageSize(model string, size string) bool {
 	if model == "cogview-3" {
 		return true
 	}
-	_, ok := constant.ImageSizeRatios[model][size]
+	_, ok := billing.ImageSizeRatios[model][size]
 	return ok
 }
 
 func getImageSizeRatio(model string, size string) float64 {
-	ratio, ok := constant.ImageSizeRatios[model][size]
+	ratio, ok := billing.ImageSizeRatios[model][size]
 	if !ok {
 		return 1
 	}
@@ -83,7 +82,7 @@ func validateImageRequest(imageRequest *relaymodel.ImageRequest, meta *util.Rela
 	if imageRequest.Prompt == "" {
 		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)
 	}
 	// Number of generated images validation
diff --git a/relay/controller/image.go b/relay/controller/image.go
index 1d078e2f..8e5b6092 100644
--- a/relay/controller/image.go
+++ b/relay/controller/image.go
@@ -12,7 +12,6 @@ import (
 	"github.com/songquanpeng/one-api/relay/billing"
 	"github.com/songquanpeng/one-api/relay/channel/openai"
 	"github.com/songquanpeng/one-api/relay/channeltype"
-	"github.com/songquanpeng/one-api/relay/constant"
 	"github.com/songquanpeng/one-api/relay/helper"
 	relaymodel "github.com/songquanpeng/one-api/relay/model"
 	"github.com/songquanpeng/one-api/relay/util"
@@ -21,11 +20,11 @@ import (
 )
 
 func isWithinRange(element string, value int) bool {
-	if _, ok := constant.ImageGenerationAmounts[element]; !ok {
+	if _, ok := billing.ImageGenerationAmounts[element]; !ok {
 		return false
 	}
-	min := constant.ImageGenerationAmounts[element][0]
-	max := constant.ImageGenerationAmounts[element][1]
+	min := billing.ImageGenerationAmounts[element][0]
+	max := billing.ImageGenerationAmounts[element][1]
 	return value >= min && value <= max
 }