From b1180a9da7fa96e6d3169e60426c8dbadfc192d8 Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Fri, 18 Oct 2024 18:06:43 +0000 Subject: [PATCH] Update to latest models --- .../next-release/api-change-athena-40598.json | 5 + .../api-change-bedrock-58111.json | 5 + .../api-change-bedrockruntime-79392.json | 5 + .../api-change-datazone-44137.json | 5 + .../next-release/api-change-ec2-41571.json | 5 + .../data/athena/2017-05-18/service-2.json | 92 ++----------------- .../bedrock-runtime/2023-09-30/service-2.json | 4 +- .../data/bedrock/2023-04-20/service-2.json | 21 ++++- .../data/datazone/2018-05-10/service-2.json | 8 +- botocore/data/ec2/2016-11-15/service-2.json | 4 +- 10 files changed, 62 insertions(+), 92 deletions(-) create mode 100644 .changes/next-release/api-change-athena-40598.json create mode 100644 .changes/next-release/api-change-bedrock-58111.json create mode 100644 .changes/next-release/api-change-bedrockruntime-79392.json create mode 100644 .changes/next-release/api-change-datazone-44137.json create mode 100644 .changes/next-release/api-change-ec2-41571.json diff --git a/.changes/next-release/api-change-athena-40598.json b/.changes/next-release/api-change-athena-40598.json new file mode 100644 index 0000000000..a7b3f6cca1 --- /dev/null +++ b/.changes/next-release/api-change-athena-40598.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``athena``", + "description": "Removing FEDERATED from Create/List/Delete/GetDataCatalog API" +} diff --git a/.changes/next-release/api-change-bedrock-58111.json b/.changes/next-release/api-change-bedrock-58111.json new file mode 100644 index 0000000000..f450d34af5 --- /dev/null +++ b/.changes/next-release/api-change-bedrock-58111.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``bedrock``", + "description": "Adding converse support to CMI API's" +} diff --git a/.changes/next-release/api-change-bedrockruntime-79392.json b/.changes/next-release/api-change-bedrockruntime-79392.json new file mode 100644 index 0000000000..edcf4308b4 --- /dev/null +++ b/.changes/next-release/api-change-bedrockruntime-79392.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``bedrock-runtime``", + "description": "Added converse support for custom imported models" +} diff --git a/.changes/next-release/api-change-datazone-44137.json b/.changes/next-release/api-change-datazone-44137.json new file mode 100644 index 0000000000..4e461e2bb3 --- /dev/null +++ b/.changes/next-release/api-change-datazone-44137.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``datazone``", + "description": "Adding the following project member designations: PROJECT_CATALOG_VIEWER, PROJECT_CATALOG_CONSUMER and PROJECT_CATALOG_STEWARD in the CreateProjectMembership API and PROJECT_CATALOG_STEWARD designation in the AddPolicyGrant API." +} diff --git a/.changes/next-release/api-change-ec2-41571.json b/.changes/next-release/api-change-ec2-41571.json new file mode 100644 index 0000000000..29f8e6089d --- /dev/null +++ b/.changes/next-release/api-change-ec2-41571.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``ec2``", + "description": "RequestSpotInstances and RequestSpotFleet feature release." +} diff --git a/botocore/data/athena/2017-05-18/service-2.json b/botocore/data/athena/2017-05-18/service-2.json index 383a3814f5..fed4374aa3 100644 --- a/botocore/data/athena/2017-05-18/service-2.json +++ b/botocore/data/athena/2017-05-18/service-2.json @@ -1021,10 +1021,10 @@ "members":{ "S3AclOption":{ "shape":"S3AclOption", - "documentation":"

The Amazon S3 canned ACL that Athena should specify when storing query results. Currently the only supported canned ACL is BUCKET_OWNER_FULL_CONTROL. If a query runs in a workgroup and the workgroup overrides client-side settings, then the Amazon S3 canned ACL specified in the workgroup's settings is used for all queries that run in the workgroup. For more information about Amazon S3 canned ACLs, see Canned ACL in the Amazon S3 User Guide.

