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

🐛 fix: fix calculation accuracy

Browse Source
This commit is contained in:
MartialBE 2024-05-15 04:08:15 +08:00
parent 46aea4731b
commit 234fb1b118
No known key found for this signature in database
GPG Key ID: 27C0267EC84B0A5C
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
model/price.go
View File

@ -62,18 +62,14 @@ func (price *Price) GetOutput() float64 {
return price.Output return price.Output
} }
func (price *Price) FetchInputCurrencyPrice(rate float64) float64 { func (price *Price) FetchInputCurrencyPrice(rate float64) string {
r := decimal.NewFromFloat(price.GetInput()).Mul(decimal.NewFromFloat(rate)) r := decimal.NewFromFloat(price.GetInput()).Mul(decimal.NewFromFloat(rate))
v, _ := r.Float64() return r.String()
return v
} }
func (price *Price) FetchOutputCurrencyPrice(rate float64) float64 { func (price *Price) FetchOutputCurrencyPrice(rate float64) string {
r := decimal.NewFromFloat(price.GetOutput()).Mul(decimal.NewFromFloat(rate)) r := decimal.NewFromFloat(price.GetOutput()).Mul(decimal.NewFromFloat(rate))
v, _ := r.Float64() return r.String()
return v
} }
func UpdatePrices(tx *gorm.DB, models []string, prices *Price) error { func UpdatePrices(tx *gorm.DB, models []string, prices *Price) error {

6
relay/util/quota.go
View File

@ -129,13 +129,13 @@ func (q *Quota) completedQuotaConsumption(usage *types.Usage, tokenName string,
} }
var modelRatioStr string var modelRatioStr string
if q.price.Type == model.TimesPriceType { if q.price.Type == model.TimesPriceType {
modelRatioStr = fmt.Sprintf("$%g/次", q.price.FetchInputCurrencyPrice(model.DollarRate)) modelRatioStr = fmt.Sprintf("$%s/次", q.price.FetchInputCurrencyPrice(model.DollarRate))
} else { } else {
// 如果输入费率和输出费率一样，则只显示一个费率 // 如果输入费率和输出费率一样，则只显示一个费率
if q.price.GetInput() == q.price.GetOutput() { if q.price.GetInput() == q.price.GetOutput() {
modelRatioStr = fmt.Sprintf("$%g/1k", q.price.FetchInputCurrencyPrice(model.DollarRate)) modelRatioStr = fmt.Sprintf("$%s/1k", q.price.FetchInputCurrencyPrice(model.DollarRate))
} else { } else {
modelRatioStr = fmt.Sprintf("$%g/1k (输入) | $%g/1k (输出)", q.price.FetchInputCurrencyPrice(model.DollarRate), q.price.FetchOutputCurrencyPrice(model.DollarRate)) modelRatioStr = fmt.Sprintf("$%s/1k (输入) | $%s/1k (输出)", q.price.FetchInputCurrencyPrice(model.DollarRate), q.price.FetchOutputCurrencyPrice(model.DollarRate))
} }
} }