xinyin025/one-api
1
0
Fork 0
mirror of https://github.com/songquanpeng/one-api.git synced 2025-11-09 02:03:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Refactor text controller logic

Browse Source 
- Move the initialization of `requestBody` to a separate if block.
- Add a comment to indicate that `requestBodyBytes` is created for debugging use.
This commit is contained in:
Laisky.Cai
2024-02-22 03:25:45 +00:00
parent d22c22d4f0
commit 3c95e1bb0d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
relay/controller/text.go
View File

@@ -53,7 +53,6 @@ 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 {
@@ -70,13 +69,17 @@ 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)
} }
requestBody = bytes.NewBuffer(jsonData) requestBody = bytes.NewBuffer(jsonData)
} }
// for debug
requestBodyBytes, _ := io.ReadAll(requestBody)
requestBody = bytes.NewBuffer(requestBodyBytes)
// do request // do request
resp, err := adaptor.DoRequest(c, meta, requestBody) resp, err := adaptor.DoRequest(c, meta, requestBody)
if err != nil { if err != nil {
@@ -86,7 +89,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))) logger.Error(ctx, fmt.Sprintf("relay text [%d] <- %q", resp.StatusCode, string(requestBodyBytes)))
return util.RelayErrorHandler(resp) return util.RelayErrorHandler(resp)
} }