Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 17 additions & 6 deletions provider/google/generativeai/generativeai.go
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,10 @@ func (p *Provider) parseResponse(resp *generateResponse) (*sdk.GenerateResult, e
return result, fmt.Errorf("google: unmarshal function call args for %q: %w", part.FunctionCall.Name, err)
}
result.ToolCalls = append(result.ToolCalls, sdk.ToolCall{
ToolCallID: id,
ToolName: part.FunctionCall.Name,
Input: input,
ToolCallID: id,
ToolName: part.FunctionCall.Name,
Input: input,
ProviderMetadata: googleThoughtSignatureMetadata(part.ThoughtSignature),
})
case part.Text != "":
isThought := part.Thought != nil && *part.Thought
Expand Down Expand Up @@ -572,9 +573,10 @@ func (p *Provider) DoStream(ctx context.Context, params sdk.GenerateParams) (*sd
}

send(&sdk.StreamToolCallPart{
ToolCallID: toolCallID,
ToolName: part.FunctionCall.Name,
Input: input,
ToolCallID: toolCallID,
ToolName: part.FunctionCall.Name,
Input: input,
ProviderMetadata: googleThoughtSignatureMetadata(part.ThoughtSignature),
})
case part.Text != "":
isThought := part.Thought != nil && *part.Thought
Expand Down Expand Up @@ -738,6 +740,15 @@ func extractGoogleThoughtSignature(meta map[string]any) string {
return sig
}

func googleThoughtSignatureMetadata(sig string) map[string]any {
if sig == "" {
return nil
}
return map[string]any{
"google": map[string]any{"thoughtSignature": sig},
}
}

func classifyError(err error) *sdk.ProviderTestResult {
var apiErr *utils.APIError
if errors.As(err, &apiErr) {
Expand Down
24 changes: 23 additions & 1 deletion provider/google/generativeai/generativeai_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ func TestDoGenerate_ToolCall(t *testing.T) {
"name": "get_weather",
"args": map[string]any{"location": "Beijing"},
},
"thoughtSignature": "sig-generate",
}},
},
"finishReason": "STOP",
Expand Down Expand Up @@ -240,6 +241,13 @@ func TestDoGenerate_ToolCall(t *testing.T) {
if input["location"] != "Beijing" {
t.Errorf("location: got %v", input["location"])
}
googleMeta, ok := tc.ProviderMetadata["google"].(map[string]any)
if !ok {
t.Fatalf("tool call provider metadata = %#v, want google map", tc.ProviderMetadata)
}
if googleMeta["thoughtSignature"] != "sig-generate" {
t.Fatalf("thoughtSignature = %#v, want sig-generate", googleMeta["thoughtSignature"])
}
}

