Skip to content

Commit 4e0d5c4

Browse files
aws-sdk-cpp-automationaws-sdk-cpp-automation
committed
Adds support for backfill of cost allocation tags, with new StartCostAllocationTagBackfill 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.
1 parent 832ce62 commit 4e0d5c4

File tree

68 files changed

+2877
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2877
-213
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.293
1+
1.11.294

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/BedrockAgentRuntimeClient.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,7 @@ namespace BedrockAgentRuntime
148148
/**
149149
* <p>Queries a knowledge base and generates responses based on the retrieved
150150
* results. The response cites up to five sources but only selects the ones that
151-
* are relevant to the query.</p> <p>The <code>numberOfResults</code> field
152-
* is currently unsupported for <code>RetrieveAndGenerate</code>. Don't include it
153-
* in the <a
154-
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_KnowledgeBaseVectorSearchConfiguration.html">vectorSearchConfiguration</a>
155-
* object.</p> <p><h3>See Also:</h3> <a
151+
* are relevant to the query.</p><p><h3>See Also:</h3> <a
156152
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/RetrieveAndGenerate">AWS
157153
* API Reference</a></p>
158154
*/

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/Citation.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,13 @@ namespace Model
2727

2828
/**
2929
* <p>An object containing a segment of the generated response that is based on a
30-
* source in the knowledge base, alongside information about the
31-
* source.</p><p><h3>See Also:</h3> <a
30+
* source in the knowledge base, alongside information about the source.</p>
31+
* <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a
32+
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax">Retrieve
33+
* response</a> – in the <code>citations</code> field</p> </li> <li> <p> <a
34+
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_ResponseSyntax">RetrieveAndGenerate
35+
* response</a> – in the <code>citations</code> field</p> </li> </ul><p><h3>See
36+
* Also:</h3> <a
3237
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/Citation">AWS
3338
* API Reference</a></p>
3439
*/

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/GeneratedResponsePart.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@ namespace Model
2525

2626
/**
2727
* <p>Contains metadata about a part of the generated response that is accompanied
28-
* by a citation.</p><p><h3>See Also:</h3> <a
28+
* by a citation.</p> <p>This data type is used in the following API
29+
* operations:</p> <ul> <li> <p> <a
30+
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax">Retrieve
31+
* response</a> – in the <code>generatedResponsePart</code> field</p> </li> <li>
32+
* <p> <a
33+
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_ResponseSyntax">RetrieveAndGenerate
34+
* response</a> – in the <code>generatedResponsePart</code> field</p> </li>
35+
* </ul><p><h3>See Also:</h3> <a
2936
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/GeneratedResponsePart">AWS
3037
* API Reference</a></p>
3138
*/

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/GenerationConfiguration.h

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#pragma once
7+
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
8+
#include <aws/bedrock-agent-runtime/model/PromptTemplate.h>
9+
#include <utility>
10+
11+
namespace Aws
12+
{
13+
namespace Utils
14+
{
15+
namespace Json
16+
{
17+
class JsonValue;
18+
class JsonView;
19+
} // namespace Json
20+
} // namespace Utils
21+
namespace BedrockAgentRuntime
22+
{
23+
namespace Model
24+
{
25+
26+
/**
27+
* <p>Contains configurations for response generation based on the knowledge base
28+
* query results.</p> <p>This data type is used in the following API
29+
* operations:</p> <ul> <li> <p> <a
30+
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax">RetrieveAndGenerate
31+
* request</a> </p> </li> </ul><p><h3>See Also:</h3> <a
32+
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/GenerationConfiguration">AWS
33+
* API Reference</a></p>
34+
*/
35+
class GenerationConfiguration
36+
{
37+
public:
38+
AWS_BEDROCKAGENTRUNTIME_API GenerationConfiguration();
39+
AWS_BEDROCKAGENTRUNTIME_API GenerationConfiguration(Aws::Utils::Json::JsonView jsonValue);
40+
AWS_BEDROCKAGENTRUNTIME_API GenerationConfiguration& operator=(Aws::Utils::Json::JsonView jsonValue);
41+
AWS_BEDROCKAGENTRUNTIME_API Aws::Utils::Json::JsonValue Jsonize() const;
42+
43+
44+
/**
45+
* <p>Contains the template for the prompt that's sent to the model for response
46+
* generation.</p>
47+
*/
48+
inline const PromptTemplate& GetPromptTemplate() const{ return m_promptTemplate; }
49+
50+
/**
51+
* <p>Contains the template for the prompt that's sent to the model for response
52+
* generation.</p>
53+
*/
54+
inline bool PromptTemplateHasBeenSet() const { return m_promptTemplateHasBeenSet; }
55+
56+
/**
57+
* <p>Contains the template for the prompt that's sent to the model for response
58+
* generation.</p>
59+
*/
60+
inline void SetPromptTemplate(const PromptTemplate& value) { m_promptTemplateHasBeenSet = true; m_promptTemplate = value; }
61+
62+
/**
63+
* <p>Contains the template for the prompt that's sent to the model for response
64+
* generation.</p>
65+
*/
66+
inline void SetPromptTemplate(PromptTemplate&& value) { m_promptTemplateHasBeenSet = true; m_promptTemplate = std::move(value); }
67+
68+
/**
69+
* <p>Contains the template for the prompt that's sent to the model for response
70+
* generation.</p>
71+
*/
72+
inline GenerationConfiguration& WithPromptTemplate(const PromptTemplate& value) { SetPromptTemplate(value); return *this;}
73+
74+
/**
75+
* <p>Contains the template for the prompt that's sent to the model for response
76+
* generation.</p>
77+
*/
78+
inline GenerationConfiguration& WithPromptTemplate(PromptTemplate&& value) { SetPromptTemplate(std::move(value)); return *this;}
79+
80+
private:
81+
82+
PromptTemplate m_promptTemplate;
83+
bool m_promptTemplateHasBeenSet = false;
84+
};
85+
86+
} // namespace Model
87+
} // namespace BedrockAgentRuntime
88+
} // namespace Aws

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/InvokeAgentRequest.h

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,32 +282,50 @@ namespace Model
282282

