Skip to content

fix(google): fix thought signature mapping and parallel tool calls on… #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cidan wants to merge 1 commit into
base: main
Choose a base branch
from
+464 −27
Open

fix(google): fix thought signature mapping and parallel tool calls on… #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 59 additions & 27 deletions providers/google/google.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,24 +414,31 @@ func toGooglePrompt(prompt fantasy.Prompt, isVertexAI bool) (*genai.Content, []*
}
case fantasy.MessageRoleAssistant:
var parts []*genai.Part
var currentReasoningMetadata *ReasoningMetadata

toolSignatures := make(map[string]*ReasoningMetadata)
var textSignatures []*ReasoningMetadata
var defaultSignature *ReasoningMetadata
for _, part := range msg.Content {
switch part.GetType() {
case fantasy.ContentTypeReasoning:
if part.GetType() == fantasy.ContentTypeReasoning {
reasoning, ok := fantasy.AsMessagePart[fantasy.ReasoningPart](part)
if !ok {
continue
}

metadata, ok := reasoning.ProviderOptions[Name]
if !ok {
continue
}
reasoningMetadata, ok := metadata.(*ReasoningMetadata)
if !ok {
continue
rm := GetReasoningMetadata(reasoning.ProviderOptions)
if rm != nil && rm.Signature != "" {
if rm.ToolID != "" {
toolSignatures[rm.ToolID] = rm
} else {
textSignatures = append(textSignatures, rm)
}
defaultSignature = rm
}
currentReasoningMetadata = reasoningMetadata
}
}

textSigIdx := 0
for _, part := range msg.Content {
switch part.GetType() {
case fantasy.ContentTypeText:
text, ok := fantasy.AsMessagePart[fantasy.TextPart](part)
if !ok || text.Text == "" {
Expand All @@ -440,9 +447,11 @@ func toGooglePrompt(prompt fantasy.Prompt, isVertexAI bool) (*genai.Content, []*
geminiPart := &genai.Part{
Text: text.Text,
}
if currentReasoningMetadata != nil {
geminiPart.ThoughtSignature = []byte(currentReasoningMetadata.Signature)
currentReasoningMetadata = nil
if textSigIdx < len(textSignatures) {
geminiPart.ThoughtSignature = []byte(textSignatures[textSigIdx].Signature)
textSigIdx++
} else if defaultSignature != nil && defaultSignature.Signature != "" && defaultSignature.ToolID == "" {
geminiPart.ThoughtSignature = []byte(defaultSignature.Signature)
}
parts = append(parts, geminiPart)
case fantasy.ContentTypeToolCall:
Expand All @@ -468,9 +477,10 @@ func toGooglePrompt(prompt fantasy.Prompt, isVertexAI bool) (*genai.Content, []*
if isVertexAI {
geminiPart.FunctionCall.ID = ""
}
if currentReasoningMetadata != nil {
geminiPart.ThoughtSignature = []byte(currentReasoningMetadata.Signature)
currentReasoningMetadata = nil
if sig, ok := toolSignatures[toolCall.ToolCallID]; ok && sig.Signature != "" {
geminiPart.ThoughtSignature = []byte(sig.Signature)
} else if defaultSignature != nil && defaultSignature.Signature != "" && defaultSignature.ToolID == "" {
geminiPart.ThoughtSignature = []byte(defaultSignature.Signature)
}
parts = append(parts, geminiPart)
}
Expand Down Expand Up @@ -715,16 +725,18 @@ func (g *languageModel) Stream(ctx context.Context, call fantasy.Call) (fantasy.
metadata := &ReasoningMetadata{
Signature: string(part.ThoughtSignature),
}
blockID := fmt.Sprintf("%d", blockCounter)
blockCounter++

if !yield(fantasy.StreamPart{
Type: fantasy.StreamPartTypeReasoningStart,
ID: currentReasoningBlockID,
ID: blockID,
}) {
return
}
if !yield(fantasy.StreamPart{
Type: fantasy.StreamPartTypeReasoningEnd,
ID: currentReasoningBlockID,
ID: blockID,
ProviderMetadata: fantasy.ProviderMetadata{
Name: metadata,
},
Expand Down Expand Up @@ -776,16 +788,18 @@ func (g *languageModel) Stream(ctx context.Context, call fantasy.Call) (fantasy.
Signature: string(part.ThoughtSignature),
ToolID: toolCallID,
}
blockID := fmt.Sprintf("%d", blockCounter)
blockCounter++

if !yield(fantasy.StreamPart{
Type: fantasy.StreamPartTypeReasoningStart,
ID: currentReasoningBlockID,
ID: blockID,
}) {
return
}
if !yield(fantasy.StreamPart{
Type: fantasy.StreamPartTypeReasoningEnd,
ID: currentReasoningBlockID,
ID: blockID,
ProviderMetadata: fantasy.ProviderMetadata{
Name: metadata,
},
Expand Down Expand Up @@ -1367,6 +1381,9 @@ func (g languageModel) mapResponse(response *genai.GenerateContentResponse, warn
content[i] = reasoningContent
foundReasoning = true
break
} else if existing := GetReasoningMetadata(fantasy.ProviderOptions(reasoningContent.ProviderMetadata)); existing != nil && existing.Signature != "" {
foundReasoning = true
break
}
}
}
Expand Down Expand Up @@ -1400,12 +1417,24 @@ func (g languageModel) mapResponse(response *genai.GenerateContentResponse, warn
if !ok {
continue
}
reasoningContent.ProviderMetadata = fantasy.ProviderMetadata{
Name: metadata,
// Only use it if it doesn't already have a signature, or if it has an unassigned ToolID
if reasoningContent.ProviderMetadata == nil || reasoningContent.ProviderMetadata[Name] == nil {
reasoningContent.ProviderMetadata = fantasy.ProviderMetadata{
Name: metadata,
}
content[i] = reasoningContent
foundReasoning = true
break
} else if existing := GetReasoningMetadata(fantasy.ProviderOptions(reasoningContent.ProviderMetadata)); existing != nil && existing.ToolID == "" {
existing.ToolID = toolCallID
if existing.Signature == "" {
existing.Signature = string(part.ThoughtSignature)
}
reasoningContent.ProviderMetadata[Name] = existing
content[i] = reasoningContent
foundReasoning = true
break
}
content[i] = reasoningContent
foundReasoning = true
break
}
}
if !foundReasoning {
Expand Down Expand Up @@ -1477,6 +1506,9 @@ func mapFinishReason(reason genai.FinishReason) fantasy.FinishReason {
}

func mapUsage(usage *genai.GenerateContentResponseUsageMetadata) fantasy.Usage {
if usage == nil {
return fantasy.Usage{}
}
return fantasy.Usage{
InputTokens: int64(usage.PromptTokenCount),
OutputTokens: int64(usage.CandidatesTokenCount),
Expand Down
Loading
Loading