Skip to content

Feat: Remove legacy model from bedrock provider #9223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KevinZhao wants to merge 3 commits into
base: main
Choose a base branch
from
+16 −108
Open

Feat: Remove legacy model from bedrock provider #9223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd55285
refactor: remove deprecated Claude 2 and Titan embedding models from …
Nov 13, 2025
6d86f4e
Merge pull request #1 from KevinZhao/refactor/remove-deprecated-bedro…
KevinZhao Nov 13, 2025
941786a
Merge branch 'main' into main
KevinZhao Dec 10, 2025
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
4 changes: 2 additions & 2 deletions packages/types/src/__tests__/provider-settings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe("getApiProtocol", () => {
it("should return 'openai' for non-anthropic providers regardless of model", () => {
expect(getApiProtocol("openrouter", "claude-3-opus")).toBe("openai")
expect(getApiProtocol("openai", "claude-3-sonnet")).toBe("openai")
expect(getApiProtocol("litellm", "claude-instant")).toBe("openai")
expect(getApiProtocol("litellm", "anthropic.claude-sonnet-4-5-20250929-v1:0")).toBe("openai")
expect(getApiProtocol("ollama", "claude-model")).toBe("openai")
})
})
Expand All @@ -80,7 +80,7 @@ describe("getApiProtocol", () => {
it("should be case-insensitive for claude detection", () => {
expect(getApiProtocol("vertex", "CLAUDE-3-OPUS")).toBe("anthropic")
expect(getApiProtocol("vertex", "claude-3-opus")).toBe("anthropic")
expect(getApiProtocol("vertex", "ClAuDe-InStAnT")).toBe("anthropic")
expect(getApiProtocol("vertex", "ClAuDe-SoNnEt-4-5")).toBe("anthropic")
})
})
})
92 changes: 0 additions & 92 deletions packages/types/src/providers/bedrock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,36 +236,6 @@ export const bedrockModels = {
inputPrice: 0.25,
outputPrice: 1.25,
},
"anthropic.claude-2-1-v1:0": {
maxTokens: 4096,
contextWindow: 100_000,
supportsImages: false,
supportsPromptCache: false,
supportsNativeTools: true,
inputPrice: 8.0,
outputPrice: 24.0,
description: "Claude 2.1",
},
"anthropic.claude-2-0-v1:0": {
maxTokens: 4096,
contextWindow: 100_000,
supportsImages: false,
supportsPromptCache: false,
supportsNativeTools: true,
inputPrice: 8.0,
outputPrice: 24.0,
description: "Claude 2.0",
},
"anthropic.claude-instant-v1:0": {
maxTokens: 4096,
contextWindow: 100_000,
supportsImages: false,
supportsPromptCache: false,
supportsNativeTools: true,
inputPrice: 0.8,
outputPrice: 2.4,
description: "Claude Instant",
},
"deepseek.r1-v1:0": {
maxTokens: 32_768,
contextWindow: 128_000,
Expand Down Expand Up @@ -423,68 +393,6 @@ export const bedrockModels = {
outputPrice: 0.6,
description: "Amazon Titan Text Express",
},
"amazon.titan-text-embeddings-v1:0": {
maxTokens: 8192,
contextWindow: 8_000,
supportsImages: false,
supportsPromptCache: false,
inputPrice: 0.1,
description: "Amazon Titan Text Embeddings",
},
"amazon.titan-text-embeddings-v2:0": {
maxTokens: 8192,
contextWindow: 8_000,
supportsImages: false,
supportsPromptCache: false,
inputPrice: 0.02,
description: "Amazon Titan Text Embeddings V2",
},
"moonshot.kimi-k2-thinking": {
maxTokens: 32_000,
contextWindow: 262_144,
supportsImages: false,
supportsPromptCache: false,
supportsNativeTools: true,
defaultToolProtocol: "native",
preserveReasoning: true,
inputPrice: 0.6,
outputPrice: 2.5,
description: "Kimi K2 Thinking (1T parameter MoE model with 32B active parameters)",
},
"minimax.minimax-m2": {
maxTokens: 16_384,
contextWindow: 196_608,
supportsImages: false,
supportsPromptCache: false,
supportsNativeTools: true,
defaultToolProtocol: "native",
preserveReasoning: true,
inputPrice: 0.3,
outputPrice: 1.2,
description: "MiniMax M2 (230B parameter MoE model with 10B active parameters)",
},
"qwen.qwen3-next-80b-a3b": {
maxTokens: 8192,
contextWindow: 262_144,
supportsImages: false,
supportsPromptCache: false,
supportsNativeTools: true,
defaultToolProtocol: "native",
inputPrice: 0.15,
outputPrice: 1.2,
description: "Qwen3 Next 80B (MoE model with 3B active parameters)",
},
"qwen.qwen3-coder-480b-a35b-v1:0": {
maxTokens: 8192,
contextWindow: 262_144,
supportsImages: false,
supportsPromptCache: false,
supportsNativeTools: true,
defaultToolProtocol: "native",
inputPrice: 0.45,
outputPrice: 1.8,
description: "Qwen3 Coder 480B (MoE model with 35B active parameters)",
},
} as const satisfies Record<string, ModelInfo>
Copy link
Contributor

