From 33bb1a04a701ba56134cdb773dcd9f67ea6a8020 Mon Sep 17 00:00:00 2001 From: Buer <42402987+MartialBE@users.noreply.github.com> Date: Sat, 20 Jan 2024 03:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20balance=20fail=20(#47)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- providers/api2d/balance.go | 5 ++--- providers/api2gpt/balance.go | 5 ++--- providers/closeai/balance.go | 5 ++--- providers/openai/balance.go | 5 ++--- providers/openaisb/balance.go | 7 +++---- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/providers/api2d/balance.go b/providers/api2d/balance.go index 4f7e3cef..e4d8147c 100644 --- a/providers/api2d/balance.go +++ b/providers/api2d/balance.go @@ -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 } diff --git a/providers/api2gpt/balance.go b/providers/api2gpt/balance.go index 370ee882..912f4a2d 100644 --- a/providers/api2gpt/balance.go +++ b/providers/api2gpt/balance.go @@ -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 } diff --git a/providers/closeai/balance.go b/providers/closeai/balance.go index d163c123..5367c06b 100644 --- a/providers/closeai/balance.go +++ b/providers/closeai/balance.go @@ -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 } diff --git a/providers/openai/balance.go b/providers/openai/balance.go index b17e8998..75cc1bf1 100644 --- a/providers/openai/balance.go +++ b/providers/openai/balance.go @@ -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 } diff --git a/providers/openaisb/balance.go b/providers/openaisb/balance.go index 3873a3b3..e0179df2 100644 --- a/providers/openaisb/balance.go +++ b/providers/openaisb/balance.go @@ -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 }