Only advance streamed tool-call index for tool-use blocks
Incrementing toolIndex on every ContentBlockStop caused it to drift when non-tool blocks (e.g. text) preceded tool-use blocks, making Bedrock tool calls disappear from the accumulated response. Track whether the current content block is a tool-use block and only bump the index when a tool-use block ends. Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
@@ -347,6 +347,7 @@ type bedrockStream struct {
|
|||||||
current llm.ChatCompletionStreamEvent
|
current llm.ChatCompletionStreamEvent
|
||||||
err error
|
err error
|
||||||
toolIndex int
|
toolIndex int
|
||||||
|
inToolUse bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func newBedrockStream(eventStream *bedrockruntime.ConverseStreamEventStream) *bedrockStream {
|
func newBedrockStream(eventStream *bedrockruntime.ConverseStreamEventStream) *bedrockStream {
|
||||||
@@ -387,6 +388,7 @@ func (s *bedrockStream) mapEvent(event types.ConverseStreamOutput) (llm.ChatComp
|
|||||||
switch e := event.(type) {
|
switch e := event.(type) {
|
||||||
case *types.ConverseStreamOutputMemberContentBlockStart:
|
case *types.ConverseStreamOutputMemberContentBlockStart:
|
||||||
if start, ok := e.Value.Start.(*types.ContentBlockStartMemberToolUse); ok {
|
if start, ok := e.Value.Start.(*types.ContentBlockStartMemberToolUse); ok {
|
||||||
|
s.inToolUse = true
|
||||||
return llm.ChatCompletionStreamEvent{
|
return llm.ChatCompletionStreamEvent{
|
||||||
Delta: llm.MessageDelta{
|
Delta: llm.MessageDelta{
|
||||||
ToolCalls: []llm.ToolCallDelta{{
|
ToolCalls: []llm.ToolCallDelta{{
|
||||||
@@ -397,6 +399,7 @@ func (s *bedrockStream) mapEvent(event types.ConverseStreamOutput) (llm.ChatComp
|
|||||||
},
|
},
|
||||||
}, true
|
}, true
|
||||||
}
|
}
|
||||||
|
s.inToolUse = false
|
||||||
return llm.ChatCompletionStreamEvent{}, false
|
return llm.ChatCompletionStreamEvent{}, false
|
||||||
|
|
||||||
case *types.ConverseStreamOutputMemberContentBlockDelta:
|
case *types.ConverseStreamOutputMemberContentBlockDelta:
|
||||||
@@ -418,7 +421,10 @@ func (s *bedrockStream) mapEvent(event types.ConverseStreamOutput) (llm.ChatComp
|
|||||||
return llm.ChatCompletionStreamEvent{}, false
|
return llm.ChatCompletionStreamEvent{}, false
|
||||||
|
|
||||||
case *types.ConverseStreamOutputMemberContentBlockStop:
|
case *types.ConverseStreamOutputMemberContentBlockStop:
|
||||||
s.toolIndex++
|
if s.inToolUse {
|
||||||
|
s.toolIndex++
|
||||||
|
s.inToolUse = false
|
||||||
|
}
|
||||||
return llm.ChatCompletionStreamEvent{}, false
|
return llm.ChatCompletionStreamEvent{}, false
|
||||||
|
|
||||||
case *types.ConverseStreamOutputMemberMessageStop:
|
case *types.ConverseStreamOutputMemberMessageStop:
|
||||||
|
|||||||
Reference in New Issue
Block a user