Skip to content

Commit

Permalink
Adds support for backfill of cost allocation tags, with new StartCost…
Browse files Browse the repository at this point in the history
…AllocationTagBackfill and ListCostAllocationTagBackfillHistory API.

Add new operation delete-kx-cluster-node and add status parameter to list-kx-cluster-node operation.
This is a documentation update for Amazon ECS.
Documentation updates for Elastic Compute Cloud (EC2).
This release adds support to customize prompts sent through the RetrieveAndGenerate API in Agents for Amazon Bedrock.
  • Loading branch information
aws-sdk-cpp-automation committed Mar 26, 2024
1 parent 832ce62 commit 4e0d5c4
Show file tree
Hide file tree
Showing 68 changed files with 2,877 additions and 213 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.293
1.11.294
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,7 @@ namespace BedrockAgentRuntime
/**
* <p>Queries a knowledge base and generates responses based on the retrieved
* results. The response cites up to five sources but only selects the ones that
* are relevant to the query.</p> <p>The <code>numberOfResults</code> field
* is currently unsupported for <code>RetrieveAndGenerate</code>. Don't include it
* in the <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_KnowledgeBaseVectorSearchConfiguration.html">vectorSearchConfiguration</a>
* object.</p> <p><h3>See Also:</h3> <a
* are relevant to the query.</p><p><h3>See Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/RetrieveAndGenerate">AWS
* API Reference</a></p>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ namespace Model

/**
* <p>An object containing a segment of the generated response that is based on a
* source in the knowledge base, alongside information about the
* source.</p><p><h3>See Also:</h3> <a
* source in the knowledge base, alongside information about the source.</p>
* <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax">Retrieve
* response</a> – in the <code>citations</code> field</p> </li> <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_ResponseSyntax">RetrieveAndGenerate
* response</a> – in the <code>citations</code> field</p> </li> </ul><p><h3>See
* Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/Citation">AWS
* API Reference</a></p>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ namespace Model

/**
* <p>Contains metadata about a part of the generated response that is accompanied
* by a citation.</p><p><h3>See Also:</h3> <a
* by a citation.</p> <p>This data type is used in the following API
* operations:</p> <ul> <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax">Retrieve
* response</a> – in the <code>generatedResponsePart</code> field</p> </li> <li>
* <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_ResponseSyntax">RetrieveAndGenerate
* response</a> – in the <code>generatedResponsePart</code> field</p> </li>
* </ul><p><h3>See Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/GeneratedResponsePart">AWS
* API Reference</a></p>
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/**
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0.
*/

#pragma once
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
#include <aws/bedrock-agent-runtime/model/PromptTemplate.h>
#include <utility>

namespace Aws
{
namespace Utils
{
namespace Json
{
class JsonValue;
class JsonView;
} // namespace Json
} // namespace Utils
namespace BedrockAgentRuntime
{
namespace Model
{

/**
* <p>Contains configurations for response generation based on the knowledge base
* query results.</p> <p>This data type is used in the following API
* operations:</p> <ul> <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax">RetrieveAndGenerate
* request</a> </p> </li> </ul><p><h3>See Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/GenerationConfiguration">AWS
* API Reference</a></p>
*/
class GenerationConfiguration
{
public:
AWS_BEDROCKAGENTRUNTIME_API GenerationConfiguration();
AWS_BEDROCKAGENTRUNTIME_API GenerationConfiguration(Aws::Utils::Json::JsonView jsonValue);
AWS_BEDROCKAGENTRUNTIME_API GenerationConfiguration& operator=(Aws::Utils::Json::JsonView jsonValue);
AWS_BEDROCKAGENTRUNTIME_API Aws::Utils::Json::JsonValue Jsonize() const;


/**
* <p>Contains the template for the prompt that's sent to the model for response
* generation.</p>
*/
inline const PromptTemplate& GetPromptTemplate() const{ return m_promptTemplate; }

/**
* <p>Contains the template for the prompt that's sent to the model for response
* generation.</p>
*/
inline bool PromptTemplateHasBeenSet() const { return m_promptTemplateHasBeenSet; }

/**
* <p>Contains the template for the prompt that's sent to the model for response
* generation.</p>
*/
inline void SetPromptTemplate(const PromptTemplate& value) { m_promptTemplateHasBeenSet = true; m_promptTemplate = value; }

/**
* <p>Contains the template for the prompt that's sent to the model for response
* generation.</p>
*/
inline void SetPromptTemplate(PromptTemplate&& value) { m_promptTemplateHasBeenSet = true; m_promptTemplate = std::move(value); }

/**
* <p>Contains the template for the prompt that's sent to the model for response
* generation.</p>
*/
inline GenerationConfiguration& WithPromptTemplate(const PromptTemplate& value) { SetPromptTemplate(value); return *this;}

/**
* <p>Contains the template for the prompt that's sent to the model for response
* generation.</p>
*/
inline GenerationConfiguration& WithPromptTemplate(PromptTemplate&& value) { SetPromptTemplate(std::move(value)); return *this;}

private:

PromptTemplate m_promptTemplate;
bool m_promptTemplateHasBeenSet = false;
};

} // namespace Model
} // namespace BedrockAgentRuntime
} // namespace Aws
Original file line number Diff line number Diff line change
Expand Up @@ -282,32 +282,50 @@ namespace Model


