Skip to content

Commit 7d45bbb

Browse files
aws-sdk-cpp-automationaws-sdk-cpp-automation
committed
Doc only update for the AWS Marketplace Deployment Service that fixes several customer-reported issues.
You can now reference images and documents stored in Amazon S3 when using InvokeModel and Converse APIs with Amazon Nova Lite and Nova Pro. This enables direct integration of S3-stored multimedia assets in your model requests without manual downloading or base64 encoding. Documentation only release for Amazon ECS.
1 parent b63aabf commit 7d45bbb

File tree

18 files changed

+920
-882
lines changed

18 files changed

+920
-882
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.554
1+
1.11.555

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#pragma once
77
#include <aws/bedrock-runtime/BedrockRuntime_EXPORTS.h>
88
#include <aws/core/utils/Array.h>
9+
#include <aws/bedrock-runtime/model/S3Location.h>
910
#include <utility>
1011

1112
namespace Aws
@@ -49,10 +50,28 @@ namespace Model
4950
template<typename BytesT = Aws::Utils::ByteBuffer>
5051
DocumentSource& WithBytes(BytesT&& value) { SetBytes(std::forward<BytesT>(value)); return *this;}
5152
///@}
53+
54+
///@{
55+
/**
56+
* <p>The location of a document object in an Amazon S3 bucket. To see which models
57+
* support S3 uploads, see <a
58+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-supported-models-features.html">Supported
59+
* models and features for Converse</a>.</p>
60+
*/
61+
inline const S3Location& GetS3Location() const { return m_s3Location; }
62+
inline bool S3LocationHasBeenSet() const { return m_s3LocationHasBeenSet; }
63+
template<typename S3LocationT = S3Location>
64+
void SetS3Location(S3LocationT&& value) { m_s3LocationHasBeenSet = true; m_s3Location = std::forward<S3LocationT>(value); }
65+
template<typename S3LocationT = S3Location>
66+
DocumentSource& WithS3Location(S3LocationT&& value) { SetS3Location(std::forward<S3LocationT>(value)); return *this;}
67+
///@}
5268
private:
5369

5470
Aws::Utils::ByteBuffer m_bytes{};
5571
bool m_bytesHasBeenSet = false;
72+
73+
S3Location m_s3Location;
74+
bool m_s3LocationHasBeenSet = false;
5675
};
5776

5877
} // namespace Model

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#pragma once
77
#include <aws/bedrock-runtime/BedrockRuntime_EXPORTS.h>
88
#include <aws/core/utils/Array.h>
9+
#include <aws/bedrock-runtime/model/S3Location.h>
910
#include <utility>
1011

1112
namespace Aws
@@ -49,10 +50,28 @@ namespace Model
4950
template<typename BytesT = Aws::Utils::ByteBuffer>
5051
ImageSource& WithBytes(BytesT&& value) { SetBytes(std::forward<BytesT>(value)); return *this;}
5152
///@}
53+
54+
///@{
55+
/**
56+
* <p>The location of an image object in an Amazon S3 bucket. To see which models
57+
* support S3 uploads, see <a
58+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-supported-models-features.html">Supported
59+
* models and features for Converse</a>.</p>
60+
*/
61+
inline const S3Location& GetS3Location() const { return m_s3Location; }
62+
inline bool S3LocationHasBeenSet() const { return m_s3LocationHasBeenSet; }
63+
template<typename S3LocationT = S3Location>
64+
void SetS3Location(S3LocationT&& value) { m_s3LocationHasBeenSet = true; m_s3Location = std::forward<S3LocationT>(value); }
65+
template<typename S3LocationT = S3Location>
66+
ImageSource& WithS3Location(S3LocationT&& value) { SetS3Location(std::forward<S3LocationT>(value)); return *this;}
67+
///@}
5268
private:
5369

5470
Aws::Utils::ByteBuffer m_bytes{};
5571
bool m_bytesHasBeenSet = false;
72+
73+
S3Location m_s3Location;
74+
bool m_s3LocationHasBeenSet = false;
5675
};
5776

