Skip to content

Commit d7542e5

Browse files
Updates Finspace documentation for smaller instances.
Add support for user metadata inside PromptVariant. Adds new logging levels (INFO and DEBUG) for additional log output control This release adds safety levers, a new mechanism to stop all running experiments and prevent new experiments from starting. Amazon Simple Storage Service /S3 Access Grants / Features : This release launches new Access Grants API - ListCallerAccessGrants. Update to support new APIs for delivery of logs from AWS services.
1 parent 08b51b4 commit d7542e5

File tree

112 files changed

+5078
-283
lines changed

Some content is hidden

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

112 files changed

+5078
-283
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.397
1+
1.11.398

generated/src/aws-cpp-sdk-appsync/include/aws/appsync/model/FieldLogLevel.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ namespace Model
1818
NOT_SET,
1919
NONE,
2020
ERROR_,
21-
ALL
21+
ALL,
22+
INFO,
23+
DEBUG_
2224
};
2325

2426
namespace FieldLogLevelMapper

generated/src/aws-cpp-sdk-appsync/include/aws/appsync/model/LogConfig.h

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,27 @@ namespace Model
4040

4141
///@{
4242
/**
43-
* <p>The field logging level. Values can be NONE, ERROR, or ALL.</p> <ul> <li> <p>
44-
* <b>NONE</b>: No field-level logs are captured.</p> </li> <li> <p> <b>ERROR</b>:
45-
* Logs the following information only for the fields that are in error:</p> <ul>
46-
* <li> <p>The error section in the server response.</p> </li> <li> <p>Field-level
47-
* errors.</p> </li> <li> <p>The generated request/response functions that got
48-
* resolved for error fields.</p> </li> </ul> </li> <li> <p> <b>ALL</b>: The
49-
* following information is logged for all fields in the query:</p> <ul> <li>
50-
* <p>Field-level tracing information.</p> </li> <li> <p>The generated
51-
* request/response functions that got resolved for each field.</p> </li> </ul>
52-
* </li> </ul>
43+
* <p>The field logging level. Values can be NONE, ERROR, INFO, DEBUG, or ALL.</p>
44+
* <ul> <li> <p> <b>NONE</b>: No field-level logs are captured.</p> </li> <li> <p>
45+
* <b>ERROR</b>: Logs the following information <b>only</b> for the fields that are
46+
* in the error category:</p> <ul> <li> <p>The error section in the server
47+
* response.</p> </li> <li> <p>Field-level errors.</p> </li> <li> <p>The generated
48+
* request/response functions that got resolved for error fields.</p> </li> </ul>
49+
* </li> <li> <p> <b>INFO</b>: Logs the following information <b>only</b> for the
50+
* fields that are in the info and error categories:</p> <ul> <li> <p>Info-level
51+
* messages.</p> </li> <li> <p>The user messages sent through
52+
* <code>$util.log.info</code> and <code>console.log</code>.</p> </li> <li>
53+
* <p>Field-level tracing and mapping logs are not shown.</p> </li> </ul> </li>
54+
* <li> <p> <b>DEBUG</b>: Logs the following information <b>only</b> for the fields
55+
* that are in the debug, info, and error categories:</p> <ul> <li> <p>Debug-level
56+
* messages.</p> </li> <li> <p>The user messages sent through
57+
* <code>$util.log.info</code>, <code>$util.log.debug</code>,
58+
* <code>console.log</code>, and <code>console.debug</code>.</p> </li> <li>
59+
* <p>Field-level tracing and mapping logs are not shown.</p> </li> </ul> </li>
60+
* <li> <p> <b>ALL</b>: The following information is logged for all fields in the
61+
* query:</p> <ul> <li> <p>Field-level tracing information.</p> </li> <li> <p>The
62+
* generated request/response functions that were resolved for each field.</p>
63+
* </li> </ul> </li> </ul>
5364
*/
5465
inline const FieldLogLevel& GetFieldLogLevel() const{ return m_fieldLogLevel; }
5566
inline bool FieldLogLevelHasBeenSet() const { return m_fieldLogLevelHasBeenSet; }

generated/src/aws-cpp-sdk-appsync/source/model/FieldLogLevel.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ namespace Aws
2323
static const int NONE_HASH = HashingUtils::HashString("NONE");
2424
static const int ERROR__HASH = HashingUtils::HashString("ERROR");
2525
static const int ALL_HASH = HashingUtils::HashString("ALL");
26+
static const int INFO_HASH = HashingUtils::HashString("INFO");
27+
static const int DEBUG__HASH = HashingUtils::HashString("DEBUG");
2628

