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

feat: add Thought field to GeminiPart and update response handling in streamResponseGeminiChat2OpenAI

Browse Source
This commit is contained in:
CaIon
2025-05-22 15:52:23 +08:00
parent 1f9fc09989
commit 66bdfe180c
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
relay/channel/gemini/dto.go
View File

@@ -54,6 +54,7 @@ type GeminiFileData struct {
type GeminiPart struct { type GeminiPart struct {
Text string `json:"text,omitempty"` Text string `json:"text,omitempty"`
Thought bool `json:"thought,omitempty"`
InlineData *GeminiInlineData `json:"inlineData,omitempty"` InlineData *GeminiInlineData `json:"inlineData,omitempty"`
FunctionCall *FunctionCall `json:"functionCall,omitempty"` FunctionCall *FunctionCall `json:"functionCall,omitempty"`
FunctionResponse *FunctionResponse `json:"functionResponse,omitempty"` FunctionResponse *FunctionResponse `json:"functionResponse,omitempty"`

10
relay/channel/gemini/relay-gemini.go
View File

@@ -596,6 +596,7 @@ func streamResponseGeminiChat2OpenAI(geminiResponse *GeminiChatResponse) (*dto.C
} }
var texts []string var texts []string
isTools := false isTools := false
isThought := false
if candidate.FinishReason != nil { if candidate.FinishReason != nil {
// p := GeminiConvertFinishReason(*candidate.FinishReason) // p := GeminiConvertFinishReason(*candidate.FinishReason)
switch *candidate.FinishReason { switch *candidate.FinishReason {
@@ -620,6 +621,9 @@ func streamResponseGeminiChat2OpenAI(geminiResponse *GeminiChatResponse) (*dto.C
call.SetIndex(len(choice.Delta.ToolCalls)) call.SetIndex(len(choice.Delta.ToolCalls))
choice.Delta.ToolCalls = append(choice.Delta.ToolCalls, *call) choice.Delta.ToolCalls = append(choice.Delta.ToolCalls, *call)
} }
} else if part.Thought {
isThought = true
texts = append(texts, part.Text)
} else { } else {
if part.ExecutableCode != nil { if part.ExecutableCode != nil {
texts = append(texts, "```"+part.ExecutableCode.Language+"\n"+part.ExecutableCode.Code+"\n```\n") texts = append(texts, "```"+part.ExecutableCode.Language+"\n"+part.ExecutableCode.Code+"\n```\n")
@@ -632,7 +636,11 @@ func streamResponseGeminiChat2OpenAI(geminiResponse *GeminiChatResponse) (*dto.C
} }
} }
} }
choice.Delta.SetContentString(strings.Join(texts, "\n")) if isThought {
choice.Delta.SetReasoningContent(strings.Join(texts, "\n"))
} else {
choice.Delta.SetContentString(strings.Join(texts, "\n"))
}
if isTools { if isTools {
choice.FinishReason = &constant.FinishReasonToolCalls choice.FinishReason = &constant.FinishReasonToolCalls
} }