Skip to content

Feature/Parameterize Bedrock model ID in CloudFormation templates #238

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
oussamahansal wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feature/Parameterize Bedrock model ID in CloudFormation templates #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fa7a74
Feature/Parameterize Bedrock model ID in CloudFormation templates
May 1, 2026
4095bbd
Merge branch 'main' into parameterize-bedrock-model
May 1, 2026
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
24 changes: 15 additions & 9 deletions ...al-graph/cloudformation-templates/graphrag-toolkit-neptune-analytics-aurora-postgres.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@
"Type": "String",
"Description": "URL of a zip file containing example notebooks to be installed on SageMaker instance (optional)",
"Default": "https://github.com/awslabs/graphrag-toolkit/releases/latest/download/lexical-graph-examples-latest.zip"
},
"BedrockModelId": {
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto May 1, 2026

Choose a reason for hiding this comment

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

Suggested change
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
"Description": "Bedrock model ID or inference profile used for extraction, response, and evaluation LLMs",

"Type": "String",
"Default": "anthropic.claude-sonnet-4-6"
}
},
"Metadata": {
Expand All @@ -83,7 +88,8 @@
"default": "Setup"
},
"Parameters": [
"ApplicationId"
"ApplicationId",
"BedrockModelId"
]
},
{
Expand Down Expand Up @@ -792,10 +798,10 @@
],
"Resource": [
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.${BedrockModelId}"
Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto May 1, 2026

Choose a reason for hiding this comment

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

Suggested change
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.${BedrockModelId}"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/${BedrockModelId}"

Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto May 1, 2026

Choose a reason for hiding this comment

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

I don't think we need the wildcard for profiles, since the profile passed in would contain the prefix.

Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto May 1, 2026

Choose a reason for hiding this comment

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

We might need to go with something like *${BedrockModelId}*?

},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/cohere.embed-english-v3"
Expand Down Expand Up @@ -943,15 +949,15 @@
},
"\" >> ~/.bashrc\n",
"echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> ~/.bashrc\n",
"echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_AUTH_MODE=IAM\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_SSL=True\" >> ~/.bashrc\n",
Expand Down Expand Up @@ -1111,15 +1117,15 @@
},
"\" >> .env\n",
" echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> .env\n",
" echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> .env\n",
" echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" if [ -f \"./run_test_suite.sh\" ]\n",
" then\n",
Expand Down
24 changes: 15 additions & 9 deletions ...ph/cloudformation-templates/graphrag-toolkit-neptune-analytics-opensearch-serverless.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@
"true",
"false"
]
},
"BedrockModelId": {
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
"Type": "String",
"Default": "anthropic.claude-sonnet-4-6"
}
},
"Metadata": {
Expand All @@ -78,7 +83,8 @@
"default": "Setup"
},
"Parameters": [
"ApplicationId"
"ApplicationId",
"BedrockModelId"
]
},
{
Expand Down Expand Up @@ -353,10 +359,10 @@
],
"Resource": [
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/cohere.embed-english-v3"
Expand Down Expand Up @@ -791,15 +797,15 @@
},
"\" >> ~/.bashrc\n",
"echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> ~/.bashrc\n",
"echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_AUTH_MODE=IAM\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_SSL=True\" >> ~/.bashrc\n",
Expand Down Expand Up @@ -947,15 +953,15 @@
},
"\" >> .env\n",
" echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> .env\n",
" echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> .env\n",
" echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" if [ -f \"./run_test_suite.sh\" ]\n",
" then\n",
Expand Down
24 changes: 15 additions & 9 deletions ...lexical-graph/cloudformation-templates/graphrag-toolkit-neptune-analytics-s3-vectors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
"Type": "String",
"Description": "URL of a zip file containing example notebooks to be installed on SageMaker instance (optional)",
"Default": "https://github.com/awslabs/graphrag-toolkit/releases/latest/download/lexical-graph-examples-latest.zip"
},
"BedrockModelId": {
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto May 1, 2026

Choose a reason for hiding this comment

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

Suggested change
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
"Description": "Bedrock model ID or inference profile used for extraction, response, and evaluation LLMs",

"Type": "String",
"Default": "anthropic.claude-sonnet-4-6"
}
},
"Metadata": {
Expand All @@ -57,7 +62,8 @@
"default": "Setup"
},
"Parameters": [
"ApplicationId"
"ApplicationId",
"BedrockModelId"
]
},
{
Expand Down Expand Up @@ -409,10 +415,10 @@
],
"Resource": [
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/cohere.embed-english-v3"
Expand Down Expand Up @@ -1019,15 +1025,15 @@
},
"\" >> ~/.bashrc\n",
"echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> ~/.bashrc\n",
"echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_AUTH_MODE=IAM\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_SSL=True\" >> ~/.bashrc\n",
Expand Down Expand Up @@ -1167,15 +1173,15 @@
},
"\" >> .env\n",
" echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> .env\n",
" echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> .env\n",
" echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" if [ -f \"./run_test_suite.sh\" ]\n",
" then\n",
Expand Down
24 changes: 15 additions & 9 deletions examples/lexical-graph/cloudformation-templates/graphrag-toolkit-neptune-analytics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
"Type": "String",
"Description": "URL of a zip file containing example notebooks to be installed on SageMaker instance (optional)",
"Default": "https://github.com/awslabs/graphrag-toolkit/releases/latest/download/lexical-graph-examples-latest.zip"
},
"BedrockModelId": {
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto May 1, 2026

Choose a reason for hiding this comment

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

Suggested change
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
"Description": "Bedrock model ID or inference profile used for extraction, response, and evaluation LLMs",

"Type": "String",
"Default": "anthropic.claude-sonnet-4-6"
}
},
"Metadata": {
Expand All @@ -57,7 +62,8 @@
"default": "Setup"
},
"Parameters": [
"ApplicationId"
"ApplicationId",
"BedrockModelId"
]
},
{
Expand Down Expand Up @@ -305,10 +311,10 @@
],
"Resource": [
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/cohere.embed-english-v3"
Expand Down Expand Up @@ -448,15 +454,15 @@
},
"\" >> ~/.bashrc\n",
"echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> ~/.bashrc\n",
"echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_AUTH_MODE=IAM\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_SSL=True\" >> ~/.bashrc\n",
Expand Down Expand Up @@ -604,15 +610,15 @@
},
"\" >> .env\n",
" echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> .env\n",
" echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> .env\n",
" echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" if [ -f \"./run_test_suite.sh\" ]\n",
" then\n",
Expand Down
24 changes: 15 additions & 9 deletions ...ph/cloudformation-templates/graphrag-toolkit-neptune-db-aurora-postgres-existing-vpc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@
"Type": "String",
"Description": "URL of a zip file containing example notebooks to be installed on SageMaker instance (optional)",
"Default": "https://github.com/awslabs/graphrag-toolkit/releases/latest/download/lexical-graph-examples-latest.zip"
},
"BedrockModelId": {
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto May 1, 2026

Choose a reason for hiding this comment

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

Suggested change
"Description": "Bedrock model ID used for extraction, response, and evaluation LLMs",
"Description": "Bedrock model ID or inference profile used for extraction, response, and evaluation LLMs",

"Type": "String",
"Default": "anthropic.claude-sonnet-4-6"
}
},
"Metadata": {
Expand All @@ -144,7 +149,8 @@
"default": "Setup"
},
"Parameters": [
"ApplicationId"
"ApplicationId",
"BedrockModelId"
]
},
{
Expand Down Expand Up @@ -732,10 +738,10 @@
],
"Resource": [
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*::foundation-model/${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.anthropic.*"
"Fn::Sub": "arn:${AWS::Partition}:bedrock:*:${AWS::AccountId}:inference-profile/*.${BedrockModelId}"
},
{
"Fn::Sub": "arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/cohere.embed-english-v3"
Expand Down Expand Up @@ -1382,15 +1388,15 @@
"Ref": "AWS::StackId"
},
"echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> ~/.bashrc\n",
"echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> ~/.bashrc\n",
"echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_AUTH_MODE=IAM\" >> ~/.bashrc\n",
"echo \"export GRAPH_NOTEBOOK_SSL=True\" >> ~/.bashrc\n",
Expand Down Expand Up @@ -1564,15 +1570,15 @@
},
"\" >> .env\n",
" echo \"export EXTRACTION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EMBEDDINGS_MODEL=cohere.embed-english-v3\" >> .env\n",
" echo \"export EMBEDDINGS_DIMENSIONS=1024\" >> .env\n",
" echo \"export RESPONSE_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export EVALUATION_MODEL=",
"anthropic.claude-sonnet-4-6",
{"Ref": "BedrockModelId"},
"\" >> .env\n",
" echo \"export LOCAL_EXTRACT_S3=",
{
Expand Down
Loading
Loading