func TestDoGenerate_ToolCallMultiTurn(t *testing.T) {
Expand All @@ -261,6 +269,7 @@ func TestDoGenerate_ToolCallMultiTurn(t *testing.T) {
Name string `json:"name"`
Args any `json:"args"`
} `json:"functionCall,omitempty"`
ThoughtSignature string `json:"thoughtSignature,omitempty"`
} `json:"parts"`
}
json.Unmarshal(body.Contents[1], &modelMsg)
Expand All @@ -270,6 +279,9 @@ func TestDoGenerate_ToolCallMultiTurn(t *testing.T) {
if len(modelMsg.Parts) != 1 || modelMsg.Parts[0].FunctionCall == nil {
t.Errorf("msg[1] should have functionCall part")
}
if modelMsg.Parts[0].ThoughtSignature != "sig-multiturn" {
t.Errorf("msg[1] thoughtSignature: got %q, want sig-multiturn", modelMsg.Parts[0].ThoughtSignature)
}

// verify tool result message has functionResponse
var toolMsg struct {
Expand Down Expand Up @@ -323,6 +335,9 @@ func TestDoGenerate_ToolCallMultiTurn(t *testing.T) {
ToolCallID: "call_abc",
ToolName: "get_weather",
Input: map[string]any{"location": "Beijing"},
ProviderMetadata: map[string]any{
"google": map[string]any{"thoughtSignature": "sig-multiturn"},
},
}},
},
{
Expand Down Expand Up @@ -630,7 +645,7 @@ func TestDoStream_ToolCall(t *testing.T) {
flusher := w.(http.Flusher)

chunks := []string{
`{"candidates":[{"content":{"role":"model","parts":[{"functionCall":{"name":"get_weather","args":{"location":"Tokyo"}}}]},"finishReason":"STOP"}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":5,"totalTokenCount":15}}`,
`{"candidates":[{"content":{"role":"model","parts":[{"functionCall":{"name":"get_weather","args":{"location":"Tokyo"}},"thoughtSignature":"sig-tool"}]},"finishReason":"STOP"}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":5,"totalTokenCount":15}}`,
}
for _, c := range chunks {
fmt.Fprintf(w, "data: %s\n\n", c)
Expand Down Expand Up @@ -705,6 +720,13 @@ func TestDoStream_ToolCall(t *testing.T) {
if !gotFinish {
t.Error("missing FinishPart")
}
googleMeta, ok := gotToolCall.ProviderMetadata["google"].(map[string]any)
if !ok {
t.Fatalf("tool call provider metadata = %#v, want google map", gotToolCall.ProviderMetadata)
}
if googleMeta["thoughtSignature"] != "sig-tool" {
t.Fatalf("thoughtSignature = %#v, want sig-tool", googleMeta["thoughtSignature"])
}
}

func TestDoStream_Reasoning(t *testing.T) {
Expand Down
6 changes: 1 addition & 5 deletions sdk/step_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ func buildStepMessages(text, reasoning string, reasoningMeta map[string]any, too
assistantParts = append(assistantParts, TextPart{Text: text})
}
for _, tc := range toolCalls {
assistantParts = append(assistantParts, ToolCallPart{
ToolCallID: tc.ToolCallID,
ToolName: tc.ToolName,
Input: tc.Input,
})
assistantParts = append(assistantParts, ToolCallPart(tc))
}

msgs := []Message{{Role: MessageRoleAssistant, Content: assistantParts, Usage: usage}}
Expand Down
28 changes: 28 additions & 0 deletions sdk/step_helpers_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package sdk

import "testing"

func TestBuildStepMessagesPreservesToolCallProviderMetadata(t *testing.T) {
meta := map[string]any{"google": map[string]any{"thoughtSignature": "sig-1"}}
msgs := buildStepMessages("", "", nil, []ToolCall{{
ToolCallID: "call-1",
ToolName: "lookup",
Input: map[string]any{"q": "memoh"},
ProviderMetadata: meta,
}}, nil, nil)

if len(msgs) != 1 || len(msgs[0].Content) != 1 {
t.Fatalf("unexpected messages: %#v", msgs)
}
part, ok := msgs[0].Content[0].(ToolCallPart)
if !ok {
t.Fatalf("content part = %T, want ToolCallPart", msgs[0].Content[0])
}
gotGoogle, ok := part.ProviderMetadata["google"].(map[string]any)
if !ok {
t.Fatalf("provider metadata = %#v, want google map", part.ProviderMetadata)
}
if gotGoogle["thoughtSignature"] != "sig-1" {
t.Fatalf("thoughtSignature = %#v, want sig-1", gotGoogle["thoughtSignature"])
}
}
14 changes: 8 additions & 6 deletions sdk/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,10 @@ func (p *ToolInputEndPart) Type() StreamPartType { return StreamPartTypeToolInpu
// --- Tool Execution ---

type StreamToolCallPart struct {
ToolCallID string
ToolName string
Input any
ToolCallID string
ToolName string
Input any
ProviderMetadata map[string]any
}

func (p *StreamToolCallPart) Type() StreamPartType { return StreamPartTypeToolCall }
Expand Down Expand Up @@ -264,9 +265,10 @@ func (sr *StreamResult) ToResult() (*GenerateResult, error) {
reasoning += p.Text
case *StreamToolCallPart:
result.ToolCalls = append(result.ToolCalls, ToolCall{
ToolCallID: p.ToolCallID,
ToolName: p.ToolName,
Input: p.Input,
ToolCallID: p.ToolCallID,
ToolName: p.ToolName,
Input: p.Input,
ProviderMetadata: p.ProviderMetadata,
})
case *StreamToolResultPart:
result.ToolResults = append(result.ToolResults, ToolResult{
Expand Down
7 changes: 4 additions & 3 deletions sdk/stream_text.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ func (c *Client) StreamText(ctx context.Context, options ...GenerateOption) (*St
}
case *StreamToolCallPart:
stepToolCalls = append(stepToolCalls, ToolCall{
ToolCallID: p.ToolCallID,
ToolName: p.ToolName,
Input: p.Input,
ToolCallID: p.ToolCallID,
ToolName: p.ToolName,
Input: p.Input,
ProviderMetadata: p.ProviderMetadata,
})
case *FinishStepPart:
stepUsage = p.Usage
Expand Down
7 changes: 4 additions & 3 deletions sdk/tool_call.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package sdk

type ToolCall struct {
ToolCallID string `json:"toolCallId"`
ToolName string `json:"toolName"`
Input any `json:"input"`
ToolCallID string `json:"toolCallId"`
ToolName string `json:"toolName"`
Input any `json:"input"`
ProviderMetadata map[string]any `json:"providerMetadata,omitempty"`
}

type ToolResult struct {
Expand Down
Loading