From 33833137f4a9dfe0021721d3eb16d322e7df2fa7 Mon Sep 17 00:00:00 2001 From: aws-sdk-dotnet-automation Date: Wed, 11 Sep 2024 18:27:26 +0000 Subject: [PATCH] Amazon Bedrock Knowledge Bases now supports using inference profiles to increase throughput and improve resilience. --- .../bedrock-agent-runtime-2023-07-26.api.json | 6 +++--- .../bedrock-agent-runtime-2023-07-26.docs.json | 6 +++--- .../bedrock-agent-runtime-2023-07-26.normal.json | 12 ++++++------ .../Generated/PropertyValueRules.xml | 12 ++++++------ ...xternalSourcesRetrieveAndGenerateConfiguration.cs | 2 +- .../KnowledgeBaseRetrieveAndGenerateConfiguration.cs | 8 ++++---- .../Generated/Model/RetrieveAndGenerateRequest.cs | 5 +++-- .../_bcl35/AmazonBedrockAgentRuntimeClient.cs | 5 +++-- .../Generated/_bcl35/IAmazonBedrockAgentRuntime.cs | 5 +++-- .../_bcl45/AmazonBedrockAgentRuntimeClient.cs | 10 ++++++---- .../Generated/_bcl45/IAmazonBedrockAgentRuntime.cs | 10 ++++++---- .../_netstandard/AmazonBedrockAgentRuntimeClient.cs | 5 +++-- .../_netstandard/IAmazonBedrockAgentRuntime.cs | 5 +++-- 13 files changed, 50 insertions(+), 41 deletions(-) diff --git a/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.api.json b/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.api.json index 821152e72abb..b02114cbdc83 100644 --- a/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.api.json +++ b/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.api.json @@ -293,9 +293,9 @@ }, "BedrockModelArn":{ "type":"string", - "max":1011, - "min":20, - "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}))$" + "max":2048, + "min":1, + "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))))|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$" }, "Boolean":{ "type":"boolean", diff --git a/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.docs.json b/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.docs.json index 7bd9b8b960f4..eebf3f1bab12 100644 --- a/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.docs.json +++ b/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.docs.json @@ -7,7 +7,7 @@ "InvokeAgent": "

The CLI doesn't support streaming operations in Amazon Bedrock, including InvokeAgent.

Sends a prompt for the agent to process and respond to. Note the following fields for the request:

The response is returned in the bytes field of the chunk object.

", "InvokeFlow": "

Invokes an alias of a flow to run the inputs that you specify and return the output of each node as a stream. If there's an error, the error is returned. For more information, see Test a flow in Amazon Bedrock in the Amazon Bedrock User Guide.

The CLI doesn't support streaming operations in Amazon Bedrock, including InvokeFlow.

", "Retrieve": "

Queries a knowledge base and retrieves information from it.

", - "RetrieveAndGenerate": "

Queries a knowledge base and generates responses based on the retrieved results. The response only cites sources that are relevant to the query.

" + "RetrieveAndGenerate": "

Queries a knowledge base and generates responses based on the retrieved results and using the specified foundation model or inference profile. The response only cites sources that are relevant to the query.

" }, "shapes": { "AccessDeniedException": { @@ -152,7 +152,7 @@ "base": null, "refs": { "ExternalSourcesRetrieveAndGenerateConfiguration$modelArn": "

The modelArn used with the external source wrapper object in the retrieveAndGenerate function.

", - "KnowledgeBaseRetrieveAndGenerateConfiguration$modelArn": "

The ARN of the foundation model used to generate a response.

" + "KnowledgeBaseRetrieveAndGenerateConfiguration$modelArn": "

The ARN of the foundation model or inference profile used to generate a response.

" } }, "Boolean": { @@ -847,7 +847,7 @@ "base": null, "refs": { "KnowledgeBaseConfiguration$knowledgeBaseId": "

The unique identifier for a knowledge base attached to the agent.

", - "KnowledgeBaseRetrieveAndGenerateConfiguration$knowledgeBaseId": "

The unique identifier of the knowledge base that is queried and the foundation model used for generation.

", + "KnowledgeBaseRetrieveAndGenerateConfiguration$knowledgeBaseId": "

The unique identifier of the knowledge base that is queried.

", "RetrieveRequest$knowledgeBaseId": "

The unique identifier of the knowledge base to query.

" } }, diff --git a/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.normal.json b/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.normal.json index 0108a86c9632..cb8f10ca79c9 100644 --- a/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.normal.json +++ b/generator/ServiceModels/bedrock-agent-runtime/bedrock-agent-runtime-2023-07-26.normal.json @@ -145,7 +145,7 @@ {"shape":"AccessDeniedException"}, {"shape":"ServiceQuotaExceededException"} ], - "documentation":"

Queries a knowledge base and generates responses based on the retrieved results. The response only cites sources that are relevant to the query.

" + "documentation":"

Queries a knowledge base and generates responses based on the retrieved results and using the specified foundation model or inference profile. The response only cites sources that are relevant to the query.

" } }, "shapes":{ @@ -392,9 +392,9 @@ }, "BedrockModelArn":{ "type":"string", - "max":1011, - "min":20, - "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}))$" + "max":2048, + "min":1, + "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))))|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$" }, "Boolean":{ "type":"boolean", @@ -1917,11 +1917,11 @@ }, "knowledgeBaseId":{ "shape":"KnowledgeBaseId", - "documentation":"