" + "documentation":"

The Amazon S3 canned ACL that Athena should specify when storing query results, including data files inserted by Athena as the result of statements like CTAS or INSERT INTO. Currently the only supported canned ACL is BUCKET_OWNER_FULL_CONTROL. If a query runs in a workgroup and the workgroup overrides client-side settings, then the Amazon S3 canned ACL specified in the workgroup's settings is used for all queries that run in the workgroup. For more information about Amazon S3 canned ACLs, see Canned ACL in the Amazon S3 User Guide.

" } }, - "documentation":"

Indicates that an Amazon S3 canned ACL should be set to control ownership of stored query results. When Athena stores query results in Amazon S3, the canned ACL is set with the x-amz-acl request header. For more information about S3 Object Ownership, see Object Ownership settings in the Amazon S3 User Guide.

" + "documentation":"

Indicates that an Amazon S3 canned ACL should be set to control ownership of stored query results, including data files inserted by Athena as the result of statements like CTAS or INSERT INTO. When Athena stores query results in Amazon S3, the canned ACL is set with the x-amz-acl request header. For more information about S3 Object Ownership, see Object Ownership settings in the Amazon S3 User Guide.

" }, "Age":{ "type":"integer", @@ -1538,41 +1538,6 @@ "min":0, "pattern":"[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*" }, - "ConnectionType":{ - "type":"string", - "enum":[ - "DYNAMODB", - "MYSQL", - "POSTGRESQL", - "REDSHIFT", - "ORACLE", - "SYNAPSE", - "SQLSERVER", - "DB2", - "OPENSEARCH", - "BIGQUERY", - "GOOGLECLOUDSTORAGE", - "HBASE", - "DOCUMENTDB", - "MSK", - "NEPTUNE", - "CMDB", - "TPCDS", - "REDIS", - "CLOUDWATCH", - "TIMESTREAM", - "SAPHANA", - "SNOWFLAKE", - "TERADATA", - "VERTICA", - "CLOUDERAIMPALA", - "CLOUDERAHIVE", - "HORTONWORKSHIVE", - "DATALAKEGEN2", - "DB2AS400", - "CLOUDWATCHMETRICS" - ] - }, "CoordinatorDpuSize":{ "type":"integer", "box":true, @@ -1618,7 +1583,7 @@ }, "Type":{ "shape":"DataCatalogType", - "documentation":"

The type of data catalog to create: LAMBDA for a federated catalog, GLUE for an Glue Data Catalog, and HIVE for an external Apache Hive metastore. FEDERATED is a federated catalog for which Athena creates the connection and the Lambda function for you based on the parameters that you pass.

" + "documentation":"

The type of data catalog to create: LAMBDA for a federated catalog, HIVE for an external hive metastore, or GLUE for an Glue Data Catalog.

" }, "Description":{ "shape":"DescriptionString", @@ -1626,7 +1591,7 @@ }, "Parameters":{ "shape":"ParametersMap", - "documentation":"

Specifies the Lambda function or functions to use for creating the data catalog. This is a mapping whose values depend on the catalog type.

" + "documentation":"

Specifies the Lambda function or functions to use for creating the data catalog. This is a mapping whose values depend on the catalog type.

" }, "Tags":{ "shape":"TagList", @@ -1637,7 +1602,6 @@ "CreateDataCatalogOutput":{ "type":"structure", "members":{ - "DataCatalog":{"shape":"DataCatalog"} } }, "CreateNamedQueryInput":{ @@ -1832,41 +1796,15 @@ }, "Type":{ "shape":"DataCatalogType", - "documentation":"

The type of data catalog to create: LAMBDA for a federated catalog, GLUE for an Glue Data Catalog, and HIVE for an external Apache Hive metastore. FEDERATED is a federated catalog for which Athena creates the connection and the Lambda function for you based on the parameters that you pass.

" + "documentation":"

The type of data catalog to create: LAMBDA for a federated catalog, HIVE for an external hive metastore, or GLUE for an Glue Data Catalog.

" }, "Parameters":{ "shape":"ParametersMap", - "documentation":"

Specifies the Lambda function or functions to use for the data catalog. This is a mapping whose values depend on the catalog type.

" - }, - "Status":{ - "shape":"DataCatalogStatus", - "documentation":"

The status of the creation or deletion of the data catalog.

Data catalog creation status:

Data catalog deletion status:

" - }, - "ConnectionType":{ - "shape":"ConnectionType", - "documentation":"

The type of connection for a FEDERATED data catalog (for example, REDSHIFT, MYSQL, or SQLSERVER). For information about individual connectors, see Available data source connectors.

" - }, - "Error":{ - "shape":"ErrorMessage", - "documentation":"

Text of the error that occurred during data catalog creation or deletion.

" + "documentation":"

Specifies the Lambda function or functions to use for the data catalog. This is a mapping whose values depend on the catalog type.

" } }, "documentation":"

Contains information about a data catalog in an Amazon Web Services account.

In the Athena console, data catalogs are listed as \"data sources\" on the Data sources page under the Data source name column.

" }, - "DataCatalogStatus":{ - "type":"string", - "enum":[ - "CREATE_IN_PROGRESS", - "CREATE_COMPLETE", - "CREATE_FAILED", - "CREATE_FAILED_CLEANUP_IN_PROGRESS", - "CREATE_FAILED_CLEANUP_COMPLETE", - "CREATE_FAILED_CLEANUP_FAILED", - "DELETE_IN_PROGRESS", - "DELETE_COMPLETE", - "DELETE_FAILED" - ] - }, "DataCatalogSummary":{ "type":"structure", "members":{ @@ -1877,18 +1815,6 @@ "Type":{ "shape":"DataCatalogType", "documentation":"

The data catalog type.

" - }, - "Status":{ - "shape":"DataCatalogStatus", - "documentation":"

The status of the creation or deletion of the data catalog.

Data catalog creation status:

Data catalog deletion status:

" - }, - "ConnectionType":{ - "shape":"ConnectionType", - "documentation":"

The type of connection for a FEDERATED data catalog (for example, REDSHIFT, MYSQL, or SQLSERVER). For information about individual connectors, see Available data source connectors.

" - }, - "Error":{ - "shape":"ErrorMessage", - "documentation":"

Text of the error that occurred during data catalog creation or deletion.

" } }, "documentation":"

The summary information for the data catalog, which includes its name and type.

" @@ -1902,8 +1828,7 @@ "enum":[ "LAMBDA", "GLUE", - "HIVE", - "FEDERATED" + "HIVE" ] }, "Database":{ @@ -1979,7 +1904,6 @@ "DeleteDataCatalogOutput":{ "type":"structure", "members":{ - "DataCatalog":{"shape":"DataCatalog"} } }, "DeleteNamedQueryInput":{ @@ -2539,7 +2463,7 @@ "members":{ "UpdateCount":{ "shape":"Long", - "documentation":"

The number of rows inserted with a CREATE TABLE AS SELECT statement.

" + "documentation":"

The number of rows inserted with a CREATE TABLE AS SELECT, INSERT INTO, or UPDATE statement.

" }, "ResultSet":{ "shape":"ResultSet", diff --git a/botocore/data/bedrock-runtime/2023-09-30/service-2.json b/botocore/data/bedrock-runtime/2023-09-30/service-2.json index 489787efd9..e4fb75f6c0 100644 --- a/botocore/data/bedrock-runtime/2023-09-30/service-2.json +++ b/botocore/data/bedrock-runtime/2023-09-30/service-2.json @@ -339,7 +339,7 @@ "type":"string", "max":2048, "min":1, - "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/[a-zA-Z0-9-:.]+)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|([a-zA-Z0-9-:.]+)" + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)" }, "ConverseMetrics":{ "type":"structure", @@ -1515,7 +1515,7 @@ "type":"string", "max":2048, "min":1, - "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/[a-zA-Z0-9-:.]+)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|([a-zA-Z0-9-:.]+)" + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)" }, "InvokeModelRequest":{ "type":"structure", diff --git a/botocore/data/bedrock/2023-04-20/service-2.json b/botocore/data/bedrock/2023-04-20/service-2.json index 6a2d07846c..9df73a5a37 100644 --- a/botocore/data/bedrock/2023-04-20/service-2.json +++ b/botocore/data/bedrock/2023-04-20/service-2.json @@ -1864,7 +1864,7 @@ "type":"string", "max":2048, "min":1, - "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:((:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/(([a-z]{2}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))))|(([a-z]{2}[.]{1})([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))" + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:((:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/(([a-z]{2}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))))|(([a-z]{2}[.]{1})([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))" }, "EvaluationModelIdentifiers":{ "type":"list", @@ -2434,6 +2434,10 @@ "modelKmsKeyArn":{ "shape":"KmsKeyArn", "documentation":"

The imported model is encrypted at rest using this key.

" + }, + "instructSupported":{ + "shape":"InstructSupported", + "documentation":"

Specifies if the imported model supports fine tuning.

" } } }, @@ -3797,9 +3801,17 @@ "creationTime":{ "shape":"Timestamp", "documentation":"

Creation time of the imported model.

" + }, + "instructSupported":{ + "shape":"InstructSupported", + "documentation":"

Specifies if the imported model supports fine tuning.

" + }, + "modelArchitecture":{ + "shape":"ModelArchitecture", + "documentation":"

The architecture of the imported model.

" } }, - "documentation":"

Information about tne imported model.

" + "documentation":"

Information about the imported model.

" }, "ImportedModelSummaryList":{ "type":"list", @@ -3924,6 +3936,10 @@ "type":"list", "member":{"shape":"InferenceType"} }, + "InstructSupported":{ + "type":"boolean", + "box":true + }, "InternalServerException":{ "type":"structure", "members":{ @@ -4680,6 +4696,7 @@ "type":"float", "box":true }, + "ModelArchitecture":{"type":"string"}, "ModelArn":{ "type":"string", "max":1011, diff --git a/botocore/data/datazone/2018-05-10/service-2.json b/botocore/data/datazone/2018-05-10/service-2.json index 25cbe093c1..8ccd2c3b71 100644 --- a/botocore/data/datazone/2018-05-10/service-2.json +++ b/botocore/data/datazone/2018-05-10/service-2.json @@ -13942,7 +13942,8 @@ "type":"string", "enum":[ "OWNER", - "CONTRIBUTOR" + "CONTRIBUTOR", + "PROJECT_CATALOG_STEWARD" ] }, "ProjectGrantFilter":{ @@ -18104,7 +18105,10 @@ "type":"string", "enum":[ "PROJECT_OWNER", - "PROJECT_CONTRIBUTOR" + "PROJECT_CONTRIBUTOR", + "PROJECT_CATALOG_VIEWER", + "PROJECT_CATALOG_CONSUMER", + "PROJECT_CATALOG_STEWARD" ] }, "UserDetails":{ diff --git a/botocore/data/ec2/2016-11-15/service-2.json b/botocore/data/ec2/2016-11-15/service-2.json index 572cfa5784..7a4ee2d5fc 100644 --- a/botocore/data/ec2/2016-11-15/service-2.json +++ b/botocore/data/ec2/2016-11-15/service-2.json @@ -21211,7 +21211,7 @@ }, "Filters":{ "shape":"FilterList", - "documentation":"

The filters.

", + "documentation":"

The filters.

", "locationName":"Filter" } } @@ -50863,7 +50863,7 @@ "locationName":"kernelId" }, "KeyName":{ - "shape":"KeyPairName", + "shape":"KeyPairNameWithResolver", "documentation":"

The name of the key pair.

", "locationName":"keyName" },