Skip to content

ai: add support for cross-region inference system profiles #2543

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

ai: add support for cross-region inference system profiles #2543

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
e173db5
ai-constructs: add support for cross-region inference system profiles
atierian Feb 26, 2025
c96bb26
add apac to eslint dictionary
atierian Feb 26, 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
5 changes: 5 additions & 0 deletions .changeset/blue-waves-travel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/ai-constructs': minor
---

add support for bedrock system cross-region inference profiles
1 change: 1 addition & 0 deletions .eslint_dictionary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"ampx",
"anonymize",
"anthropic",
"apac",
"apns",
"apollo",
"appleid",
Expand Down
141 changes: 141 additions & 0 deletions packages/ai-constructs/src/conversation/conversation_handler_construct.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,4 +414,145 @@ void describe('Conversation Handler Function construct', () => {
});
});
});

void describe('cross-region models', () => {
void it('creates handler with access to eu cross-region models and inference profiles', () => {
const app = new App();
const stack = new Stack(app, 'TestStack', {
env: { region: 'eu-west-1' },
});
new ConversationHandlerFunction(stack, 'conversationHandler', {
models: [
{
modelId: 'eu.anthropic.claude-3-5-sonnet-20240620-v1:0',
},
],
});

const template = Template.fromStack(stack);
template.hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Statement: [
{
Action: [
'bedrock:InvokeModel',
'bedrock:InvokeModelWithResponseStream',
],
Effect: 'Allow',
Resource: [
{
'Fn::Join': [
'',
[
'arn:aws:bedrock:eu-west-1:',
{
Ref: 'AWS::AccountId',
},
':inference-profile/eu.anthropic.claude-3-5-sonnet-20240620-v1:0',
],
],
},
'arn:aws:bedrock:eu-west-1::foundation-model/anthropic.claude-3-5-sonnet-20240620-v1:0',
'arn:aws:bedrock:eu-west-3::foundation-model/anthropic.claude-3-5-sonnet-20240620-v1:0',
'arn:aws:bedrock:eu-central-1::foundation-model/anthropic.claude-3-5-sonnet-20240620-v1:0',
],
},
],
},
});
});

void it('creates handler with access to us cross-region models and inference profiles', () => {
const app = new App();
const stack = new Stack(app, 'TestStack', {
env: { region: 'us-east-1' },
});
new ConversationHandlerFunction(stack, 'conversationHandler', {
models: [
{
modelId: 'us.anthropic.claude-3-7-sonnet-20250219-v1:0',
},
],
});

const template = Template.fromStack(stack);
template.hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Statement: [
{
Action: [
'bedrock:InvokeModel',
'bedrock:InvokeModelWithResponseStream',
],
Effect: 'Allow',
Resource: [
{
'Fn::Join': [
'',
[
'arn:aws:bedrock:us-east-1:',
{
Ref: 'AWS::AccountId',
},
':inference-profile/us.anthropic.claude-3-7-sonnet-20250219-v1:0',
],
],
},
'arn:aws:bedrock:us-east-1::foundation-model/anthropic.claude-3-7-sonnet-20250219-v1:0',
'arn:aws:bedrock:us-east-2::foundation-model/anthropic.claude-3-7-sonnet-20250219-v1:0',
'arn:aws:bedrock:us-west-2::foundation-model/anthropic.claude-3-7-sonnet-20250219-v1:0',
],
},
],
},
});
});

void it('creates handler with access to apac cross-region models and inference profiles', () => {
const app = new App();
const stack = new Stack(app, 'TestStack', {
env: { region: 'ap-northeast-1' },
});
new ConversationHandlerFunction(stack, 'conversationHandler', {
models: [
{
modelId: 'apac.anthropic.claude-3-haiku-20240307-v1:0',
},
],
});

const template = Template.fromStack(stack);
template.hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Statement: [
{
Action: [
'bedrock:InvokeModel',
'bedrock:InvokeModelWithResponseStream',
],
Effect: 'Allow',
Resource: [
{
'Fn::Join': [
'',
[
'arn:aws:bedrock:ap-northeast-1:',
{
Ref: 'AWS::AccountId',
},
':inference-profile/apac.anthropic.claude-3-haiku-20240307-v1:0',
],
],
},
'arn:aws:bedrock:ap-northeast-1::foundation-model/anthropic.claude-3-haiku-20240307-v1:0',
'arn:aws:bedrock:ap-northeast-2::foundation-model/anthropic.claude-3-haiku-20240307-v1:0',
'arn:aws:bedrock:ap-southeast-1::foundation-model/anthropic.claude-3-haiku-20240307-v1:0',
'arn:aws:bedrock:ap-southeast-2::foundation-model/anthropic.claude-3-haiku-20240307-v1:0',
],
},
],
},
});
});
});
});
54 changes: 48 additions & 6 deletions packages/ai-constructs/src/conversation/conversation_handler_construct.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,7 @@ export class ConversationHandlerFunction
);

if (this.props.models && this.props.models.length > 0) {
const resources = this.props.models.map(
(model) =>
`arn:aws:bedrock:${
model.region ?? Stack.of(this).region
}::foundation-model/${model.modelId}`
);
const resources = this.generateIamPolicyResourceBlocks(this.props.models);
conversationHandler.addToRolePolicy(
new PolicyStatement({
effect: Effect.ALLOW,
Expand All @@ -160,6 +155,53 @@ export class ConversationHandlerFunction
this.storeOutput(this.props.outputStorageStrategy);
}

private generateIamPolicyResourceBlocks = (
models: { modelId: string; region?: string }[]
): string[] => {
const crossRegionInferenceProfileRegions: Record<string, string[]> = {
'eu.': ['eu-west-1', 'eu-west-3', 'eu-central-1'],
'us.': ['us-east-1', 'us-east-2', 'us-west-2'],
'apac.': [
'ap-northeast-1',
'ap-northeast-2',
'ap-southeast-1',
'ap-southeast-2',
],
};
const resourceBlocks = models.map((model) => {
const region = model.region ?? Stack.of(this).region;
const modelPrefix = Object.keys(crossRegionInferenceProfileRegions).find(
(prefix) => model.modelId.startsWith(prefix)
);

if (modelPrefix) {
// For cross-region models, generate resource blocks for all supported regions
const foundationModelResourceBlocks =
crossRegionInferenceProfileRegions[modelPrefix].map(
(region) =>
`arn:aws:bedrock:${region}::foundation-model/${model.modelId.substring(
modelPrefix.length
)}`
);

// For cross-region models, also generate inference profile resource blocks
const inferenceProfileResourceBlock = `arn:aws:bedrock:${region}:${
Stack.of(this).account
}:inference-profile/${model.modelId}`;

return [
inferenceProfileResourceBlock,
...foundationModelResourceBlocks,
];
}

// For non-cross-region models, use the specified or stack region
return [`arn:aws:bedrock:${region}::foundation-model/${model.modelId}`];
});

return resourceBlocks.flat();
};

/**
* Append conversation handler to defined functions.
*/
Expand Down
Loading