🐛 fix: balance fail (#47)

This commit is contained in:
Buer 2024-01-20 03:01:13 +08:00 committed by GitHub
parent b42d4d44aa
commit 33bb1a04a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 16 deletions

View File

@ -2,11 +2,10 @@ package api2d
import (
"errors"
"one-api/model"
"one-api/providers/base"
)
func (p *Api2dProvider) Balance(channel *model.Channel) (float64, error) {
func (p *Api2dProvider) Balance() (float64, error) {
fullRequestURL := p.GetFullRequestURL("/dashboard/billing/credit_grants", "")
headers := p.GetRequestHeaders()
@ -22,7 +21,7 @@ func (p *Api2dProvider) Balance(channel *model.Channel) (float64, error) {
return 0, errors.New(errWithCode.OpenAIError.Message)
}
channel.UpdateBalance(response.TotalAvailable)
p.Channel.UpdateBalance(response.TotalAvailable)
return response.TotalAvailable, nil
}

View File

@ -2,11 +2,10 @@ package api2gpt
import (
"errors"
"one-api/model"
"one-api/providers/base"
)
func (p *Api2gptProvider) Balance(channel *model.Channel) (float64, error) {
func (p *Api2gptProvider) Balance() (float64, error) {
fullRequestURL := p.GetFullRequestURL("/dashboard/billing/credit_grants", "")
headers := p.GetRequestHeaders()
@ -22,7 +21,7 @@ func (p *Api2gptProvider) Balance(channel *model.Channel) (float64, error) {
return 0, errors.New(errWithCode.OpenAIError.Message)
}
channel.UpdateBalance(response.TotalAvailable)
p.Channel.UpdateBalance(response.TotalAvailable)
return response.TotalRemaining, nil
}

View File

@ -2,10 +2,9 @@ package closeai
import (
"errors"
"one-api/model"
)
func (p *CloseaiProxyProvider) Balance(channel *model.Channel) (float64, error) {
func (p *CloseaiProxyProvider) Balance() (float64, error) {
fullRequestURL := p.GetFullRequestURL("/dashboard/billing/credit_grants", "")
headers := p.GetRequestHeaders()
@ -21,7 +20,7 @@ func (p *CloseaiProxyProvider) Balance(channel *model.Channel) (float64, error)
return 0, errors.New(errWithCode.OpenAIError.Message)
}
channel.UpdateBalance(response.TotalAvailable)
p.Channel.UpdateBalance(response.TotalAvailable)
return response.TotalAvailable, nil
}

View File

@ -3,11 +3,10 @@ package openai
import (
"errors"
"fmt"
"one-api/model"
"time"
)
func (p *OpenAIProvider) Balance(channel *model.Channel) (float64, error) {
func (p *OpenAIProvider) Balance() (float64, error) {
if !p.BalanceAction {
return 0, errors.New("不支持余额查询")
}
@ -46,6 +45,6 @@ func (p *OpenAIProvider) Balance(channel *model.Channel) (float64, error) {
}
balance := subscription.HardLimitUSD - usage.TotalUsage/100
channel.UpdateBalance(balance)
p.Channel.UpdateBalance(balance)
return balance, nil
}

View File

@ -3,13 +3,12 @@ package openaisb
import (
"errors"
"fmt"
"one-api/model"
"strconv"
)
func (p *OpenaiSBProvider) Balance(channel *model.Channel) (float64, error) {
func (p *OpenaiSBProvider) Balance() (float64, error) {
fullRequestURL := p.GetFullRequestURL("/sb-api/user/status", "")
fullRequestURL = fmt.Sprintf("%s?api_key=%s", fullRequestURL, channel.Key)
fullRequestURL = fmt.Sprintf("%s?api_key=%s", fullRequestURL, p.Channel.Key)
headers := p.GetRequestHeaders()
req, err := p.Requester.NewRequest("GET", fullRequestURL, p.Requester.WithHeader(headers))
@ -31,6 +30,6 @@ func (p *OpenaiSBProvider) Balance(channel *model.Channel) (float64, error) {
if err != nil {
return 0, err
}
channel.UpdateBalance(balance)
p.Channel.UpdateBalance(balance)
return balance, nil
}