5877
} // namespace Model

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

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

2626
/**
27-
* <p>A storage location in an S3 bucket.</p><p><h3>See Also:</h3> <a
27+
* <p>A storage location in an Amazon S3 bucket.</p><p><h3>See Also:</h3> <a
2828
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-runtime-2023-09-30/S3Location">AWS
2929
* API Reference</a></p>
3030
*/

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ namespace Model
5454

5555
///@{
5656
/**
57-
* <p>The location of a video object in an S3 bucket.</p>
57+
* <p>The location of a video object in an Amazon S3 bucket. To see which models
58+
* support S3 uploads, see <a
59+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-supported-models-features.html">Supported
60+
* models and features for Converse</a>.</p>
5861
*/
5962
inline const S3Location& GetS3Location() const { return m_s3Location; }
6063
inline bool S3LocationHasBeenSet() const { return m_s3LocationHasBeenSet; }

‎generated/src/aws-cpp-sdk-bedrock-runtime/source/model/DocumentSource.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ DocumentSource& DocumentSource::operator =(JsonView jsonValue)
3131
m_bytes = HashingUtils::Base64Decode(jsonValue.GetString("bytes"));
3232
m_bytesHasBeenSet = true;
3333
}
34+
if(jsonValue.ValueExists("s3Location"))
35+
{
36+
m_s3Location = jsonValue.GetObject("s3Location");
37+
m_s3LocationHasBeenSet = true;
38+
}
3439
return *this;
3540
}
3641

@@ -43,6 +48,12 @@ JsonValue DocumentSource::Jsonize() const
4348
payload.WithString("bytes", HashingUtils::Base64Encode(m_bytes));
4449
}
4550

51+
if(m_s3LocationHasBeenSet)
52+
{
53+
payload.WithObject("s3Location", m_s3Location.Jsonize());
54+
55+
}
56+
4657
return payload;
4758
}
4859

‎generated/src/aws-cpp-sdk-bedrock-runtime/source/model/ImageSource.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ ImageSource& ImageSource::operator =(JsonView jsonValue)
3131
m_bytes = HashingUtils::Base64Decode(jsonValue.GetString("bytes"));
3232
m_bytesHasBeenSet = true;
3333
}
34+
if(jsonValue.ValueExists("s3Location"))
35+
{
36+
m_s3Location = jsonValue.GetObject("s3Location");
37+
m_s3LocationHasBeenSet = true;
38+
}
3439
return *this;
3540
}
3641

@@ -43,6 +48,12 @@ JsonValue ImageSource::Jsonize() const
4348
payload.WithString("bytes", HashingUtils::Base64Encode(m_bytes));
4449
}
4550

51+
if(m_s3LocationHasBeenSet)
52+
{
53+
payload.WithObject("s3Location", m_s3Location.Jsonize());
54+
55+
}
56+
4657
return payload;
4758
}
4859

