aws-cdk-lib 2.173.3__py3-none-any.whl → 2.174.0__py3-none-any.whl

aws_cdk/aws_bedrock/__init__.py

@@ -135,7 +135,8 @@ class CfnAgent(
                                 description="description",
                                 required=False
                             )
-                        }
+                        },
+                        require_confirmation="requireConfirmation"
                     )]
                 ),
                 parent_action_group_signature="parentActionGroupSignature",
@@ -846,7 +847,8 @@ class CfnAgent(
                                     description="description",
                                     required=False
                                 )
-                            }
+                            },
+                            require_confirmation="requireConfirmation"
                         )]
                     ),
                     parent_action_group_signature="parentActionGroupSignature",
@@ -1080,6 +1082,7 @@ class CfnAgent(
             "name": "name",
             "description": "description",
             "parameters": "parameters",
+            "require_confirmation": "requireConfirmation",
         },
     )
     class FunctionProperty:
@@ -1089,6 +1092,7 @@ class CfnAgent(
             name: builtins.str,
             description: typing.Optional[builtins.str] = None,
             parameters: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Mapping[builtins.str, typing.Union[_IResolvable_da3f097b, typing.Union["CfnAgent.ParameterDetailProperty", typing.Dict[builtins.str, typing.Any]]]]]] = None,
+            require_confirmation: typing.Optional[builtins.str] = None,
         ) -> None:
             '''Defines parameters that the agent needs to invoke from the user to complete the function.
 
@@ -1105,6 +1109,7 @@ class CfnAgent(
             :param name: A name for the function.
             :param description: A description of the function and its purpose.
             :param parameters: The parameters that the agent elicits from the user to fulfill the function.
+            :param require_confirmation: Contains information if user confirmation is required to invoke the function.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-function.html
             :exampleMetadata: fixture=_generated
@@ -1128,7 +1133,8 @@ class CfnAgent(
                             description="description",
                             required=False
                         )
-                    }
+                    },
+                    require_confirmation="requireConfirmation"
                 )
             '''
             if __debug__:
@@ -1136,6 +1142,7 @@ class CfnAgent(
                 check_type(argname="argument name", value=name, expected_type=type_hints["name"])
                 check_type(argname="argument description", value=description, expected_type=type_hints["description"])
                 check_type(argname="argument parameters", value=parameters, expected_type=type_hints["parameters"])
+                check_type(argname="argument require_confirmation", value=require_confirmation, expected_type=type_hints["require_confirmation"])
             self._values: typing.Dict[builtins.str, typing.Any] = {
                 "name": name,
             }
@@ -1143,6 +1150,8 @@ class CfnAgent(
                 self._values["description"] = description
             if parameters is not None:
                 self._values["parameters"] = parameters
+            if require_confirmation is not None:
+                self._values["require_confirmation"] = require_confirmation
 
         @builtins.property
         def name(self) -> builtins.str:
@@ -1174,6 +1183,15 @@ class CfnAgent(
             result = self._values.get("parameters")
             return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Mapping[builtins.str, typing.Union[_IResolvable_da3f097b, "CfnAgent.ParameterDetailProperty"]]]], result)
 
+        @builtins.property
+        def require_confirmation(self) -> typing.Optional[builtins.str]:
+            '''Contains information if user confirmation is required to invoke the function.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-function.html#cfn-bedrock-agent-function-requireconfirmation
+            '''
+            result = self._values.get("require_confirmation")
+            return typing.cast(typing.Optional[builtins.str], result)
+
         def __eq__(self, rhs: typing.Any) -> builtins.bool:
             return isinstance(rhs, self.__class__) and rhs._values == self._values
 
@@ -1223,7 +1241,8 @@ class CfnAgent(
                                 description="description",
                                 required=False
                             )