2729

2830
FieldLogLevel GetFieldLogLevelForName(const Aws::String& name)
@@ -40,6 +42,14 @@ namespace Aws
4042
{
4143
return FieldLogLevel::ALL;
4244
}
45+
else if (hashCode == INFO_HASH)
46+
{
47+
return FieldLogLevel::INFO;
48+
}
49+
else if (hashCode == DEBUG__HASH)
50+
{
51+
return FieldLogLevel::DEBUG_;
52+
}
4353
EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
4454
if(overflowContainer)
4555
{
@@ -62,6 +72,10 @@ namespace Aws
6272
return "ERROR";
6373
case FieldLogLevel::ALL:
6474
return "ALL";
75+
case FieldLogLevel::INFO:
76+
return "INFO";
77+
case FieldLogLevel::DEBUG_:
78+
return "DEBUG";
6579
default:
6680
EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
6781
if(overflowContainer)

generated/src/aws-cpp-sdk-bedrock-agent/include/aws/bedrock-agent/BedrockAgentClient.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,12 @@ namespace BedrockAgent
124124
* orchestration and to use advanced prompts, include a
125125
* <code>promptOverrideConfiguration</code> object. For more information, see <a
126126
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/advanced-prompts.html">Advanced
127-
* prompts</a>.</p> </li> <li> <p>If you agent fails to be created, the response
127+
* prompts</a>.</p> </li> <li> <p>If your agent fails to be created, the response
128128
* returns a list of <code>failureReasons</code> alongside a list of
129-
* <code>recommendedActions</code> for you to troubleshoot.</p> </li>
130-
* </ul><p><h3>See Also:</h3> <a
129+
* <code>recommendedActions</code> for you to troubleshoot.</p> </li> <li> <p>The
130+
* agent instructions will not be honored if your agent has only one knowledge
131+
* base, uses default prompts, has no action group, and user input is disabled.</p>
132+
* </li> </ul><p><h3>See Also:</h3> <a
131133
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-2023-06-05/CreateAgent">AWS
132134
* API Reference</a></p>
133135
*/

generated/src/aws-cpp-sdk-bedrock-agent/include/aws/bedrock-agent/model/ParsingConfiguration.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ namespace Model
3737
* <code>anthropic.claude-3-sonnet-20240229-v1:0</code> </p> </li> <li>
3838
* <p>Anthropic Claude 3 Haiku -
3939
* <code>anthropic.claude-3-haiku-20240307-v1:0</code> </p> </li> </ul> <p>You can
40-
* get the ARN of a model with the action. Standard model usage charges apply for
41-
* the foundation model parsing strategy.</p><p><h3>See Also:</h3> <a
40+
* get the ARN of a model with the <a
41+
* href="https://docs.aws.amazon.com/bedrock/latest/APIReference/API_ListFoundationModels.html">ListFoundationModels</a>
42+
* action. Standard model usage charges apply for the foundation model parsing
43+
* strategy.</p><p><h3>See Also:</h3> <a
4244
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-2023-06-05/ParsingConfiguration">AWS
4345
* API Reference</a></p>
4446
*/
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
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/BedrockAgent_EXPORTS.h>
8+
#include <aws/core/utils/memory/stl/AWSString.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 BedrockAgent
22+
{
23+
namespace Model
24+
{
25+
26+
/**
27+
* <p>Contains a key-value pair that defines a metadata tag and value to attach to
28+
* a prompt variant. For more information, see <a
29+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-management-create.html">Create
30+
* a prompt using Prompt management</a>.</p><p><h3>See Also:</h3> <a
31+
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-agent-2023-06-05/PromptMetadataEntry">AWS
32+
* API Reference</a></p>
33+
*/
34+
class PromptMetadataEntry
35+
{
36+
public:
37+
AWS_BEDROCKAGENT_API PromptMetadataEntry();
38+
AWS_BEDROCKAGENT_API PromptMetadataEntry(Aws::Utils::Json::JsonView jsonValue);
39+
AWS_BEDROCKAGENT_API PromptMetadataEntry& operator=(Aws::Utils::Json::JsonView jsonValue);
40+
AWS_BEDROCKAGENT_API Aws::Utils::Json::JsonValue Jsonize() const;
41+
42+
43+
///@{
44+
/**
45+
* <p>The key of a metadata tag for a prompt variant.</p>
46+
*/
47+
inline const Aws::String& GetKey() const{ return m_key; }
48+
inline bool KeyHasBeenSet() const { return m_keyHasBeenSet; }
49+
inline void SetKey(const Aws::String& value) { m_keyHasBeenSet = true; m_key = value; }
50+
inline void SetKey(Aws::String&& value) { m_keyHasBeenSet = true; m_key = std::move(value); }
51+
inline void SetKey(const char* value) { m_keyHasBeenSet = true; m_key.assign(value); }
52+
inline PromptMetadataEntry& WithKey(const Aws::String& value) { SetKey(value); return *this;}
53+
inline PromptMetadataEntry& WithKey(Aws::String&& value) { SetKey(std::move(value)); return *this;}
54+
inline PromptMetadataEntry& WithKey(const char* value) { SetKey(value); return *this;}
55+
///@}
56+
57+
///@{
58+
/**
59+
* <p>The value of a metadata tag for a prompt variant.</p>
60+
*/
61+
inline const Aws::String& GetValue() const{ return m_value; }
62+
inline bool ValueHasBeenSet() const { return m_valueHasBeenSet; }
63+
inline void SetValue(const Aws::String& value) { m_valueHasBeenSet = true; m_value = value; }
64+
inline void SetValue(Aws::String&& value) { m_valueHasBeenSet = true; m_value = std::move(value); }
65+
inline void SetValue(const char* value) { m_valueHasBeenSet = true; m_value.assign(value); }
66+
inline PromptMetadataEntry& WithValue(const Aws::String& value) { SetValue(value); return *this;}
67+
inline PromptMetadataEntry& WithValue(Aws::String&& value) { SetValue(std::move(value)); return *this;}
68+
inline PromptMetadataEntry& WithValue(const char* value) { SetValue(value); return *this;}
69+
///@}
70+
private:
71+
72+
Aws::String m_key;
73+
bool m_keyHasBeenSet = false;
74+
75+
Aws::String m_value;
76+
bool m_valueHasBeenSet = false;
77+
};
78+
79+
} // namespace Model
80+
} // namespace BedrockAgent
81+
} // namespace Aws

