Skip to content

Commit e3cfb1f

Browse files
committed
feat: use given usage if available in stream mode
1 parent f89ae5a commit e3cfb1f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

relay/channel/openai/adaptor.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ func (a *Adaptor) DoRequest(c *gin.Context, meta *util.RelayMeta, requestBody io
7070
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.RelayMeta) (usage *model.Usage, err *model.ErrorWithStatusCode) {
7171
if meta.IsStream {
7272
var responseText string
73-
err, responseText, _ = StreamHandler(c, resp, meta.Mode)
74-
usage = ResponseText2Usage(responseText, meta.ActualModelName, meta.PromptTokens)
73+
err, responseText, usage = StreamHandler(c, resp, meta.Mode)
74+
if usage == nil {
75+
usage = ResponseText2Usage(responseText, meta.ActualModelName, meta.PromptTokens)
76+
}
7577
} else {
7678
err, usage = Handler(c, resp, meta.PromptTokens, meta.ActualModelName)
7779
}

0 commit comments

Comments
 (0)