The unique identifier of the knowledge base that is queried and the foundation model used for generation.

" + "documentation":"

The unique identifier of the knowledge base that is queried.

" }, "modelArn":{ "shape":"BedrockModelArn", - "documentation":"

The ARN of the foundation model used to generate a response.

" + "documentation":"

The ARN of the foundation model or inference profile used to generate a response.

" }, "orchestrationConfiguration":{ "shape":"OrchestrationConfiguration", diff --git a/sdk/code-analysis/ServiceAnalysis/BedrockAgentRuntime/Generated/PropertyValueRules.xml b/sdk/code-analysis/ServiceAnalysis/BedrockAgentRuntime/Generated/PropertyValueRules.xml index 16f3795abc2f..50cafcf9d594 100644 --- a/sdk/code-analysis/ServiceAnalysis/BedrockAgentRuntime/Generated/PropertyValueRules.xml +++ b/sdk/code-analysis/ServiceAnalysis/BedrockAgentRuntime/Generated/PropertyValueRules.xml @@ -165,9 +165,9 @@ Amazon.BedrockAgentRuntime.Model.ExternalSourcesRetrieveAndGenerateConfiguration.ModelArn - 20 - 1011 - ^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}))$ + 1 + 2048 + ^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))))|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$ Amazon.BedrockAgentRuntime.Model.FailureTrace.TraceId @@ -252,9 +252,9 @@ Amazon.BedrockAgentRuntime.Model.KnowledgeBaseRetrieveAndGenerateConfiguration.ModelArn - 20 - 1011 - ^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}))$ + 1 + 2048 + ^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))))|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$ Amazon.BedrockAgentRuntime.Model.KnowledgeBaseVectorSearchConfiguration.NumberOfResults diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/ExternalSourcesRetrieveAndGenerateConfiguration.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/ExternalSourcesRetrieveAndGenerateConfiguration.cs index 65aa7a723f7a..f4cc3daeb4d9 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/ExternalSourcesRetrieveAndGenerateConfiguration.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/ExternalSourcesRetrieveAndGenerateConfiguration.cs @@ -65,7 +65,7 @@ internal bool IsSetGenerationConfiguration() /// function. /// /// - [AWSProperty(Required=true, Min=20, Max=1011)] + [AWSProperty(Required=true, Min=1, Max=2048)] public string ModelArn { get { return this._modelArn; } diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/KnowledgeBaseRetrieveAndGenerateConfiguration.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/KnowledgeBaseRetrieveAndGenerateConfiguration.cs index fb767b145646..349250cfce00 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/KnowledgeBaseRetrieveAndGenerateConfiguration.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/KnowledgeBaseRetrieveAndGenerateConfiguration.cs @@ -78,8 +78,7 @@ internal bool IsSetGenerationConfiguration() /// /// Gets and sets the property KnowledgeBaseId. /// - /// The unique identifier of the knowledge base that is queried and the foundation model - /// used for generation. + /// The unique identifier of the knowledge base that is queried. /// /// [AWSProperty(Required=true, Min=0, Max=10)] @@ -98,10 +97,11 @@ internal bool IsSetKnowledgeBaseId() /// /// Gets and sets the property ModelArn. /// - /// The ARN of the foundation model used to generate a response. + /// The ARN of the foundation model or inference + /// profile used to generate a response. /// /// - [AWSProperty(Required=true, Min=20, Max=1011)] + [AWSProperty(Required=true, Min=1, Max=2048)] public string ModelArn { get { return this._modelArn; } diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/RetrieveAndGenerateRequest.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/RetrieveAndGenerateRequest.cs index 76264d155399..e1df9203dc6e 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/RetrieveAndGenerateRequest.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/RetrieveAndGenerateRequest.cs @@ -31,8 +31,9 @@ namespace Amazon.BedrockAgentRuntime.Model { /// /// Container for the parameters to the RetrieveAndGenerate operation. - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// public partial class RetrieveAndGenerateRequest : AmazonBedrockAgentRuntimeRequest { diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl35/AmazonBedrockAgentRuntimeClient.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl35/AmazonBedrockAgentRuntimeClient.cs index c62dad088bc8..b2ecdba5f075 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl35/AmazonBedrockAgentRuntimeClient.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl35/AmazonBedrockAgentRuntimeClient.cs @@ -755,8 +755,9 @@ public virtual RetrieveResponse EndRetrieve(IAsyncResult asyncResult) #region RetrieveAndGenerate /// - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// /// Container for the necessary parameters to execute the RetrieveAndGenerate service method. /// diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl35/IAmazonBedrockAgentRuntime.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl35/IAmazonBedrockAgentRuntime.cs index 77298606a1be..6cfd59f5e6c5 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl35/IAmazonBedrockAgentRuntime.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl35/IAmazonBedrockAgentRuntime.cs @@ -467,8 +467,9 @@ public partial interface IAmazonBedrockAgentRuntime : IAmazonService, IDisposabl /// - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// /// Container for the necessary parameters to execute the RetrieveAndGenerate service method. /// diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl45/AmazonBedrockAgentRuntimeClient.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl45/AmazonBedrockAgentRuntimeClient.cs index 6c4f6095f406..787cad8bb9c9 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl45/AmazonBedrockAgentRuntimeClient.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl45/AmazonBedrockAgentRuntimeClient.cs @@ -909,8 +909,9 @@ public virtual RetrieveResponse Retrieve(RetrieveRequest request) /// - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// /// Container for the necessary parameters to execute the RetrieveAndGenerate service method. /// @@ -958,8 +959,9 @@ public virtual RetrieveAndGenerateResponse RetrieveAndGenerate(RetrieveAndGenera /// - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// /// Container for the necessary parameters to execute the RetrieveAndGenerate service method. /// diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl45/IAmazonBedrockAgentRuntime.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl45/IAmazonBedrockAgentRuntime.cs index 5422440ae626..e150e5dc4563 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl45/IAmazonBedrockAgentRuntime.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/_bcl45/IAmazonBedrockAgentRuntime.cs @@ -623,8 +623,9 @@ public partial interface IAmazonBedrockAgentRuntime : IAmazonService, IDisposabl /// - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// /// Container for the necessary parameters to execute the RetrieveAndGenerate service method. /// @@ -666,8 +667,9 @@ public partial interface IAmazonBedrockAgentRuntime : IAmazonService, IDisposabl /// - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// /// Container for the necessary parameters to execute the RetrieveAndGenerate service method. /// diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/_netstandard/AmazonBedrockAgentRuntimeClient.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/_netstandard/AmazonBedrockAgentRuntimeClient.cs index a11e15f32bc3..18ca00927d4b 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/_netstandard/AmazonBedrockAgentRuntimeClient.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/_netstandard/AmazonBedrockAgentRuntimeClient.cs @@ -670,8 +670,9 @@ internal virtual RetrieveAndGenerateResponse RetrieveAndGenerate(RetrieveAndGene /// - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// /// Container for the necessary parameters to execute the RetrieveAndGenerate service method. /// diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/_netstandard/IAmazonBedrockAgentRuntime.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/_netstandard/IAmazonBedrockAgentRuntime.cs index e4c79f4e5da5..c04b619fbaaa 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/_netstandard/IAmazonBedrockAgentRuntime.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/_netstandard/IAmazonBedrockAgentRuntime.cs @@ -356,8 +356,9 @@ public partial interface IAmazonBedrockAgentRuntime : IAmazonService, IDisposabl /// - /// Queries a knowledge base and generates responses based on the retrieved results. The - /// response only cites sources that are relevant to the query. + /// Queries a knowledge base and generates responses based on the retrieved results and + /// using the specified foundation model or inference + /// profile. The response only cites sources that are relevant to the query. /// /// Container for the necessary parameters to execute the RetrieveAndGenerate service method. ///