Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
aed80b18
authored
Aug 06, 2023
by
glzjin
Committed by
GitHub
Aug 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix SparkDesk not billed (#344)
parent
00a89c7a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
controller/relay-xunfei.go
+13
-13
No files found.
controller/relay-xunfei.go
View file @
aed80b18
...
...
@@ -63,16 +63,16 @@ type XunfeiChatResponse struct {
Seq
int
`json:"seq"`
Text
[]
XunfeiChatResponseTextItem
`json:"text"`
}
`json:"choices"`
Usage
struct
{
//Text struct {
// QuestionTokens string `json:"question_tokens"`
// PromptTokens string `json:"prompt_tokens"`
// CompletionTokens string `json:"completion_tokens"`
// TotalTokens string `json:"total_tokens"`
//} `json:"text"`
Text
Usage
`json:"text"`
}
`json:"usage"`
}
`json:"payload"`
Usage
struct
{
//Text struct {
// QuestionTokens string `json:"question_tokens"`
// PromptTokens string `json:"prompt_tokens"`
// CompletionTokens string `json:"completion_tokens"`
// TotalTokens string `json:"total_tokens"`
//} `json:"text"`
Text
Usage
`json:"text"`
}
`json:"usage"`
}
func
requestOpenAI2Xunfei
(
request
GeneralOpenAIRequest
,
xunfeiAppId
string
)
*
XunfeiChatRequest
{
...
...
@@ -123,7 +123,7 @@ func responseXunfei2OpenAI(response *XunfeiChatResponse) *OpenAITextResponse {
Object
:
"chat.completion"
,
Created
:
common
.
GetTimestamp
(),
Choices
:
[]
OpenAITextResponseChoice
{
choice
},
Usage
:
response
.
Usage
.
Text
,
Usage
:
response
.
Payload
.
Usage
.
Text
,
}
return
&
fullTextResponse
}
...
...
@@ -222,9 +222,9 @@ func xunfeiStreamHandler(c *gin.Context, textRequest GeneralOpenAIRequest, appId
c
.
Stream
(
func
(
w
io
.
Writer
)
bool
{
select
{
case
xunfeiResponse
:=
<-
dataChan
:
usage
.
PromptTokens
+=
xunfeiResponse
.
Usage
.
Text
.
PromptTokens
usage
.
CompletionTokens
+=
xunfeiResponse
.
Usage
.
Text
.
CompletionTokens
usage
.
TotalTokens
+=
xunfeiResponse
.
Usage
.
Text
.
TotalTokens
usage
.
PromptTokens
+=
xunfeiResponse
.
Payload
.
Usage
.
Text
.
PromptTokens
usage
.
CompletionTokens
+=
xunfeiResponse
.
Payload
.
Usage
.
Text
.
CompletionTokens
usage
.
TotalTokens
+=
xunfeiResponse
.
Payload
.
Usage
.
Text
.
TotalTokens
response
:=
streamResponseXunfei2OpenAI
(
&
xunfeiResponse
)
jsonResponse
,
err
:=
json
.
Marshal
(
response
)
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment