fixes structured output for bedrock #1372
Merged
+199
−104
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
📝 WalkthroughSummary by CodeRabbit
✏️ Tip: You can customize this high-level summary in your review settings. WalkthroughThis PR adds structured output support for Bedrock streaming by intercepting tool-use events and converting them to content deltas. Additionally, it removes tool call content transformation logic from litellmcompat and bumps versions across the core and plugin stack. Changes
Sequence DiagramsequenceDiagram
participant Client
participant BedrockProvider as Bedrock Provider
participant BedrockAPI as Bedrock API
participant StructOutput as Structured Output Handler
Client->>BedrockProvider: ChatCompletion with structured_output
BedrockProvider->>BedrockAPI: Send request
BedrockAPI-->>BedrockProvider: ToolUse response (tool_calls)
alt Streaming Path
loop For each ToolUse delta
BedrockAPI-->>BedrockProvider: ToolUse.Delta
BedrockProvider->>StructOutput: Accumulate delta
end
StructOutput->>BedrockProvider: Convert accumulated deltas to content
BedrockProvider->>BedrockProvider: Override finish_reason: tool_calls → stop
BedrockProvider-->>Client: Content chunk (not tool_call event)
else Non-Streaming Path
BedrockProvider->>StructOutput: Process tool_calls in response
StructOutput->>BedrockProvider: Extract content from tool_calls
BedrockProvider->>BedrockProvider: Override finish_reason: tool_calls → stop
BedrockProvider-->>Client: ChatCompletion with content
end
Estimated Code Review Effort🎯 4 (Complex) | ⏱️ ~50 minutes Possibly Related PRs
Suggested Reviewers
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
🧪 Generate unit tests (beta)
Comment |
Contributor
🧪 Test Suite AvailableThis PR can be tested by a repository admin. |
akshaydeo
force-pushed
the
01-19-fixes_structured_output_for_bedrock
branch
from
2353e0d to
52d3053
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In `@framework/changelog.md`:
- Line 1: The changelog entry "chore: upgrades core to 1.3.11" in
framework/changelog.md is unrelated to this PR; remove that line or replace it
with a concise, accurate entry describing the Bedrock structured output handling
changes (mention Bedrock provider improvements/structured output handling) and
ensure the entry follows the repo's changelog style and formatting.
🧹 Nitpick comments (2)
core/providers/bedrock/bedrock.go (2)
809-817: Consider normalizing finish reasons across all choices.
OnlyChoices[0]gets the structured-output override today; ifn > 1, other choices can still surfacetool_calls. Looping through the slice keeps behavior consistent.Suggested adjustment
- if len(bifrostResponse.Choices) > 0 && bifrostResponse.Choices[0].FinishReason != nil { - if *bifrostResponse.Choices[0].FinishReason == string(schemas.BifrostFinishReasonToolCalls) { - bifrostResponse.Choices[0].FinishReason = schemas.Ptr(string(schemas.BifrostFinishReasonStop)) - } - } + for i := range bifrostResponse.Choices { + if bifrostResponse.Choices[i].FinishReason != nil && + *bifrostResponse.Choices[i].FinishReason == string(schemas.BifrostFinishReasonToolCalls) { + bifrostResponse.Choices[i].FinishReason = schemas.Ptr(string(schemas.BifrostFinishReasonStop)) + } + }
898-1046: Verify structured-output accumulation doesn’t mask later tool calls.
isAccumulatingStructuredOutputis never reset. If Bedrock can emit multipletool_useblocks in a stream (e.g., user tools + structured output), later tool-use deltas would be coerced into content. Please confirm Bedrock stream semantics; if multiple blocks are possible, consider tracking the tool-use ID and clearing the flag on the tool-use stop event.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Added support for structured outputs in Bedrock provider by properly converting response_format to tool calls and intercepting tool responses to present them as content.
Changes
Type of change
Affected areas
How to test
Breaking changes
Related issues
Improves structured output support across providers.
Security considerations
No security implications.
Checklist