fix: update request handling to enforce usage inclusion and remove unused import

This commit is contained in:
Laisky.Cai
2024-11-27 06:25:15 +00:00
parent 988a054178
commit 79257420a8
2 changed files with 5 additions and 4 deletions

View File

@@ -15,7 +15,6 @@ import (
"github.com/songquanpeng/one-api/relay"
"github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/apitype"
"github.com/songquanpeng/one-api/relay/billing"
billingratio "github.com/songquanpeng/one-api/relay/billing/ratio"
"github.com/songquanpeng/one-api/relay/channeltype"
@@ -111,8 +110,8 @@ func RelayTextHelper(c *gin.Context) *relaymodel.ErrorWithStatusCode {
}
func getRequestBody(c *gin.Context, meta *meta.Meta, textRequest *relaymodel.GeneralOpenAIRequest, adaptor adaptor.Adaptor) (io.Reader, error) {
if !config.EnforceIncludeUsage && meta.APIType == apitype.OpenAI && meta.OriginModelName == meta.ActualModelName && meta.ChannelType != channeltype.Baichuan {
// no need to convert request for openai
if !config.EnforceIncludeUsage && meta.OriginModelName == meta.ActualModelName && meta.ChannelType != channeltype.Baichuan {
// openai also need convert
return c.Request.Body, nil
}