283283

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

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

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

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

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

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

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/KnowledgeBaseQuery.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ namespace Model
2424
{
2525

2626
/**
27-
* <p>Contains the query made to the knowledge base.</p><p><h3>See Also:</h3> <a
27+
* <p>Contains the query made to the knowledge base.</p> <p>This data type is used
28+
* in the following API operations:</p> <ul> <li> <p> <a
29+
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_RequestSyntax">Retrieve
30+
* request</a> – in the <code>retrievalQuery</code> field</p> </li> </ul><p><h3>See
31+
* Also:</h3> <a
2832
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/KnowledgeBaseQuery">AWS
2933
* API Reference</a></p>
3034
*/

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/KnowledgeBaseRetrievalConfiguration.h

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ namespace Model
2424
{
2525

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

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

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

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

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

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

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

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/KnowledgeBaseRetrievalResult.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ namespace Model
2525
{
2626

2727
/**
28-
* <p>Details about a result from querying the knowledge base.</p><p><h3>See
29-
* Also:</h3> <a
28+
* <p>Details about a result from querying the knowledge base.</p> <p>This data
29+
* type is used in the following API operations:</p> <ul> <li> <p> <a
30+
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax">Retrieve
31+
* response</a> – in the <code>retrievalResults</code> field</p> </li>
32+
* </ul><p><h3>See Also:</h3> <a
3033
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-runtime-2023-07-26/KnowledgeBaseRetrievalResult">AWS
3134
* API Reference</a></p>
3235
*/

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/KnowledgeBaseRetrieveAndGenerateConfiguration.h

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#pragma once
77
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
8+
#include <aws/bedrock-agent-runtime/model/GenerationConfiguration.h>
89
#include <aws/core/utils/memory/stl/AWSString.h>
910
#include <aws/bedrock-agent-runtime/model/KnowledgeBaseRetrievalConfiguration.h>
1011
#include <utility>
@@ -25,8 +26,14 @@ namespace Model
2526
{
2627

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

4148

49+
/**
50+
* <p>Contains configurations for response generation based on the knowwledge base
51+
* query results.</p>
52+
*/
53+
inline const GenerationConfiguration& GetGenerationConfiguration() const{ return m_generationConfiguration; }
54+
55+
/**
56+
* <p>Contains configurations for response generation based on the knowwledge base
57+
* query results.</p>
58+
*/
59+
inline bool GenerationConfigurationHasBeenSet() const { return m_generationConfigurationHasBeenSet; }
60+
61+
/**
62+
* <p>Contains configurations for response generation based on the knowwledge base
63+
* query results.</p>
64+
*/
65+
inline void SetGenerationConfiguration(const GenerationConfiguration& value) { m_generationConfigurationHasBeenSet = true; m_generationConfiguration = value; }
66+
67+
/**
68+
* <p>Contains configurations for response generation based on the knowwledge base
69+
* query results.</p>
70+
*/
71+
inline void SetGenerationConfiguration(GenerationConfiguration&& value) { m_generationConfigurationHasBeenSet = true; m_generationConfiguration = std::move(value); }
72+
73+
/**
74+
* <p>Contains configurations for response generation based on the knowwledge base
75+
* query results.</p>
76+
*/
77+
inline KnowledgeBaseRetrieveAndGenerateConfiguration& WithGenerationConfiguration(const GenerationConfiguration& value) { SetGenerationConfiguration(value); return *this;}
78+
79+
/**
80+
* <p>Contains configurations for response generation based on the knowwledge base
81+
* query results.</p>
82+
*/
83+
inline KnowledgeBaseRetrieveAndGenerateConfiguration& WithGenerationConfiguration(GenerationConfiguration&& value) { SetGenerationConfiguration(std::move(value)); return *this;}
84+
85+
4286
/**
4387
* <p>The unique identifier of the knowledge base that is queried and the
4488
* foundation model used for generation.</p>
@@ -167,6 +211,9 @@ namespace Model
167211

168212
private:
169213

214+
GenerationConfiguration m_generationConfiguration;
215+
bool m_generationConfigurationHasBeenSet = false;
216+
170217
Aws::String m_knowledgeBaseId;
171218
bool m_knowledgeBaseIdHasBeenSet = false;
172219

0 commit comments

Comments
 (0)