xinyin025/one-api
1
0
Fork 0
mirror of https://github.com/songquanpeng/one-api.git synced 2025-09-19 18:16:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

style: Upgrade relay controller text package

Browse Source 
- Refactoring of the Text controller.
This commit is contained in:
Laisky.Cai 2024-02-22 03:09:46 +00:00
parent 609a6cb4b2
commit b9972e0aa4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
relay/controller/text.go
View File

@ -53,6 +53,7 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
// get request body // get request body
var requestBody io.Reader var requestBody io.Reader
var jsonData []byte
if meta.APIType == constant.APITypeOpenAI { if meta.APIType == constant.APITypeOpenAI {
// no need to convert request for openai // no need to convert request for openai
if isModelMapped { if isModelMapped {
@ -69,7 +70,7 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
if err != nil { if err != nil {
return openai.ErrorWrapper(err, "convert_request_failed", http.StatusInternalServerError) return openai.ErrorWrapper(err, "convert_request_failed", http.StatusInternalServerError)
} }
jsonData, err := json.Marshal(convertedRequest) jsonData, err = json.Marshal(convertedRequest)
if err != nil { if err != nil {
return openai.ErrorWrapper(err, "json_marshal_failed", http.StatusInternalServerError) return openai.ErrorWrapper(err, "json_marshal_failed", http.StatusInternalServerError)
} }
@ -85,6 +86,7 @@ func RelayTextHelper(c *gin.Context) *model.ErrorWithStatusCode {
meta.IsStream = meta.IsStream || strings.HasPrefix(resp.Header.Get("Content-Type"), "text/event-stream") meta.IsStream = meta.IsStream || strings.HasPrefix(resp.Header.Get("Content-Type"), "text/event-stream")
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
util.ReturnPreConsumedQuota(ctx, preConsumedQuota, meta.TokenId) util.ReturnPreConsumedQuota(ctx, preConsumedQuota, meta.TokenId)
logger.Error(ctx, fmt.Sprintf("relay text [%d] <- %q", resp.StatusCode, string(jsonData)))
return util.RelayErrorHandler(resp) return util.RelayErrorHandler(resp)
} }