oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: support azure stream_options

Browse Source
This commit is contained in:
CalciumIon
2024-12-26 22:51:06 +08:00
parent 0b1354ed51
commit 62ae46b552
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
relay/channel/openai/adaptor.go
View File

@@ -106,7 +106,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, info *relaycommon.RelayInfo, re
if request == nil { if request == nil {
return nil, errors.New("request is nil") return nil, errors.New("request is nil")
} }
if info.ChannelType != common.ChannelTypeOpenAI { if info.ChannelType != common.ChannelTypeOpenAI && info.ChannelType != common.ChannelTypeAzure {
request.StreamOptions = nil request.StreamOptions = nil
} }
if strings.HasPrefix(request.Model, "o1") { if strings.HasPrefix(request.Model, "o1") {

2
relay/common/relay_info.go
View File

@@ -109,7 +109,7 @@ func GenRelayInfo(c *gin.Context) *RelayInfo {
} }
if info.ChannelType == common.ChannelTypeOpenAI || info.ChannelType == common.ChannelTypeAnthropic || if info.ChannelType == common.ChannelTypeOpenAI || info.ChannelType == common.ChannelTypeAnthropic ||
info.ChannelType == common.ChannelTypeAws || info.ChannelType == common.ChannelTypeGemini || info.ChannelType == common.ChannelTypeAws || info.ChannelType == common.ChannelTypeGemini ||
info.ChannelType == common.ChannelCloudflare { info.ChannelType == common.ChannelCloudflare || info.ChannelType == common.ChannelTypeAzure {
info.SupportStreamOptions = true info.SupportStreamOptions = true
} }
return info return info

4
service/token_counter.go
View File

@@ -92,11 +92,11 @@ func getImageToken(imageUrl *dto.MessageImageUrl, model string, stream bool) (in
} }
// TODO: 非流模式下不计算图片token数量 // TODO: 非流模式下不计算图片token数量
if !constant.GetMediaTokenNotStream && !stream { if !constant.GetMediaTokenNotStream && !stream {
return 1000, nil return 256, nil
} }
// 是否统计图片token // 是否统计图片token
if !constant.GetMediaToken { if !constant.GetMediaToken {
return 1000, nil return 256, nil
} }
// 同步One API的图片计费逻辑 // 同步One API的图片计费逻辑
if imageUrl.Detail == "auto" || imageUrl.Detail == "" { if imageUrl.Detail == "auto" || imageUrl.Detail == "" {