Skip to content

Commit

Permalink
Update API model
Browse files Browse the repository at this point in the history
  • Loading branch information
@aws-sdk-swift-automation
aws-sdk-swift-automation committed Sep 11, 2024
1 parent 20b93bb commit 2563316
Show file tree
Hide file tree
Showing 6 changed files with 5,945 additions and 337 deletions.
12 changes: 6 additions & 6 deletions codegen/sdk-codegen/aws-models/bedrock-agent-runtime.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1061,10 +1061,10 @@
"type": "string",
"traits": {
"smithy.api#length": {
"min": 20,
"max": 1011
"min": 1,
"max": 2048
},
"smithy.api#pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}))$"
"smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))))|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$"
}
},
"com.amazonaws.bedrockagentruntime#ByteContentBlob": {
Expand Down Expand Up @@ -3627,14 +3627,14 @@
"knowledgeBaseId": {
"target": "com.amazonaws.bedrockagentruntime#KnowledgeBaseId",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the knowledge base that is queried and the foundation model used for generation.</p>",
"smithy.api#documentation": "<p>The unique identifier of the knowledge base that is queried.</p>",
"smithy.api#required": {}
}
},
"modelArn": {
"target": "com.amazonaws.bedrockagentruntime#BedrockModelArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the foundation model used to generate a response.</p>",
"smithy.api#documentation": "<p>The ARN of the foundation model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> used to generate a response.</p>",
"smithy.api#required": {}
}
},
Expand Down Expand Up @@ -5024,7 +5024,7 @@
}
],
"traits": {
"smithy.api#documentation": "<p>Queries a knowledge base and generates responses based on the retrieved results. The response only cites sources that are relevant to the query.</p>",
"smithy.api#documentation": "<p>Queries a knowledge base and generates responses based on the retrieved results and using the specified foundation model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a>. The response only cites sources that are relevant to the query.</p>",
"smithy.api#http": {
"code": 200,
"method": "POST",
Expand Down
8 changes: 4 additions & 4 deletions codegen/sdk-codegen/aws-models/bedrock-agent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2028,7 +2028,7 @@
"modelArn": {
"target": "com.amazonaws.bedrockagent#BedrockModelArn",
"traits": {
"smithy.api#documentation": "<p>The model's ARN.</p>",
"smithy.api#documentation": "<p>The ARN of the foundation model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a>.</p>",
"smithy.api#required": {}
}
},
Expand All @@ -2040,7 +2040,7 @@
}
},
"traits": {
"smithy.api#documentation": "<p>Settings for a foundation model used to parse documents for a data source.</p>"
"smithy.api#documentation": "<p>Settings for a foundation model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> used to parse documents for a data source.</p>"
}
},
"com.amazonaws.bedrockagent#BedrockModelArn": {
Expand All @@ -2050,7 +2050,7 @@
"min": 1,
"max": 2048
},
"smithy.api#pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})$"
"smithy.api#pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)$"
}
},
"com.amazonaws.bedrockagent#BucketOwnerAccountId": {
Expand Down Expand Up @@ -9950,7 +9950,7 @@
}
},
"traits": {
"smithy.api#documentation": "<p>Settings for parsing document contents. By default, the service converts the contents of each\n document into text before splitting it into chunks. To improve processing of PDF files with tables and images,\n you can configure the data source to convert the pages of text into images and use a model to describe the\n contents of each page.</p>\n <p>To use a model to parse PDF documents, set the parsing strategy to <code>BEDROCK_FOUNDATION_MODEL</code> and\n specify the model to use by ARN. You can also override the default parsing prompt with instructions for how\n to interpret images and tables in your documents. The following models are supported.</p>\n <ul>\n <li>\n <p>Anthropic Claude 3 Sonnet - <code>anthropic.claude-3-sonnet-20240229-v1:0</code>\n </p>\n </li>\n <li>\n <p>Anthropic Claude 3 Haiku - <code>anthropic.claude-3-haiku-20240307-v1:0</code>\n </p>\n </li>\n </ul>\n <p>You can get the ARN of a model with the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_ListFoundationModels.html\">ListFoundationModels</a> action. Standard model usage\n charges apply for the foundation model parsing strategy.</p>"
"smithy.api#documentation": "<p>Settings for parsing document contents. By default, the service converts the contents of each\n document into text before splitting it into chunks. To improve processing of PDF files with tables and images,\n you can configure the data source to convert the pages of text into images and use a model to describe the\n contents of each page.</p>\n <p>To use a model to parse PDF documents, set the parsing strategy to <code>BEDROCK_FOUNDATION_MODEL</code> and\n specify the model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> to use by ARN. You can also override the default parsing prompt with instructions for how\n to interpret images and tables in your documents. The following models are supported.</p>\n <ul>\n <li>\n <p>Anthropic Claude 3 Sonnet - <code>anthropic.claude-3-sonnet-20240229-v1:0</code>\n </p>\n </li>\n <li>\n <p>Anthropic Claude 3 Haiku - <code>anthropic.claude-3-haiku-20240307-v1:0</code>\n </p>\n </li>\n </ul>\n <p>You can get the ARN of a model with the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_ListFoundationModels.html\">ListFoundationModels</a> action. Standard model usage\n charges apply for the foundation model parsing strategy.</p>"
}
},
"com.amazonaws.bedrockagent#ParsingPrompt": {
Expand Down
48 changes: 41 additions & 7 deletions codegen/sdk-codegen/aws-models/ecr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
},
"aws.protocols#awsJson1_1": {},
"smithy.api#documentation": "<fullname>Amazon Elastic Container Registry</fullname>\n <p>Amazon Elastic Container Registry (Amazon ECR) is a managed container image registry service. Customers can use the\n familiar Docker CLI, or their preferred client, to push, pull, and manage images. Amazon ECR\n provides a secure, scalable, and reliable registry for your Docker or Open Container\n Initiative (OCI) images. Amazon ECR supports private repositories with resource-based\n permissions using IAM so that specific users or Amazon EC2 instances can access\n repositories and images.</p>\n <p>Amazon ECR has service endpoints in each supported Region. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/ecr.html\">Amazon ECR endpoints</a> in the\n <i>Amazon Web Services General Reference</i>.</p>",
"smithy.api#title": "Amazon EC2 Container Registry",
"smithy.api#title": "Amazon Elastic Container Registry",
"smithy.api#xmlNamespace": {
"uri": "http://ecr.amazonaws.com/doc/2015-09-21/"
},
Expand Down Expand Up @@ -2142,7 +2142,7 @@
"customRoleArn": {
"target": "com.amazonaws.ecr#CustomRoleArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as\n the registry that you are configuring. Amazon ECR will assume your supplied role when\n the customRoleArn is specified. When this field isn't specified, Amazon ECR will\n use the service-linked role for the repository creation template.</p>"
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as\n the registry that you are configuring. Amazon ECR will assume your supplied role when the\n customRoleArn is specified. When this field isn't specified, Amazon ECR will use the\n service-linked role for the repository creation template.</p>"
}
}
},
Expand Down Expand Up @@ -3329,7 +3329,20 @@
"outputToken": "nextToken",
"items": "repositories",
"pageSize": "maxResults"
}
},
"smithy.test#smokeTests": [
{
"id": "DescribeRepositoriesSuccess",
"params": {},
"vendorParams": {
"region": "us-west-2"
},
"vendorParamsShape": "aws.test#AwsVendorParams",
"expect": {
"success": {}
}
}
]
}
},
"com.amazonaws.ecr#DescribeRepositoriesRequest": {
Expand Down Expand Up @@ -3486,7 +3499,7 @@
"encryptionType": {
"target": "com.amazonaws.ecr#EncryptionType",
"traits": {
"smithy.api#documentation": "<p>The encryption type to use.</p>\n <p>If you use the <code>KMS</code> encryption type, the contents of the repository will\n be encrypted using server-side encryption with Key Management Service key stored in KMS. When you\n use KMS to encrypt your data, you can either use the default Amazon Web Services managed KMS key\n for Amazon ECR, or specify your own KMS key, which you already created. For more\n information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting data using server-side\n encryption with an KMS key stored in Key Management Service (SSE-KMS)</a> in the\n <i>Amazon Simple Storage Service Console Developer Guide</i>.</p>\n <p>If you use the <code>AES256</code> encryption type, Amazon ECR uses server-side encryption\n with Amazon S3-managed encryption keys which encrypts the images in the repository using an\n AES256 encryption algorithm. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html\">Protecting data using\n server-side encryption with Amazon S3-managed encryption keys (SSE-S3)</a> in the\n <i>Amazon Simple Storage Service Console Developer Guide</i>.</p>",
"smithy.api#documentation": "<p>The encryption type to use.</p>\n <p>If you use the <code>KMS</code> encryption type, the contents of the repository will\n be encrypted using server-side encryption with Key Management Service key stored in KMS. When you\n use KMS to encrypt your data, you can either use the default Amazon Web Services managed KMS key\n for Amazon ECR, or specify your own KMS key, which you already created.</p>\n <p>If you use the <code>KMS_DSSE</code> encryption type, the contents of the repository\n will be encrypted with two layers of encryption using server-side encryption with the\n KMS Management Service key stored in KMS. Similar to the KMS encryption type, you\n can either use the default Amazon Web Services managed KMS key for Amazon ECR, or specify your own KMS\n key, which you've already created. </p>\n <p>If you use the <code>AES256</code> encryption type, Amazon ECR uses server-side encryption\n with Amazon S3-managed encryption keys which encrypts the images in the repository using an\n AES256 encryption algorithm. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html\">Protecting data using\n server-side encryption with Amazon S3-managed encryption keys (SSE-S3)</a> in the\n <i>Amazon Simple Storage Service Console Developer Guide</i>.</p>",
"smithy.api#required": {}
}
},
Expand Down Expand Up @@ -3536,6 +3549,12 @@
"traits": {
"smithy.api#enumValue": "KMS"
}
},
"KMS_DSSE": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "KMS_DSSE"
}
}
}
},
Expand Down Expand Up @@ -5550,7 +5569,22 @@
"outputToken": "nextToken",
"items": "imageIds",
"pageSize": "maxResults"
}
},
"smithy.test#smokeTests": [
{
"id": "ListImagesFailure",
"params": {
"repositoryName": "not-a-real-repository"
},
"vendorParams": {
"region": "us-west-2"
},
"vendorParamsShape": "aws.test#AwsVendorParams",
"expect": {
"failure": {}
}
}
]
}
},
"com.amazonaws.ecr#ListImagesFilter": {
Expand Down Expand Up @@ -6910,7 +6944,7 @@
"customRoleArn": {
"target": "com.amazonaws.ecr#CustomRoleArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. Amazon ECR will assume your supplied role when\n the customRoleArn is specified. When this field isn't specified, Amazon ECR will\n use the service-linked role for the repository creation template.</p>"
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. Amazon ECR will assume your supplied role\n when the customRoleArn is specified. When this field isn't specified, Amazon ECR will use the\n service-linked role for the repository creation template.</p>"
}
},
"createdAt": {
Expand Down Expand Up @@ -8223,7 +8257,7 @@
"customRoleArn": {
"target": "com.amazonaws.ecr#CustomRoleArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as\n the registry that you are configuring. Amazon ECR will assume your supplied role when\n the customRoleArn is specified. When this field isn't specified, Amazon ECR will\n use the service-linked role for the repository creation template.</p>"
"smithy.api#documentation": "<p>The ARN of the role to be assumed by Amazon ECR. This role must be in the same account as\n the registry that you are configuring. Amazon ECR will assume your supplied role when the\n customRoleArn is specified. When this field isn't specified, Amazon ECR will use the\n service-linked role for the repository creation template.</p>"
}
}
},
Expand Down
Loading

0 comments on commit 2563316

Please sign in to comment.