Skip to content

Commit 9c91982

Browse files
author
Maha Lakshmi Soumya Yalavarthi
committed
Add comprehensive EU region model support
- Add MODEL_MAPPINGS for US to EU model conversion - Implement region-aware model filtering and swapping - Add EU model constraints to CloudFormation templates - Support both US and EU model variants in all patterns - Remove unused Pattern2CustomConfigPath parameter
1 parent cc2f0d6 commit 9c91982

File tree

4 files changed

+325
-93
lines changed

4 files changed

+325
-93
lines changed

patterns/pattern-1/template.yaml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,26 @@ Parameters:
108108
Type: String
109109
Description: "Bedrock model id to use for label extraction"
110110
Default: "us.amazon.nova-pro-v1:0"
111+
AllowedValues:
112+
- "us.amazon.nova-lite-v1:0"
113+
- "us.amazon.nova-pro-v1:0"
114+
- "us.amazon.nova-premier-v1:0"
115+
- "us.anthropic.claude-3-haiku-20240307-v1:0"
116+
- "us.anthropic.claude-haiku-4-5-20251001-v1:0"
117+
- "us.anthropic.claude-3-5-sonnet-20241022-v2:0"
118+
- "us.anthropic.claude-3-7-sonnet-20250219-v1:0"
119+
- "us.anthropic.claude-sonnet-4-20250514-v1:0"
120+
- "us.anthropic.claude-sonnet-4-5-20250929-v1:0"
121+
- "us.anthropic.claude-opus-4-20250514-v1:0"
122+
- "us.anthropic.claude-opus-4-1-20250805-v1:0"
123+
- "eu.amazon.nova-lite-v1:0"
124+
- "eu.amazon.nova-pro-v1:0"
125+
- "eu.anthropic.claude-3-haiku-20240307-v1:0"
126+
- "eu.anthropic.claude-haiku-4-5-20251001-v1:0"
127+
- "eu.anthropic.claude-3-5-sonnet-20241022-v2:0"
128+
- "eu.anthropic.claude-3-7-sonnet-20250219-v1:0"
129+
- "eu.anthropic.claude-sonnet-4-20250514-v1:0"
130+
- "eu.anthropic.claude-sonnet-4-5-20250929-v1:0"
111131