/**
* <p>Contains parameters that specify various attributes of the session.</p>
* <p>Contains parameters that specify various attributes of the session. For more
* information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html">Control
* session context</a>.</p>
*/
inline const SessionState& GetSessionState() const{ return m_sessionState; }

/**
* <p>Contains parameters that specify various attributes of the session.</p>
* <p>Contains parameters that specify various attributes of the session. For more
* information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html">Control
* session context</a>.</p>
*/
inline bool SessionStateHasBeenSet() const { return m_sessionStateHasBeenSet; }

/**
* <p>Contains parameters that specify various attributes of the session.</p>
* <p>Contains parameters that specify various attributes of the session. For more
* information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html">Control
* session context</a>.</p>
*/
inline void SetSessionState(const SessionState& value) { m_sessionStateHasBeenSet = true; m_sessionState = value; }

/**
* <p>Contains parameters that specify various attributes of the session.</p>
* <p>Contains parameters that specify various attributes of the session. For more
* information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html">Control
* session context</a>.</p>
*/
inline void SetSessionState(SessionState&& value) { m_sessionStateHasBeenSet = true; m_sessionState = std::move(value); }

/**
* <p>Contains parameters that specify various attributes of the session.</p>
* <p>Contains parameters that specify various attributes of the session. For more
* information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html">Control
* session context</a>.</p>
*/
inline InvokeAgentRequest& WithSessionState(const SessionState& value) { SetSessionState(value); return *this;}