-                        }
+                        },
+                        require_confirmation="requireConfirmation"
                     )]
                 )
             '''
@@ -2529,7 +2548,8 @@ class CfnAgentProps:
                                     description="description",
                                     required=False
                                 )
-                            }
+                            },
+                            require_confirmation="requireConfirmation"
                         )]
                     ),
                     parent_action_group_signature="parentActionGroupSignature",
@@ -3462,10 +3482,14 @@ class CfnDataSource(
                     parsing_strategy="parsingStrategy",
         
                     # the properties below are optional
+                    bedrock_data_automation_configuration=bedrock.CfnDataSource.BedrockDataAutomationConfigurationProperty(
+                        parsing_modality="parsingModality"
+                    ),
                     bedrock_foundation_model_configuration=bedrock.CfnDataSource.BedrockFoundationModelConfigurationProperty(
                         model_arn="modelArn",
         
                         # the properties below are optional
+                        parsing_modality="parsingModality",
                         parsing_prompt=bedrock.CfnDataSource.ParsingPromptProperty(
                             parsing_prompt_text="parsingPromptText"
                         )
@@ -3704,21 +3728,82 @@ class CfnDataSource(
             check_type(argname="argument value", value=value, expected_type=type_hints["value"])
         jsii.set(self, "vectorIngestionConfiguration", value) # pyright: ignore[reportArgumentType]
 
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnDataSource.BedrockDataAutomationConfigurationProperty",
+        jsii_struct_bases=[],
+        name_mapping={"parsing_modality": "parsingModality"},
+    )
+    class BedrockDataAutomationConfigurationProperty:
+        def __init__(
+            self,
+            *,
+            parsing_modality: typing.Optional[builtins.str] = None,
+        ) -> None:
+            '''Contains configurations for using Amazon Bedrock Data Automation as the parser for ingesting your data sources.
+
+            :param parsing_modality: Specifies whether to enable parsing of multimodal data, including both text and/or images.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-bedrockdataautomationconfiguration.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                bedrock_data_automation_configuration_property = bedrock.CfnDataSource.BedrockDataAutomationConfigurationProperty(
+                    parsing_modality="parsingModality"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__d1c9cf855ebecb64cb9a92684072efa631cc07e2bded88aa0e8cfa6319f97834)
+                check_type(argname="argument parsing_modality", value=parsing_modality, expected_type=type_hints["parsing_modality"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {}
+            if parsing_modality is not None:
+                self._values["parsing_modality"] = parsing_modality
+
+        @builtins.property
+        def parsing_modality(self) -> typing.Optional[builtins.str]:
+            '''Specifies whether to enable parsing of multimodal data, including both text and/or images.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-bedrockdataautomationconfiguration.html#cfn-bedrock-datasource-bedrockdataautomationconfiguration-parsingmodality
+            '''
+            result = self._values.get("parsing_modality")
+            return typing.cast(typing.Optional[builtins.str], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "BedrockDataAutomationConfigurationProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
     @jsii.data_type(
         jsii_type="aws-cdk-lib.aws_bedrock.CfnDataSource.BedrockFoundationModelConfigurationProperty",
         jsii_struct_bases=[],
-        name_mapping={"model_arn": "modelArn", "parsing_prompt": "parsingPrompt"},
+        name_mapping={
+            "model_arn": "modelArn",
+            "parsing_modality": "parsingModality",
+            "parsing_prompt": "parsingPrompt",
+        },
     )
     class BedrockFoundationModelConfigurationProperty:
         def __init__(
             self,
             *,
             model_arn: builtins.str,
+            parsing_modality: typing.Optional[builtins.str] = None,
             parsing_prompt: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnDataSource.ParsingPromptProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
         ) -> None:
             '''Settings for a foundation model or `inference profile <https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html>`_ used to parse documents for a data source.
 
-            :param model_arn: The ARN of the foundation model or `inference profile <https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html>`_ .
+            :param model_arn: The ARN of the foundation model or `inference profile <https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html>`_ to use for parsing.
+            :param parsing_modality: Specifies whether to enable parsing of multimodal data, including both text and/or images.
             :param parsing_prompt: Instructions for interpreting the contents of a document.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-bedrockfoundationmodelconfiguration.html
@@ -3734,6 +3819,7 @@ class CfnDataSource(
                     model_arn="modelArn",
                 
                     # the properties below are optional
+                    parsing_modality="parsingModality",
                     parsing_prompt=bedrock.CfnDataSource.ParsingPromptProperty(
                         parsing_prompt_text="parsingPromptText"
                     )
@@ -3742,16 +3828,19 @@ class CfnDataSource(
             if __debug__:
                 type_hints = typing.get_type_hints(_typecheckingstub__1988b824c4171f598d30cf03abdb56bc617fd654dd3daf3e641d11499c0e04ac)
                 check_type(argname="argument model_arn", value=model_arn, expected_type=type_hints["model_arn"])
+                check_type(argname="argument parsing_modality", value=parsing_modality, expected_type=type_hints["parsing_modality"])
                 check_type(argname="argument parsing_prompt", value=parsing_prompt, expected_type=type_hints["parsing_prompt"])
             self._values: typing.Dict[builtins.str, typing.Any] = {
                 "model_arn": model_arn,
             }
+            if parsing_modality is not None:
+                self._values["parsing_modality"] = parsing_modality
             if parsing_prompt is not None:
                 self._values["parsing_prompt"] = parsing_prompt
 
         @builtins.property
         def model_arn(self) -> builtins.str:
-            '''The ARN of the foundation model or `inference profile <https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html>`_ .
+            '''The ARN of the foundation model or `inference profile <https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html>`_ to use for parsing.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-bedrockfoundationmodelconfiguration.html#cfn-bedrock-datasource-bedrockfoundationmodelconfiguration-modelarn
             '''
@@ -3759,6 +3848,15 @@ class CfnDataSource(
             assert result is not None, "Required property 'model_arn' is missing"
             return typing.cast(builtins.str, result)
 
+        @builtins.property
+        def parsing_modality(self) -> typing.Optional[builtins.str]:
+            '''Specifies whether to enable parsing of multimodal data, including both text and/or images.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-bedrockfoundationmodelconfiguration.html#cfn-bedrock-datasource-bedrockfoundationmodelconfiguration-parsingmodality
+            '''
+            result = self._values.get("parsing_modality")
+            return typing.cast(typing.Optional[builtins.str], result)
+
         @builtins.property
         def parsing_prompt(
             self,
@@ -4929,6 +5027,7 @@ class CfnDataSource(
         jsii_struct_bases=[],
         name_mapping={
             "parsing_strategy": "parsingStrategy",
+            "bedrock_data_automation_configuration": "bedrockDataAutomationConfiguration",
             "bedrock_foundation_model_configuration": "bedrockFoundationModelConfiguration",
         },
     )
@@ -4937,21 +5036,19 @@ class CfnDataSource(
             self,
             *,
             parsing_strategy: builtins.str,
+            bedrock_data_automation_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnDataSource.BedrockDataAutomationConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
             bedrock_foundation_model_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnDataSource.BedrockFoundationModelConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
         ) -> None:
             '''Settings for parsing document contents.
 
-            By default, the service converts the contents of each document into text before splitting it into chunks. To improve processing of PDF files with tables and images, you can configure the data source to convert the pages of text into images and use a model to describe the contents of each page.
-
-            To use a model to parse PDF documents, set the parsing strategy to ``BEDROCK_FOUNDATION_MODEL`` and specify the model or `inference profile <https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html>`_ to use by ARN. You can also override the default parsing prompt with instructions for how to interpret images and tables in your documents. The following models are supported.
-
-            - Anthropic Claude 3 Sonnet - ``anthropic.claude-3-sonnet-20240229-v1:0``
-            - Anthropic Claude 3 Haiku - ``anthropic.claude-3-haiku-20240307-v1:0``
+            If you exclude this field, the default parser converts the contents of each document into text before splitting it into chunks. Specify the parsing strategy to use in the ``parsingStrategy`` field and include the relevant configuration, or omit it to use the Amazon Bedrock default parser. For more information, see `Parsing options for your data source <https://docs.aws.amazon.com/bedrock/latest/userguide/kb-advanced-parsing.html>`_ .
+            .. epigraph::
 
-            You can get the ARN of a model with the `ListFoundationModels <https://docs.aws.amazon.com/bedrock/latest/APIReference/API_ListFoundationModels.html>`_ action. Standard model usage charges apply for the foundation model parsing strategy.
+               If you specify ``BEDROCK_DATA_AUTOMATION`` or ``BEDROCK_FOUNDATION_MODEL`` and it fails to parse a file, the Amazon Bedrock default parser will be used instead.
 
             :param parsing_strategy: The parsing strategy for the data source.
-            :param bedrock_foundation_model_configuration: Settings for a foundation model used to parse documents for a data source.
+            :param bedrock_data_automation_configuration: If you specify ``BEDROCK_DATA_AUTOMATION`` as the parsing strategy for ingesting your data source, use this object to modify configurations for using the Amazon Bedrock Data Automation parser.
+            :param bedrock_foundation_model_configuration: If you specify ``BEDROCK_FOUNDATION_MODEL`` as the parsing strategy for ingesting your data source, use this object to modify configurations for using a foundation model to parse documents.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-parsingconfiguration.html
             :exampleMetadata: fixture=_generated
@@ -4966,10 +5063,14 @@ class CfnDataSource(
                     parsing_strategy="parsingStrategy",
                 
                     # the properties below are optional
+                    bedrock_data_automation_configuration=bedrock.CfnDataSource.BedrockDataAutomationConfigurationProperty(
+                        parsing_modality="parsingModality"
+                    ),
                     bedrock_foundation_model_configuration=bedrock.CfnDataSource.BedrockFoundationModelConfigurationProperty(
                         model_arn="modelArn",
                 
                         # the properties below are optional
+                        parsing_modality="parsingModality",
                         parsing_prompt=bedrock.CfnDataSource.ParsingPromptProperty(
                             parsing_prompt_text="parsingPromptText"
                         )
@@ -4979,10 +5080,13 @@ class CfnDataSource(
             if __debug__:
                 type_hints = typing.get_type_hints(_typecheckingstub__26a14ade018e836fe8686ec2de5e50a05435a92d8d540814f0759c1bb3893ef0)
                 check_type(argname="argument parsing_strategy", value=parsing_strategy, expected_type=type_hints["parsing_strategy"])
+                check_type(argname="argument bedrock_data_automation_configuration", value=bedrock_data_automation_configuration, expected_type=type_hints["bedrock_data_automation_configuration"])
                 check_type(argname="argument bedrock_foundation_model_configuration", value=bedrock_foundation_model_configuration, expected_type=type_hints["bedrock_foundation_model_configuration"])
             self._values: typing.Dict[builtins.str, typing.Any] = {
                 "parsing_strategy": parsing_strategy,
             }
+            if bedrock_data_automation_configuration is not None:
+                self._values["bedrock_data_automation_configuration"] = bedrock_data_automation_configuration
             if bedrock_foundation_model_configuration is not None:
                 self._values["bedrock_foundation_model_configuration"] = bedrock_foundation_model_configuration
 
@@ -4996,11 +5100,22 @@ class CfnDataSource(
             assert result is not None, "Required property 'parsing_strategy' is missing"
             return typing.cast(builtins.str, result)
 
+        @builtins.property
+        def bedrock_data_automation_configuration(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnDataSource.BedrockDataAutomationConfigurationProperty"]]:
+            '''If you specify ``BEDROCK_DATA_AUTOMATION`` as the parsing strategy for ingesting your data source, use this object to modify configurations for using the Amazon Bedrock Data Automation parser.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-parsingconfiguration.html#cfn-bedrock-datasource-parsingconfiguration-bedrockdataautomationconfiguration
+            '''
+            result = self._values.get("bedrock_data_automation_configuration")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnDataSource.BedrockDataAutomationConfigurationProperty"]], result)
+
         @builtins.property
         def bedrock_foundation_model_configuration(
             self,
         ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnDataSource.BedrockFoundationModelConfigurationProperty"]]:
-            '''Settings for a foundation model used to parse documents for a data source.
+            '''If you specify ``BEDROCK_FOUNDATION_MODEL`` as the parsing strategy for ingesting your data source, use this object to modify configurations for using a foundation model to parse documents.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-parsingconfiguration.html#cfn-bedrock-datasource-parsingconfiguration-bedrockfoundationmodelconfiguration
             '''
@@ -5335,9 +5450,9 @@ class CfnDataSource(
     )
     class S3LocationProperty:
         def __init__(self, *, uri: builtins.str) -> None:
-            '''An Amazon S3 location.
+            '''A storage location in an S3 bucket.
 
-            :param uri: The location's URI. For example, ``s3://my-bucket/chunk-processor/`` .
+            :param uri: An object URI starting with ``s3://`` .
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3location.html
             :exampleMetadata: fixture=_generated
@@ -5361,9 +5476,7 @@ class CfnDataSource(
 
         @builtins.property
         def uri(self) -> builtins.str:
-            '''The location's URI.
-
-            For example, ``s3://my-bucket/chunk-processor/`` .
+            '''An object URI starting with ``s3://`` .
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3location.html#cfn-bedrock-datasource-s3location-uri
             '''
@@ -6455,7 +6568,7 @@ class CfnDataSource(
 
             :param chunking_configuration: Details about how to chunk the documents in the data source. A *chunk* refers to an excerpt from a data source that is returned when the knowledge base that it belongs to is queried.
             :param custom_transformation_configuration: A custom document transformer for parsed data source documents.
-            :param parsing_configuration: A custom parser for data source documents.
+            :param parsing_configuration: Configurations for a parser to use for parsing documents in your data source. If you exclude this field, the default parser will be used.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-vectoringestionconfiguration.html
             :exampleMetadata: fixture=_generated
@@ -6506,10 +6619,14 @@ class CfnDataSource(
                         parsing_strategy="parsingStrategy",
                 
                         # the properties below are optional
+                        bedrock_data_automation_configuration=bedrock.CfnDataSource.BedrockDataAutomationConfigurationProperty(
+                            parsing_modality="parsingModality"
+                        ),
                         bedrock_foundation_model_configuration=bedrock.CfnDataSource.BedrockFoundationModelConfigurationProperty(
                             model_arn="modelArn",
                 
                             # the properties below are optional
+                            parsing_modality="parsingModality",
                             parsing_prompt=bedrock.CfnDataSource.ParsingPromptProperty(
                                 parsing_prompt_text="parsingPromptText"
                             )
@@ -6558,7 +6675,9 @@ class CfnDataSource(
         def parsing_configuration(
             self,
         ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnDataSource.ParsingConfigurationProperty"]]:
-            '''A custom parser for data source documents.
+            '''Configurations for a parser to use for parsing documents in your data source.
+
+            If you exclude this field, the default parser will be used.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-vectoringestionconfiguration.html#cfn-bedrock-datasource-vectoringestionconfiguration-parsingconfiguration
             '''
@@ -7110,10 +7229,14 @@ class CfnDataSourceProps:
                         parsing_strategy="parsingStrategy",
             
                         # the properties below are optional
+                        bedrock_data_automation_configuration=bedrock.CfnDataSource.BedrockDataAutomationConfigurationProperty(
+                            parsing_modality="parsingModality"
+                        ),
                         bedrock_foundation_model_configuration=bedrock.CfnDataSource.BedrockFoundationModelConfigurationProperty(
                             model_arn="modelArn",
             
                             # the properties below are optional
+                            parsing_modality="parsingModality",
                             parsing_prompt=bedrock.CfnDataSource.ParsingPromptProperty(
                                 parsing_prompt_text="parsingPromptText"
                             )
@@ -15448,7 +15571,7 @@ class CfnGuardrail(
             '''The PII entity to configure for the guardrail.
 
             :param action: Configure guardrail action when the PII entity is detected.
-            :param type: Configure guardrail type when the PII entity is detected. The following PIIs are used to block or mask sensitive information: - *General* - *ADDRESS* A physical address, such as "100 Main Street, Anytown, USA" or "Suite #12, Building 123". An address can include information such as the street, building, location, city, state, country, county, zip code, precinct, and neighborhood. - *AGE* An individual's age, including the quantity and unit of time. For example, in the phrase "I am 40 years old," Guarrails recognizes "40 years" as an age. - *NAME* An individual's name. This entity type does not include titles, such as Dr., Mr., Mrs., or Miss. guardrails doesn't apply this entity type to names that are part of organizations or addresses. For example, guardrails recognizes the "John Doe Organization" as an organization, and it recognizes "Jane Doe Street" as an address. - *EMAIL* An email address, such as *marymajor@email.com* . - *PHONE* A phone number. This entity type also includes fax and pager numbers. - *USERNAME* A user name that identifies an account, such as a login name, screen name, nick name, or handle. - *PASSWORD* An alphanumeric string that is used as a password, such as "* *very20special#pass** ". - *DRIVER_ID* The number assigned to a driver's license, which is an official document permitting an individual to operate one or more motorized vehicles on a public road. A driver's license number consists of alphanumeric characters. - *LICENSE_PLATE* A license plate for a vehicle is issued by the state or country where the vehicle is registered. The format for passenger vehicles is typically five to eight digits, consisting of upper-case letters and numbers. The format varies depending on the location of the issuing state or country. - *VEHICLE_IDENTIFICATION_NUMBER* A Vehicle Identification Number (VIN) uniquely identifies a vehicle. VIN content and format are defined in the *ISO 3779* specification. Each country has specific codes and formats for VINs. - *Finance* - *REDIT_DEBIT_CARD_CVV* A three-digit card verification code (CVV) that is present on VISA, MasterCard, and Discover credit and debit cards. For American Express credit or debit cards, the CVV is a four-digit numeric code. - *CREDIT_DEBIT_CARD_EXPIRY* The expiration date for a credit or debit card. This number is usually four digits long and is often formatted as *month/year* or *MM/YY* . Guardrails recognizes expiration dates such as *01/21* , *01/2021* , and *Jan 2021* . - *CREDIT_DEBIT_CARD_NUMBER* The number for a credit or debit card. These numbers can vary from 13 to 16 digits in length. However, Amazon Comprehend also recognizes credit or debit card numbers when only the last four digits are present. - *PIN* A four-digit personal identification number (PIN) with which you can access your bank account. - *INTERNATIONAL_BANK_ACCOUNT_NUMBER* An International Bank Account Number has specific formats in each country. For more information, see `www.iban.com/structure <https://docs.aws.amazon.com/https://www.iban.com/structure>`_ . - *SWIFT_CODE* A SWIFT code is a standard format of Bank Identifier Code (BIC) used to specify a particular bank or branch. Banks use these codes for money transfers such as international wire transfers. SWIFT codes consist of eight or 11 characters. The 11-digit codes refer to specific branches, while eight-digit codes (or 11-digit codes ending in 'XXX') refer to the head or primary office. - *IT* - *IP_ADDRESS* An IPv4 address, such as *198.51.100.0* . - *MAC_ADDRESS* A *media access control* (MAC) address is a unique identifier assigned to a network interface controller (NIC). - *URL* A web address, such as *www.example.com* . - *AWS_ACCESS_KEY* A unique identifier that's associated with a secret access key; you use the access key ID and secret access key to sign programmatic AWS requests cryptographically. - *AWS_SECRET_KEY* A unique identifier that's associated with an access key. You use the access key ID and secret access key to sign programmatic AWS requests cryptographically. - *USA specific* - *US_BANK_ACCOUNT_NUMBER* A US bank account number, which is typically 10 to 12 digits long. - *US_BANK_ROUTING_NUMBER* A US bank account routing number. These are typically nine digits long, - *US_INDIVIDUAL_TAX_IDENTIFICATION_NUMBER* A US Individual Taxpayer Identification Number (ITIN) is a nine-digit number that starts with a "9" and contain a "7" or "8" as the fourth digit. An ITIN can be formatted with a space or a dash after the third and forth digits. - *US_PASSPORT_NUMBER* A US passport number. Passport numbers range from six to nine alphanumeric characters. - *US_SOCIAL_SECURITY_NUMBER* A US Social Security Number (SSN) is a nine-digit number that is issued to US citizens, permanent residents, and temporary working residents. - *Canada specific* - *CA_HEALTH_NUMBER* A Canadian Health Service Number is a 10-digit unique identifier, required for individuals to access healthcare benefits. - *CA_SOCIAL_INSURANCE_NUMBER* A Canadian Social Insurance Number (SIN) is a nine-digit unique identifier, required for individuals to access government programs and benefits. The SIN is formatted as three groups of three digits, such as *123-456-789* . A SIN can be validated through a simple check-digit process called the `Luhn algorithm <https://docs.aws.amazon.com/https://www.wikipedia.org/wiki/Luhn_algorithm>`_ . - *UK Specific* - *UK_NATIONAL_HEALTH_SERVICE_NUMBER* A UK National Health Service Number is a 10-17 digit number, such as *485 777 3456* . The current system formats the 10-digit number with spaces after the third and sixth digits. The final digit is an error-detecting checksum. - *UK_NATIONAL_INSURANCE_NUMBER* A UK National Insurance Number (NINO) provides individuals with access to National Insurance (social security) benefits. It is also used for some purposes in the UK tax system. The number is nine digits long and starts with two letters, followed by six numbers and one letter. A NINO can be formatted with a space or a dash after the two letters and after the second, forth, and sixth digits. - *UK_UNIQUE_TAXPAYER_REFERENCE_NUMBER* A UK Unique Taxpayer Reference (UTR) is a 10-digit number that identifies a taxpayer or a business. - *Custom* - *Regex filter* - You can use a regular expressions to define patterns for a guardrail to recognize and act upon such as serial number, booking ID etc..
+            :param type: Configure guardrail type when the PII entity is detected. The following PIIs are used to block or mask sensitive information: - *General* - *ADDRESS* A physical address, such as "100 Main Street, Anytown, USA" or "Suite #12, Building 123". An address can include information such as the street, building, location, city, state, country, county, zip code, precinct, and neighborhood. - *AGE* An individual's age, including the quantity and unit of time. For example, in the phrase "I am 40 years old," Guardrails recognizes "40 years" as an age. - *NAME* An individual's name. This entity type does not include titles, such as Dr., Mr., Mrs., or Miss. guardrails doesn't apply this entity type to names that are part of organizations or addresses. For example, guardrails recognizes the "John Doe Organization" as an organization, and it recognizes "Jane Doe Street" as an address. - *EMAIL* An email address, such as *marymajor@email.com* . - *PHONE* A phone number. This entity type also includes fax and pager numbers. - *USERNAME* A user name that identifies an account, such as a login name, screen name, nick name, or handle. - *PASSWORD* An alphanumeric string that is used as a password, such as "* *very20special#pass** ". - *DRIVER_ID* The number assigned to a driver's license, which is an official document permitting an individual to operate one or more motorized vehicles on a public road. A driver's license number consists of alphanumeric characters. - *LICENSE_PLATE* A license plate for a vehicle is issued by the state or country where the vehicle is registered. The format for passenger vehicles is typically five to eight digits, consisting of upper-case letters and numbers. The format varies depending on the location of the issuing state or country. - *VEHICLE_IDENTIFICATION_NUMBER* A Vehicle Identification Number (VIN) uniquely identifies a vehicle. VIN content and format are defined in the *ISO 3779* specification. Each country has specific codes and formats for VINs. - *Finance* - *CREDIT_DEBIT_CARD_CVV* A three-digit card verification code (CVV) that is present on VISA, MasterCard, and Discover credit and debit cards. For American Express credit or debit cards, the CVV is a four-digit numeric code. - *CREDIT_DEBIT_CARD_EXPIRY* The expiration date for a credit or debit card. This number is usually four digits long and is often formatted as *month/year* or *MM/YY* . Guardrails recognizes expiration dates such as *01/21* , *01/2021* , and *Jan 2021* . - *CREDIT_DEBIT_CARD_NUMBER* The number for a credit or debit card. These numbers can vary from 13 to 16 digits in length. However, Amazon Comprehend also recognizes credit or debit card numbers when only the last four digits are present. - *PIN* A four-digit personal identification number (PIN) with which you can access your bank account. - *INTERNATIONAL_BANK_ACCOUNT_NUMBER* An International Bank Account Number has specific formats in each country. For more information, see `www.iban.com/structure <https://docs.aws.amazon.com/https://www.iban.com/structure>`_ . - *SWIFT_CODE* A SWIFT code is a standard format of Bank Identifier Code (BIC) used to specify a particular bank or branch. Banks use these codes for money transfers such as international wire transfers. SWIFT codes consist of eight or 11 characters. The 11-digit codes refer to specific branches, while eight-digit codes (or 11-digit codes ending in 'XXX') refer to the head or primary office. - *IT* - *IP_ADDRESS* An IPv4 address, such as *198.51.100.0* . - *MAC_ADDRESS* A *media access control* (MAC) address is a unique identifier assigned to a network interface controller (NIC). - *URL* A web address, such as *www.example.com* . - *AWS_ACCESS_KEY* A unique identifier that's associated with a secret access key; you use the access key ID and secret access key to sign programmatic AWS requests cryptographically. - *AWS_SECRET_KEY* A unique identifier that's associated with an access key. You use the access key ID and secret access key to sign programmatic AWS requests cryptographically. - *USA specific* - *US_BANK_ACCOUNT_NUMBER* A US bank account number, which is typically 10 to 12 digits long. - *US_BANK_ROUTING_NUMBER* A US bank account routing number. These are typically nine digits long, - *US_INDIVIDUAL_TAX_IDENTIFICATION_NUMBER* A US Individual Taxpayer Identification Number (ITIN) is a nine-digit number that starts with a "9" and contain a "7" or "8" as the fourth digit. An ITIN can be formatted with a space or a dash after the third and forth digits. - *US_PASSPORT_NUMBER* A US passport number. Passport numbers range from six to nine alphanumeric characters. - *US_SOCIAL_SECURITY_NUMBER* A US Social Security Number (SSN) is a nine-digit number that is issued to US citizens, permanent residents, and temporary working residents. - *Canada specific* - *CA_HEALTH_NUMBER* A Canadian Health Service Number is a 10-digit unique identifier, required for individuals to access healthcare benefits. - *CA_SOCIAL_INSURANCE_NUMBER* A Canadian Social Insurance Number (SIN) is a nine-digit unique identifier, required for individuals to access government programs and benefits. The SIN is formatted as three groups of three digits, such as *123-456-789* . A SIN can be validated through a simple check-digit process called the `Luhn algorithm <https://docs.aws.amazon.com/https://www.wikipedia.org/wiki/Luhn_algorithm>`_ . - *UK Specific* - *UK_NATIONAL_HEALTH_SERVICE_NUMBER* A UK National Health Service Number is a 10-17 digit number, such as *485 777 3456* . The current system formats the 10-digit number with spaces after the third and sixth digits. The final digit is an error-detecting checksum. - *UK_NATIONAL_INSURANCE_NUMBER* A UK National Insurance Number (NINO) provides individuals with access to National Insurance (social security) benefits. It is also used for some purposes in the UK tax system. The number is nine digits long and starts with two letters, followed by six numbers and one letter. A NINO can be formatted with a space or a dash after the two letters and after the second, forth, and sixth digits. - *UK_UNIQUE_TAXPAYER_REFERENCE_NUMBER* A UK Unique Taxpayer Reference (UTR) is a 10-digit number that identifies a taxpayer or a business. - *Custom* - *Regex filter* - You can use a regular expressions to define patterns for a guardrail to recognize and act upon such as serial number, booking ID etc..
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-guardrail-piientityconfig.html
             :exampleMetadata: fixture=_generated
@@ -15496,7 +15619,7 @@ class CfnGuardrail(
 
             - *AGE*
 
-            An individual's age, including the quantity and unit of time. For example, in the phrase "I am 40 years old," Guarrails recognizes "40 years" as an age.
+            An individual's age, including the quantity and unit of time. For example, in the phrase "I am 40 years old," Guardrails recognizes "40 years" as an age.
 
             - *NAME*
 
@@ -15531,7 +15654,7 @@ class CfnGuardrail(
             A Vehicle Identification Number (VIN) uniquely identifies a vehicle. VIN content and format are defined in the *ISO 3779* specification. Each country has specific codes and formats for VINs.
 
             - *Finance*
-            - *REDIT_DEBIT_CARD_CVV*
+            - *CREDIT_DEBIT_CARD_CVV*
 
             A three-digit card verification code (CVV) that is present on VISA, MasterCard, and Discover credit and debit cards. For American Express credit or debit cards, the CVV is a four-digit numeric code.
 
@@ -16677,6 +16800,11 @@ class CfnKnowledgeBase(
         cfn_knowledge_base = bedrock.CfnKnowledgeBase(self, "MyCfnKnowledgeBase",
             knowledge_base_configuration=bedrock.CfnKnowledgeBase.KnowledgeBaseConfigurationProperty(
                 type="type",
+        
+                # the properties below are optional
+                kendra_knowledge_base_configuration=bedrock.CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty(
+                    kendra_index_arn="kendraIndexArn"
+                ),
                 vector_knowledge_base_configuration=bedrock.CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty(
                     embedding_model_arn="embeddingModelArn",
         
@@ -16685,11 +16813,24 @@ class CfnKnowledgeBase(
                         bedrock_embedding_model_configuration=bedrock.CfnKnowledgeBase.BedrockEmbeddingModelConfigurationProperty(
                             dimensions=123
                         )
+                    ),
+                    supplemental_data_storage_configuration=bedrock.CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty(
+                        supplemental_data_storage_locations=[bedrock.CfnKnowledgeBase.SupplementalDataStorageLocationProperty(
+                            supplemental_data_storage_location_type="supplementalDataStorageLocationType",
+        
+                            # the properties below are optional
+                            s3_location=bedrock.CfnKnowledgeBase.S3LocationProperty(
+                                uri="uri"
+                            )
+                        )]
                     )
                 )
             ),
             name="name",
             role_arn="roleArn",
+        
+            # the properties below are optional
+            description="description",
             storage_configuration=bedrock.CfnKnowledgeBase.StorageConfigurationProperty(
                 type="type",
         
@@ -16727,9 +16868,6 @@ class CfnKnowledgeBase(
                     table_name="tableName"
                 )
             ),
-        
-            # the properties below are optional
-            description="description",
             tags={
                 "tags_key": "tags"
             }
@@ -16744,8 +16882,8 @@ class CfnKnowledgeBase(
         knowledge_base_configuration: typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.KnowledgeBaseConfigurationProperty", typing.Dict[builtins.str, typing.Any]]],
         name: builtins.str,
         role_arn: builtins.str,
-        storage_configuration: typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.StorageConfigurationProperty", typing.Dict[builtins.str, typing.Any]]],
         description: typing.Optional[builtins.str] = None,
+        storage_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.StorageConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
         tags: typing.Optional[typing.Mapping[builtins.str, builtins.str]] = None,
     ) -> None:
         '''
@@ -16754,8 +16892,8 @@ class CfnKnowledgeBase(
         :param knowledge_base_configuration: Contains details about the embeddings configuration of the knowledge base.
         :param name: The name of the knowledge base.
         :param role_arn: The Amazon Resource Name (ARN) of the IAM role with permissions to invoke API operations on the knowledge base.
-        :param storage_configuration: Contains details about the storage configuration of the knowledge base.
         :param description: The description of the knowledge base associated with the inline agent.
+        :param storage_configuration: Contains details about the storage configuration of the knowledge base.
         :param tags: Metadata that you can assign to a resource as key-value pairs. For more information, see the following resources:. - `Tag naming limits and requirements <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-conventions>`_ - `Tagging best practices <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-best-practices>`_
         '''
         if __debug__:
@@ -16766,8 +16904,8 @@ class CfnKnowledgeBase(
             knowledge_base_configuration=knowledge_base_configuration,
             name=name,
             role_arn=role_arn,
-            storage_configuration=storage_configuration,
             description=description,
+            storage_configuration=storage_configuration,
             tags=tags,
         )
 
@@ -16912,37 +17050,37 @@ class CfnKnowledgeBase(
             check_type(argname="argument value", value=value, expected_type=type_hints["value"])
         jsii.set(self, "roleArn", value) # pyright: ignore[reportArgumentType]
 
+    @builtins.property
+    @jsii.member(jsii_name="description")
+    def description(self) -> typing.Optional[builtins.str]:
+        '''The description of the knowledge base associated with the inline agent.'''
+        return typing.cast(typing.Optional[builtins.str], jsii.get(self, "description"))
+
+    @description.setter
+    def description(self, value: typing.Optional[builtins.str]) -> None:
+        if __debug__:
+            type_hints = typing.get_type_hints(_typecheckingstub__f9fef7f262d2bad58c7f37c90b8756dd028b772a93aa036a4caf0c9565a7fff1)
+            check_type(argname="argument value", value=value, expected_type=type_hints["value"])
+        jsii.set(self, "description", value) # pyright: ignore[reportArgumentType]
+
     @builtins.property
     @jsii.member(jsii_name="storageConfiguration")
     def storage_configuration(
         self,
-    ) -> typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.StorageConfigurationProperty"]:
+    ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.StorageConfigurationProperty"]]:
         '''Contains details about the storage configuration of the knowledge base.'''
-        return typing.cast(typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.StorageConfigurationProperty"], jsii.get(self, "storageConfiguration"))
+        return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.StorageConfigurationProperty"]], jsii.get(self, "storageConfiguration"))
 
     @storage_configuration.setter
     def storage_configuration(
         self,
-        value: typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.StorageConfigurationProperty"],
+        value: typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.StorageConfigurationProperty"]],
     ) -> None:
         if __debug__:
             type_hints = typing.get_type_hints(_typecheckingstub__9c3409dc5fcb9799e2f638dda4e66d2391cf6984b3e10eb29b36e85981cfc59b)
             check_type(argname="argument value", value=value, expected_type=type_hints["value"])
         jsii.set(self, "storageConfiguration", value) # pyright: ignore[reportArgumentType]
 
-    @builtins.property
-    @jsii.member(jsii_name="description")
-    def description(self) -> typing.Optional[builtins.str]:
-        '''The description of the knowledge base associated with the inline agent.'''
-        return typing.cast(typing.Optional[builtins.str], jsii.get(self, "description"))
-
-    @description.setter
-    def description(self, value: typing.Optional[builtins.str]) -> None:
-        if __debug__:
-            type_hints = typing.get_type_hints(_typecheckingstub__f9fef7f262d2bad58c7f37c90b8756dd028b772a93aa036a4caf0c9565a7fff1)
-            check_type(argname="argument value", value=value, expected_type=type_hints["value"])
-        jsii.set(self, "description", value) # pyright: ignore[reportArgumentType]
-
     @builtins.property
     @jsii.member(jsii_name="tags")
     def tags(self) -> typing.Optional[typing.Mapping[builtins.str, builtins.str]]:
@@ -17074,11 +17212,64 @@ class CfnKnowledgeBase(
                 k + "=" + repr(v) for k, v in self._values.items()
             )
 
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty",
+        jsii_struct_bases=[],
+        name_mapping={"kendra_index_arn": "kendraIndexArn"},
+    )
+    class KendraKnowledgeBaseConfigurationProperty:
+        def __init__(self, *, kendra_index_arn: builtins.str) -> None:
+            '''Settings for an Amazon Kendra knowledge base.
+
+            :param kendra_index_arn: The ARN of the Amazon Kendra index.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-kendraknowledgebaseconfiguration.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                kendra_knowledge_base_configuration_property = bedrock.CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty(
+                    kendra_index_arn="kendraIndexArn"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__f49108183c657ffec5628bb187155a62b4da5dfc81f77718084a35d0e1296bfd)
+                check_type(argname="argument kendra_index_arn", value=kendra_index_arn, expected_type=type_hints["kendra_index_arn"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "kendra_index_arn": kendra_index_arn,
+            }
+
+        @builtins.property
+        def kendra_index_arn(self) -> builtins.str:
+            '''The ARN of the Amazon Kendra index.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-kendraknowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-kendraknowledgebaseconfiguration-kendraindexarn
+            '''
+            result = self._values.get("kendra_index_arn")
+            assert result is not None, "Required property 'kendra_index_arn' is missing"
+            return typing.cast(builtins.str, result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "KendraKnowledgeBaseConfigurationProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
     @jsii.data_type(
         jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBase.KnowledgeBaseConfigurationProperty",
         jsii_struct_bases=[],
         name_mapping={
             "type": "type",
+            "kendra_knowledge_base_configuration": "kendraKnowledgeBaseConfiguration",
             "vector_knowledge_base_configuration": "vectorKnowledgeBaseConfiguration",
         },
     )
@@ -17087,13 +17278,15 @@ class CfnKnowledgeBase(
             self,
             *,
             type: builtins.str,
-            vector_knowledge_base_configuration: typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty", typing.Dict[builtins.str, typing.Any]]],
+            kendra_knowledge_base_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
+            vector_knowledge_base_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
         ) -> None:
             '''Configurations to apply to a knowledge base attached to the agent during query.
 
             For more information, see `Knowledge base retrieval configurations <https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html#session-state-kb>`_ .
 
             :param type: The type of data that the data source is converted into for the knowledge base.
+            :param kendra_knowledge_base_configuration: Settings for an Amazon Kendra knowledge base.
             :param vector_knowledge_base_configuration: Contains details about the model that's used to convert the data source into vector embeddings.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-knowledgebaseconfiguration.html
@@ -17107,6 +17300,11 @@ class CfnKnowledgeBase(
                 
                 knowledge_base_configuration_property = bedrock.CfnKnowledgeBase.KnowledgeBaseConfigurationProperty(
                     type="type",
+                
+                    # the properties below are optional
+                    kendra_knowledge_base_configuration=bedrock.CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty(
+                        kendra_index_arn="kendraIndexArn"
+                    ),
                     vector_knowledge_base_configuration=bedrock.CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty(
                         embedding_model_arn="embeddingModelArn",
                 
@@ -17115,6 +17313,16 @@ class CfnKnowledgeBase(
                             bedrock_embedding_model_configuration=bedrock.CfnKnowledgeBase.BedrockEmbeddingModelConfigurationProperty(
                                 dimensions=123
                             )
+                        ),
+                        supplemental_data_storage_configuration=bedrock.CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty(
+                            supplemental_data_storage_locations=[bedrock.CfnKnowledgeBase.SupplementalDataStorageLocationProperty(
+                                supplemental_data_storage_location_type="supplementalDataStorageLocationType",
+                
+                                # the properties below are optional
+                                s3_location=bedrock.CfnKnowledgeBase.S3LocationProperty(
+                                    uri="uri"
+                                )
+                            )]
                         )
                     )
                 )
@@ -17122,11 +17330,15 @@ class CfnKnowledgeBase(
             if __debug__:
                 type_hints = typing.get_type_hints(_typecheckingstub__f2ca26f28cc4cf3a289e62f58643faf6a7d98ea3e55e7ff4f0f77530fa0294b4)
                 check_type(argname="argument type", value=type, expected_type=type_hints["type"])
+                check_type(argname="argument kendra_knowledge_base_configuration", value=kendra_knowledge_base_configuration, expected_type=type_hints["kendra_knowledge_base_configuration"])
                 check_type(argname="argument vector_knowledge_base_configuration", value=vector_knowledge_base_configuration, expected_type=type_hints["vector_knowledge_base_configuration"])
             self._values: typing.Dict[builtins.str, typing.Any] = {
                 "type": type,
-                "vector_knowledge_base_configuration": vector_knowledge_base_configuration,
             }
+            if kendra_knowledge_base_configuration is not None:
+                self._values["kendra_knowledge_base_configuration"] = kendra_knowledge_base_configuration
+            if vector_knowledge_base_configuration is not None:
+                self._values["vector_knowledge_base_configuration"] = vector_knowledge_base_configuration
 
         @builtins.property
         def type(self) -> builtins.str:
@@ -17138,17 +17350,27 @@ class CfnKnowledgeBase(
             assert result is not None, "Required property 'type' is missing"
             return typing.cast(builtins.str, result)
 
+        @builtins.property
+        def kendra_knowledge_base_configuration(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty"]]:
+            '''Settings for an Amazon Kendra knowledge base.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-knowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-knowledgebaseconfiguration-kendraknowledgebaseconfiguration
+            '''
+            result = self._values.get("kendra_knowledge_base_configuration")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty"]], result)
+
         @builtins.property
         def vector_knowledge_base_configuration(
             self,
-        ) -> typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty"]:
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty"]]:
             '''Contains details about the model that's used to convert the data source into vector embeddings.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-knowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-knowledgebaseconfiguration-vectorknowledgebaseconfiguration
             '''
             result = self._values.get("vector_knowledge_base_configuration")
-            assert result is not None, "Required property 'vector_knowledge_base_configuration' is missing"
-            return typing.cast(typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty"], result)
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty"]], result)
 
         def __eq__(self, rhs: typing.Any) -> builtins.bool:
             return isinstance(rhs, self.__class__) and rhs._values == self._values
@@ -17778,6 +18000,58 @@ class CfnKnowledgeBase(
                 k + "=" + repr(v) for k, v in self._values.items()
             )
 
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBase.S3LocationProperty",
+        jsii_struct_bases=[],
+        name_mapping={"uri": "uri"},
+    )
+    class S3LocationProperty:
+        def __init__(self, *, uri: builtins.str) -> None:
+            '''A storage location in an S3 bucket.
+
+            :param uri: An object URI starting with ``s3://`` .
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-s3location.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                s3_location_property = bedrock.CfnKnowledgeBase.S3LocationProperty(
+                    uri="uri"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__2d65bf934dc283aa920ce8366929ceeb84863f6a3de2b775a4f2d2ee019979bc)
+                check_type(argname="argument uri", value=uri, expected_type=type_hints["uri"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "uri": uri,
+            }
+
+        @builtins.property
+        def uri(self) -> builtins.str:
+            '''An object URI starting with ``s3://`` .
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-s3location.html#cfn-bedrock-knowledgebase-s3location-uri
+            '''
+            result = self._values.get("uri")
+            assert result is not None, "Required property 'uri' is missing"
+            return typing.cast(builtins.str, result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "S3LocationProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
     @jsii.data_type(
         jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBase.StorageConfigurationProperty",
         jsii_struct_bases=[],
@@ -17924,26 +18198,25 @@ class CfnKnowledgeBase(
             )
 
     @jsii.data_type(
-        jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty",
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty",
         jsii_struct_bases=[],
         name_mapping={
-            "embedding_model_arn": "embeddingModelArn",
-            "embedding_model_configuration": "embeddingModelConfiguration",
+            "supplemental_data_storage_locations": "supplementalDataStorageLocations",
         },
     )
-    class VectorKnowledgeBaseConfigurationProperty:
+    class SupplementalDataStorageConfigurationProperty:
         def __init__(
             self,
             *,
-            embedding_model_arn: builtins.str,
-            embedding_model_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.EmbeddingModelConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
+            supplemental_data_storage_locations: typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.SupplementalDataStorageLocationProperty", typing.Dict[builtins.str, typing.Any]]]]],
         ) -> None:
-            '''Contains details about the model used to create vector embeddings for the knowledge base.
+            '''Specifies configurations for the storage location of the images extracted from multimodal documents in your data source.
 
-            :param embedding_model_arn: The Amazon Resource Name (ARN) of the model or inference profile used to create vector embeddings for the knowledge base.
-            :param embedding_model_configuration: The embeddings model configuration details for the vector model used in Knowledge Base.
+            These images can be retrieved and returned to the end user.
 
-            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html
+            :param supplemental_data_storage_locations: List of supplemental data storage locations.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-supplementaldatastorageconfiguration.html
             :exampleMetadata: fixture=_generated
 
             Example::
@@ -17952,47 +18225,35 @@ class CfnKnowledgeBase(
                 # The values are placeholders you should change.
                 from aws_cdk import aws_bedrock as bedrock
                 
-                vector_knowledge_base_configuration_property = bedrock.CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty(
-                    embedding_model_arn="embeddingModelArn",
+                supplemental_data_storage_configuration_property = bedrock.CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty(
+                    supplemental_data_storage_locations=[bedrock.CfnKnowledgeBase.SupplementalDataStorageLocationProperty(
+                        supplemental_data_storage_location_type="supplementalDataStorageLocationType",
                 
-                    # the properties below are optional
-                    embedding_model_configuration=bedrock.CfnKnowledgeBase.EmbeddingModelConfigurationProperty(
-                        bedrock_embedding_model_configuration=bedrock.CfnKnowledgeBase.BedrockEmbeddingModelConfigurationProperty(
-                            dimensions=123
+                        # the properties below are optional
+                        s3_location=bedrock.CfnKnowledgeBase.S3LocationProperty(
+                            uri="uri"
                         )
-                    )
+                    )]
                 )
             '''
             if __debug__:
-                type_hints = typing.get_type_hints(_typecheckingstub__53b08e209954b21c35b746e5eee517d51370af30630f5f17b3e5435150898236)
-                check_type(argname="argument embedding_model_arn", value=embedding_model_arn, expected_type=type_hints["embedding_model_arn"])
-                check_type(argname="argument embedding_model_configuration", value=embedding_model_configuration, expected_type=type_hints["embedding_model_configuration"])
+                type_hints = typing.get_type_hints(_typecheckingstub__23aedf500d0c089aa233b40ff3fc0bdc7842b000954e996faef806cf0f44c930)
+                check_type(argname="argument supplemental_data_storage_locations", value=supplemental_data_storage_locations, expected_type=type_hints["supplemental_data_storage_locations"])
             self._values: typing.Dict[builtins.str, typing.Any] = {
-                "embedding_model_arn": embedding_model_arn,
+                "supplemental_data_storage_locations": supplemental_data_storage_locations,
             }
-            if embedding_model_configuration is not None:
-                self._values["embedding_model_configuration"] = embedding_model_configuration
-
-        @builtins.property
-        def embedding_model_arn(self) -> builtins.str:
-            '''The Amazon Resource Name (ARN) of the model or inference profile used to create vector embeddings for the knowledge base.
-
-            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-vectorknowledgebaseconfiguration-embeddingmodelarn
-            '''
-            result = self._values.get("embedding_model_arn")
-            assert result is not None, "Required property 'embedding_model_arn' is missing"
-            return typing.cast(builtins.str, result)
 
         @builtins.property
-        def embedding_model_configuration(
+        def supplemental_data_storage_locations(
             self,
-        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.EmbeddingModelConfigurationProperty"]]:
-            '''The embeddings model configuration details for the vector model used in Knowledge Base.
+        ) -> typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.SupplementalDataStorageLocationProperty"]]]:
+            '''List of supplemental data storage locations.
 
-            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-vectorknowledgebaseconfiguration-embeddingmodelconfiguration
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-supplementaldatastorageconfiguration.html#cfn-bedrock-knowledgebase-supplementaldatastorageconfiguration-supplementaldatastoragelocations
             '''
-            result = self._values.get("embedding_model_configuration")
-            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.EmbeddingModelConfigurationProperty"]], result)
+            result = self._values.get("supplemental_data_storage_locations")
+            assert result is not None, "Required property 'supplemental_data_storage_locations' is missing"
+            return typing.cast(typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.SupplementalDataStorageLocationProperty"]]], result)
 
         def __eq__(self, rhs: typing.Any) -> builtins.bool:
             return isinstance(rhs, self.__class__) and rhs._values == self._values
@@ -18001,20 +18262,211 @@ class CfnKnowledgeBase(
             return not (rhs == self)
 
         def __repr__(self) -> str:
-            return "VectorKnowledgeBaseConfigurationProperty(%s)" % ", ".join(
+            return "SupplementalDataStorageConfigurationProperty(%s)" % ", ".join(
                 k + "=" + repr(v) for k, v in self._values.items()
             )
 
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBase.SupplementalDataStorageLocationProperty",
+        jsii_struct_bases=[],
+        name_mapping={
+            "supplemental_data_storage_location_type": "supplementalDataStorageLocationType",
+            "s3_location": "s3Location",
+        },
+    )
+    class SupplementalDataStorageLocationProperty:
+        def __init__(
+            self,
+            *,
+            supplemental_data_storage_location_type: builtins.str,
+            s3_location: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.S3LocationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
+        ) -> None:
+            '''Contains information about a storage location for images extracted from multimodal documents in your data source.
 
-@jsii.data_type(
-    jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBaseProps",
-    jsii_struct_bases=[],
-    name_mapping={
+            :param supplemental_data_storage_location_type: Supplemental data storage location type.
+            :param s3_location: Contains information about the Amazon S3 location for the extracted images.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-supplementaldatastoragelocation.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                supplemental_data_storage_location_property = bedrock.CfnKnowledgeBase.SupplementalDataStorageLocationProperty(
+                    supplemental_data_storage_location_type="supplementalDataStorageLocationType",
+                
+                    # the properties below are optional
+                    s3_location=bedrock.CfnKnowledgeBase.S3LocationProperty(
+                        uri="uri"
+                    )
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__754c3d05d3167c3b2203485932c3bc498a24c9d4555c672a7d5069d4d86f73d6)
+                check_type(argname="argument supplemental_data_storage_location_type", value=supplemental_data_storage_location_type, expected_type=type_hints["supplemental_data_storage_location_type"])
+                check_type(argname="argument s3_location", value=s3_location, expected_type=type_hints["s3_location"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "supplemental_data_storage_location_type": supplemental_data_storage_location_type,
+            }
+            if s3_location is not None:
+                self._values["s3_location"] = s3_location
+
+        @builtins.property
+        def supplemental_data_storage_location_type(self) -> builtins.str:
+            '''Supplemental data storage location type.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-supplementaldatastoragelocation.html#cfn-bedrock-knowledgebase-supplementaldatastoragelocation-supplementaldatastoragelocationtype
+            '''
+            result = self._values.get("supplemental_data_storage_location_type")
+            assert result is not None, "Required property 'supplemental_data_storage_location_type' is missing"
+            return typing.cast(builtins.str, result)
+
+        @builtins.property
+        def s3_location(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.S3LocationProperty"]]:
+            '''Contains information about the Amazon S3 location for the extracted images.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-supplementaldatastoragelocation.html#cfn-bedrock-knowledgebase-supplementaldatastoragelocation-s3location
+            '''
+            result = self._values.get("s3_location")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.S3LocationProperty"]], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "SupplementalDataStorageLocationProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty",
+        jsii_struct_bases=[],
+        name_mapping={
+            "embedding_model_arn": "embeddingModelArn",
+            "embedding_model_configuration": "embeddingModelConfiguration",
+            "supplemental_data_storage_configuration": "supplementalDataStorageConfiguration",
+        },
+    )
+    class VectorKnowledgeBaseConfigurationProperty:
+        def __init__(
+            self,
+            *,
+            embedding_model_arn: builtins.str,
+            embedding_model_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.EmbeddingModelConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
+            supplemental_data_storage_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
+        ) -> None:
+            '''Contains details about the model used to create vector embeddings for the knowledge base.
+
+            :param embedding_model_arn: The Amazon Resource Name (ARN) of the model or inference profile used to create vector embeddings for the knowledge base.
+            :param embedding_model_configuration: The embeddings model configuration details for the vector model used in Knowledge Base.
+            :param supplemental_data_storage_configuration: If you include multimodal data from your data source, use this object to specify configurations for the storage location of the images extracted from your documents. These images can be retrieved and returned to the end user. They can also be used in generation when using `RetrieveAndGenerate <https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html>`_ .
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                vector_knowledge_base_configuration_property = bedrock.CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty(
+                    embedding_model_arn="embeddingModelArn",
+                
+                    # the properties below are optional
+                    embedding_model_configuration=bedrock.CfnKnowledgeBase.EmbeddingModelConfigurationProperty(
+                        bedrock_embedding_model_configuration=bedrock.CfnKnowledgeBase.BedrockEmbeddingModelConfigurationProperty(
+                            dimensions=123
+                        )
+                    ),
+                    supplemental_data_storage_configuration=bedrock.CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty(
+                        supplemental_data_storage_locations=[bedrock.CfnKnowledgeBase.SupplementalDataStorageLocationProperty(
+                            supplemental_data_storage_location_type="supplementalDataStorageLocationType",
+                
+                            # the properties below are optional
+                            s3_location=bedrock.CfnKnowledgeBase.S3LocationProperty(
+                                uri="uri"
+                            )
+                        )]
+                    )
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__53b08e209954b21c35b746e5eee517d51370af30630f5f17b3e5435150898236)
+                check_type(argname="argument embedding_model_arn", value=embedding_model_arn, expected_type=type_hints["embedding_model_arn"])
+                check_type(argname="argument embedding_model_configuration", value=embedding_model_configuration, expected_type=type_hints["embedding_model_configuration"])
+                check_type(argname="argument supplemental_data_storage_configuration", value=supplemental_data_storage_configuration, expected_type=type_hints["supplemental_data_storage_configuration"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "embedding_model_arn": embedding_model_arn,
+            }
+            if embedding_model_configuration is not None:
+                self._values["embedding_model_configuration"] = embedding_model_configuration
+            if supplemental_data_storage_configuration is not None:
+                self._values["supplemental_data_storage_configuration"] = supplemental_data_storage_configuration
+
+        @builtins.property
+        def embedding_model_arn(self) -> builtins.str:
+            '''The Amazon Resource Name (ARN) of the model or inference profile used to create vector embeddings for the knowledge base.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-vectorknowledgebaseconfiguration-embeddingmodelarn
+            '''
+            result = self._values.get("embedding_model_arn")
+            assert result is not None, "Required property 'embedding_model_arn' is missing"
+            return typing.cast(builtins.str, result)
+
+        @builtins.property
+        def embedding_model_configuration(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.EmbeddingModelConfigurationProperty"]]:
+            '''The embeddings model configuration details for the vector model used in Knowledge Base.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-vectorknowledgebaseconfiguration-embeddingmodelconfiguration
+            '''
+            result = self._values.get("embedding_model_configuration")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.EmbeddingModelConfigurationProperty"]], result)
+
+        @builtins.property
+        def supplemental_data_storage_configuration(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty"]]:
+            '''If you include multimodal data from your data source, use this object to specify configurations for the storage location of the images extracted from your documents.
+
+            These images can be retrieved and returned to the end user. They can also be used in generation when using `RetrieveAndGenerate <https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html>`_ .
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-vectorknowledgebaseconfiguration-supplementaldatastorageconfiguration
+            '''
+            result = self._values.get("supplemental_data_storage_configuration")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty"]], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "VectorKnowledgeBaseConfigurationProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+
+@jsii.data_type(
+    jsii_type="aws-cdk-lib.aws_bedrock.CfnKnowledgeBaseProps",
+    jsii_struct_bases=[],
+    name_mapping={
         "knowledge_base_configuration": "knowledgeBaseConfiguration",
         "name": "name",
         "role_arn": "roleArn",
-        "storage_configuration": "storageConfiguration",
         "description": "description",
+        "storage_configuration": "storageConfiguration",
         "tags": "tags",
     },
 )
@@ -18025,8 +18477,8 @@ class CfnKnowledgeBaseProps:
         knowledge_base_configuration: typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.KnowledgeBaseConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
         name: builtins.str,
         role_arn: builtins.str,
-        storage_configuration: typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.StorageConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
         description: typing.Optional[builtins.str] = None,
+        storage_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.StorageConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
         tags: typing.Optional[typing.Mapping[builtins.str, builtins.str]] = None,
     ) -> None:
         '''Properties for defining a ``CfnKnowledgeBase``.
@@ -18034,8 +18486,8 @@ class CfnKnowledgeBaseProps:
         :param knowledge_base_configuration: Contains details about the embeddings configuration of the knowledge base.
         :param name: The name of the knowledge base.
         :param role_arn: The Amazon Resource Name (ARN) of the IAM role with permissions to invoke API operations on the knowledge base.
-        :param storage_configuration: Contains details about the storage configuration of the knowledge base.
         :param description: The description of the knowledge base associated with the inline agent.
+        :param storage_configuration: Contains details about the storage configuration of the knowledge base.
         :param tags: Metadata that you can assign to a resource as key-value pairs. For more information, see the following resources:. - `Tag naming limits and requirements <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-conventions>`_ - `Tagging best practices <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-best-practices>`_
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-knowledgebase.html
@@ -18050,6 +18502,11 @@ class CfnKnowledgeBaseProps:
             cfn_knowledge_base_props = bedrock.CfnKnowledgeBaseProps(
                 knowledge_base_configuration=bedrock.CfnKnowledgeBase.KnowledgeBaseConfigurationProperty(
                     type="type",
+            
+                    # the properties below are optional
+                    kendra_knowledge_base_configuration=bedrock.CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty(
+                        kendra_index_arn="kendraIndexArn"
+                    ),
                     vector_knowledge_base_configuration=bedrock.CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty(
                         embedding_model_arn="embeddingModelArn",
             
@@ -18058,11 +18515,24 @@ class CfnKnowledgeBaseProps:
                             bedrock_embedding_model_configuration=bedrock.CfnKnowledgeBase.BedrockEmbeddingModelConfigurationProperty(
                                 dimensions=123
                             )
+                        ),
+                        supplemental_data_storage_configuration=bedrock.CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty(
+                            supplemental_data_storage_locations=[bedrock.CfnKnowledgeBase.SupplementalDataStorageLocationProperty(
+                                supplemental_data_storage_location_type="supplementalDataStorageLocationType",
+            
+                                # the properties below are optional
+                                s3_location=bedrock.CfnKnowledgeBase.S3LocationProperty(
+                                    uri="uri"
+                                )
+                            )]
                         )
                     )
                 ),
                 name="name",
                 role_arn="roleArn",
+            
+                # the properties below are optional
+                description="description",
                 storage_configuration=bedrock.CfnKnowledgeBase.StorageConfigurationProperty(
                     type="type",
             
@@ -18100,9 +18570,6 @@ class CfnKnowledgeBaseProps:
                         table_name="tableName"
                     )
                 ),
-            
-                # the properties below are optional
-                description="description",
                 tags={
                     "tags_key": "tags"
                 }
@@ -18113,17 +18580,18 @@ class CfnKnowledgeBaseProps:
             check_type(argname="argument knowledge_base_configuration", value=knowledge_base_configuration, expected_type=type_hints["knowledge_base_configuration"])
             check_type(argname="argument name", value=name, expected_type=type_hints["name"])
             check_type(argname="argument role_arn", value=role_arn, expected_type=type_hints["role_arn"])
-            check_type(argname="argument storage_configuration", value=storage_configuration, expected_type=type_hints["storage_configuration"])
             check_type(argname="argument description", value=description, expected_type=type_hints["description"])
+            check_type(argname="argument storage_configuration", value=storage_configuration, expected_type=type_hints["storage_configuration"])
             check_type(argname="argument tags", value=tags, expected_type=type_hints["tags"])
         self._values: typing.Dict[builtins.str, typing.Any] = {
             "knowledge_base_configuration": knowledge_base_configuration,
             "name": name,
             "role_arn": role_arn,
-            "storage_configuration": storage_configuration,
         }
         if description is not None:
             self._values["description"] = description
+        if storage_configuration is not None:
+            self._values["storage_configuration"] = storage_configuration
         if tags is not None:
             self._values["tags"] = tags
 
@@ -18159,18 +18627,6 @@ class CfnKnowledgeBaseProps:
         assert result is not None, "Required property 'role_arn' is missing"
         return typing.cast(builtins.str, result)
 
-    @builtins.property
-    def storage_configuration(
-        self,
-    ) -> typing.Union[_IResolvable_da3f097b, CfnKnowledgeBase.StorageConfigurationProperty]:
-        '''Contains details about the storage configuration of the knowledge base.
-
-        :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-knowledgebase.html#cfn-bedrock-knowledgebase-storageconfiguration
-        '''
-        result = self._values.get("storage_configuration")
-        assert result is not None, "Required property 'storage_configuration' is missing"
-        return typing.cast(typing.Union[_IResolvable_da3f097b, CfnKnowledgeBase.StorageConfigurationProperty], result)
-
     @builtins.property
     def description(self) -> typing.Optional[builtins.str]:
         '''The description of the knowledge base associated with the inline agent.
@@ -18180,6 +18636,17 @@ class CfnKnowledgeBaseProps:
         result = self._values.get("description")
         return typing.cast(typing.Optional[builtins.str], result)
 
+    @builtins.property
+    def storage_configuration(
+        self,
+    ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, CfnKnowledgeBase.StorageConfigurationProperty]]:
+        '''Contains details about the storage configuration of the knowledge base.
+
+        :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-knowledgebase.html#cfn-bedrock-knowledgebase-storageconfiguration
+        '''
+        result = self._values.get("storage_configuration")
+        return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, CfnKnowledgeBase.StorageConfigurationProperty]], result)
+
     @builtins.property
     def tags(self) -> typing.Optional[typing.Mapping[builtins.str, builtins.str]]:
         '''Metadata that you can assign to a resource as key-value pairs. For more information, see the following resources:.
@@ -18224,6 +18691,10 @@ class CfnPrompt(
         # The values are placeholders you should change.
         from aws_cdk import aws_bedrock as bedrock
         
+        # any: Any
+        # auto: Any
+        # json: Any
+        
         cfn_prompt = bedrock.CfnPrompt(self, "MyCfnPrompt",
             name="name",
         
@@ -18237,6 +18708,44 @@ class CfnPrompt(
             variants=[bedrock.CfnPrompt.PromptVariantProperty(
                 name="name",
                 template_configuration=bedrock.CfnPrompt.PromptTemplateConfigurationProperty(
+                    chat=bedrock.CfnPrompt.ChatPromptTemplateConfigurationProperty(
+                        messages=[bedrock.CfnPrompt.MessageProperty(
+                            content=[bedrock.CfnPrompt.ContentBlockProperty(
+                                text="text"
+                            )],
+                            role="role"
+                        )],
+        
+                        # the properties below are optional
+                        input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
+                            name="name"
+                        )],
+                        system=[bedrock.CfnPrompt.SystemContentBlockProperty(
+                            text="text"
+                        )],
+                        tool_configuration=bedrock.CfnPrompt.ToolConfigurationProperty(
+                            tools=[bedrock.CfnPrompt.ToolProperty(
+                                tool_spec=bedrock.CfnPrompt.ToolSpecificationProperty(
+                                    input_schema=bedrock.CfnPrompt.ToolInputSchemaProperty(
+                                        json=json
+                                    ),
+                                    name="name",
+        
+                                    # the properties below are optional
+                                    description="description"
+                                )
+                            )],
+        
+                            # the properties below are optional
+                            tool_choice=bedrock.CfnPrompt.ToolChoiceProperty(
+                                any=any,
+                                auto=auto,
+                                tool=bedrock.CfnPrompt.SpecificToolChoiceProperty(
+                                    name="name"
+                                )
+                            )
+                        )
+                    ),
                     text=bedrock.CfnPrompt.TextPromptTemplateConfigurationProperty(
                         input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
                             name="name"
@@ -18254,6 +18763,11 @@ class CfnPrompt(
                 template_type="templateType",
         
                 # the properties below are optional
+                gen_ai_resource=bedrock.CfnPrompt.PromptGenAiResourceProperty(
+                    agent=bedrock.CfnPrompt.PromptAgentResourceProperty(
+                        agent_identifier="agentIdentifier"
+                    )
+                ),
                 inference_configuration=bedrock.CfnPrompt.PromptInferenceConfigurationProperty(
                     text=bedrock.CfnPrompt.PromptModelInferenceConfigurationProperty(
                         max_tokens=123,
@@ -18480,21 +18994,34 @@ class CfnPrompt(
         jsii.set(self, "variants", value) # pyright: ignore[reportArgumentType]
 
     @jsii.data_type(
-        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.PromptInferenceConfigurationProperty",
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.ChatPromptTemplateConfigurationProperty",
         jsii_struct_bases=[],
-        name_mapping={"text": "text"},
+        name_mapping={
+            "messages": "messages",
+            "input_variables": "inputVariables",
+            "system": "system",
+            "tool_configuration": "toolConfiguration",
+        },
     )
-    class PromptInferenceConfigurationProperty:
+    class ChatPromptTemplateConfigurationProperty:
         def __init__(
             self,
             *,
-            text: typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.PromptModelInferenceConfigurationProperty", typing.Dict[builtins.str, typing.Any]]],
+            messages: typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.MessageProperty", typing.Dict[builtins.str, typing.Any]]]]],
+            input_variables: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.PromptInputVariableProperty", typing.Dict[builtins.str, typing.Any]]]]]] = None,
+            system: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.SystemContentBlockProperty", typing.Dict[builtins.str, typing.Any]]]]]] = None,
+            tool_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.ToolConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
         ) -> None:
-            '''Contains inference configurations for the prompt.
+            '''Contains configurations to use a prompt in a conversational format.
 
-            :param text: Contains inference configurations for a text prompt.
+            For more information, see `Create a prompt using Prompt management <https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-management-create.html>`_ .
 
-            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptinferenceconfiguration.html
+            :param messages: Contains messages in the chat for the prompt.
+            :param input_variables: An array of the variables in the prompt template.
+            :param system: Contains system prompts to provide context to the model or to describe how it should behave.
+            :param tool_configuration: Configuration information for the tools that the model can use when generating a response.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-chatprompttemplateconfiguration.html
             :exampleMetadata: fixture=_generated
 
             Example::
@@ -18503,33 +19030,420 @@ class CfnPrompt(
                 # The values are placeholders you should change.
                 from aws_cdk import aws_bedrock as bedrock
                 
-                prompt_inference_configuration_property = bedrock.CfnPrompt.PromptInferenceConfigurationProperty(
-                    text=bedrock.CfnPrompt.PromptModelInferenceConfigurationProperty(
-                        max_tokens=123,
-                        stop_sequences=["stopSequences"],
-                        temperature=123,
-                        top_p=123
+                # any: Any
+                # auto: Any
+                # json: Any
+                
+                chat_prompt_template_configuration_property = bedrock.CfnPrompt.ChatPromptTemplateConfigurationProperty(
+                    messages=[bedrock.CfnPrompt.MessageProperty(
+                        content=[bedrock.CfnPrompt.ContentBlockProperty(
+                            text="text"
+                        )],
+                        role="role"
+                    )],
+                
+                    # the properties below are optional
+                    input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
+                        name="name"
+                    )],
+                    system=[bedrock.CfnPrompt.SystemContentBlockProperty(
+                        text="text"
+                    )],
+                    tool_configuration=bedrock.CfnPrompt.ToolConfigurationProperty(
+                        tools=[bedrock.CfnPrompt.ToolProperty(
+                            tool_spec=bedrock.CfnPrompt.ToolSpecificationProperty(
+                                input_schema=bedrock.CfnPrompt.ToolInputSchemaProperty(
+                                    json=json
+                                ),
+                                name="name",
+                
+                                # the properties below are optional
+                                description="description"
+                            )
+                        )],
+                
+                        # the properties below are optional
+                        tool_choice=bedrock.CfnPrompt.ToolChoiceProperty(
+                            any=any,
+                            auto=auto,
+                            tool=bedrock.CfnPrompt.SpecificToolChoiceProperty(
+                                name="name"
+                            )
+                        )
                     )
                 )
             '''
             if __debug__:
-                type_hints = typing.get_type_hints(_typecheckingstub__bd64a2009dff1bac3dd98571ac9a9cd65cbb030a3896121e0b1c8f24dfe6c74d)
-                check_type(argname="argument text", value=text, expected_type=type_hints["text"])
+                type_hints = typing.get_type_hints(_typecheckingstub__9c6a58ca5edb4fe7249a2b37babee7b708f1fc92b3adcd4af4c3afa45077ee55)
+                check_type(argname="argument messages", value=messages, expected_type=type_hints["messages"])
+                check_type(argname="argument input_variables", value=input_variables, expected_type=type_hints["input_variables"])
+                check_type(argname="argument system", value=system, expected_type=type_hints["system"])
+                check_type(argname="argument tool_configuration", value=tool_configuration, expected_type=type_hints["tool_configuration"])
             self._values: typing.Dict[builtins.str, typing.Any] = {
-                "text": text,
+                "messages": messages,
             }
+            if input_variables is not None:
+                self._values["input_variables"] = input_variables
+            if system is not None:
+                self._values["system"] = system
+            if tool_configuration is not None:
+                self._values["tool_configuration"] = tool_configuration
 
         @builtins.property
-        def text(
+        def messages(
             self,
-        ) -> typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptModelInferenceConfigurationProperty"]:
-            '''Contains inference configurations for a text prompt.
+        ) -> typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.MessageProperty"]]]:
+            '''Contains messages in the chat for the prompt.
 
-            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptinferenceconfiguration.html#cfn-bedrock-prompt-promptinferenceconfiguration-text
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-chatprompttemplateconfiguration.html#cfn-bedrock-prompt-chatprompttemplateconfiguration-messages
             '''
-            result = self._values.get("text")
-            assert result is not None, "Required property 'text' is missing"
-            return typing.cast(typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptModelInferenceConfigurationProperty"], result)
+            result = self._values.get("messages")
+            assert result is not None, "Required property 'messages' is missing"
+            return typing.cast(typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.MessageProperty"]]], result)
+
+        @builtins.property
+        def input_variables(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptInputVariableProperty"]]]]:
+            '''An array of the variables in the prompt template.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-chatprompttemplateconfiguration.html#cfn-bedrock-prompt-chatprompttemplateconfiguration-inputvariables
+            '''
+            result = self._values.get("input_variables")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptInputVariableProperty"]]]], result)
+
+        @builtins.property
+        def system(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.SystemContentBlockProperty"]]]]:
+            '''Contains system prompts to provide context to the model or to describe how it should behave.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-chatprompttemplateconfiguration.html#cfn-bedrock-prompt-chatprompttemplateconfiguration-system
+            '''
+            result = self._values.get("system")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.SystemContentBlockProperty"]]]], result)
+
+        @builtins.property
+        def tool_configuration(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolConfigurationProperty"]]:
+            '''Configuration information for the tools that the model can use when generating a response.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-chatprompttemplateconfiguration.html#cfn-bedrock-prompt-chatprompttemplateconfiguration-toolconfiguration
+            '''
+            result = self._values.get("tool_configuration")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolConfigurationProperty"]], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "ChatPromptTemplateConfigurationProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.ContentBlockProperty",
+        jsii_struct_bases=[],
+        name_mapping={"text": "text"},
+    )
+    class ContentBlockProperty:
+        def __init__(self, *, text: builtins.str) -> None:
+            '''A block of content for a message that you pass to, or receive from, a model with the `Converse <https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_Converse.html>`_ or `ConverseStream <https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ConverseStream.html>`_ API operations.
+
+            :param text: Text to include in the message.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-contentblock.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                content_block_property = bedrock.CfnPrompt.ContentBlockProperty(
+                    text="text"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__2d0cf0f0136b9d804a0809956c82c64b1f75a73d35d6c0fa6f1007666d629ec6)
+                check_type(argname="argument text", value=text, expected_type=type_hints["text"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "text": text,
+            }
+
+        @builtins.property
+        def text(self) -> builtins.str:
+            '''Text to include in the message.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-contentblock.html#cfn-bedrock-prompt-contentblock-text
+            '''
+            result = self._values.get("text")
+            assert result is not None, "Required property 'text' is missing"
+            return typing.cast(builtins.str, result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "ContentBlockProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.MessageProperty",
+        jsii_struct_bases=[],
+        name_mapping={"content": "content", "role": "role"},
+    )
+    class MessageProperty:
+        def __init__(
+            self,
+            *,
+            content: typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.ContentBlockProperty", typing.Dict[builtins.str, typing.Any]]]]],
+            role: builtins.str,
+        ) -> None:
+            '''A message input, or returned from, a call to `Converse <https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_Converse.html>`_ or `ConverseStream <https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ConverseStream.html>`_ .
+
+            :param content: The message content. Note the following restrictions:. - You can include up to 20 images. Each image's size, height, and width must be no more than 3.75 MB, 8000 px, and 8000 px, respectively. - You can include up to five documents. Each document's size must be no more than 4.5 MB. - If you include a ``ContentBlock`` with a ``document`` field in the array, you must also include a ``ContentBlock`` with a ``text`` field. - You can only include images and documents if the ``role`` is ``user`` .
+            :param role: The role that the message plays in the message.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-message.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                message_property = bedrock.CfnPrompt.MessageProperty(
+                    content=[bedrock.CfnPrompt.ContentBlockProperty(
+                        text="text"
+                    )],
+                    role="role"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__42b42b22130352586f0ff208cc8c3ce6b3705d340f12b03331553326e9b7585b)
+                check_type(argname="argument content", value=content, expected_type=type_hints["content"])
+                check_type(argname="argument role", value=role, expected_type=type_hints["role"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "content": content,
+                "role": role,
+            }
+
+        @builtins.property
+        def content(
+            self,
+        ) -> typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ContentBlockProperty"]]]:
+            '''The message content. Note the following restrictions:.
+
+            - You can include up to 20 images. Each image's size, height, and width must be no more than 3.75 MB, 8000 px, and 8000 px, respectively.
+            - You can include up to five documents. Each document's size must be no more than 4.5 MB.
+            - If you include a ``ContentBlock`` with a ``document`` field in the array, you must also include a ``ContentBlock`` with a ``text`` field.
+            - You can only include images and documents if the ``role`` is ``user`` .
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-message.html#cfn-bedrock-prompt-message-content
+            '''
+            result = self._values.get("content")
+            assert result is not None, "Required property 'content' is missing"
+            return typing.cast(typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ContentBlockProperty"]]], result)
+
+        @builtins.property
+        def role(self) -> builtins.str:
+            '''The role that the message plays in the message.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-message.html#cfn-bedrock-prompt-message-role
+            '''
+            result = self._values.get("role")
+            assert result is not None, "Required property 'role' is missing"
+            return typing.cast(builtins.str, result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "MessageProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.PromptAgentResourceProperty",
+        jsii_struct_bases=[],
+        name_mapping={"agent_identifier": "agentIdentifier"},
+    )
+    class PromptAgentResourceProperty:
+        def __init__(self, *, agent_identifier: builtins.str) -> None:
+            '''Contains specifications for an Amazon Bedrock agent with which to use the prompt.
+
+            For more information, see `Create a prompt using Prompt management <https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-management-create.html>`_ and `Automate tasks in your application using conversational agents <https://docs.aws.amazon.com/bedrock/latest/userguide/agents.html>`_ .
+
+            :param agent_identifier: The ARN of the agent with which to use the prompt.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptagentresource.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                prompt_agent_resource_property = bedrock.CfnPrompt.PromptAgentResourceProperty(
+                    agent_identifier="agentIdentifier"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__d28921d18df971112b15d156471e2c5279000c3080bd4f0620f849341fd6a896)
+                check_type(argname="argument agent_identifier", value=agent_identifier, expected_type=type_hints["agent_identifier"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "agent_identifier": agent_identifier,
+            }
+
+        @builtins.property
+        def agent_identifier(self) -> builtins.str:
+            '''The ARN of the agent with which to use the prompt.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptagentresource.html#cfn-bedrock-prompt-promptagentresource-agentidentifier
+            '''
+            result = self._values.get("agent_identifier")
+            assert result is not None, "Required property 'agent_identifier' is missing"
+            return typing.cast(builtins.str, result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "PromptAgentResourceProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.PromptGenAiResourceProperty",
+        jsii_struct_bases=[],
+        name_mapping={"agent": "agent"},
+    )
+    class PromptGenAiResourceProperty:
+        def __init__(
+            self,
+            *,
+            agent: typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.PromptAgentResourceProperty", typing.Dict[builtins.str, typing.Any]]],
+        ) -> None:
+            '''Contains specifications for a generative AI resource with which to use the prompt.
+
+            For more information, see `Create a prompt using Prompt management <https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-management-create.html>`_ .
+
+            :param agent: Specifies an Amazon Bedrock agent with which to use the prompt.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptgenairesource.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                prompt_gen_ai_resource_property = bedrock.CfnPrompt.PromptGenAiResourceProperty(
+                    agent=bedrock.CfnPrompt.PromptAgentResourceProperty(
+                        agent_identifier="agentIdentifier"
+                    )
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__64cff76991e320523c3338e0c04d15db173e4f0d91de163069f07878d8c88123)
+                check_type(argname="argument agent", value=agent, expected_type=type_hints["agent"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "agent": agent,
+            }
+
+        @builtins.property
+        def agent(
+            self,
+        ) -> typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptAgentResourceProperty"]:
+            '''Specifies an Amazon Bedrock agent with which to use the prompt.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptgenairesource.html#cfn-bedrock-prompt-promptgenairesource-agent
+            '''
+            result = self._values.get("agent")
+            assert result is not None, "Required property 'agent' is missing"
+            return typing.cast(typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptAgentResourceProperty"], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "PromptGenAiResourceProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.PromptInferenceConfigurationProperty",
+        jsii_struct_bases=[],
+        name_mapping={"text": "text"},
+    )
+    class PromptInferenceConfigurationProperty:
+        def __init__(
+            self,
+            *,
+            text: typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.PromptModelInferenceConfigurationProperty", typing.Dict[builtins.str, typing.Any]]],
+        ) -> None:
+            '''Contains inference configurations for the prompt.
+
+            :param text: Contains inference configurations for a text prompt.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptinferenceconfiguration.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                prompt_inference_configuration_property = bedrock.CfnPrompt.PromptInferenceConfigurationProperty(
+                    text=bedrock.CfnPrompt.PromptModelInferenceConfigurationProperty(
+                        max_tokens=123,
+                        stop_sequences=["stopSequences"],
+                        temperature=123,
+                        top_p=123
+                    )
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__bd64a2009dff1bac3dd98571ac9a9cd65cbb030a3896121e0b1c8f24dfe6c74d)
+                check_type(argname="argument text", value=text, expected_type=type_hints["text"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "text": text,
+            }
+
+        @builtins.property
+        def text(
+            self,
+        ) -> typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptModelInferenceConfigurationProperty"]:
+            '''Contains inference configurations for a text prompt.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptinferenceconfiguration.html#cfn-bedrock-prompt-promptinferenceconfiguration-text
+            '''
+            result = self._values.get("text")
+            assert result is not None, "Required property 'text' is missing"
+            return typing.cast(typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptModelInferenceConfigurationProperty"], result)
 
         def __eq__(self, rhs: typing.Any) -> builtins.bool:
             return isinstance(rhs, self.__class__) and rhs._values == self._values
@@ -18705,18 +19619,20 @@ class CfnPrompt(
     @jsii.data_type(
         jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.PromptTemplateConfigurationProperty",
         jsii_struct_bases=[],
-        name_mapping={"text": "text"},
+        name_mapping={"chat": "chat", "text": "text"},
     )
     class PromptTemplateConfigurationProperty:
         def __init__(
             self,
             *,
-            text: typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.TextPromptTemplateConfigurationProperty", typing.Dict[builtins.str, typing.Any]]],
+            chat: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.ChatPromptTemplateConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
+            text: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.TextPromptTemplateConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
         ) -> None:
             '''Contains the message for a prompt.
 
             For more information, see `Construct and store reusable prompts with Prompt management in Amazon Bedrock <https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-management.html>`_ .
 
+            :param chat: Contains configurations to use the prompt in a conversational format.
             :param text: Contains configurations for the text in a message for a prompt.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-prompttemplateconfiguration.html
@@ -18728,12 +19644,54 @@ class CfnPrompt(
                 # The values are placeholders you should change.
                 from aws_cdk import aws_bedrock as bedrock
                 
+                # any: Any
+                # auto: Any
+                # json: Any
+                
                 prompt_template_configuration_property = bedrock.CfnPrompt.PromptTemplateConfigurationProperty(
-                    text=bedrock.CfnPrompt.TextPromptTemplateConfigurationProperty(
+                    chat=bedrock.CfnPrompt.ChatPromptTemplateConfigurationProperty(
+                        messages=[bedrock.CfnPrompt.MessageProperty(
+                            content=[bedrock.CfnPrompt.ContentBlockProperty(
+                                text="text"
+                            )],
+                            role="role"
+                        )],
+                
+                        # the properties below are optional
                         input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
                             name="name"
                         )],
-                        text="text",
+                        system=[bedrock.CfnPrompt.SystemContentBlockProperty(
+                            text="text"
+                        )],
+                        tool_configuration=bedrock.CfnPrompt.ToolConfigurationProperty(
+                            tools=[bedrock.CfnPrompt.ToolProperty(
+                                tool_spec=bedrock.CfnPrompt.ToolSpecificationProperty(
+                                    input_schema=bedrock.CfnPrompt.ToolInputSchemaProperty(
+                                        json=json
+                                    ),
+                                    name="name",
+                
+                                    # the properties below are optional
+                                    description="description"
+                                )
+                            )],
+                
+                            # the properties below are optional
+                            tool_choice=bedrock.CfnPrompt.ToolChoiceProperty(
+                                any=any,
+                                auto=auto,
+                                tool=bedrock.CfnPrompt.SpecificToolChoiceProperty(
+                                    name="name"
+                                )
+                            )
+                        )
+                    ),
+                    text=bedrock.CfnPrompt.TextPromptTemplateConfigurationProperty(
+                        input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
+                            name="name"
+                        )],
+                        text="text",
                         text_s3_location=bedrock.CfnPrompt.TextS3LocationProperty(
                             bucket="bucket",
                             key="key",
@@ -18746,22 +19704,35 @@ class CfnPrompt(
             '''
             if __debug__:
                 type_hints = typing.get_type_hints(_typecheckingstub__fde740ede958bf60edc6a98392bd083868fd4fd5f6ba5698705fc5e13de4d2bc)
+                check_type(argname="argument chat", value=chat, expected_type=type_hints["chat"])
                 check_type(argname="argument text", value=text, expected_type=type_hints["text"])
-            self._values: typing.Dict[builtins.str, typing.Any] = {
-                "text": text,
-            }
+            self._values: typing.Dict[builtins.str, typing.Any] = {}
+            if chat is not None:
+                self._values["chat"] = chat
+            if text is not None:
+                self._values["text"] = text
+
+        @builtins.property
+        def chat(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ChatPromptTemplateConfigurationProperty"]]:
+            '''Contains configurations to use the prompt in a conversational format.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-prompttemplateconfiguration.html#cfn-bedrock-prompt-prompttemplateconfiguration-chat
+            '''
+            result = self._values.get("chat")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ChatPromptTemplateConfigurationProperty"]], result)
 
         @builtins.property
         def text(
             self,
-        ) -> typing.Union[_IResolvable_da3f097b, "CfnPrompt.TextPromptTemplateConfigurationProperty"]:
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.TextPromptTemplateConfigurationProperty"]]:
             '''Contains configurations for the text in a message for a prompt.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-prompttemplateconfiguration.html#cfn-bedrock-prompt-prompttemplateconfiguration-text
             '''
             result = self._values.get("text")
-            assert result is not None, "Required property 'text' is missing"
-            return typing.cast(typing.Union[_IResolvable_da3f097b, "CfnPrompt.TextPromptTemplateConfigurationProperty"], result)
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.TextPromptTemplateConfigurationProperty"]], result)
 
         def __eq__(self, rhs: typing.Any) -> builtins.bool:
             return isinstance(rhs, self.__class__) and rhs._values == self._values
@@ -18781,6 +19752,7 @@ class CfnPrompt(
             "name": "name",
             "template_configuration": "templateConfiguration",
             "template_type": "templateType",
+            "gen_ai_resource": "genAiResource",
             "inference_configuration": "inferenceConfiguration",
             "model_id": "modelId",
         },
@@ -18792,6 +19764,7 @@ class CfnPrompt(
             name: builtins.str,
             template_configuration: typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.PromptTemplateConfigurationProperty", typing.Dict[builtins.str, typing.Any]]],
             template_type: builtins.str,
+            gen_ai_resource: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.PromptGenAiResourceProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
             inference_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.PromptInferenceConfigurationProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
             model_id: typing.Optional[builtins.str] = None,
         ) -> None:
@@ -18800,6 +19773,7 @@ class CfnPrompt(
             :param name: The name of the prompt variant.
             :param template_configuration: Contains configurations for the prompt template.
             :param template_type: The type of prompt template to use.
+            :param gen_ai_resource: Specifies a generative AI resource with which to use the prompt.
             :param inference_configuration: Contains inference configurations for the prompt variant.
             :param model_id: The unique identifier of the model or `inference profile <https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html>`_ with which to run inference on the prompt.
 
@@ -18812,9 +19786,51 @@ class CfnPrompt(
                 # The values are placeholders you should change.
                 from aws_cdk import aws_bedrock as bedrock
                 
+                # any: Any
+                # auto: Any
+                # json: Any
+                
                 prompt_variant_property = bedrock.CfnPrompt.PromptVariantProperty(
                     name="name",
                     template_configuration=bedrock.CfnPrompt.PromptTemplateConfigurationProperty(
+                        chat=bedrock.CfnPrompt.ChatPromptTemplateConfigurationProperty(
+                            messages=[bedrock.CfnPrompt.MessageProperty(
+                                content=[bedrock.CfnPrompt.ContentBlockProperty(
+                                    text="text"
+                                )],
+                                role="role"
+                            )],
+                
+                            # the properties below are optional
+                            input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
+                                name="name"
+                            )],
+                            system=[bedrock.CfnPrompt.SystemContentBlockProperty(
+                                text="text"
+                            )],
+                            tool_configuration=bedrock.CfnPrompt.ToolConfigurationProperty(
+                                tools=[bedrock.CfnPrompt.ToolProperty(
+                                    tool_spec=bedrock.CfnPrompt.ToolSpecificationProperty(
+                                        input_schema=bedrock.CfnPrompt.ToolInputSchemaProperty(
+                                            json=json
+                                        ),
+                                        name="name",
+                
+                                        # the properties below are optional
+                                        description="description"
+                                    )
+                                )],
+                
+                                # the properties below are optional
+                                tool_choice=bedrock.CfnPrompt.ToolChoiceProperty(
+                                    any=any,
+                                    auto=auto,
+                                    tool=bedrock.CfnPrompt.SpecificToolChoiceProperty(
+                                        name="name"
+                                    )
+                                )
+                            )
+                        ),
                         text=bedrock.CfnPrompt.TextPromptTemplateConfigurationProperty(
                             input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
                                 name="name"
@@ -18832,6 +19848,11 @@ class CfnPrompt(
                     template_type="templateType",
                 
                     # the properties below are optional
+                    gen_ai_resource=bedrock.CfnPrompt.PromptGenAiResourceProperty(
+                        agent=bedrock.CfnPrompt.PromptAgentResourceProperty(
+                            agent_identifier="agentIdentifier"
+                        )
+                    ),
                     inference_configuration=bedrock.CfnPrompt.PromptInferenceConfigurationProperty(
                         text=bedrock.CfnPrompt.PromptModelInferenceConfigurationProperty(
                             max_tokens=123,
@@ -18848,6 +19869,7 @@ class CfnPrompt(
                 check_type(argname="argument name", value=name, expected_type=type_hints["name"])
                 check_type(argname="argument template_configuration", value=template_configuration, expected_type=type_hints["template_configuration"])
                 check_type(argname="argument template_type", value=template_type, expected_type=type_hints["template_type"])
+                check_type(argname="argument gen_ai_resource", value=gen_ai_resource, expected_type=type_hints["gen_ai_resource"])
                 check_type(argname="argument inference_configuration", value=inference_configuration, expected_type=type_hints["inference_configuration"])
                 check_type(argname="argument model_id", value=model_id, expected_type=type_hints["model_id"])
             self._values: typing.Dict[builtins.str, typing.Any] = {
@@ -18855,6 +19877,8 @@ class CfnPrompt(
                 "template_configuration": template_configuration,
                 "template_type": template_type,
             }
+            if gen_ai_resource is not None:
+                self._values["gen_ai_resource"] = gen_ai_resource
             if inference_configuration is not None:
                 self._values["inference_configuration"] = inference_configuration
             if model_id is not None:
@@ -18892,6 +19916,17 @@ class CfnPrompt(
             assert result is not None, "Required property 'template_type' is missing"
             return typing.cast(builtins.str, result)
 
+        @builtins.property
+        def gen_ai_resource(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptGenAiResourceProperty"]]:
+            '''Specifies a generative AI resource with which to use the prompt.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptvariant.html#cfn-bedrock-prompt-promptvariant-genairesource
+            '''
+            result = self._values.get("gen_ai_resource")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.PromptGenAiResourceProperty"]], result)
+
         @builtins.property
         def inference_configuration(
             self,
@@ -18923,6 +19958,116 @@ class CfnPrompt(
                 k + "=" + repr(v) for k, v in self._values.items()
             )
 
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.SpecificToolChoiceProperty",
+        jsii_struct_bases=[],
+        name_mapping={"name": "name"},
+    )
+    class SpecificToolChoiceProperty:
+        def __init__(self, *, name: builtins.str) -> None:
+            '''The model must request a specific tool. For example, ``{"tool" : {"name" : "Your tool name"}}`` .
+
+            .. epigraph::
+
+               This field is only supported by Anthropic Claude 3 models.
+
+            :param name: The name of the tool that the model must request.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-specifictoolchoice.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                specific_tool_choice_property = bedrock.CfnPrompt.SpecificToolChoiceProperty(
+                    name="name"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__da5ae43b082eab1803451ea8230aaac824b9e7e5692a382e90523019503e98d8)
+                check_type(argname="argument name", value=name, expected_type=type_hints["name"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "name": name,
+            }
+
+        @builtins.property
+        def name(self) -> builtins.str:
+            '''The name of the tool that the model must request.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-specifictoolchoice.html#cfn-bedrock-prompt-specifictoolchoice-name
+            '''
+            result = self._values.get("name")
+            assert result is not None, "Required property 'name' is missing"
+            return typing.cast(builtins.str, result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "SpecificToolChoiceProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.SystemContentBlockProperty",
+        jsii_struct_bases=[],
+        name_mapping={"text": "text"},
+    )
+    class SystemContentBlockProperty:
+        def __init__(self, *, text: builtins.str) -> None:
+            '''Contains configurations for instructions to provide the model for how to handle input.
+
+            To learn more, see `Using the Converse API <https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-call.html>`_ .
+
+            :param text: A system prompt for the model.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-systemcontentblock.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                system_content_block_property = bedrock.CfnPrompt.SystemContentBlockProperty(
+                    text="text"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__8684cdb8cfe450b629e96665dd0dbfcf0c5a9af74b282632d6f3c9b2aa9f3ba1)
+                check_type(argname="argument text", value=text, expected_type=type_hints["text"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "text": text,
+            }
+
+        @builtins.property
+        def text(self) -> builtins.str:
+            '''A system prompt for the model.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-systemcontentblock.html#cfn-bedrock-prompt-systemcontentblock-text
+            '''
+            result = self._values.get("text")
+            assert result is not None, "Required property 'text' is missing"
+            return typing.cast(builtins.str, result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "SystemContentBlockProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
     @jsii.data_type(
         jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.TextPromptTemplateConfigurationProperty",
         jsii_struct_bases=[],
@@ -19095,12 +20240,435 @@ class CfnPrompt(
             return typing.cast(builtins.str, result)
 
         @builtins.property
-        def version(self) -> typing.Optional[builtins.str]:
-            '''The version of the Amazon S3 location to use.
+        def version(self) -> typing.Optional[builtins.str]:
+            '''The version of the Amazon S3 location to use.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-texts3location.html#cfn-bedrock-prompt-texts3location-version
+            '''
+            result = self._values.get("version")
+            return typing.cast(typing.Optional[builtins.str], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "TextS3LocationProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.ToolChoiceProperty",
+        jsii_struct_bases=[],
+        name_mapping={"any": "any", "auto": "auto", "tool": "tool"},
+    )
+    class ToolChoiceProperty:
+        def __init__(
+            self,
+            *,
+            any: typing.Any = None,
+            auto: typing.Any = None,
+            tool: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.SpecificToolChoiceProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
+        ) -> None:
+            '''Determines which tools the model should request in a call to ``Converse`` or ``ConverseStream`` .
+
+            ``ToolChoice`` is only supported by Anthropic Claude 3 models and by Mistral AI Mistral Large.
+
+            :param any: The model must request at least one tool (no text is generated).
+            :param auto: (Default). The Model automatically decides if a tool should be called or whether to generate text instead.
+            :param tool: The Model must request the specified tool. Only supported by Anthropic Claude 3 models.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolchoice.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                # any: Any
+                # auto: Any
+                
+                tool_choice_property = bedrock.CfnPrompt.ToolChoiceProperty(
+                    any=any,
+                    auto=auto,
+                    tool=bedrock.CfnPrompt.SpecificToolChoiceProperty(
+                        name="name"
+                    )
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__ad9877c38015f6113fa32d864cca77d0c46ace16b3e5266c514440f59ad5d586)
+                check_type(argname="argument any", value=any, expected_type=type_hints["any"])
+                check_type(argname="argument auto", value=auto, expected_type=type_hints["auto"])
+                check_type(argname="argument tool", value=tool, expected_type=type_hints["tool"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {}
+            if any is not None:
+                self._values["any"] = any
+            if auto is not None:
+                self._values["auto"] = auto
+            if tool is not None:
+                self._values["tool"] = tool
+
+        @builtins.property
+        def any(self) -> typing.Any:
+            '''The model must request at least one tool (no text is generated).
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolchoice.html#cfn-bedrock-prompt-toolchoice-any
+            '''
+            result = self._values.get("any")
+            return typing.cast(typing.Any, result)
+
+        @builtins.property
+        def auto(self) -> typing.Any:
+            '''(Default).
+
+            The Model automatically decides if a tool should be called or whether to generate text instead.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolchoice.html#cfn-bedrock-prompt-toolchoice-auto
+            '''
+            result = self._values.get("auto")
+            return typing.cast(typing.Any, result)
+
+        @builtins.property
+        def tool(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.SpecificToolChoiceProperty"]]:
+            '''The Model must request the specified tool.
+
+            Only supported by Anthropic Claude 3 models.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolchoice.html#cfn-bedrock-prompt-toolchoice-tool
+            '''
+            result = self._values.get("tool")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.SpecificToolChoiceProperty"]], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "ToolChoiceProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.ToolConfigurationProperty",
+        jsii_struct_bases=[],
+        name_mapping={"tools": "tools", "tool_choice": "toolChoice"},
+    )
+    class ToolConfigurationProperty:
+        def __init__(
+            self,
+            *,
+            tools: typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.ToolProperty", typing.Dict[builtins.str, typing.Any]]]]],
+            tool_choice: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.ToolChoiceProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
+        ) -> None:
+            '''Configuration information for the tools that you pass to a model.
+
+            For more information, see `Tool use (function calling) <https://docs.aws.amazon.com/bedrock/latest/userguide/tool-use.html>`_ in the Amazon Bedrock User Guide.
+
+            :param tools: An array of tools that you want to pass to a model.
+            :param tool_choice: If supported by model, forces the model to request a tool.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolconfiguration.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                # any: Any
+                # auto: Any
+                # json: Any
+                
+                tool_configuration_property = bedrock.CfnPrompt.ToolConfigurationProperty(
+                    tools=[bedrock.CfnPrompt.ToolProperty(
+                        tool_spec=bedrock.CfnPrompt.ToolSpecificationProperty(
+                            input_schema=bedrock.CfnPrompt.ToolInputSchemaProperty(
+                                json=json
+                            ),
+                            name="name",
+                
+                            # the properties below are optional
+                            description="description"
+                        )
+                    )],
+                
+                    # the properties below are optional
+                    tool_choice=bedrock.CfnPrompt.ToolChoiceProperty(
+                        any=any,
+                        auto=auto,
+                        tool=bedrock.CfnPrompt.SpecificToolChoiceProperty(
+                            name="name"
+                        )
+                    )
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__58bef5956bcdc66861dfc71e6b8d5195db50ef860d563950a8cad8402be28a72)
+                check_type(argname="argument tools", value=tools, expected_type=type_hints["tools"])
+                check_type(argname="argument tool_choice", value=tool_choice, expected_type=type_hints["tool_choice"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "tools": tools,
+            }
+            if tool_choice is not None:
+                self._values["tool_choice"] = tool_choice
+
+        @builtins.property
+        def tools(
+            self,
+        ) -> typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolProperty"]]]:
+            '''An array of tools that you want to pass to a model.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolconfiguration.html#cfn-bedrock-prompt-toolconfiguration-tools
+            '''
+            result = self._values.get("tools")
+            assert result is not None, "Required property 'tools' is missing"
+            return typing.cast(typing.Union[_IResolvable_da3f097b, typing.List[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolProperty"]]], result)
+
+        @builtins.property
+        def tool_choice(
+            self,
+        ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolChoiceProperty"]]:
+            '''If supported by model, forces the model to request a tool.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolconfiguration.html#cfn-bedrock-prompt-toolconfiguration-toolchoice
+            '''
+            result = self._values.get("tool_choice")
+            return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolChoiceProperty"]], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "ToolConfigurationProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.ToolInputSchemaProperty",
+        jsii_struct_bases=[],
+        name_mapping={"json": "json"},
+    )
+    class ToolInputSchemaProperty:
+        def __init__(self, *, json: typing.Any) -> None:
+            '''The schema for the tool.
+
+            The top level schema type must be ``object`` .
+
+            :param json: The JSON schema for the tool. For more information, see `JSON Schema Reference <https://docs.aws.amazon.com/https://json-schema.org/understanding-json-schema/reference>`_ .
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolinputschema.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                # json: Any
+                
+                tool_input_schema_property = bedrock.CfnPrompt.ToolInputSchemaProperty(
+                    json=json
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__53e39100fca2ebe3fae8a9a713a4d2e8e663f416119f9157301a00b1d678de97)
+                check_type(argname="argument json", value=json, expected_type=type_hints["json"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "json": json,
+            }
+
+        @builtins.property
+        def json(self) -> typing.Any:
+            '''The JSON schema for the tool.
+
+            For more information, see `JSON Schema Reference <https://docs.aws.amazon.com/https://json-schema.org/understanding-json-schema/reference>`_ .
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolinputschema.html#cfn-bedrock-prompt-toolinputschema-json
+            '''
+            result = self._values.get("json")
+            assert result is not None, "Required property 'json' is missing"
+            return typing.cast(typing.Any, result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "ToolInputSchemaProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.ToolProperty",
+        jsii_struct_bases=[],
+        name_mapping={"tool_spec": "toolSpec"},
+    )
+    class ToolProperty:
+        def __init__(
+            self,
+            *,
+            tool_spec: typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.ToolSpecificationProperty", typing.Dict[builtins.str, typing.Any]]],
+        ) -> None:
+            '''Information about a tool that you can use with the Converse API.
+
+            For more information, see `Tool use (function calling) <https://docs.aws.amazon.com/bedrock/latest/userguide/tool-use.html>`_ in the Amazon Bedrock User Guide.
+
+            :param tool_spec: The specfication for the tool.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-tool.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                # json: Any
+                
+                tool_property = bedrock.CfnPrompt.ToolProperty(
+                    tool_spec=bedrock.CfnPrompt.ToolSpecificationProperty(
+                        input_schema=bedrock.CfnPrompt.ToolInputSchemaProperty(
+                            json=json
+                        ),
+                        name="name",
+                
+                        # the properties below are optional
+                        description="description"
+                    )
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__e0724eccb0497cbb88041bf7ba797dcfaceb20385a8cb461c8adc1b539c869e2)
+                check_type(argname="argument tool_spec", value=tool_spec, expected_type=type_hints["tool_spec"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "tool_spec": tool_spec,
+            }
+
+        @builtins.property
+        def tool_spec(
+            self,
+        ) -> typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolSpecificationProperty"]:
+            '''The specfication for the tool.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-tool.html#cfn-bedrock-prompt-tool-toolspec
+            '''
+            result = self._values.get("tool_spec")
+            assert result is not None, "Required property 'tool_spec' is missing"
+            return typing.cast(typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolSpecificationProperty"], result)
+
+        def __eq__(self, rhs: typing.Any) -> builtins.bool:
+            return isinstance(rhs, self.__class__) and rhs._values == self._values
+
+        def __ne__(self, rhs: typing.Any) -> builtins.bool:
+            return not (rhs == self)
+
+        def __repr__(self) -> str:
+            return "ToolProperty(%s)" % ", ".join(
+                k + "=" + repr(v) for k, v in self._values.items()
+            )
+
+    @jsii.data_type(
+        jsii_type="aws-cdk-lib.aws_bedrock.CfnPrompt.ToolSpecificationProperty",
+        jsii_struct_bases=[],
+        name_mapping={
+            "input_schema": "inputSchema",
+            "name": "name",
+            "description": "description",
+        },
+    )
+    class ToolSpecificationProperty:
+        def __init__(
+            self,
+            *,
+            input_schema: typing.Union[_IResolvable_da3f097b, typing.Union["CfnPrompt.ToolInputSchemaProperty", typing.Dict[builtins.str, typing.Any]]],
+            name: builtins.str,
+            description: typing.Optional[builtins.str] = None,
+        ) -> None:
+            '''The specification for the tool.
+
+            :param input_schema: The input schema for the tool in JSON format.
+            :param name: The name for the tool.
+            :param description: The description for the tool.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolspecification.html
+            :exampleMetadata: fixture=_generated
+
+            Example::
+
+                # The code below shows an example of how to instantiate this type.
+                # The values are placeholders you should change.
+                from aws_cdk import aws_bedrock as bedrock
+                
+                # json: Any
+                
+                tool_specification_property = bedrock.CfnPrompt.ToolSpecificationProperty(
+                    input_schema=bedrock.CfnPrompt.ToolInputSchemaProperty(
+                        json=json
+                    ),
+                    name="name",
+                
+                    # the properties below are optional
+                    description="description"
+                )
+            '''
+            if __debug__:
+                type_hints = typing.get_type_hints(_typecheckingstub__431488796f561e2bc20a8aab4af239c209e0fc67b16251fa2476c7a19e2add9d)
+                check_type(argname="argument input_schema", value=input_schema, expected_type=type_hints["input_schema"])
+                check_type(argname="argument name", value=name, expected_type=type_hints["name"])
+                check_type(argname="argument description", value=description, expected_type=type_hints["description"])
+            self._values: typing.Dict[builtins.str, typing.Any] = {
+                "input_schema": input_schema,
+                "name": name,
+            }
+            if description is not None:
+                self._values["description"] = description
+
+        @builtins.property
+        def input_schema(
+            self,
+        ) -> typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolInputSchemaProperty"]:
+            '''The input schema for the tool in JSON format.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolspecification.html#cfn-bedrock-prompt-toolspecification-inputschema
+            '''
+            result = self._values.get("input_schema")
+            assert result is not None, "Required property 'input_schema' is missing"
+            return typing.cast(typing.Union[_IResolvable_da3f097b, "CfnPrompt.ToolInputSchemaProperty"], result)
+
+        @builtins.property
+        def name(self) -> builtins.str:
+            '''The name for the tool.
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolspecification.html#cfn-bedrock-prompt-toolspecification-name
+            '''
+            result = self._values.get("name")
+            assert result is not None, "Required property 'name' is missing"
+            return typing.cast(builtins.str, result)
+
+        @builtins.property
+        def description(self) -> typing.Optional[builtins.str]:
+            '''The description for the tool.
 
-            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-texts3location.html#cfn-bedrock-prompt-texts3location-version
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-toolspecification.html#cfn-bedrock-prompt-toolspecification-description
             '''
-            result = self._values.get("version")
+            result = self._values.get("description")
             return typing.cast(typing.Optional[builtins.str], result)
 
         def __eq__(self, rhs: typing.Any) -> builtins.bool:
@@ -19110,7 +20678,7 @@ class CfnPrompt(
             return not (rhs == self)
 
         def __repr__(self) -> str:
-            return "TextS3LocationProperty(%s)" % ", ".join(
+            return "ToolSpecificationProperty(%s)" % ", ".join(
                 k + "=" + repr(v) for k, v in self._values.items()
             )
 
@@ -19156,6 +20724,10 @@ class CfnPromptProps:
             # The values are placeholders you should change.
             from aws_cdk import aws_bedrock as bedrock
             
+            # any: Any
+            # auto: Any
+            # json: Any
+            
             cfn_prompt_props = bedrock.CfnPromptProps(
                 name="name",
             
@@ -19169,6 +20741,44 @@ class CfnPromptProps:
                 variants=[bedrock.CfnPrompt.PromptVariantProperty(
                     name="name",
                     template_configuration=bedrock.CfnPrompt.PromptTemplateConfigurationProperty(
+                        chat=bedrock.CfnPrompt.ChatPromptTemplateConfigurationProperty(
+                            messages=[bedrock.CfnPrompt.MessageProperty(
+                                content=[bedrock.CfnPrompt.ContentBlockProperty(
+                                    text="text"
+                                )],
+                                role="role"
+                            )],
+            
+                            # the properties below are optional
+                            input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
+                                name="name"
+                            )],
+                            system=[bedrock.CfnPrompt.SystemContentBlockProperty(
+                                text="text"
+                            )],
+                            tool_configuration=bedrock.CfnPrompt.ToolConfigurationProperty(
+                                tools=[bedrock.CfnPrompt.ToolProperty(
+                                    tool_spec=bedrock.CfnPrompt.ToolSpecificationProperty(
+                                        input_schema=bedrock.CfnPrompt.ToolInputSchemaProperty(
+                                            json=json
+                                        ),
+                                        name="name",
+            
+                                        # the properties below are optional
+                                        description="description"
+                                    )
+                                )],
+            
+                                # the properties below are optional
+                                tool_choice=bedrock.CfnPrompt.ToolChoiceProperty(
+                                    any=any,
+                                    auto=auto,
+                                    tool=bedrock.CfnPrompt.SpecificToolChoiceProperty(
+                                        name="name"
+                                    )
+                                )
+                            )
+                        ),
                         text=bedrock.CfnPrompt.TextPromptTemplateConfigurationProperty(
                             input_variables=[bedrock.CfnPrompt.PromptInputVariableProperty(
                                 name="name"
@@ -19186,6 +20796,11 @@ class CfnPromptProps:
                     template_type="templateType",
             
                     # the properties below are optional
+                    gen_ai_resource=bedrock.CfnPrompt.PromptGenAiResourceProperty(
+                        agent=bedrock.CfnPrompt.PromptAgentResourceProperty(
+                            agent_identifier="agentIdentifier"
+                        )
+                    ),
                     inference_configuration=bedrock.CfnPrompt.PromptInferenceConfigurationProperty(
                         text=bedrock.CfnPrompt.PromptModelInferenceConfigurationProperty(
                             max_tokens=123,
@@ -20162,7 +21777,12 @@ class FoundationModelIdentifier(
     @jsii.python.classproperty
     @jsii.member(jsii_name="AI21_J2_GRANDE_INSTRUCT")
     def AI21_J2_GRANDE_INSTRUCT(cls) -> "FoundationModelIdentifier":
-        '''Base model "ai21.j2-grande-instruct".'''
+        '''(deprecated) Base model "ai21.j2-grande-instruct".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "AI21_J2_GRANDE_INSTRUCT"))
 
     @jsii.python.classproperty
@@ -20174,19 +21794,34 @@ class FoundationModelIdentifier(
     @jsii.python.classproperty
     @jsii.member(jsii_name="AI21_J2_JUMBO_INSTRUCT")
     def AI21_J2_JUMBO_INSTRUCT(cls) -> "FoundationModelIdentifier":
-        '''Base model "ai21.j2-jumbo-instruct".'''
+        '''(deprecated) Base model "ai21.j2-jumbo-instruct".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "AI21_J2_JUMBO_INSTRUCT"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="AI21_J2_MID")
     def AI21_J2_MID(cls) -> "FoundationModelIdentifier":
-        '''Base model "ai21.j2-mid".'''
+        '''(deprecated) Base model "ai21.j2-mid".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "AI21_J2_MID"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="AI21_J2_ULTRA")
     def AI21_J2_ULTRA(cls) -> "FoundationModelIdentifier":
-        '''Base model "ai21.j2-ultra".'''
+        '''(deprecated) Base model "ai21.j2-ultra".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "AI21_J2_ULTRA"))
 
     @jsii.python.classproperty
@@ -20204,19 +21839,34 @@ class FoundationModelIdentifier(
     @jsii.python.classproperty
     @jsii.member(jsii_name="AI21_LABS_JURASSIC_2_MID_V1")
     def AI21_LABS_JURASSIC_2_MID_V1(cls) -> "FoundationModelIdentifier":
-        '''Base model "ai21.j2-mid-v1".'''
+        '''(deprecated) Base model "ai21.j2-mid-v1".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "AI21_LABS_JURASSIC_2_MID_V1"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="AI21_LABS_JURASSIC_2_ULTRA_V1")
     def AI21_LABS_JURASSIC_2_ULTRA_V1(cls) -> "FoundationModelIdentifier":
-        '''Base model "ai21.j2-ultra-v1".'''
+        '''(deprecated) Base model "ai21.j2-ultra-v1".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "AI21_LABS_JURASSIC_2_ULTRA_V1"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="AI21_LABS_JURASSIC_2_ULTRA_V1_0_8K")
     def AI21_LABS_JURASSIC_2_ULTRA_V1_0_8_K(cls) -> "FoundationModelIdentifier":
-        '''Base model "ai21.j2-ultra-v1:0:8k".'''
+        '''(deprecated) Base model "ai21.j2-ultra-v1:0:8k".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "AI21_LABS_JURASSIC_2_ULTRA_V1_0_8K"))
 
     @jsii.python.classproperty
@@ -20387,12 +22037,60 @@ class FoundationModelIdentifier(
         '''Base model "anthropic.claude-3-5-sonnet-20240620-v1:0".'''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0"))
 
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_18K")
+    def ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_18_K(
+        cls,
+    ) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-5-sonnet-20240620-v1:0:18k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_18K"))
+
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_200K")
+    def ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_200_K(
+        cls,
+    ) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-5-sonnet-20240620-v1:0:200k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_200K"))
+
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_51K")
+    def ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_51_K(
+        cls,
+    ) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-5-sonnet-20240620-v1:0:51k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_5_SONNET_20240620_V1_0_51K"))
+
     @jsii.python.classproperty
     @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0")
     def ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0(cls) -> "FoundationModelIdentifier":
         '''Base model "anthropic.claude-3-5-sonnet-20241022-v2:0".'''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0"))
 
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_18K")
+    def ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_18_K(
+        cls,
+    ) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-5-sonnet-20241022-v2:0:18k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_18K"))
+
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_200K")
+    def ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_200_K(
+        cls,
+    ) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-5-sonnet-20241022-v2:0:200k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_200K"))
+
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_51K")
+    def ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_51_K(
+        cls,
+    ) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-5-sonnet-20241022-v2:0:51k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_5_SONNET_20241022_V2_0_51K"))
+
     @jsii.python.classproperty
     @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_HAIKU_20240307_V1_0")
     def ANTHROPIC_CLAUDE_3_HAIKU_20240307_V1_0(cls) -> "FoundationModelIdentifier":
@@ -20419,6 +22117,24 @@ class FoundationModelIdentifier(
         '''Base model "anthropic.claude-3-opus-20240229-v1:0".'''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0"))
 
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_12K")
+    def ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_12_K(cls) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-opus-20240229-v1:0:12k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_12K"))
+
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_200K")
+    def ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_200_K(cls) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-opus-20240229-v1:0:200k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_200K"))
+
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_28K")
+    def ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_28_K(cls) -> "FoundationModelIdentifier":
+        '''Base model "anthropic.claude-3-opus-20240229-v1:0:28k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "ANTHROPIC_CLAUDE_3_OPUS_20240229_V1_0_28K"))
+
     @jsii.python.classproperty
     @jsii.member(jsii_name="ANTHROPIC_CLAUDE_3_SONNET_20240229_V1_0")
     def ANTHROPIC_CLAUDE_3_SONNET_20240229_V1_0(cls) -> "FoundationModelIdentifier":
@@ -20569,49 +22285,89 @@ class FoundationModelIdentifier(
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_2_13B_CHAT_V1_0_4K")
     def META_LLAMA_2_13_B_CHAT_V1_0_4_K(cls) -> "FoundationModelIdentifier":
-        '''Base model "meta.llama2-13b-chat-v1:0:4k".'''
+        '''(deprecated) Base model "meta.llama2-13b-chat-v1:0:4k".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_2_13B_CHAT_V1_0_4K"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_2_13B_V1")
     def META_LLAMA_2_13_B_V1(cls) -> "FoundationModelIdentifier":
-        '''Base model "meta.llama2-13b-v1".'''
+        '''(deprecated) Base model "meta.llama2-13b-v1".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_2_13B_V1"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_2_13B_V1_0_4K")
     def META_LLAMA_2_13_B_V1_0_4_K(cls) -> "FoundationModelIdentifier":
-        '''Base model "meta.llama2-13b-v1:0:4k".'''
+        '''(deprecated) Base model "meta.llama2-13b-v1:0:4k".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_2_13B_V1_0_4K"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_2_70B_CHAT_V1_0_4K")
     def META_LLAMA_2_70_B_CHAT_V1_0_4_K(cls) -> "FoundationModelIdentifier":
-        '''Base model "meta.llama2-70b-chat-v1:0:4k".'''
+        '''(deprecated) Base model "meta.llama2-70b-chat-v1:0:4k".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_2_70B_CHAT_V1_0_4K"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_2_70B_V1")
     def META_LLAMA_2_70_B_V1(cls) -> "FoundationModelIdentifier":
-        '''Base model "meta.llama2-70b-v1".'''
+        '''(deprecated) Base model "meta.llama2-70b-v1".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_2_70B_V1"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_2_70B_V1_0_4K")
     def META_LLAMA_2_70_B_V1_0_4_K(cls) -> "FoundationModelIdentifier":
-        '''Base model "meta.llama2-70b-v1:0:4k".'''
+        '''(deprecated) Base model "meta.llama2-70b-v1:0:4k".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_2_70B_V1_0_4K"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_2_CHAT_13B_V1")
     def META_LLAMA_2_CHAT_13_B_V1(cls) -> "FoundationModelIdentifier":
-        '''Base model "meta.llama2-13b-chat-v1".'''
+        '''(deprecated) Base model "meta.llama2-13b-chat-v1".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_2_CHAT_13B_V1"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_2_CHAT_70B_V1")
     def META_LLAMA_2_CHAT_70_B_V1(cls) -> "FoundationModelIdentifier":
-        '''Base model "meta.llama2-70b-chat-v1".'''
+        '''(deprecated) Base model "meta.llama2-70b-chat-v1".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_2_CHAT_70B_V1"))
 
     @jsii.python.classproperty
@@ -20626,6 +22382,18 @@ class FoundationModelIdentifier(
         '''Base model "meta.llama3-1-70b-instruct-v1:0".'''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_3_1_70_INSTRUCT_V1"))
 
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="META_LLAMA_3_1_70_INSTRUCT_V1_128K")
+    def META_LLAMA_3_1_70_INSTRUCT_V1_128_K(cls) -> "FoundationModelIdentifier":
+        '''Base model "meta.llama3-1-70b-instruct-v1:0:128k".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_3_1_70_INSTRUCT_V1_128K"))
+
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="META_LLAMA_3_1_8B_INSTRUCT_V_128K")
+    def META_LLAMA_3_1_8_B_INSTRUCT_V_128_K(cls) -> "FoundationModelIdentifier":
+        '''Base model "meta.llama3-1-8b-instruct-v1:0:128".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_3_1_8B_INSTRUCT_V_128K"))
+
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_3_1_8B_INSTRUCT_V1")
     def META_LLAMA_3_1_8_B_INSTRUCT_V1(cls) -> "FoundationModelIdentifier":
@@ -20656,6 +22424,12 @@ class FoundationModelIdentifier(
         '''Base model "meta.llama3-2-90b-instruct-v1:0".'''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_3_2_90B_INSTRUCT_V1"))
 
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="META_LLAMA_3_3_70B_INSTRUCT_V1")
+    def META_LLAMA_3_3_70_B_INSTRUCT_V1(cls) -> "FoundationModelIdentifier":
+        '''Base model "meta.llama3-3-70b-instruct-v1:0".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "META_LLAMA_3_3_70B_INSTRUCT_V1"))
+
     @jsii.python.classproperty
     @jsii.member(jsii_name="META_LLAMA_3_70_INSTRUCT_V1")
     def META_LLAMA_3_70_INSTRUCT_V1(cls) -> "FoundationModelIdentifier":
@@ -20698,6 +22472,12 @@ class FoundationModelIdentifier(
         '''Base model "mistral.mistral-small-2402-v1:0".'''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "MISTRAL_SMALL_V0_1"))
 
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="STABILITY_SD3_5_LARGE_V1_0")
+    def STABILITY_SD3_5_LARGE_V1_0(cls) -> "FoundationModelIdentifier":
+        '''Base model "stability.sd3-5-large-v1:0".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "STABILITY_SD3_5_LARGE_V1_0"))
+
     @jsii.python.classproperty
     @jsii.member(jsii_name="STABILITY_SD3_LARGE_V1_0")
     def STABILITY_SD3_LARGE_V1_0(cls) -> "FoundationModelIdentifier":
@@ -20729,13 +22509,23 @@ class FoundationModelIdentifier(
     @jsii.python.classproperty
     @jsii.member(jsii_name="STABILITY_STABLE_DIFFUSION_XL_V1")
     def STABILITY_STABLE_DIFFUSION_XL_V1(cls) -> "FoundationModelIdentifier":
-        '''Base model "stability.stable-diffusion-xl-v1".'''
+        '''(deprecated) Base model "stability.stable-diffusion-xl-v1".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "STABILITY_STABLE_DIFFUSION_XL_V1"))
 
     @jsii.python.classproperty
     @jsii.member(jsii_name="STABILITY_STABLE_DIFFUSION_XL_V1_0")
     def STABILITY_STABLE_DIFFUSION_XL_V1_0(cls) -> "FoundationModelIdentifier":
-        '''Base model "stability.stable-diffusion-xl-v1:0".'''
+        '''(deprecated) Base model "stability.stable-diffusion-xl-v1:0".
+
+        :deprecated: use latest version of the model
+
+        :stability: deprecated
+        '''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "STABILITY_STABLE_DIFFUSION_XL_V1_0"))
 
     @jsii.python.classproperty
@@ -20744,12 +22534,24 @@ class FoundationModelIdentifier(
         '''Base model "stability.stable-image-core-v1:0".'''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "STABILITY_STABLE_IMAGE_CORE_V1_0"))
 
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="STABILITY_STABLE_IMAGE_CORE_V1_1")
+    def STABILITY_STABLE_IMAGE_CORE_V1_1(cls) -> "FoundationModelIdentifier":
+        '''Base model "stability.stable-image-core-v1:1".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "STABILITY_STABLE_IMAGE_CORE_V1_1"))
+
     @jsii.python.classproperty
     @jsii.member(jsii_name="STABILITY_STABLE_IMAGE_ULTRA_V1_0")
     def STABILITY_STABLE_IMAGE_ULTRA_V1_0(cls) -> "FoundationModelIdentifier":
         '''Base model "stability.stable-image-ultra-v1:0".'''
         return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "STABILITY_STABLE_IMAGE_ULTRA_V1_0"))
 
+    @jsii.python.classproperty
+    @jsii.member(jsii_name="STABILITY_STABLE_IMAGE_ULTRA_V1_1")
+    def STABILITY_STABLE_IMAGE_ULTRA_V1_1(cls) -> "FoundationModelIdentifier":
+        '''Base model "stability.stable-image-ultra-v1:1".'''
+        return typing.cast("FoundationModelIdentifier", jsii.sget(cls, "STABILITY_STABLE_IMAGE_ULTRA_V1_1"))
+
     @builtins.property
     @jsii.member(jsii_name="modelId")
     def model_id(self) -> builtins.str:
@@ -21115,6 +22917,7 @@ def _typecheckingstub__19341a6c1d4ad6e6ceea8110fa1f82a06ec1a28df35e4ccc6cdb16f02
     name: builtins.str,
     description: typing.Optional[builtins.str] = None,
     parameters: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Mapping[builtins.str, typing.Union[_IResolvable_da3f097b, typing.Union[CfnAgent.ParameterDetailProperty, typing.Dict[builtins.str, typing.Any]]]]]] = None,
+    require_confirmation: typing.Optional[builtins.str] = None,
 ) -> None:
     """Type checking stubs"""
     pass
@@ -21426,9 +23229,17 @@ def _typecheckingstub__033990e14b671fe96b02a12658cd4beadf8bae975b4e0c94984d3e419
     """Type checking stubs"""
     pass
 
+def _typecheckingstub__d1c9cf855ebecb64cb9a92684072efa631cc07e2bded88aa0e8cfa6319f97834(
+    *,
+    parsing_modality: typing.Optional[builtins.str] = None,
+) -> None:
+    """Type checking stubs"""
+    pass
+
 def _typecheckingstub__1988b824c4171f598d30cf03abdb56bc617fd654dd3daf3e641d11499c0e04ac(
     *,
     model_arn: builtins.str,
+    parsing_modality: typing.Optional[builtins.str] = None,
     parsing_prompt: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnDataSource.ParsingPromptProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
 ) -> None:
     """Type checking stubs"""
@@ -21530,6 +23341,7 @@ def _typecheckingstub__5bdd915748b8cf592aa9f03cf95eac889f69f61263bafe87a0ba9aa14
 def _typecheckingstub__26a14ade018e836fe8686ec2de5e50a05435a92d8d540814f0759c1bb3893ef0(
     *,
     parsing_strategy: builtins.str,
+    bedrock_data_automation_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnDataSource.BedrockDataAutomationConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
     bedrock_foundation_model_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnDataSource.BedrockFoundationModelConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
 ) -> None:
     """Type checking stubs"""
@@ -22739,8 +24551,8 @@ def _typecheckingstub__6ef81b8dcbedbd76b5a39a6fd5a967ba49aa887b63aad45e2bc246c96
     knowledge_base_configuration: typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.KnowledgeBaseConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
     name: builtins.str,
     role_arn: builtins.str,
-    storage_configuration: typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.StorageConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
     description: typing.Optional[builtins.str] = None,
+    storage_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.StorageConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
     tags: typing.Optional[typing.Mapping[builtins.str, builtins.str]] = None,
 ) -> None:
     """Type checking stubs"""
@@ -22776,14 +24588,14 @@ def _typecheckingstub__e6281f2d1ed9a2f71b02754159fe6b2d8c70d3527e97d2d060434dc34
     """Type checking stubs"""
     pass
 
-def _typecheckingstub__9c3409dc5fcb9799e2f638dda4e66d2391cf6984b3e10eb29b36e85981cfc59b(
-    value: typing.Union[_IResolvable_da3f097b, CfnKnowledgeBase.StorageConfigurationProperty],
+def _typecheckingstub__f9fef7f262d2bad58c7f37c90b8756dd028b772a93aa036a4caf0c9565a7fff1(
+    value: typing.Optional[builtins.str],
 ) -> None:
     """Type checking stubs"""
     pass
 
-def _typecheckingstub__f9fef7f262d2bad58c7f37c90b8756dd028b772a93aa036a4caf0c9565a7fff1(
-    value: typing.Optional[builtins.str],
+def _typecheckingstub__9c3409dc5fcb9799e2f638dda4e66d2391cf6984b3e10eb29b36e85981cfc59b(
+    value: typing.Optional[typing.Union[_IResolvable_da3f097b, CfnKnowledgeBase.StorageConfigurationProperty]],
 ) -> None:
     """Type checking stubs"""
     pass
@@ -22808,10 +24620,18 @@ def _typecheckingstub__a2105581ffba179dfd90baf9c36dfefb76ca74a5c6cfca17d6c87aec8
     """Type checking stubs"""
     pass
 
+def _typecheckingstub__f49108183c657ffec5628bb187155a62b4da5dfc81f77718084a35d0e1296bfd(
+    *,
+    kendra_index_arn: builtins.str,
+) -> None:
+    """Type checking stubs"""
+    pass
+
 def _typecheckingstub__f2ca26f28cc4cf3a289e62f58643faf6a7d98ea3e55e7ff4f0f77530fa0294b4(
     *,
     type: builtins.str,
-    vector_knowledge_base_configuration: typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
+    kendra_knowledge_base_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.KendraKnowledgeBaseConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
+    vector_knowledge_base_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.VectorKnowledgeBaseConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
 ) -> None:
     """Type checking stubs"""
     pass
@@ -22873,6 +24693,13 @@ def _typecheckingstub__0060deafed28d2f4c1690bf8921de0b9aca79fe88ac4c5ca53f29b4ef
     """Type checking stubs"""
     pass
 
+def _typecheckingstub__2d65bf934dc283aa920ce8366929ceeb84863f6a3de2b775a4f2d2ee019979bc(
+    *,
+    uri: builtins.str,
+) -> None:
+    """Type checking stubs"""
+    pass
+
 def _typecheckingstub__fa4cccae88d65689f5f3cabcb8393a082af16eb90d7613332a03867c32272af4(
     *,
     type: builtins.str,
@@ -22883,10 +24710,26 @@ def _typecheckingstub__fa4cccae88d65689f5f3cabcb8393a082af16eb90d7613332a03867c3
     """Type checking stubs"""
     pass
 
+def _typecheckingstub__23aedf500d0c089aa233b40ff3fc0bdc7842b000954e996faef806cf0f44c930(
+    *,
+    supplemental_data_storage_locations: typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.SupplementalDataStorageLocationProperty, typing.Dict[builtins.str, typing.Any]]]]],
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__754c3d05d3167c3b2203485932c3bc498a24c9d4555c672a7d5069d4d86f73d6(
+    *,
+    supplemental_data_storage_location_type: builtins.str,
+    s3_location: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.S3LocationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
+) -> None:
+    """Type checking stubs"""
+    pass
+
 def _typecheckingstub__53b08e209954b21c35b746e5eee517d51370af30630f5f17b3e5435150898236(
     *,
     embedding_model_arn: builtins.str,
     embedding_model_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.EmbeddingModelConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
+    supplemental_data_storage_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.SupplementalDataStorageConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
 ) -> None:
     """Type checking stubs"""
     pass
@@ -22896,8 +24739,8 @@ def _typecheckingstub__a5f6560ff734e79a877ac4cd934408cd79b9c6a6c1dac195972f27ac4
     knowledge_base_configuration: typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.KnowledgeBaseConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
     name: builtins.str,
     role_arn: builtins.str,
-    storage_configuration: typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.StorageConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
     description: typing.Optional[builtins.str] = None,
+    storage_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnKnowledgeBase.StorageConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
     tags: typing.Optional[typing.Mapping[builtins.str, builtins.str]] = None,
 ) -> None:
     """Type checking stubs"""
@@ -22965,6 +24808,45 @@ def _typecheckingstub__b92123c0073f901a0741c026473098ec639beea3bd80ea47a9b53798e
     """Type checking stubs"""
     pass
 
+def _typecheckingstub__9c6a58ca5edb4fe7249a2b37babee7b708f1fc92b3adcd4af4c3afa45077ee55(
+    *,
+    messages: typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.MessageProperty, typing.Dict[builtins.str, typing.Any]]]]],
+    input_variables: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.PromptInputVariableProperty, typing.Dict[builtins.str, typing.Any]]]]]] = None,
+    system: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.SystemContentBlockProperty, typing.Dict[builtins.str, typing.Any]]]]]] = None,
+    tool_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.ToolConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__2d0cf0f0136b9d804a0809956c82c64b1f75a73d35d6c0fa6f1007666d629ec6(
+    *,
+    text: builtins.str,
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__42b42b22130352586f0ff208cc8c3ce6b3705d340f12b03331553326e9b7585b(
+    *,
+    content: typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.ContentBlockProperty, typing.Dict[builtins.str, typing.Any]]]]],
+    role: builtins.str,
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__d28921d18df971112b15d156471e2c5279000c3080bd4f0620f849341fd6a896(
+    *,
+    agent_identifier: builtins.str,
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__64cff76991e320523c3338e0c04d15db173e4f0d91de163069f07878d8c88123(
+    *,
+    agent: typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.PromptAgentResourceProperty, typing.Dict[builtins.str, typing.Any]]],
+) -> None:
+    """Type checking stubs"""
+    pass
+
 def _typecheckingstub__bd64a2009dff1bac3dd98571ac9a9cd65cbb030a3896121e0b1c8f24dfe6c74d(
     *,
     text: typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.PromptModelInferenceConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
@@ -22991,7 +24873,8 @@ def _typecheckingstub__d348efba187570a443093419bc85fbc24f754a9496fbfc85e29bb7e40
 
 def _typecheckingstub__fde740ede958bf60edc6a98392bd083868fd4fd5f6ba5698705fc5e13de4d2bc(
     *,
-    text: typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.TextPromptTemplateConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
+    chat: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.ChatPromptTemplateConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
+    text: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.TextPromptTemplateConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
 ) -> None:
     """Type checking stubs"""
     pass
@@ -23001,12 +24884,27 @@ def _typecheckingstub__84ac4a525676aedbb60bd913121b2941e7f39f8599421758678b789b5
     name: builtins.str,
     template_configuration: typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.PromptTemplateConfigurationProperty, typing.Dict[builtins.str, typing.Any]]],
     template_type: builtins.str,
+    gen_ai_resource: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.PromptGenAiResourceProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
     inference_configuration: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.PromptInferenceConfigurationProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
     model_id: typing.Optional[builtins.str] = None,
 ) -> None:
     """Type checking stubs"""
     pass
 
+def _typecheckingstub__da5ae43b082eab1803451ea8230aaac824b9e7e5692a382e90523019503e98d8(
+    *,
+    name: builtins.str,
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__8684cdb8cfe450b629e96665dd0dbfcf0c5a9af74b282632d6f3c9b2aa9f3ba1(
+    *,
+    text: builtins.str,
+) -> None:
+    """Type checking stubs"""
+    pass
+
 def _typecheckingstub__01b3fa0f925290ea253625fab81f78f897a7a15beed843aec623b58c22593c4c(
     *,
     input_variables: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.PromptInputVariableProperty, typing.Dict[builtins.str, typing.Any]]]]]] = None,
@@ -23025,6 +24923,46 @@ def _typecheckingstub__d1287781cb0d3129610c849bcac59920b6cd9c4ee3463830e5e8a9c13
     """Type checking stubs"""
     pass
 
+def _typecheckingstub__ad9877c38015f6113fa32d864cca77d0c46ace16b3e5266c514440f59ad5d586(
+    *,
+    any: typing.Any = None,
+    auto: typing.Any = None,
+    tool: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.SpecificToolChoiceProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__58bef5956bcdc66861dfc71e6b8d5195db50ef860d563950a8cad8402be28a72(
+    *,
+    tools: typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.ToolProperty, typing.Dict[builtins.str, typing.Any]]]]],
+    tool_choice: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.ToolChoiceProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__53e39100fca2ebe3fae8a9a713a4d2e8e663f416119f9157301a00b1d678de97(
+    *,
+    json: typing.Any,
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__e0724eccb0497cbb88041bf7ba797dcfaceb20385a8cb461c8adc1b539c869e2(
+    *,
+    tool_spec: typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.ToolSpecificationProperty, typing.Dict[builtins.str, typing.Any]]],
+) -> None:
+    """Type checking stubs"""
+    pass
+
+def _typecheckingstub__431488796f561e2bc20a8aab4af239c209e0fc67b16251fa2476c7a19e2add9d(
+    *,
+    input_schema: typing.Union[_IResolvable_da3f097b, typing.Union[CfnPrompt.ToolInputSchemaProperty, typing.Dict[builtins.str, typing.Any]]],
+    name: builtins.str,
+    description: typing.Optional[builtins.str] = None,
+) -> None:
+    """Type checking stubs"""
+    pass
+
 def _typecheckingstub__ae555e4fe530af3f71499cdb465b902eb20b6de3d58aa48f4003015a29807bf9(
     *,
     name: builtins.str,