@roomote roomote bot Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The merge with main appears to have incorrectly removed 4 models that were recently added in PR #9905: moonshot.kimi-k2-thinking, minimax.minimax-m2, qwen.qwen3-next-80b-a3b, and qwen.qwen3-coder-480b-a35b-v1:0. These models exist in main but are missing from this branch. This looks like a merge conflict resolution error - the PR should only remove the legacy Claude 2 and Titan embedding models, not these newly added models.

Fix it with Roo Code or mention @roomote and request a fix.


export const BEDROCK_DEFAULT_TEMPERATURE = 0.3
Expand Down
6 changes: 3 additions & 3 deletions src/api/providers/__tests__/bedrock-invokedModelId.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ describe("AwsBedrockHandler with invokedModelId", () => {
trace: {
promptRouter: {
invokedModelId:
"arn:aws:bedrock:us-west-2:699475926481:inference-profile/us.anthropic.claude-2-1-v1:0",
"arn:aws:bedrock:us-west-2:699475926481:inference-profile/us.anthropic.claude-sonnet-4-5-20250929-v1:0",
usage: {
inputTokens: 150,
outputTokens: 250,
Expand Down Expand Up @@ -162,12 +162,12 @@ describe("AwsBedrockHandler with invokedModelId", () => {
}

// Verify that getModelById was called with the id, not the full arn
expect(getModelByIdSpy).toHaveBeenCalledWith("anthropic.claude-2-1-v1:0", "inference-profile")
expect(getModelByIdSpy).toHaveBeenCalledWith("anthropic.claude-sonnet-4-5-20250929-v1:0", "inference-profile")

// Verify that getModel returns the updated model info
const costModel = handler.getModel()
//expect(costModel.id).toBe("anthropic.claude-3-5-sonnet-20240620-v1:0")
expect(costModel.info.inputPrice).toBe(8)
expect(costModel.info.inputPrice).toBe(3)

// Verify that a usage event was emitted after updating the costModelConfig
const usageEvents = events.filter((event) => event.type === "usage")
Expand Down
4 changes: 2 additions & 2 deletions src/api/providers/bedrock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,9 +889,9 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
* macOS, Linux, and any other operating system where JavaScript runs.
*
* This matches ARNs like:
* - Foundation Model: arn:aws:bedrock:us-west-2::foundation-model/anthropic.claude-v2
* - Foundation Model: arn:aws:bedrock:us-west-2::foundation-model/anthropic.claude-sonnet-4-20250514-v1:0
* - Prompt Router: arn:aws:bedrock:us-west-2:123456789012:prompt-router/anthropic-claude
* - Inference Profile: arn:aws:bedrock:us-west-2:123456789012:inference-profile/anthropic.claude-v2
* - Inference Profile: arn:aws:bedrock:us-west-2:123456789012:inference-profile/anthropic.claude-opus-4-20250514-v1:0
* - Cross Region Inference Profile: arn:aws:bedrock:us-west-2:123456789012:inference-profile/us.anthropic.claude-3-5-sonnet-20241022-v2:0
* - Custom Model (Provisioned Throughput): arn:aws:bedrock:us-west-2:123456789012:provisioned-model/my-custom-model
* - Imported Model: arn:aws:bedrock:us-west-2:123456789012:imported-model/my-imported-model
Expand Down
2 changes: 1 addition & 1 deletion src/core/task/__tests__/Task.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@ describe("Cline", () => {
const claudeModelFormats = [
"claude-3-opus",
"Claude-3-Sonnet",
"CLAUDE-instant",
"CLAUDE-sonnet-4-5",
"anthropic/claude-3-haiku",
"some-provider/claude-model",
]
Expand Down
4 changes: 2 additions & 2 deletions src/core/webview/__tests__/ClineProvider.apiHandlerRebuild.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,8 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
)
expect(getModelId({ apiProvider: "openai", openAiModelId: "gpt-4-turbo" })).toBe("gpt-4-turbo")
expect(getModelId({ apiProvider: "glama", glamaModelId: "some-model" })).toBe("some-model")
expect(getModelId({ apiProvider: "bedrock", apiModelId: "anthropic.claude-v2" })).toBe(
"anthropic.claude-v2",
expect(getModelId({ apiProvider: "bedrock", apiModelId: "anthropic.claude-sonnet-4-5-20250929-v1:0" })).toBe(
"anthropic.claude-sonnet-4-5-20250929-v1:0",
)
})

Expand Down
12 changes: 6 additions & 6 deletions webview-ui/src/components/chat/__tests__/ApiConfigSelector.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ describe("ApiConfigSelector", () => {
{ id: "config4", name: "Config 4", modelId: "gpt-3.5-turbo" },
{ id: "config5", name: "Config 5", modelId: "claude-3-haiku-20240307" },
{ id: "config6", name: "Config 6", modelId: "gpt-4-turbo" },
{ id: "config7", name: "Config 7", modelId: "claude-2.1" },
{ id: "config7", name: "Config 7", modelId: "anthropic.claude-sonnet-4-5-20250929-v1:0" },
],
}
render(<ApiConfigSelector {...props} />)
Expand Down Expand Up @@ -165,7 +165,7 @@ describe("ApiConfigSelector", () => {
{ id: "config4", name: "Config 4", modelId: "gpt-3.5-turbo" },
{ id: "config5", name: "Config 5", modelId: "claude-3-haiku-20240307" },
{ id: "config6", name: "Config 6", modelId: "gpt-4-turbo" },
{ id: "config7", name: "Config 7", modelId: "claude-2.1" },
{ id: "config7", name: "Config 7", modelId: "anthropic.claude-sonnet-4-5-20250929-v1:0" },
],
}
render(<ApiConfigSelector {...props} />)
Expand Down Expand Up @@ -195,7 +195,7 @@ describe("ApiConfigSelector", () => {
{ id: "config4", name: "Config 4", modelId: "gpt-3.5-turbo" },
{ id: "config5", name: "Config 5", modelId: "claude-3-haiku-20240307" },
{ id: "config6", name: "Config 6", modelId: "gpt-4-turbo" },
{ id: "config7", name: "Config 7", modelId: "claude-2.1" },
{ id: "config7", name: "Config 7", modelId: "anthropic.claude-sonnet-4-5-20250929-v1:0" },
],
}
render(<ApiConfigSelector {...props} />)
Expand All @@ -221,7 +221,7 @@ describe("ApiConfigSelector", () => {
{ id: "config4", name: "Config 4", modelId: "gpt-3.5-turbo" },
{ id: "config5", name: "Config 5", modelId: "claude-3-haiku-20240307" },
{ id: "config6", name: "Config 6", modelId: "gpt-4-turbo" },
{ id: "config7", name: "Config 7", modelId: "claude-2.1" },
{ id: "config7", name: "Config 7", modelId: "anthropic.claude-sonnet-4-5-20250929-v1:0" },
],
}
render(<ApiConfigSelector {...props} />)
Expand Down Expand Up @@ -357,7 +357,7 @@ describe("ApiConfigSelector", () => {
{ id: "config4", name: "Config 4", modelId: "gpt-3.5-turbo" },
{ id: "config5", name: "Config 5", modelId: "claude-3-haiku-20240307" },
{ id: "config6", name: "Config 6", modelId: "gpt-4-turbo" },
{ id: "config7", name: "Config 7", modelId: "claude-2.1" },
{ id: "config7", name: "Config 7", modelId: "anthropic.claude-sonnet-4-5-20250929-v1:0" },
],
}
render(<ApiConfigSelector {...props} />)
Expand Down Expand Up @@ -414,7 +414,7 @@ describe("ApiConfigSelector", () => {
{ id: "config4", name: "Config 4", modelId: "gpt-3.5-turbo" },
{ id: "config5", name: "Config 5", modelId: "claude-3-haiku-20240307" },
{ id: "config6", name: "Config 6", modelId: "gpt-4-turbo" },
{ id: "config7", name: "Config 7", modelId: "claude-2.1" },
{ id: "config7", name: "Config 7", modelId: "anthropic.claude-sonnet-4-5-20250929-v1:0" },
],
}
render(<ApiConfigSelector {...props} />)
Expand Down
Loading