/**
* <p>Contains parameters that specify various attributes of the session.</p>
* <p>Contains parameters that specify various attributes of the session. For more
* information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html">Control
* session context</a>.</p>
*/
inline InvokeAgentRequest& WithSessionState(SessionState&& value) { SetSessionState(std::move(value)); return *this;}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ namespace Model
{

/**
* <p>Contains the query made to the knowledge base.</p><p><h3>See Also:</h3> <a
* <p>Contains the query made to the knowledge base.</p> <p>This data type is used
* in the following API operations:</p> <ul> <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_RequestSyntax">Retrieve
* request</a> – in the <code>retrievalQuery</code> field</p> </li> </ul><p><h3>See
* Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/KnowledgeBaseQuery">AWS
* API Reference</a></p>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,17 @@ namespace Model
{

/**
* <p>Contains details about how the results should be returned.</p> <p>This data
* type is used in the following API operations:</p> <ul> <li> <p> <a
* <p>Contains configurations for the knowledge base query and retrieval process.
* For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html">Query
* configurations</a>.</p> <p>This data type is used in the following API
* operations:</p> <ul> <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_RequestSyntax">Retrieve
* request body</a> </p> </li> <li> <p> <a
* request</a> – in the <code>retrievalConfiguration</code> field</p> </li> <li>
* <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax">RetrieveAndGenerate
* request body</a> </p> </li> </ul><p><h3>See Also:</h3> <a
* request</a> – in the <code>retrievalConfiguration</code> field</p> </li>
* </ul><p><h3>See Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/KnowledgeBaseRetrievalConfiguration">AWS
* API Reference</a></p>
*/
Expand All @@ -44,37 +49,49 @@ namespace Model

/**
* <p>Contains details about how the results from the vector search should be
* returned.</p>
* returned. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html">Query
* configurations</a>.</p>
*/
inline const KnowledgeBaseVectorSearchConfiguration& GetVectorSearchConfiguration() const{ return m_vectorSearchConfiguration; }

/**
* <p>Contains details about how the results from the vector search should be
* returned.</p>
* returned. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html">Query
* configurations</a>.</p>
*/
inline bool VectorSearchConfigurationHasBeenSet() const { return m_vectorSearchConfigurationHasBeenSet; }

/**
* <p>Contains details about how the results from the vector search should be
* returned.</p>
* returned. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html">Query
* configurations</a>.</p>
*/
inline void SetVectorSearchConfiguration(const KnowledgeBaseVectorSearchConfiguration& value) { m_vectorSearchConfigurationHasBeenSet = true; m_vectorSearchConfiguration = value; }

/**
* <p>Contains details about how the results from the vector search should be
* returned.</p>
* returned. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html">Query
* configurations</a>.</p>
*/
inline void SetVectorSearchConfiguration(KnowledgeBaseVectorSearchConfiguration&& value) { m_vectorSearchConfigurationHasBeenSet = true; m_vectorSearchConfiguration = std::move(value); }

/**
* <p>Contains details about how the results from the vector search should be
* returned.</p>
* returned. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html">Query
* configurations</a>.</p>
*/
inline KnowledgeBaseRetrievalConfiguration& WithVectorSearchConfiguration(const KnowledgeBaseVectorSearchConfiguration& value) { SetVectorSearchConfiguration(value); return *this;}

/**
* <p>Contains details about how the results from the vector search should be
* returned.</p>
* returned. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html">Query
* configurations</a>.</p>
*/
inline KnowledgeBaseRetrievalConfiguration& WithVectorSearchConfiguration(KnowledgeBaseVectorSearchConfiguration&& value) { SetVectorSearchConfiguration(std::move(value)); return *this;}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ namespace Model
{

/**
* <p>Details about a result from querying the knowledge base.</p><p><h3>See
* Also:</h3> <a
* <p>Details about a result from querying the knowledge base.</p> <p>This data
* type is used in the following API operations:</p> <ul> <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax">Retrieve
* response</a> – in the <code>retrievalResults</code> field</p> </li>
* </ul><p><h3>See Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/KnowledgeBaseRetrievalResult">AWS
* API Reference</a></p>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#pragma once
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
#include <aws/bedrock-agent-runtime/model/GenerationConfiguration.h>
#include <aws/core/utils/memory/stl/AWSString.h>
#include <aws/bedrock-agent-runtime/model/KnowledgeBaseRetrievalConfiguration.h>
#include <utility>
Expand All @@ -25,8 +26,14 @@ namespace Model
{

/**
* <p>Contains details about the resource being queried.</p><p><h3>See Also:</h3>
* <a
* <p>Contains details about the resource being queried.</p> <p>This data type is
* used in the following API operations:</p> <ul> <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_RequestSyntax">Retrieve
* request</a> – in the <code>knowledgeBaseConfiguration</code> field</p> </li>
* <li> <p> <a
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax">RetrieveAndGenerate
* request</a> – in the <code>knowledgeBaseConfiguration</code> field</p> </li>
* </ul><p><h3>See Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/KnowledgeBaseRetrieveAndGenerateConfiguration">AWS
* API Reference</a></p>
*/
Expand All @@ -39,6 +46,43 @@ namespace Model
AWS_BEDROCKAGENTRUNTIME_API Aws::Utils::Json::JsonValue Jsonize() const;


/**
* <p>Contains configurations for response generation based on the knowwledge base
* query results.</p>
*/
inline const GenerationConfiguration& GetGenerationConfiguration() const{ return m_generationConfiguration; }

/**
* <p>Contains configurations for response generation based on the knowwledge base
* query results.</p>
*/
inline bool GenerationConfigurationHasBeenSet() const { return m_generationConfigurationHasBeenSet; }

/**
* <p>Contains configurations for response generation based on the knowwledge base
* query results.</p>
*/
inline void SetGenerationConfiguration(const GenerationConfiguration& value) { m_generationConfigurationHasBeenSet = true; m_generationConfiguration = value; }

/**
* <p>Contains configurations for response generation based on the knowwledge base
* query results.</p>
*/
inline void SetGenerationConfiguration(GenerationConfiguration&& value) { m_generationConfigurationHasBeenSet = true; m_generationConfiguration = std::move(value); }

/**
* <p>Contains configurations for response generation based on the knowwledge base
* query results.</p>
*/
inline KnowledgeBaseRetrieveAndGenerateConfiguration& WithGenerationConfiguration(const GenerationConfiguration& value) { SetGenerationConfiguration(value); return *this;}

/**
* <p>Contains configurations for response generation based on the knowwledge base
* query results.</p>
*/
inline KnowledgeBaseRetrieveAndGenerateConfiguration& WithGenerationConfiguration(GenerationConfiguration&& value) { SetGenerationConfiguration(std::move(value)); return *this;}


/**
* <p>The unique identifier of the knowledge base that is queried and the
* foundation model used for generation.</p>
Expand Down Expand Up @@ -167,6 +211,9 @@ namespace Model

private:

GenerationConfiguration m_generationConfiguration;
bool m_generationConfigurationHasBeenSet = false;

Aws::String m_knowledgeBaseId;
bool m_knowledgeBaseIdHasBeenSet = false;

Expand Down
Loading

0 comments on commit 4e0d5c4

Please sign in to comment.