‎generated/src/aws-cpp-sdk-ecs/include/aws/ecs/model/RegisterTaskDefinitionRequest.h

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -208,24 +208,10 @@ namespace Model
208208
* type or external launch type, this field is optional. Supported values are
209209
* between <code>128</code> CPU units (<code>0.125</code> vCPUs) and
210210
* <code>196608</code> CPU units (<code>192</code> vCPUs). If you do not specify a
211-
* value, the parameter is ignored.</p> <p>If you're using the Fargate launch type,
212-
* this field is required and you must use one of the following values, which
213-
* determines your range of supported values for the <code>memory</code>
214-
* parameter:</p> <p>The CPU units cannot be less than 1 vCPU when you use Windows
215-
* containers on Fargate.</p> <ul> <li> <p>256 (.25 vCPU) - Available
216-
* <code>memory</code> values: 512 (0.5 GB), 1024 (1 GB), 2048 (2 GB)</p> </li>
217-
* <li> <p>512 (.5 vCPU) - Available <code>memory</code> values: 1024 (1 GB), 2048
218-
* (2 GB), 3072 (3 GB), 4096 (4 GB)</p> </li> <li> <p>1024 (1 vCPU) - Available
219-
* <code>memory</code> values: 2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB),
220-
* 6144 (6 GB), 7168 (7 GB), 8192 (8 GB)</p> </li> <li> <p>2048 (2 vCPU) -
221-
* Available <code>memory</code> values: 4096 (4 GB) and 16384 (16 GB) in
222-
* increments of 1024 (1 GB)</p> </li> <li> <p>4096 (4 vCPU) - Available
223-
* <code>memory</code> values: 8192 (8 GB) and 30720 (30 GB) in increments of 1024
224-
* (1 GB)</p> </li> <li> <p>8192 (8 vCPU) - Available <code>memory</code> values:
225-
* 16 GB and 60 GB in 4 GB increments</p> <p>This option requires Linux platform
226-
* <code>1.4.0</code> or later.</p> </li> <li> <p>16384 (16vCPU) - Available
227-
* <code>memory</code> values: 32GB and 120 GB in 8 GB increments</p> <p>This
228-
* option requires Linux platform <code>1.4.0</code> or later.</p> </li> </ul>
211+
* value, the parameter is ignored.</p> <p>This field is required for Fargate. For
212+
* information about the valid values, see <a
213+
* href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#task_size">Task
214+
* size</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>
229215
*/
230216
inline const Aws::String& GetCpu() const { return m_cpu; }
231217
inline bool CpuHasBeenSet() const { return m_cpuHasBeenSet; }

‎generated/src/aws-cpp-sdk-ecs/include/aws/ecs/model/Task.h

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,10 @@ namespace Model
176176
* type, this field is optional. Supported values are between <code>128</code> CPU
177177
* units (<code>0.125</code> vCPUs) and <code>196608</code> CPU units
178178
* (<code>192</code> vCPUs). If you do not specify a value, the parameter is
179-
* ignored.</p> <p>If you're using the Fargate launch type, this field is required.
180-
* You must use one of the following values. These values determine the range of
181-
* supported values for the <code>memory</code> parameter:</p> <p>The CPU units
182-
* cannot be less than 1 vCPU when you use Windows containers on Fargate.</p> <ul>
183-
* <li> <p>256 (.25 vCPU) - Available <code>memory</code> values: 512 (0.5 GB),
184-
* 1024 (1 GB), 2048 (2 GB)</p> </li> <li> <p>512 (.5 vCPU) - Available
185-
* <code>memory</code> values: 1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4
186-
* GB)</p> </li> <li> <p>1024 (1 vCPU) - Available <code>memory</code> values: 2048
187-
* (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8
188-
* GB)</p> </li> <li> <p>2048 (2 vCPU) - Available <code>memory</code> values: 4096
189-
* (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>4096 (4
190-
* vCPU) - Available <code>memory</code> values: 8192 (8 GB) and 30720 (30 GB) in
191-
* increments of 1024 (1 GB)</p> </li> <li> <p>8192 (8 vCPU) - Available
192-
* <code>memory</code> values: 16 GB and 60 GB in 4 GB increments</p> <p>This
193-
* option requires Linux platform <code>1.4.0</code> or later.</p> </li> <li>
194-
* <p>16384 (16vCPU) - Available <code>memory</code> values: 32GB and 120 GB in 8
195-
* GB increments</p> <p>This option requires Linux platform <code>1.4.0</code> or
196-
* later.</p> </li> </ul>
179+
* ignored.</p> <p>This field is required for Fargate. For information about the
180+
* valid values, see <a
181+
* href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#task_size">Task
182+
* size</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>
197183
*/
198184
inline const Aws::String& GetCpu() const { return m_cpu; }
199185
inline bool CpuHasBeenSet() const { return m_cpuHasBeenSet; }

‎generated/src/aws-cpp-sdk-ecs/include/aws/ecs/model/TaskDefinition.h

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -318,21 +318,10 @@ namespace Model
318318
* <code>memory</code> parameter.</p> <p>If you're using the EC2 launch type or the
319319
* external launch type, this field is optional. Supported values are between
320320
* <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>196608</code>
321-
* CPU units (<code>192</code> vCPUs). The CPU units cannot be less than 1 vCPU
322-
* when you use Windows containers on Fargate.</p> <ul> <li> <p>256 (.25 vCPU) -
323-
* Available <code>memory</code> values: 512 (0.5 GB), 1024 (1 GB), 2048 (2 GB)</p>
324-
* </li> <li> <p>512 (.5 vCPU) - Available <code>memory</code> values: 1024 (1 GB),
325-
* 2048 (2 GB), 3072 (3 GB), 4096 (4 GB)</p> </li> <li> <p>1024 (1 vCPU) -
326-
* Available <code>memory</code> values: 2048 (2 GB), 3072 (3 GB), 4096 (4 GB),
327-
* 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB)</p> </li> <li> <p>2048 (2
328-
* vCPU) - Available <code>memory</code> values: 4096 (4 GB) and 16384 (16 GB) in
329-
* increments of 1024 (1 GB)</p> </li> <li> <p>4096 (4 vCPU) - Available
330-
* <code>memory</code> values: 8192 (8 GB) and 30720 (30 GB) in increments of 1024
331-
* (1 GB)</p> </li> <li> <p>8192 (8 vCPU) - Available <code>memory</code> values:
332-
* 16 GB and 60 GB in 4 GB increments</p> <p>This option requires Linux platform
333-
* <code>1.4.0</code> or later.</p> </li> <li> <p>16384 (16vCPU) - Available
334-
* <code>memory</code> values: 32GB and 120 GB in 8 GB increments</p> <p>This
335-
* option requires Linux platform <code>1.4.0</code> or later.</p> </li> </ul>
321+
* CPU units (<code>192</code> vCPUs). </p> <p>This field is required for Fargate.
322+
* For information about the valid values, see <a
323+
* href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#task_size">Task
324+
* size</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>
336325
*/
337326
inline const Aws::String& GetCpu() const { return m_cpu; }
338327
inline bool CpuHasBeenSet() const { return m_cpuHasBeenSet; }

