Skip to content

Commit ac1758c

Browse files
YeEmrickyeqisong
andauthored
fix: preserve Bedrock DeepSeek model ids (anomalyco#34441)
Co-authored-by: yeqisong <[email protected]>
1 parent d6855b6 commit ac1758c

4 files changed

Lines changed: 58 additions & 2 deletions

File tree

‎packages/core/src/plugin/provider/amazon-bedrock.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ type MantleSDK = {
1313
// specific model/region combinations. Keep the mapping narrow and avoid
1414
// double-prefixing model IDs that models.dev already marks as global/us/eu/etc.
1515
function resolveModelID(modelID: string, region: string | undefined) {
16+
if (modelID.startsWith("arn:")) return modelID
17+
1618
const crossRegionPrefixes = ["global.", "us.", "eu.", "jp.", "apac.", "au."]
1719
if (crossRegionPrefixes.some((prefix) => modelID.startsWith(prefix))) return modelID
1820

1921
const resolvedRegion = region ?? "us-east-1"
2022
const regionPrefix = resolvedRegion.split("-")[0]
2123
if (regionPrefix === "us") {
22-
const requiresPrefix = ["nova-micro", "nova-lite", "nova-pro", "nova-premier", "nova-2", "claude", "deepseek"].some(
24+
const requiresPrefix = ["nova-micro", "nova-lite", "nova-pro", "nova-premier", "nova-2", "claude", "deepseek.r1"].some(
2325
(item) => modelID.includes(item),
2426
)
2527
if (requiresPrefix && !resolvedRegion.startsWith("us-gov")) return `${regionPrefix}.${modelID}`

‎packages/core/test/plugin/provider-amazon-bedrock.test.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,13 @@ describe("AmazonBedrockPlugin", () => {
528528
{ region: "us-east-1", modelID: "amazon.nova-2-lite-v1:0", expected: "us.amazon.nova-2-lite-v1:0" },
529529
{ region: "us-east-1", modelID: "anthropic.claude-sonnet-4-5", expected: "us.anthropic.claude-sonnet-4-5" },
530530
{ region: "us-east-1", modelID: "deepseek.r1-v1:0", expected: "us.deepseek.r1-v1:0" },
531+
{ region: "us-east-1", modelID: "us.deepseek.r1-v1:0", expected: "us.deepseek.r1-v1:0" },
532+
{ region: "us-east-1", modelID: "deepseek.v3.2", expected: "deepseek.v3.2" },
533+
{
534+
region: "us-east-1",
535+
modelID: "arn:aws:bedrock:us-east-1::foundation-model/deepseek.v3.2",
536+
expected: "arn:aws:bedrock:us-east-1::foundation-model/deepseek.v3.2",
537+
},
531538
{ region: "us-gov-west-1", modelID: "anthropic.claude-sonnet-4-5", expected: "anthropic.claude-sonnet-4-5" },
532539
{ region: "us-east-1", modelID: "cohere.command-r-plus-v1:0", expected: "cohere.command-r-plus-v1:0" },
533540
{ region: "eu-west-1", modelID: "anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },

‎packages/opencode/src/provider/provider.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,10 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
376376

377377
// Skip region prefixing if model already has a cross-region inference profile prefix
378378
// Models from models.dev may already include prefixes like us., eu., global., etc.
379+
if (modelID.startsWith("arn:")) {
380+
return sdk.languageModel(modelID)
381+
}
382+
379383
const crossRegionPrefixes = ["global.", "us.", "eu.", "jp.", "apac.", "au."]
380384
if (crossRegionPrefixes.some((prefix) => modelID.startsWith(prefix))) {
381385
return sdk.languageModel(modelID)
@@ -398,7 +402,7 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
398402
"nova-premier",
399403
"nova-2",
400404
"claude",
401-
"deepseek",
405+
"deepseek.r1",
402406
].some((m) => modelID.includes(m))
403407
const isGovCloud = region.startsWith("us-gov")
404408
if (modelRequiresPrefix && !isGovCloud) {

‎packages/opencode/test/provider/amazon-bedrock.test.ts‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,49 @@ it.instance(
229229
{ config: { provider: { "amazon-bedrock": { options: { region: "us-east-1" } } } } },
230230
)
231231

232+
it.instance(
233+
"Bedrock: preserves explicit DeepSeek model identifiers",
234+
() =>
235+
Effect.gen(function* () {
236+
yield* set("AWS_BEARER_TOKEN_BEDROCK", "test-bearer-token")
237+
const provider = yield* Provider.Service
238+
const deepseek = yield* provider.getLanguage(
239+
yield* provider.getModel(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("deepseek.v3.2")),
240+
)
241+
const r1 = yield* provider.getLanguage(
242+
yield* provider.getModel(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("deepseek.r1-v1:0")),
243+
)
244+
const profile = yield* provider.getLanguage(
245+
yield* provider.getModel(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("us.deepseek.r1-v1:0")),
246+
)
247+
const arn = yield* provider.getLanguage(
248+
yield* provider.getModel(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("deepseek-v3-2-arn")),
249+
)
250+
expect((deepseek as { modelId: string }).modelId).toBe("deepseek.v3.2")
251+
expect((r1 as { modelId: string }).modelId).toBe("us.deepseek.r1-v1:0")
252+
expect((profile as { modelId: string }).modelId).toBe("us.deepseek.r1-v1:0")
253+
expect((arn as { modelId: string }).modelId).toBe("arn:aws:bedrock:us-east-1::foundation-model/deepseek.v3.2")
254+
}),
255+
{
256+
config: {
257+
provider: {
258+
"amazon-bedrock": {
259+
options: { region: "us-east-1" },
260+
models: {
261+
"deepseek.v3.2": { name: "DeepSeek V3.2" },
262+
"deepseek.r1-v1:0": { name: "DeepSeek R1" },
263+
"us.deepseek.r1-v1:0": { name: "DeepSeek R1 US" },
264+
"deepseek-v3-2-arn": {
265+
id: "arn:aws:bedrock:us-east-1::foundation-model/deepseek.v3.2",
266+
name: "DeepSeek V3.2 ARN",
267+
},
268+
},
269+
},
270+
},
271+
},
272+
},
273+
)
274+
232275
// Cross-region inference profile prefix handling.
233276
// Models from models.dev may come with prefixes already (e.g. us., eu., global.).
234277
// These should NOT be double-prefixed when passed to the SDK.

0 commit comments

Comments
 (0)