Skip to content

Commit 8fba7fc

Browse files
committed
chore: remove remaining Bedrock non-native tool conversion
1 parent 725bd33 commit 8fba7fc

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

src/api/providers/bedrock.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -840,12 +840,10 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
840840
usePromptCache: boolean = false,
841841
modelInfo?: any,
842842
conversationId?: string, // Optional conversation ID to track cache points across messages
843-
useNativeTools: boolean = false, // Whether native tool calling is being used
843+
_useNativeTools: boolean = false, // Deprecated: Bedrock converter is native-only now
844844
): { system: SystemContentBlock[]; messages: Message[] } {
845845
// First convert messages using shared converter for proper image handling
846-
const convertedMessages = sharedConverter(anthropicMessages as Anthropic.Messages.MessageParam[], {
847-
useNativeTools,
848-
})
846+
const convertedMessages = sharedConverter(anthropicMessages as Anthropic.Messages.MessageParam[])
849847

850848
// If prompt caching is disabled, return the converted messages directly
851849
if (!usePromptCache) {

src/api/transform/__tests__/bedrock-converse-format.spec.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ describe("convertToBedrockConverseMessages", () => {
104104
}
105105
})
106106

107-
it("converts tool use messages correctly when useNativeTools=true (native tools format)", () => {
107+
it("converts tool use messages correctly (native tools format)", () => {
108108
const messages: Anthropic.Messages.MessageParam[] = [
109109
{
110110
role: "assistant",
@@ -121,8 +121,7 @@ describe("convertToBedrockConverseMessages", () => {
121121
},
122122
]
123123

124-
// With useNativeTools: true, keeps tool_use as native format
125-
const result = convertToBedrockConverseMessages(messages, { useNativeTools: true })
124+
const result = convertToBedrockConverseMessages(messages)
126125

127126
if (!result[0] || !result[0].content) {
128127
expect.fail("Expected result to have content")
@@ -177,7 +176,7 @@ describe("convertToBedrockConverseMessages", () => {
177176
}
178177
})
179178

180-
it("converts tool result messages to native format (useNativeTools: true)", () => {
179+
it("converts tool result messages to native format", () => {
181180
const messages: Anthropic.Messages.MessageParam[] = [
182181
{
183182
role: "user",
@@ -191,8 +190,7 @@ describe("convertToBedrockConverseMessages", () => {
191190
},
192191
]
193192

194-
// With useNativeTools: true, keeps tool_result as native format
195-
const result = convertToBedrockConverseMessages(messages, { useNativeTools: true })
193+
const result = convertToBedrockConverseMessages(messages)
196194

197195
if (!result[0] || !result[0].content) {
198196
expect.fail("Expected result to have content")
@@ -247,7 +245,7 @@ describe("convertToBedrockConverseMessages", () => {
247245
}
248246
})
249247

250-
it("converts tool result messages with string content to native format (useNativeTools: true)", () => {
248+
it("converts tool result messages with string content to native format", () => {
251249
const messages: Anthropic.Messages.MessageParam[] = [
252250
{
253251
role: "user",
@@ -261,7 +259,7 @@ describe("convertToBedrockConverseMessages", () => {
261259
},
262260
]
263261

264-
const result = convertToBedrockConverseMessages(messages, { useNativeTools: true })
262+
const result = convertToBedrockConverseMessages(messages)
265263

266264
if (!result[0] || !result[0].content) {
267265
expect.fail("Expected result to have content")

src/api/transform/bedrock-converse-format.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@ interface BedrockMessageContent {
2525
/**
2626
* Convert Anthropic messages to Bedrock Converse format
2727
* @param anthropicMessages Messages in Anthropic format
28-
* @param options Optional configuration for conversion
29-
* @param options.useNativeTools When true (default), uses Bedrock's native toolUse/toolResult blocks
3028
*/
31-
export function convertToBedrockConverseMessages(
32-
anthropicMessages: Anthropic.Messages.MessageParam[],
33-
options?: { useNativeTools?: boolean },
34-
): Message[] {
35-
const useNativeTools = options?.useNativeTools ?? true
29+
export function convertToBedrockConverseMessages(anthropicMessages: Anthropic.Messages.MessageParam[]): Message[] {
3630
return anthropicMessages.map((anthropicMessage) => {
3731
// Map Anthropic roles to Bedrock roles
3832
const role: ConversationRole = anthropicMessage.role === "assistant" ? "assistant" : "user"
@@ -104,7 +98,6 @@ export function convertToBedrockConverseMessages(
10498
}
10599

106100
if (messageBlock.type === "tool_result") {
107-
void useNativeTools
108101
// Handle content field - can be string or array (native tool format)
109102
if (messageBlock.content) {
110103
// Content is a string

0 commit comments

Comments
 (0)