‎generated/src/aws-cpp-sdk-marketplace-deployment/include/aws/marketplace-deployment/MarketplaceDeploymentClient.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ namespace MarketplaceDeployment
2020
* which is a deployment option for software as a service (SaaS) products. Quick
2121
* Launch simplifies and reduces the time, resources, and steps required to
2222
* configure, deploy, and launch a products. The AWS Marketplace Deployment Service
23-
* provides sellers with a secure method for passing deployment parameters (for
24-
* example, API keys and external IDs) to buyers during the Quick Launch
25-
* experience.</p>
23+
* provides sellers with a secure method for passing deployment parameters, such as
24+
* API keys and external IDs, to buyers during the Quick Launch experience.</p>
2625
*/
2726
class AWS_MARKETPLACEDEPLOYMENT_API MarketplaceDeploymentClient : public Aws::Client::AWSJsonClient, public Aws::Client::ClientWithAsyncTemplateMethods<MarketplaceDeploymentClient>
2827
{

‎generated/src/aws-cpp-sdk-marketplace-deployment/include/aws/marketplace-deployment/model/DeploymentParameterInput.h

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

2626
/**
2727
* <p>The shape containing the requested deployment parameter name and
28-
* secretString.</p><p><h3>See Also:</h3> <a
28+
* secretString.</p> <p>To support AWS CloudFormation dynamic references to
29+
* this resource using Quick Launch, this value must match a parameter defined in
30+
* the CloudFormation templated provided to buyers.</p> <p><h3>See
31+
* Also:</h3> <a
2932
* href="http://docs.aws.amazon.com/goto/WebAPI/marketplace-deployment-2023-01-25/DeploymentParameterInput">AWS
3033
* API Reference</a></p>
3134
*/

‎generated/src/aws-cpp-sdk-marketplace-deployment/include/aws/marketplace-deployment/model/PutDeploymentParameterRequest.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace Model
5050

5151
///@{
5252
/**
53-
* <p>The catalog related to the request. Fixed value: <code>AWS Marketplace</code>
53+
* <p>The catalog related to the request. Fixed value: <code>AWSMarketplace</code>
5454
* </p>
5555
*/
5656
inline const Aws::String& GetCatalog() const { return m_catalog; }
@@ -64,7 +64,9 @@ namespace Model
6464
///@{
6565
/**
6666
* <p>The idempotency token for deployment parameters. A unique identifier for the
67-
* new version.</p>
67+
* new version.</p> <p>This field is not required if you're calling using an
68+
* AWS SDK. Otherwise, a <code>clientToken</code> must be provided with the
69+
* request.</p>
6870
*/
6971
inline const Aws::String& GetClientToken() const { return m_clientToken; }
7072
inline bool ClientTokenHasBeenSet() const { return m_clientTokenHasBeenSet; }

‎src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
#pragma once
66

7-
#define AWS_SDK_VERSION_STRING "1.11.554"
7+
#define AWS_SDK_VERSION_STRING "1.11.555"
88
#define AWS_SDK_VERSION_MAJOR 1
99
#define AWS_SDK_VERSION_MINOR 11
10-
#define AWS_SDK_VERSION_PATCH 554
10+
#define AWS_SDK_VERSION_PATCH 555

‎tools/code-generation/api-descriptions/bedrock-runtime-2023-09-30.normal.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,10 @@
987987
"bytes":{
988988
"shape":"DocumentSourceBytesBlob",
989989
"documentation":"<p>The raw bytes for the document. If you use an Amazon Web Services SDK, you don't need to encode the bytes in base64.</p>"
990+
},
991+
"s3Location":{
992+
"shape":"S3Location",
993+
"documentation":"<p>The location of a document object in an Amazon S3 bucket. To see which models support S3 uploads, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-supported-models-features.html\">Supported models and features for Converse</a>.</p>"
990994
}
991995
},
992996
"documentation":"<p>Contains the content of a document.</p>",
@@ -1987,6 +1991,10 @@
19871991
"bytes":{
19881992
"shape":"ImageSourceBytesBlob",
19891993
"documentation":"<p>The raw image bytes for the image. If you use an AWS SDK, you don't need to encode the image bytes in base64.</p>"
1994+
},
1995+
"s3Location":{
1996+
"shape":"S3Location",
1997+
"documentation":"<p>The location of an image object in an Amazon S3 bucket. To see which models support S3 uploads, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-supported-models-features.html\">Supported models and features for Converse</a>.</p>"
19901998
}
19911999
},
19922000
"documentation":"<p>The source for an image.</p>",
@@ -2726,7 +2734,7 @@
27262734
"documentation":"<p>If the bucket belongs to another AWS account, specify that account's ID.</p>"
27272735
}
27282736
},
2729-
"documentation":"<p>A storage location in an S3 bucket.</p>"
2737+
"documentation":"<p>A storage location in an Amazon S3 bucket.</p>"
27302738
},
27312739
"S3Uri":{
27322740
"type":"string",
@@ -3248,7 +3256,7 @@
32483256
},
32493257
"s3Location":{
32503258
"shape":"S3Location",
3251-
"documentation":"<p>The location of a video object in an S3 bucket.</p>"
3259+
"documentation":"<p>The location of a video object in an Amazon S3 bucket. To see which models support S3 uploads, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-supported-models-features.html\">Supported models and features for Converse</a>.</p>"
32523260
}
32533261
},
32543262
"documentation":"<p>A video source. You can upload a smaller video as a base64-encoded string as long as the encoded file is less than 25MB. You can also transfer videos up to 1GB in size from an S3 bucket.</p>",

0 commit comments

Comments
 (0)