Skip to content

fix: IncludeServerSideToolInvocations field in genai api #5576

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

Merged
akshaydeo merged 2 commits into from
Jul 27, 2026
Merged

fix: IncludeServerSideToolInvocations field in genai api #5576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d28743f
docs: responses retrieve stream
Jul 27, 2026
f3ebadb
fix: IncludeServerSideToolInvocations field in genai api
Jul 27, 2026
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
21 changes: 19 additions & 2 deletions core/providers/gemini/chat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,20 @@ func ToGeminiChatCompletionRequestWithImageURLSchemes(ctx *schemas.BifrostContex
return nil, err
}

// Convert tool choice to tool config
// Convert tool choice if present, but only when function declarations exist.
// Gemini rejects functionCallingConfig without function_declarations
// (e.g. a tools list holding only non-function types yields no declarations).
if bifrostReq.Params.ToolChoice != nil {
geminiReq.ToolConfig = convertToolChoiceToToolConfig(bifrostReq.Params.ToolChoice)
hasFunctionDeclarations := false
for _, tool := range geminiReq.Tools {
if len(tool.FunctionDeclarations) > 0 {
hasFunctionDeclarations = true
break
}
}
if hasFunctionDeclarations {
geminiReq.ToolConfig = convertToolChoiceToToolConfig(bifrostReq.Params.ToolChoice)
}
}
}

Expand All @@ -66,6 +77,10 @@ func ToGeminiChatCompletionRequestWithImageURLSchemes(ctx *schemas.BifrostContex
geminiReq.Tools = append(geminiReq.Tools, Tool{GoogleSearch: googleSearch})
}

if bifrostReq.Params.IncludeServerSideToolInvocations != nil && *bifrostReq.Params.IncludeServerSideToolInvocations {
applyServerSideToolInvocations(geminiReq)
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

if bifrostReq.Params.ServiceTier != nil {
geminiReq.ServiceTier = mapBifrostServiceTierToGemini(*bifrostReq.Params.ServiceTier)
}
Expand Down Expand Up @@ -311,6 +326,7 @@ func (response *GenerateContentResponse) ToBifrostChatResponse() *schemas.Bifros

// Set usage information
bifrostResp.Usage = ConvertGeminiUsageMetadataToChatUsage(response.UsageMetadata)
applyGeminiSearchQueryChatUsage(bifrostResp.Usage, candidate.GroundingMetadata, response.ModelVersion)

if response.UsageMetadata != nil {
if t := mapGeminiTrafficTypeToBifrost(response.UsageMetadata.TrafficType); t != nil {
Expand Down Expand Up @@ -546,6 +562,7 @@ func (response *GenerateContentResponse) ToBifrostChatCompletionStream(state *Ge
// Add usage information if this is the last chunk
if isLastChunk && response.UsageMetadata != nil {
streamResponse.Usage = ConvertGeminiUsageMetadataToChatUsage(response.UsageMetadata)
applyGeminiSearchQueryChatUsage(streamResponse.Usage, candidate.GroundingMetadata, response.ModelVersion)
if t := mapGeminiTrafficTypeToBifrost(response.UsageMetadata.TrafficType); t != nil {
streamResponse.ServiceTier = t
} else if response.UsageMetadata.ServiceTier != "" {
Expand Down
Loading
Loading