generated/src/aws-cpp-sdk-bedrock-agent/include/aws/bedrock-agent/model/PromptVariant.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
#pragma once
77
#include <aws/bedrock-agent/BedrockAgent_EXPORTS.h>
88
#include <aws/bedrock-agent/model/PromptInferenceConfiguration.h>
9+
#include <aws/core/utils/memory/stl/AWSVector.h>
910
#include <aws/core/utils/memory/stl/AWSString.h>
1011
#include <aws/bedrock-agent/model/PromptTemplateConfiguration.h>
1112
#include <aws/bedrock-agent/model/PromptTemplateType.h>
13+
#include <aws/bedrock-agent/model/PromptMetadataEntry.h>
1214
#include <utility>
1315

1416
namespace Aws
@@ -52,6 +54,23 @@ namespace Model
5254
inline PromptVariant& WithInferenceConfiguration(PromptInferenceConfiguration&& value) { SetInferenceConfiguration(std::move(value)); return *this;}
5355
///@}
5456

57+
///@{
58+
/**
59+
* <p>An array of objects, each containing a key-value pair that defines a metadata
60+
* tag and value to attach to a prompt variant. For more information, see <a
61+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-management-create.html">Create
62+
* a prompt using Prompt management</a>.</p>
63+
*/
64+
inline const Aws::Vector<PromptMetadataEntry>& GetMetadata() const{ return m_metadata; }
65+
inline bool MetadataHasBeenSet() const { return m_metadataHasBeenSet; }
66+
inline void SetMetadata(const Aws::Vector<PromptMetadataEntry>& value) { m_metadataHasBeenSet = true; m_metadata = value; }
67+
inline void SetMetadata(Aws::Vector<PromptMetadataEntry>&& value) { m_metadataHasBeenSet = true; m_metadata = std::move(value); }
68+
inline PromptVariant& WithMetadata(const Aws::Vector<PromptMetadataEntry>& value) { SetMetadata(value); return *this;}
69+
inline PromptVariant& WithMetadata(Aws::Vector<PromptMetadataEntry>&& value) { SetMetadata(std::move(value)); return *this;}
70+
inline PromptVariant& AddMetadata(const PromptMetadataEntry& value) { m_metadataHasBeenSet = true; m_metadata.push_back(value); return *this; }
71+
inline PromptVariant& AddMetadata(PromptMetadataEntry&& value) { m_metadataHasBeenSet = true; m_metadata.push_back(std::move(value)); return *this; }
72+
///@}
73+
5574
///@{
5675
/**
5776
* <p>The unique identifier of the model with which to run inference on the
@@ -109,6 +128,9 @@ namespace Model
109128
PromptInferenceConfiguration m_inferenceConfiguration;
110129
bool m_inferenceConfigurationHasBeenSet = false;
111130

131+
Aws::Vector<PromptMetadataEntry> m_metadata;
132+
bool m_metadataHasBeenSet = false;
133+
112134
Aws::String m_modelId;
113135
bool m_modelIdHasBeenSet = false;
114136

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#include <aws/bedrock-agent/model/PromptMetadataEntry.h>
7+
#include <aws/core/utils/json/JsonSerializer.h>
8+
9+
#include <utility>
10+
11+
using namespace Aws::Utils::Json;
12+
using namespace Aws::Utils;
13+
14+
namespace Aws
15+
{
16+
namespace BedrockAgent
17+
{
18+
namespace Model
19+
{
20+
21+
PromptMetadataEntry::PromptMetadataEntry() :
22+
m_keyHasBeenSet(false),
23+
m_valueHasBeenSet(false)
24+
{
25+
}
26+
27+
PromptMetadataEntry::PromptMetadataEntry(JsonView jsonValue)
28+
: PromptMetadataEntry()
29+
{
30+
*this = jsonValue;
31+
}
32+
33+
PromptMetadataEntry& PromptMetadataEntry::operator =(JsonView jsonValue)
34+
{
35+
if(jsonValue.ValueExists("key"))
36+
{
37+
m_key = jsonValue.GetString("key");
38+
39+
m_keyHasBeenSet = true;
40+
}
41+
42+
if(jsonValue.ValueExists("value"))
43+
{
44+
m_value = jsonValue.GetString("value");
45+
46+
m_valueHasBeenSet = true;
47+
}
48+
49+
return *this;
50+
}
51+
52+
JsonValue PromptMetadataEntry::Jsonize() const
53+
{
54+
JsonValue payload;
55+
56+
if(m_keyHasBeenSet)
57+
{
58+
payload.WithString("key", m_key);
59+
60+
}
61+
62+
if(m_valueHasBeenSet)
63+
{
64+
payload.WithString("value", m_value);
65+
66+
}
67+
68+
return payload;
69+
}
70+
71+
} // namespace Model
72+
} // namespace BedrockAgent
73+
} // namespace Aws

generated/src/aws-cpp-sdk-bedrock-agent/source/model/PromptVariant.cpp

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ namespace Model
2020

2121
PromptVariant::PromptVariant() :
2222
m_inferenceConfigurationHasBeenSet(false),
23+
m_metadataHasBeenSet(false),
2324
m_modelIdHasBeenSet(false),
2425
m_nameHasBeenSet(false),
2526
m_templateConfigurationHasBeenSet(false),
@@ -43,6 +44,16 @@ PromptVariant& PromptVariant::operator =(JsonView jsonValue)
4344
m_inferenceConfigurationHasBeenSet = true;
4445
}
4546

47+
if(jsonValue.ValueExists("metadata"))
48+
{
49+
Aws::Utils::Array<JsonView> metadataJsonList = jsonValue.GetArray("metadata");
50+
for(unsigned metadataIndex = 0; metadataIndex < metadataJsonList.GetLength(); ++metadataIndex)
51+
{
52+
m_metadata.push_back(metadataJsonList[metadataIndex].AsObject());
53+
}
54+
m_metadataHasBeenSet = true;
55+
}
56+
4657
if(jsonValue.ValueExists("modelId"))
4758
{
4859
m_modelId = jsonValue.GetString("modelId");
@@ -84,6 +95,17 @@ JsonValue PromptVariant::Jsonize() const
8495

8596
}
8697

98+
if(m_metadataHasBeenSet)
99+
{
100+
Aws::Utils::Array<JsonValue> metadataJsonList(m_metadata.size());
101+
for(unsigned metadataIndex = 0; metadataIndex < metadataJsonList.GetLength(); ++metadataIndex)
102+
{
103+
metadataJsonList[metadataIndex].AsObject(m_metadata[metadataIndex].Jsonize());
104+
}
105+
payload.WithArray("metadata", std::move(metadataJsonList));
106+
107+
}
108+
87109
if(m_modelIdHasBeenSet)
88110
{
89111
payload.WithString("modelId", m_modelId);

0 commit comments

Comments
 (0)