Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
62 changes: 62 additions & 0 deletions packages/types/src/__tests__/bedrock-custom-arn.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {
BEDROCK_CUSTOM_ARN_OTHER_BASE_MODEL,
BEDROCK_GLOBAL_INFERENCE_MODEL_IDS,
getBedrockInferenceModelId,
isBedrockFoundationModelArn,
resolveBedrockCustomArnBaseModelId,
} from "../providers/bedrock.js"
Expand Down Expand Up @@ -117,3 +119,63 @@ describe("isBedrockFoundationModelArn", () => {
expect(isBedrockFoundationModelArn("")).toBe(false)
})
})

describe("getBedrockInferenceModelId", () => {
const globalModel = BEDROCK_GLOBAL_INFERENCE_MODEL_IDS[0]
const regionalOnlyModel = "amazon.titan-text-express-v1"

it.each([
[
"strips an existing regional prefix",
"us.anthropic.claude-opus-4-8",
"eu-west-1",
false,
false,
"anthropic.claude-opus-4-8",
],
["strips an existing global prefix", `global.${globalModel}`, undefined, false, false, globalModel],
[
"uses the global profile for a supported model",
globalModel,
"us-east-1",
true,
true,
`global.${globalModel}`,
],
[
"falls back to the regional profile for a model without a global profile",
regionalOnlyModel,
"us-east-1",
true,
true,
`us.${regionalOnlyModel}`,
],
[
"maps a region to its geography prefix",
regionalOnlyModel,
"eu-west-1",
true,
false,
`eu.${regionalOnlyModel}`,
],
["keeps the model ID when no region is given", regionalOnlyModel, undefined, true, false, regionalOnlyModel],
[
"keeps the model ID for an unmapped region",
regionalOnlyModel,
"me-central-1",
true,
false,
regionalOnlyModel,
],
[
"keeps the model ID when cross-region is off",
regionalOnlyModel,
"us-east-1",
false,
false,
regionalOnlyModel,
],
] as const)("%s", (_name, modelId, region, crossRegion, global, expected) => {
expect(getBedrockInferenceModelId(modelId, region, crossRegion, global)).toBe(expected)
})
})
33 changes: 33 additions & 0 deletions packages/types/src/providers/bedrock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ import {

export type BedrockModelId = keyof typeof bedrockModels

export const BedrockModelsMessageType = {
requestBedrockModels: "requestBedrockModels",
cancelBedrockModels: "cancelBedrockModels",
bedrockModels: "bedrockModels",
} as const

export interface BedrockCatalogEntry {
arn: string
name: string
kind: "regional" | "geographic" | "global" | "application"
}

export const bedrockDefaultModelId: BedrockModelId = "anthropic.claude-sonnet-4-5-20250929-v1:0"

export const bedrockDefaultPromptRouterModelId: BedrockModelId = "anthropic.claude-3-sonnet-20240229-v1:0"
Expand Down Expand Up @@ -812,6 +824,27 @@ export const BEDROCK_SERVICE_TIER_PRICING = {
PRIORITY: 1.75, // 75% premium over standard
} as const

/** Resolve the bundled model selection without silently opting into a routing geography. */
export function getBedrockInferenceModelId(
modelId: string,
region?: string,
crossRegion?: boolean,
global?: boolean,
): string {
const existingPrefix = ["global.", ...AWS_INFERENCE_PROFILE_MAPPING.map(([, prefix]) => prefix)].find((prefix) =>
modelId.startsWith(prefix),
)
if (existingPrefix) modelId = modelId.slice(existingPrefix.length)
if (global && BEDROCK_GLOBAL_INFERENCE_MODEL_IDS.some((id) => id === modelId)) {
return `global.${modelId}`
}
const prefix =
crossRegion && region
? AWS_INFERENCE_PROFILE_MAPPING.find(([pattern]) => region.startsWith(pattern))?.[1]
: undefined
return prefix ? `${prefix}${modelId}` : modelId
}

Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
const isBedrockModelId = (id: string): id is BedrockModelId => Object.prototype.hasOwnProperty.call(bedrockModels, id)

/** Stored in `awsCustomArnBaseModelId` when the user explicitly chooses "Other" for a custom ARN. */
Expand Down
5 changes: 5 additions & 0 deletions packages/types/src/vscode-extension-host.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { RouterModelsMessageType, type ModelInfo, type ModelRecord, type RouterM
import { LmStudioModelsMessageType } from "./providers/lm-studio.js"
import { OllamaModelsMessageType } from "./providers/ollama.js"
import { OpenAiModelsMessageType } from "./providers/openai.js"
import { BedrockModelsMessageType, type BedrockCatalogEntry } from "./providers/bedrock.js"
import { VsCodeLmModelsMessageType } from "./providers/vscode-llm.js"
import type { OpenAiCodexRateLimitInfo } from "./providers/openai-codex-rate-limits.js"
import type { SkillMetadata } from "./skills.js"
Expand Down Expand Up @@ -45,6 +46,7 @@ export interface ExtensionMessage {
| typeof RouterModelsMessageType.routerModels
| "zooGatewayCredentialsReady"
| typeof OpenAiModelsMessageType.openAiModels
| typeof BedrockModelsMessageType.bedrockModels
| typeof OllamaModelsMessageType.ollamaModels
| typeof LmStudioModelsMessageType.lmStudioModels
| typeof VsCodeLmModelsMessageType.vsCodeLmModels
Expand Down Expand Up @@ -147,6 +149,7 @@ export interface ExtensionMessage {
clineMessage?: ClineMessage
routerModels?: RouterModels
openAiModels?: string[]
bedrockModels?: BedrockCatalogEntry[]
ollamaModels?: ModelRecord
lmStudioModels?: ModelRecord
vsCodeLmModels?: {
Expand Down Expand Up @@ -546,6 +549,8 @@ export interface WebviewMessage {
| typeof RouterModelsMessageType.flushRouterModels
| typeof RouterModelsMessageType.requestRouterModels
| typeof OpenAiModelsMessageType.requestOpenAiModels
| typeof BedrockModelsMessageType.requestBedrockModels
| typeof BedrockModelsMessageType.cancelBedrockModels
| typeof OllamaModelsMessageType.requestOllamaModels
| typeof LmStudioModelsMessageType.requestLmStudioModels
| "requestRooModels"
Expand Down
Loading
Loading