112132
EnableXRayTracing:
113133
Type: String
@@ -368,7 +388,6 @@ Resources:
368388
model:
369389
type: string
370390
description: Bedrock model ID
371-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0","us.anthropic.claude-haiku-4-5-20251001-v1:0","us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
372391
order: 1
373392
temperature:
374393
type: number
@@ -420,7 +439,6 @@ Resources:
420439
model:
421440
type: string
422441
description: Bedrock model ID
423-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
424442
order: 1
425443
temperature:
426444
type: number
@@ -463,7 +481,6 @@ Resources:
463481
model_id:
464482
type: string
465483
description: Bedrock model ID for discovery without ground truth
466-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
467484
default: "us.amazon.nova-pro-v1:0"
468485
order: 0
469486
temperature:
@@ -508,7 +525,6 @@ Resources:
508525
model_id:
509526
type: string
510527
description: Bedrock model ID for discovery with ground truth
511-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
512528
default: "us.amazon.nova-pro-v1:0"
513529
order: 0
514530
temperature:
@@ -570,7 +586,7 @@ Resources:
570586
model_id:
571587
type: string
572588
description: Model ID for the error analysis agent
573-
enum: ["anthropic.claude-3-sonnet-20240229-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0"]
589+
enum: ["anthropic.claude-3-sonnet-20240229-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "eu.anthropic.claude-3-5-sonnet-20241022-v2:0", "eu.anthropic.claude-3-7-sonnet-20250219-v1:0", "eu.anthropic.claude-sonnet-4-20250514-v1:0"]
574590
default: "us.anthropic.claude-sonnet-4-20250514-v1:0"
575591
order: 0
576592
system_prompt:
@@ -625,6 +641,15 @@ Resources:
625641
price:
626642
type: number
627643
description: Estimated cost/unit
644+
default:
645+
- name: "lambda/requests"
646+
units:
647+
- name: "invocations"
648+
price: 2.0E-7
649+
- name: "lambda/duration"
650+
units:
651+
- name: "gb_seconds"
652+
price: 1.66667E-5
628653
UpdateReplacePolicy: Delete
629654
DeletionPolicy: Delete
630655

patterns/pattern-3/template.yaml

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,15 @@ Resources:
214214
- "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"
215215
- "us.anthropic.claude-opus-4-20250514-v1:0"
216216
- "us.anthropic.claude-opus-4-1-20250805-v1:0"
217+
- "eu.amazon.nova-lite-v1:0"
218+
- "eu.amazon.nova-pro-v1:0"
219+
- "eu.anthropic.claude-3-haiku-20240307-v1:0"
220+
- "eu.anthropic.claude-haiku-4-5-20251001-v1:0"
221+
- "eu.anthropic.claude-3-5-sonnet-20241022-v2:0"
222+
- "eu.anthropic.claude-3-7-sonnet-20250219-v1:0"
223+
- "eu.anthropic.claude-sonnet-4-20250514-v1:0"
224+
- "eu.anthropic.claude-sonnet-4-5-20250929-v1:0"
225+
- "eu.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"
217226
order: 2
218227
dependsOn: {
219228
field: "backend",
@@ -513,6 +522,15 @@ Resources:
513522
- "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"
514523
- "us.anthropic.claude-opus-4-20250514-v1:0"
515524
- "us.anthropic.claude-opus-4-1-20250805-v1:0"
525+
- "eu.amazon.nova-lite-v1:0"
526+
- "eu.amazon.nova-pro-v1:0"
527+
- "eu.anthropic.claude-3-haiku-20240307-v1:0"
528+
- "eu.anthropic.claude-haiku-4-5-20251001-v1:0"
529+
- "eu.anthropic.claude-3-5-sonnet-20241022-v2:0"
530+
- "eu.anthropic.claude-3-7-sonnet-20250219-v1:0"
531+
- "eu.anthropic.claude-sonnet-4-20250514-v1:0"
532+
- "eu.anthropic.claude-sonnet-4-5-20250929-v1:0"
533+
- "eu.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"
516534
order: 1
517535
temperature:
518536
type: number
@@ -626,7 +644,7 @@ Resources:
626644
model:
627645
type: string
628646
description: Bedrock model ID
629-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
647+
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0", "eu.amazon.nova-lite-v1:0", "eu.amazon.nova-pro-v1:0", "eu.anthropic.claude-3-haiku-20240307-v1:0", "eu.anthropic.claude-haiku-4-5-20251001-v1:0", "eu.anthropic.claude-3-5-sonnet-20241022-v2:0", "eu.anthropic.claude-3-7-sonnet-20250219-v1:0", "eu.anthropic.claude-sonnet-4-20250514-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"]
630648
order: 3
631649
temperature:
632650
type: number
@@ -667,7 +685,7 @@ Resources:
667685
model:
668686
type: string
669687
description: Bedrock model ID
670-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
688+
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0", "eu.amazon.nova-lite-v1:0", "eu.amazon.nova-pro-v1:0", "eu.anthropic.claude-3-haiku-20240307-v1:0", "eu.anthropic.claude-haiku-4-5-20251001-v1:0", "eu.anthropic.claude-3-5-sonnet-20241022-v2:0", "eu.anthropic.claude-3-7-sonnet-20250219-v1:0", "eu.anthropic.claude-sonnet-4-20250514-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"]
671689
order: 1
672690
temperature:
673691
type: number
@@ -706,7 +724,7 @@ Resources:
706724
model:
707725
type: string
708726
description: Bedrock model ID
709-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
727+
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0", "eu.amazon.nova-lite-v1:0", "eu.amazon.nova-pro-v1:0", "eu.anthropic.claude-3-haiku-20240307-v1:0", "eu.anthropic.claude-haiku-4-5-20251001-v1:0", "eu.anthropic.claude-3-5-sonnet-20241022-v2:0", "eu.anthropic.claude-3-7-sonnet-20250219-v1:0", "eu.anthropic.claude-sonnet-4-20250514-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"]
710728
order: 1
711729
temperature:
712730
type: number
@@ -751,7 +769,7 @@ Resources:
751769
model_id:
752770
type: string
753771
description: Bedrock model ID for discovery without ground truth
754-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
772+
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0", "eu.amazon.nova-lite-v1:0", "eu.amazon.nova-pro-v1:0", "eu.anthropic.claude-3-haiku-20240307-v1:0", "eu.anthropic.claude-haiku-4-5-20251001-v1:0", "eu.anthropic.claude-3-5-sonnet-20241022-v2:0", "eu.anthropic.claude-3-7-sonnet-20250219-v1:0", "eu.anthropic.claude-sonnet-4-20250514-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"]
755773
default: "us.amazon.nova-pro-v1:0"
756774
order: 0
757775
temperature:
@@ -796,7 +814,7 @@ Resources:
796814
model_id:
797815
type: string
798816
description: Bedrock model ID for discovery with ground truth
799-
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0"]
817+
enum: ["us.amazon.nova-lite-v1:0", "us.amazon.nova-pro-v1:0", "us.amazon.nova-premier-v1:0", "us.anthropic.claude-3-haiku-20240307-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0:1m", "us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-sonnet-4-5-20250929-v1:0:1m", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-opus-4-1-20250805-v1:0", "eu.amazon.nova-lite-v1:0", "eu.amazon.nova-pro-v1:0", "eu.anthropic.claude-3-haiku-20240307-v1:0", "eu.anthropic.claude-haiku-4-5-20251001-v1:0", "eu.anthropic.claude-3-5-sonnet-20241022-v2:0", "eu.anthropic.claude-3-7-sonnet-20250219-v1:0", "eu.anthropic.claude-sonnet-4-20250514-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0", "eu.anthropic.claude-sonnet-4-5-20250929-v1:0:1m"]
800818
default: "us.amazon.nova-pro-v1:0"
801819
order: 0
802820
temperature:
@@ -858,7 +876,7 @@ Resources:
858876
model_id:
859877
type: string
860878
description: Model ID for the error analysis agent
861-
enum: ["anthropic.claude-3-sonnet-20240229-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0"]
879+
enum: ["anthropic.claude-3-sonnet-20240229-v1:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "eu.anthropic.claude-3-5-sonnet-20241022-v2:0", "eu.anthropic.claude-3-7-sonnet-20250219-v1:0", "eu.anthropic.claude-sonnet-4-20250514-v1:0"]
862880
default: "us.anthropic.claude-sonnet-4-20250514-v1:0"
863881
order: 0
864882
system_prompt:
@@ -913,6 +931,15 @@ Resources:
913931
price:
914932
type: number
915933
description: Estimated cost/unit
934+
default:
935+
- name: "lambda/requests"
936+
units:
937+
- name: "invocations"
938+
price: 2.0E-7
939+
- name: "lambda/duration"
940+
units:
941+
- name: "gb_seconds"
942+
price: 1.66667E-5
916943
UpdateReplacePolicy: Delete
917944
DeletionPolicy: Delete
918945

0 commit comments

Comments
 (0)