xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-11-06 22:33:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 代码结构优化

Browse Source
This commit is contained in:
CaIon
2024-03-21 17:19:21 +08:00
parent 3f808be254
commit 031957714a
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
relay/channel/openai/relay-openai.go
View File

@@ -157,7 +157,7 @@ func OpenaiHandler(c *gin.Context, resp *http.Response, promptTokens int, model
if textResponse.Usage.TotalTokens == 0 || checkSensitive { if textResponse.Usage.TotalTokens == 0 || checkSensitive {
completionTokens := 0 completionTokens := 0
for _, choice := range textResponse.Choices { for i, choice := range textResponse.Choices {
stringContent := string(choice.Message.Content) stringContent := string(choice.Message.Content)
ctkm, _, _ := service.CountTokenText(stringContent, model, false) ctkm, _, _ := service.CountTokenText(stringContent, model, false)
completionTokens += ctkm completionTokens += ctkm
@@ -167,7 +167,7 @@ func OpenaiHandler(c *gin.Context, resp *http.Response, promptTokens int, model
triggerSensitive = true triggerSensitive = true
msg := choice.Message msg := choice.Message
msg.Content = common.StringToByteSlice(stringContent) msg.Content = common.StringToByteSlice(stringContent)
choice.Message = msg textResponse.Choices[i].Message = msg
sensitiveWords = append(sensitiveWords, words...) sensitiveWords = append(sensitiveWords, words...)
} }
} }
@@ -179,8 +179,13 @@ func OpenaiHandler(c *gin.Context, resp *http.Response, promptTokens int, model
} }
} }
if checkSensitive && constant.StopOnSensitiveEnabled && triggerSensitive { if checkSensitive && triggerSensitive && constant.StopOnSensitiveEnabled {
sensitiveWords = common.RemoveDuplicate(sensitiveWords)
return service.OpenAIErrorWrapper(errors.New(fmt.Sprintf("sensitive words detected on response: %s",
strings.Join(sensitiveWords, ", "))), "sensitive_words_detected", http.StatusBadRequest),
&textResponse.Usage, &dto.SensitiveResponse{
SensitiveWords: sensitiveWords,
}
} else { } else {
responseBody, err = json.Marshal(textResponse) responseBody, err = json.Marshal(textResponse)
// Reset response body // Reset response body
@@ -202,12 +207,5 @@ func OpenaiHandler(c *gin.Context, resp *http.Response, promptTokens int, model
return service.OpenAIErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil, nil return service.OpenAIErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil, nil
} }
} }
if checkSensitive && triggerSensitive {
sensitiveWords = common.RemoveDuplicate(sensitiveWords)
return service.OpenAIErrorWrapper(errors.New(fmt.Sprintf("sensitive words detected on response: %s", strings.Join(sensitiveWords, ", "))), "sensitive_words_detected", http.StatusBadRequest), &textResponse.Usage, &dto.SensitiveResponse{
SensitiveWords: sensitiveWords,
}
}
return nil, &textResponse.Usage, nil return nil, &textResponse.Usage, nil
} }