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

feat: add checks for non-empty URLs in file metadata processing

Browse Source
This commit is contained in:
CaIon
2025-08-15 19:10:40 +08:00
parent 28bd31a30b
commit c63b6b3ef8
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dto/openai_request.go
View File

@@ -115,12 +115,14 @@ func (r *GeneralOpenAIRequest) GetTokenCountMeta() *types.TokenCountMeta {
if m.Type == ContentTypeImageURL { if m.Type == ContentTypeImageURL {
imageUrl := m.GetImageMedia() imageUrl := m.GetImageMedia()
if imageUrl != nil { if imageUrl != nil {
meta := &types.FileMeta{ if imageUrl.Url != "" {
FileType: types.FileTypeImage, meta := &types.FileMeta{
FileType: types.FileTypeImage,
}
meta.OriginData = imageUrl.Url
meta.Detail = imageUrl.Detail
fileMeta = append(fileMeta, meta)
} }
meta.OriginData = imageUrl.Url
meta.Detail = imageUrl.Detail
fileMeta = append(fileMeta, meta)
} }
} else if m.Type == ContentTypeInputAudio { } else if m.Type == ContentTypeInputAudio {
inputAudio := m.GetInputAudio() inputAudio := m.GetInputAudio()
@@ -142,7 +144,7 @@ func (r *GeneralOpenAIRequest) GetTokenCountMeta() *types.TokenCountMeta {
} }
} else if m.Type == ContentTypeVideoUrl { } else if m.Type == ContentTypeVideoUrl {
videoUrl := m.GetVideoUrl() videoUrl := m.GetVideoUrl()
if videoUrl != nil { if videoUrl != nil && videoUrl.Url != "" {
meta := &types.FileMeta{ meta := &types.FileMeta{
FileType: types.FileTypeVideo, FileType: types.FileTypeVideo,
} }
@@ -783,16 +785,20 @@ func (r *OpenAIResponsesRequest) GetTokenCountMeta() *types.TokenCountMeta {
inputs := r.ParseInput() inputs := r.ParseInput()
for _, input := range inputs { for _, input := range inputs {
if input.Type == "input_image" { if input.Type == "input_image" {
fileMeta = append(fileMeta, &types.FileMeta{ if input.ImageUrl != "" {
FileType: types.FileTypeImage, fileMeta = append(fileMeta, &types.FileMeta{
OriginData: input.ImageUrl, FileType: types.FileTypeImage,
Detail: input.Detail, OriginData: input.ImageUrl,
}) Detail: input.Detail,
})
}
} else if input.Type == "input_file" { } else if input.Type == "input_file" {
fileMeta = append(fileMeta, &types.FileMeta{ if input.FileUrl != "" {
FileType: types.FileTypeFile, fileMeta = append(fileMeta, &types.FileMeta{
OriginData: input.FileUrl, FileType: types.FileTypeFile,
}) OriginData: input.FileUrl,
})
}
} else { } else {
texts = append(texts, input.Text) texts = append(texts, input.Text)
} }