diff --git a/README.md b/README.md index c162783..23ae4a2 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,7 @@ This solution only supports the regions where Amazon Bedrock is available: - US East (N. Virginia): us-east-1 - US West (Oregon): us-west-2 - Asia Pacific (Singapore): ap-southeast-1 +- Asia Pacific (Sydney): ap-southeast-2 - Asia Pacific (Tokyo): ap-northeast-1 - Europe (Frankfurt): eu-central-1 - Europe (Paris): eu-west-3 diff --git a/README_CN.md b/README_CN.md index 98dbfcf..bdee1a7 100644 --- a/README_CN.md +++ b/README_CN.md @@ -212,6 +212,7 @@ print(response) - 美国东部(弗吉尼亚北部):us-east-1 - 美国西部(俄勒冈州):us-west-2 - 亚太地区(新加坡):ap-southeast-1 +- 亚太地区(悉尼):ap-southeast-2 - 亚太地区(东京):ap-northeast-1 - 欧洲(法兰克福):eu-central-1 - 欧洲(巴黎):eu-west-3 diff --git a/deployment/BedrockProxy.template b/deployment/BedrockProxy.template index 5cb3ac3..776ac9b 100644 --- a/deployment/BedrockProxy.template +++ b/deployment/BedrockProxy.template @@ -1,5 +1,6 @@ { "Description": "Bedrock Access Gateway - OpenAI-compatible RESTful APIs for Amazon Bedrock", + "Transform": "AWS::LanguageExtensions", "Parameters": { "ApiKeyParam": { "Type": "String", @@ -326,44 +327,9 @@ "Fn::Join": [ "", [ + "366590864501.dkr.ecr.", { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Fn::FindInMap": [ - "ProxyRegionTable03E5BEB3", - { - "Ref": "AWS::Region" - }, - "repoArn" - ] - } - ] - } - ] - }, - ".dkr.ecr.", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Fn::FindInMap": [ - "ProxyRegionTable03E5BEB3", - { - "Ref": "AWS::Region" - }, - "repoArn" - ] - } - ] - } - ] + "Ref": "AWS::Region" }, ".", { @@ -387,7 +353,10 @@ { "Ref": "AWS::Region" }, - "model" + "model", + { + "DefaultValue": "anthropic.claude-3-sonnet-20240229-v1:0" + } ] }, "DEFAULT_EMBEDDING_MODEL": "cohere.embed-multilingual-v3" @@ -553,28 +522,16 @@ "Mappings": { "ProxyRegionTable03E5BEB3": { "us-east-1": { - "repoArn": "arn:aws:ecr:us-east-1:366590864501:repository/bedrock-proxy-api", - "model": "anthropic.claude-3-sonnet-20240229-v1:0" - }, - "us-west-2": { - "repoArn": "arn:aws:ecr:us-west-2:366590864501:repository/bedrock-proxy-api", "model": "anthropic.claude-3-sonnet-20240229-v1:0" }, "ap-southeast-1": { - "repoArn": "arn:aws:ecr:ap-southeast-1:366590864501:repository/bedrock-proxy-api", "model": "anthropic.claude-v2" }, "ap-northeast-1": { - "repoArn": "arn:aws:ecr:ap-northeast-1:366590864501:repository/bedrock-proxy-api", "model": "anthropic.claude-v2:1" }, "eu-central-1": { - "repoArn": "arn:aws:ecr:eu-central-1:366590864501:repository/bedrock-proxy-api", "model": "anthropic.claude-v2:1" - }, - "eu-west-3": { - "repoArn": "arn:aws:ecr:eu-west-3:366590864501:repository/bedrock-proxy-api", - "model": "anthropic.claude-3-sonnet-20240229-v1:0" } } }, diff --git a/deployment/BedrockProxyFargate.template b/deployment/BedrockProxyFargate.template index 303e640..b6c5e9e 100644 --- a/deployment/BedrockProxyFargate.template +++ b/deployment/BedrockProxyFargate.template @@ -1,5 +1,6 @@ { "Description": "Bedrock Access Gateway - OpenAI-compatible RESTful APIs for Amazon Bedrock", + "Transform": "AWS::LanguageExtensions", "Parameters": { "ApiKeyParam": { "Type": "String", @@ -267,12 +268,15 @@ ], "Effect": "Allow", "Resource": { - "Fn::FindInMap": [ - "ProxyRegionTable03E5BEB3", - { - "Ref": "AWS::Region" - }, - "repoArn" + "Fn::Join": [ + "", + [ + "arn:aws:ecr:", + { + "Ref": "AWS::Region" + }, + ":366590864501:repository/bedrock-proxy-api-ecs" + ] ] } }, @@ -420,7 +424,10 @@ { "Ref": "AWS::Region" }, - "model" + "model", + { + "DefaultValue": "anthropic.claude-3-sonnet-20240229-v1:0" + } ] } }, @@ -434,44 +441,9 @@ "Fn::Join": [ "", [ + "366590864501.dkr.ecr.", { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Fn::FindInMap": [ - "ProxyRegionTable03E5BEB3", - { - "Ref": "AWS::Region" - }, - "repoArn" - ] - } - ] - } - ] - }, - ".dkr.ecr.", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Fn::FindInMap": [ - "ProxyRegionTable03E5BEB3", - { - "Ref": "AWS::Region" - }, - "repoArn" - ] - } - ] - } - ] + "Ref": "AWS::Region" }, ".", { @@ -778,28 +750,16 @@ "Mappings": { "ProxyRegionTable03E5BEB3": { "us-east-1": { - "repoArn": "arn:aws:ecr:us-east-1:366590864501:repository/bedrock-proxy-api-ecs", - "model": "anthropic.claude-3-sonnet-20240229-v1:0" - }, - "us-west-2": { - "repoArn": "arn:aws:ecr:us-west-2:366590864501:repository/bedrock-proxy-api-ecs", "model": "anthropic.claude-3-sonnet-20240229-v1:0" }, "ap-southeast-1": { - "repoArn": "arn:aws:ecr:ap-southeast-1:366590864501:repository/bedrock-proxy-api-ecs", "model": "anthropic.claude-v2" }, "ap-northeast-1": { - "repoArn": "arn:aws:ecr:ap-northeast-1:366590864501:repository/bedrock-proxy-api-ecs", "model": "anthropic.claude-v2:1" }, "eu-central-1": { - "repoArn": "arn:aws:ecr:eu-central-1:366590864501:repository/bedrock-proxy-api-ecs", "model": "anthropic.claude-v2:1" - }, - "eu-west-3": { - "repoArn": "arn:aws:ecr:eu-west-3:366590864501:repository/bedrock-proxy-api-ecs", - "model": "anthropic.claude-3-sonnet-20240229-v1:0" } } },