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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ inference-extension-conformance-test-report.yaml
/aigw
site/.cursorrules
/.cursor
.worktrees/
37 changes: 15 additions & 22 deletions internal/translator/anthropic_awsbedrock.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,36 +78,29 @@ func (a *anthropicToAWSBedrockTranslator) RequestBody(_ []byte, body *anthropics
msg := &messages[i]
switch msg.Role {
case anthropicschema.MessageRoleUser:
bedrockMsg, convErr := a.convertUserMessage(msg)
if convErr != nil {
return nil, nil, convErr
}
bedrockReq.Messages = append(bedrockReq.Messages, bedrockMsg)
i++
case anthropicschema.MessageRoleAssistant:
bedrockMsg, convErr := a.convertAssistantMessage(msg)
if convErr != nil {
return nil, nil, convErr
}
bedrockReq.Messages = append(bedrockReq.Messages, bedrockMsg)
i++
default:
// Check for tool_result content blocks (these come as "user" role in Anthropic
// but we handle them specially).
if hasToolResult(msg) {
bedrockMsg := a.convertToolResultMessage(msg)
// Coalesce consecutive tool result messages.
for i+1 < msgLen && hasToolResult(&body.Messages[i+1]) {
nextMsg := &body.Messages[i+1]
for i+1 < msgLen && hasToolResult(&messages[i+1]) {
nextMsg := &messages[i+1]
nextBedrockMsg := a.convertToolResultMessage(nextMsg)
bedrockMsg.Content = append(bedrockMsg.Content, nextBedrockMsg.Content...)
i++
}
bedrockReq.Messages = append(bedrockReq.Messages, bedrockMsg)
} else {
return nil, nil, fmt.Errorf("%w: unexpected role: %s", internalapi.ErrInvalidRequestBody, msg.Role)
bedrockMsg, convErr := a.convertUserMessage(msg)
if convErr != nil {
return nil, nil, convErr
}
bedrockReq.Messages = append(bedrockReq.Messages, bedrockMsg)
}
i++
case anthropicschema.MessageRoleAssistant:
bedrockReq.Messages = append(bedrockReq.Messages, a.convertAssistantMessage(msg))
i++
default:
return nil, nil, fmt.Errorf("%w: unexpected role: %s", internalapi.ErrInvalidRequestBody, msg.Role)
}
}

Expand Down Expand Up @@ -236,13 +229,13 @@ func (a *anthropicToAWSBedrockTranslator) convertUserMessage(msg *anthropicschem
return bedrockMsg, nil
}

func (a *anthropicToAWSBedrockTranslator) convertAssistantMessage(msg *anthropicschema.MessageParam) (*awsbedrock.Message, error) {
func (a *anthropicToAWSBedrockTranslator) convertAssistantMessage(msg *anthropicschema.MessageParam) *awsbedrock.Message {
bedrockMsg := &awsbedrock.Message{Role: awsbedrock.ConversationRoleAssistant}
if msg.Content.Text != "" {
bedrockMsg.Content = []*awsbedrock.ContentBlock{
{Text: ptr.To(msg.Content.Text)},
}
return bedrockMsg, nil
return bedrockMsg
}
bedrockMsg.Content = make([]*awsbedrock.ContentBlock, 0, len(msg.Content.Array))
for i := range msg.Content.Array {
Expand Down Expand Up @@ -277,7 +270,7 @@ func (a *anthropicToAWSBedrockTranslator) convertAssistantMessage(msg *anthropic
})
}
}
return bedrockMsg, nil
return bedrockMsg
}

func (a *anthropicToAWSBedrockTranslator) convertToolResultMessage(msg *anthropicschema.MessageParam) *awsbedrock.Message {
Expand Down
Loading
Loading