Skip to content

Commit 174ae89

Browse files
Merge branch 'release-1.38.3' into develop
* release-1.38.3: Bumping version to 1.38.3 Update endpoints model Update to latest models
2 parents 79a077f + 74c285b commit 174ae89

File tree

8 files changed

+63
-12
lines changed

8 files changed

+63
-12
lines changed

.changes/1.38.3.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[
2+
{
3+
"category": "``bedrock-runtime``",
4+
"description": "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.",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``ecs``",
9+
"description": "Documentation only release for Amazon ECS.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``marketplace-deployment``",
14+
"description": "Doc only update for the AWS Marketplace Deployment Service that fixes several customer-reported issues.",
15+
"type": "api-change"
16+
}
17+
]

CHANGELOG.rst

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
CHANGELOG
33
=========
44

5+
1.38.3
6+
======
7+
8+
* api-change:``bedrock-runtime``: 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.
9+
* api-change:``ecs``: Documentation only release for Amazon ECS.
10+
* api-change:``marketplace-deployment``: Doc only update for the AWS Marketplace Deployment Service that fixes several customer-reported issues.
11+
12+
513
1.38.2
614
======
715

botocore/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import os
1717
import re
1818

19-
__version__ = '1.38.2'
19+
__version__ = '1.38.3'
2020

2121

2222
class NullHandler(logging.Handler):

botocore/data/bedrock-runtime/2023-09-30/service-2.json

+10-2
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>",

botocore/data/ecs/2014-11-13/service-2.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4866,7 +4866,7 @@
48664866
},
48674867
"cpu":{
48684868
"shape":"String",
4869-
"documentation":"<p>The number of CPU units used by the task. It can be expressed as an integer using CPU units (for example, <code>1024</code>) or as a string using vCPUs (for example, <code>1 vCPU</code> or <code>1 vcpu</code>) in a task definition. String values are converted to an integer indicating the CPU units when the task definition is registered.</p> <note> <p>Task-level CPU and memory parameters are ignored for Windows containers. We recommend specifying container-level resources for Windows containers.</p> </note> <p>If you're using the EC2 launch type or external launch type, this field is optional. Supported values are between <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>196608</code> CPU units (<code>192</code> vCPUs). If you do not specify a value, the parameter is ignored.</p> <p>If you're using the Fargate launch type, this field is required and you must use one of the following values, which determines your range of supported values for the <code>memory</code> parameter:</p> <p>The CPU units cannot be less than 1 vCPU when you use Windows containers on Fargate.</p> <ul> <li> <p>256 (.25 vCPU) - Available <code>memory</code> values: 512 (0.5 GB), 1024 (1 GB), 2048 (2 GB)</p> </li> <li> <p>512 (.5 vCPU) - Available <code>memory</code> values: 1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB)</p> </li> <li> <p>1024 (1 vCPU) - Available <code>memory</code> values: 2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB)</p> </li> <li> <p>2048 (2 vCPU) - Available <code>memory</code> values: 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>4096 (4 vCPU) - Available <code>memory</code> values: 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>8192 (8 vCPU) - Available <code>memory</code> values: 16 GB and 60 GB in 4 GB increments</p> <p>This option requires Linux platform <code>1.4.0</code> or later.</p> </li> <li> <p>16384 (16vCPU) - Available <code>memory</code> values: 32GB and 120 GB in 8 GB increments</p> <p>This option requires Linux platform <code>1.4.0</code> or later.</p> </li> </ul>"
4869+
"documentation":"<p>The number of CPU units used by the task. It can be expressed as an integer using CPU units (for example, <code>1024</code>) or as a string using vCPUs (for example, <code>1 vCPU</code> or <code>1 vcpu</code>) in a task definition. String values are converted to an integer indicating the CPU units when the task definition is registered.</p> <note> <p>Task-level CPU and memory parameters are ignored for Windows containers. We recommend specifying container-level resources for Windows containers.</p> </note> <p>If you're using the EC2 launch type or external launch type, this field is optional. Supported values are between <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>196608</code> CPU units (<code>192</code> vCPUs). If you do not specify a value, the parameter is ignored.</p> <p>This field is required for Fargate. For information about the valid values, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#task_size\">Task size</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
48704870
},
48714871
"memory":{
48724872
"shape":"String",
@@ -6369,7 +6369,7 @@
63696369
},
63706370
"cpu":{
63716371
"shape":"String",
6372-
"documentation":"<p>The number of CPU units used by the task as expressed in a task definition. It can be expressed as an integer using CPU units (for example, <code>1024</code>). It can also be expressed as a string using vCPUs (for example, <code>1 vCPU</code> or <code>1 vcpu</code>). String values are converted to an integer that indicates the CPU units when the task definition is registered.</p> <p>If you're using the EC2 launch type or the external launch type, this field is optional. Supported values are between <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>196608</code> CPU units (<code>192</code> vCPUs). If you do not specify a value, the parameter is ignored.</p> <p>If you're using the Fargate launch type, this field is required. You must use one of the following values. These values determine the range of supported values for the <code>memory</code> parameter:</p> <p>The CPU units cannot be less than 1 vCPU when you use Windows containers on Fargate.</p> <ul> <li> <p>256 (.25 vCPU) - Available <code>memory</code> values: 512 (0.5 GB), 1024 (1 GB), 2048 (2 GB)</p> </li> <li> <p>512 (.5 vCPU) - Available <code>memory</code> values: 1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB)</p> </li> <li> <p>1024 (1 vCPU) - Available <code>memory</code> values: 2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB)</p> </li> <li> <p>2048 (2 vCPU) - Available <code>memory</code> values: 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>4096 (4 vCPU) - Available <code>memory</code> values: 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>8192 (8 vCPU) - Available <code>memory</code> values: 16 GB and 60 GB in 4 GB increments</p> <p>This option requires Linux platform <code>1.4.0</code> or later.</p> </li> <li> <p>16384 (16vCPU) - Available <code>memory</code> values: 32GB and 120 GB in 8 GB increments</p> <p>This option requires Linux platform <code>1.4.0</code> or later.</p> </li> </ul>"
6372+
"documentation":"<p>The number of CPU units used by the task as expressed in a task definition. It can be expressed as an integer using CPU units (for example, <code>1024</code>). It can also be expressed as a string using vCPUs (for example, <code>1 vCPU</code> or <code>1 vcpu</code>). String values are converted to an integer that indicates the CPU units when the task definition is registered.</p> <p>If you're using the EC2 launch type or the external launch type, this field is optional. Supported values are between <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>196608</code> CPU units (<code>192</code> vCPUs). If you do not specify a value, the parameter is ignored.</p> <p>This field is required for Fargate. For information about the valid values, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#task_size\">Task size</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
63736373
},
63746374
"createdAt":{
63756375
"shape":"Timestamp",
@@ -6543,7 +6543,7 @@
65436543
},
65446544
"cpu":{
65456545
"shape":"String",
6546-
"documentation":"<p>The number of <code>cpu</code> units used by the task. If you use the EC2 launch type, this field is optional. Any value can be used. If you use the Fargate launch type, this field is required. You must use one of the following values. The value that you choose determines your range of valid values for the <code>memory</code> parameter.</p> <p>If you're using the EC2 launch type or the external launch type, this field is optional. Supported values are between <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>196608</code> CPU units (<code>192</code> vCPUs). The CPU units cannot be less than 1 vCPU when you use Windows containers on Fargate.</p> <ul> <li> <p>256 (.25 vCPU) - Available <code>memory</code> values: 512 (0.5 GB), 1024 (1 GB), 2048 (2 GB)</p> </li> <li> <p>512 (.5 vCPU) - Available <code>memory</code> values: 1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB)</p> </li> <li> <p>1024 (1 vCPU) - Available <code>memory</code> values: 2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB)</p> </li> <li> <p>2048 (2 vCPU) - Available <code>memory</code> values: 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>4096 (4 vCPU) - Available <code>memory</code> values: 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>8192 (8 vCPU) - Available <code>memory</code> values: 16 GB and 60 GB in 4 GB increments</p> <p>This option requires Linux platform <code>1.4.0</code> or later.</p> </li> <li> <p>16384 (16vCPU) - Available <code>memory</code> values: 32GB and 120 GB in 8 GB increments</p> <p>This option requires Linux platform <code>1.4.0</code> or later.</p> </li> </ul>"
6546+
"documentation":"<p>The number of <code>cpu</code> units used by the task. If you use the EC2 launch type, this field is optional. Any value can be used. If you use the Fargate launch type, this field is required. You must use one of the following values. The value that you choose determines your range of valid values for the <code>memory</code> parameter.</p> <p>If you're using the EC2 launch type or the external launch type, this field is optional. Supported values are between <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>196608</code> CPU units (<code>192</code> vCPUs). </p> <p>This field is required for Fargate. For information about the valid values, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#task_size\">Task size</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
65476547
},
65486548
"memory":{
65496549
"shape":"String",

botocore/data/endpoints.json

+16
Original file line numberDiff line numberDiff line change
@@ -36528,6 +36528,11 @@
3652836528
"us-iso-west-1" : { }
3652936529
}
3653036530
},
36531+
"batch" : {
36532+
"endpoints" : {
36533+
"us-iso-east-1" : { }
36534+
}
36535+
},
3653136536
"bedrock" : {
3653236537
"endpoints" : {
3653336538
"bedrock-runtime-us-iso-east-1" : {
@@ -37658,6 +37663,12 @@
3765837663
} ]
3765937664
}
3766037665
}
37666+
},
37667+
"xray" : {
37668+
"endpoints" : {
37669+
"us-iso-east-1" : { },
37670+
"us-iso-west-1" : { }
37671+
}
3766137672
}
3766237673
}
3766337674
}, {
@@ -37742,6 +37753,11 @@
3774237753
"us-isob-east-1" : { }
3774337754
}
3774437755
},
37756+
"batch" : {
37757+
"endpoints" : {
37758+
"us-isob-east-1" : { }
37759+
}
37760+
},
3774537761
"budgets" : {
3774637762
"endpoints" : {
3774737763
"aws-iso-b-global" : {

botocore/data/marketplace-deployment/2023-01-25/service-2.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
"endpointPrefix":"deployment-marketplace",
66
"jsonVersion":"1.1",
77
"protocol":"rest-json",
8+
"protocols":["rest-json"],
89
"serviceFullName":"AWS Marketplace Deployment Service",
910
"serviceId":"Marketplace Deployment",
1011
"signatureVersion":"v4",
1112
"signingName":"aws-marketplace",
12-
"uid":"marketplace-deployment-2023-01-25"
13+
"uid":"marketplace-deployment-2023-01-25",
14+
"auth":["aws.auth#sigv4"]
1315
},
1416
"operations":{
1517
"ListTagsForResource":{
@@ -153,7 +155,7 @@
153155
"documentation":"<p>The text to encrypt and store in the secret.</p>"
154156
}
155157
},
156-
"documentation":"<p>The shape containing the requested deployment parameter name and secretString.</p>"
158+
"documentation":"<p>The shape containing the requested deployment parameter name and secretString.</p> <note> <p>To support AWS CloudFormation dynamic references to this resource using Quick Launch, this value must match a parameter defined in the CloudFormation templated provided to buyers.</p> </note>"
157159
},
158160
"DeploymentParameterName":{
159161
"type":"string",
@@ -215,13 +217,13 @@
215217
},
216218
"catalog":{
217219
"shape":"Catalog",
218-
"documentation":"<p>The catalog related to the request. Fixed value: <code>AWS Marketplace</code> </p>",
220+
"documentation":"<p>The catalog related to the request. Fixed value: <code>AWSMarketplace</code> </p>",
219221
"location":"uri",
220222
"locationName":"catalog"
221223
},
222224
"clientToken":{
223225
"shape":"ClientToken",
224-
"documentation":"<p>The idempotency token for deployment parameters. A unique identifier for the new version.</p>",
226+
"documentation":"<p>The idempotency token for deployment parameters. A unique identifier for the new version.</p> <note> <p>This field is not required if you're calling using an AWS SDK. Otherwise, a <code>clientToken</code> must be provided with the request.</p> </note>",
225227
"idempotencyToken":true
226228
},
227229
"deploymentParameter":{
@@ -429,5 +431,5 @@
429431
"exception":true
430432
}
431433
},
432-
"documentation":"<p>The AWS Marketplace Deployment Service supports the Quick Launch experience, which is a deployment option for software as a service (SaaS) products. Quick Launch simplifies and reduces the time, resources, and steps required to configure, deploy, and launch a products. The AWS Marketplace Deployment Service provides sellers with a secure method for passing deployment parameters (for example, API keys and external IDs) to buyers during the Quick Launch experience.</p>"
434+
"documentation":"<p>The AWS Marketplace Deployment Service supports the Quick Launch experience, which is a deployment option for software as a service (SaaS) products. Quick Launch simplifies and reduces the time, resources, and steps required to configure, deploy, and launch a products. The AWS Marketplace Deployment Service provides sellers with a secure method for passing deployment parameters, such as API keys and external IDs, to buyers during the Quick Launch experience.</p>"
433435
}

docs/source/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
# The short X.Y version.
6060
version = '1.38'
6161
# The full version, including alpha/beta/rc tags.
62-
release = '1.38.2'
62+
release = '1.38.3'
6363

6464
# The language for content autogenerated by Sphinx. Refer to documentation
6565
# for a list of supported languages.

0 commit comments

Comments
 (0)