Skip to content

Commit 68ba836

Browse files
aws-sdk-python-automationaws-sdk-python-automation
committed
Merge branch 'release-1.37.17'
* release-1.37.17: Bumping version to 1.37.17 Update endpoints model Update to latest models Merge customizations for Network Firewall
2 parents bb68e8d + a21bad6 commit 68ba836

File tree

12 files changed

+747
-58
lines changed

12 files changed

+747
-58
lines changed

‎.changes/1.37.17.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[
2+
{
3+
"category": "``amplify``",
4+
"description": "Added appId field to Webhook responses",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``bedrock``",
9+
"description": "With this release, Bedrock Evaluation will now support bring your own inference responses.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``controlcatalog``",
14+
"description": "Add ExemptAssumeRoot parameter to adapt for new AWS AssumeRoot capability.",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``mailmanager``",
19+
"description": "Amazon SES Mail Manager. Extended rule string and boolean expressions to support analysis in condition evaluation. Extended ingress point string expression to support analysis in condition evaluation",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``network-firewall``",
24+
"description": "You can now use flow operations to either flush or capture traffic monitored in your firewall's flow table.",
25+
"type": "api-change"
26+
}
27+
]

‎CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
CHANGELOG
33
=========
44

5+
1.37.17
6+
=======
7+
8+
* api-change:``amplify``: Added appId field to Webhook responses
9+
* api-change:``bedrock``: With this release, Bedrock Evaluation will now support bring your own inference responses.
10+
* api-change:``controlcatalog``: Add ExemptAssumeRoot parameter to adapt for new AWS AssumeRoot capability.
11+
* api-change:``mailmanager``: Amazon SES Mail Manager. Extended rule string and boolean expressions to support analysis in condition evaluation. Extended ingress point string expression to support analysis in condition evaluation
12+
* api-change:``network-firewall``: You can now use flow operations to either flush or capture traffic monitored in your firewall's flow table.
13+
14+
515
1.37.16
616
=======
717

‎botocore/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import os
1717
import re
1818

19-
__version__ = '1.37.16'
19+
__version__ = '1.37.17'
2020

2121

2222
class NullHandler(logging.Handler):

‎botocore/data/amplify/2017-07-25/service-2.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
{"shape":"InternalFailureException"},
382382
{"shape":"LimitExceededException"}
383383
],
384-
"documentation":"<p>Returns a list of artifacts for a specified app, branch, and job. </p>"
384+
"documentation":"<p>Returns a list of end-to-end testing artifacts for a specified app, branch, and job.</p> <p>To return the build artifacts, use the <a href=\"https://docs.aws.amazon.com/amplify/latest/APIReference/API_GetJob.html\">GetJob</a> API.</p> <p>For more information about Amplify testing support, see <a href=\"https://docs.aws.amazon.com/amplify/latest/userguide/running-tests.html\">Setting up end-to-end Cypress tests for your Amplify application</a> in the <i>Amplify Hosting User Guide</i>. </p>"
385385
},
386386
"ListBackendEnvironments":{
387387
"name":"ListBackendEnvironments",
@@ -3035,7 +3035,7 @@
30353035
},
30363036
"artifactsUrl":{
30373037
"shape":"ArtifactsUrl",
3038-
"documentation":"<p> The URL to the artifact for the execution step. </p>"
3038+
"documentation":"<p> The URL to the build artifact for the execution step. </p>"
30393039
},
30403040
"testArtifactsUrl":{
30413041
"shape":"TestArtifactsUrl",
@@ -3650,6 +3650,10 @@
36503650
"shape":"WebhookUrl",
36513651
"documentation":"<p>The URL of the webhook. </p>"
36523652
},
3653+
"appId":{
3654+
"shape":"AppId",
3655+
"documentation":"<p>The unique ID of an Amplify app.</p>"
3656+
},
36533657
"branchName":{
36543658
"shape":"BranchName",
36553659
"documentation":"<p>The name for a branch that is part of an Amplify app. </p>"

‎botocore/data/bedrock/2023-04-20/service-2.json

Lines changed: 155 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2259,12 +2259,18 @@
22592259
"max":20,
22602260
"min":0
22612261
},
2262+
"EvaluationBedrockKnowledgeBaseIdentifiers":{
2263+
"type":"list",
2264+
"member":{"shape":"KnowledgeBaseId"},
2265+
"max":1,
2266+
"min":0
2267+
},
22622268
"EvaluationBedrockModel":{
22632269
"type":"structure",
22642270
"required":["modelIdentifier"],
22652271
"members":{
22662272
"modelIdentifier":{
2267-
"shape":"EvaluationModelIdentifier",
2273+
"shape":"EvaluationBedrockModelIdentifier",
22682274
"documentation":"<p>The ARN of the Amazon Bedrock model or inference profile specified.</p>"
22692275
},
22702276
"inferenceParams":{
@@ -2278,6 +2284,18 @@
22782284
},
22792285
"documentation":"<p>Contains the ARN of the Amazon Bedrock model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> specified in your evaluation job. Each Amazon Bedrock model supports different <code>inferenceParams</code>. To learn more about supported inference parameters for Amazon Bedrock models, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html\">Inference parameters for foundation models</a>.</p> <p>The <code>inferenceParams</code> are specified using JSON. To successfully insert JSON as string make sure that all quotations are properly escaped. For example, <code>\"temperature\":\"0.25\"</code> key value pair would need to be formatted as <code>\\\"temperature\\\":\\\"0.25\\\"</code> to successfully accepted in the request.</p>"
22802286
},
2287+
"EvaluationBedrockModelIdentifier":{
2288+
"type":"string",
2289+
"max":2048,
2290+
"min":1,
2291+
"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}:application-inference-profile/[a-z0-9]{12})|([0-9]{12}:inference-profile/(([a-z-]{2,8}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([0-9]{12}:(default-prompt-router|prompt-router)/[a-zA-Z0-9-:.]+)))|(([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}))|arn:aws(-[^:]+)?:sagemaker:[a-z0-9-]{1,20}:[0-9]{12}:endpoint/[a-z0-9-]{1,63}"
2292+
},
2293+
"EvaluationBedrockModelIdentifiers":{
2294+
"type":"list",
2295+
"member":{"shape":"EvaluationBedrockModelIdentifier"},
2296+
"max":2,
2297+
"min":0
2298+
},
22812299
"EvaluationConfig":{
22822300
"type":"structure",
22832301
"members":{
@@ -2370,6 +2388,20 @@
23702388
"documentation":"<p>The configuration details of the inference model for an evaluation job.</p> <p>For automated model evaluation jobs, only a single model is supported.</p> <p>For human-based model evaluation jobs, your annotator can compare the responses for up to two different models.</p>",
23712389
"union":true
23722390
},
2391+
"EvaluationInferenceConfigSummary":{
2392+
"type":"structure",
2393+
"members":{
2394+
"modelConfigSummary":{
2395+
"shape":"EvaluationModelConfigSummary",
2396+
"documentation":"<p>A summary of the models used in an Amazon Bedrock model evaluation job. These resources can be models in Amazon Bedrock or models outside of Amazon Bedrock that you use to generate your own inference response data.</p>"
2397+
},
2398+
"ragConfigSummary":{
2399+
"shape":"EvaluationRagConfigSummary",
2400+
"documentation":"<p>A summary of the RAG resources used in an Amazon Bedrock Knowledge Base evaluation job. These resources can be Knowledge Bases in Amazon Bedrock or RAG sources outside of Amazon Bedrock that you use to generate your own inference response data.</p>"
2401+
}
2402+
},
2403+
"documentation":"<p>Identifies the models, Knowledge Bases, or other RAG sources evaluated in a model or Knowledge Base evaluation job.</p>"
2404+
},
23732405
"EvaluationJobArn":{
23742406
"type":"string",
23752407
"max":1011,
@@ -2446,29 +2478,35 @@
24462478
"bedrockModel":{
24472479
"shape":"EvaluationBedrockModel",
24482480
"documentation":"<p>Defines the Amazon Bedrock model or inference profile and inference parameters you want used.</p>"
2481+
},
2482+
"precomputedInferenceSource":{
2483+
"shape":"EvaluationPrecomputedInferenceSource",
2484+
"documentation":"<p>Defines the model used to generate inference response data for a model evaluation job where you provide your own inference response data.</p>"
24492485
}
24502486
},
24512487
"documentation":"<p>Defines the models used in the model evaluation job.</p>",
24522488
"union":true
24532489
},
2490+
"EvaluationModelConfigSummary":{
2491+
"type":"structure",
2492+
"members":{
2493+
"bedrockModelIdentifiers":{
2494+
"shape":"EvaluationBedrockModelIdentifiers",
2495+
"documentation":"<p>The Amazon Resource Names (ARNs) of the models used for the evaluation job.</p>"
2496+
},
2497+
"precomputedInferenceSourceIdentifiers":{
2498+
"shape":"EvaluationPrecomputedInferenceSourceIdentifiers",
2499+
"documentation":"<p>A label that identifies the models used for a model evaluation job where you provide your own inference response data.</p>"
2500+
}
2501+
},
2502+
"documentation":"<p>A summary of the models used in an Amazon Bedrock model evaluation job. These resources can be models in Amazon Bedrock or models outside of Amazon Bedrock that you use to generate your own inference response data.</p>"
2503+
},
24542504
"EvaluationModelConfigs":{
24552505
"type":"list",
24562506
"member":{"shape":"EvaluationModelConfig"},
24572507
"max":2,
24582508
"min":1
24592509
},
2460-
"EvaluationModelIdentifier":{
2461-
"type":"string",
2462-
"max":2048,
2463-
"min":1,
2464-
"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}:application-inference-profile/[a-z0-9]{12})|([0-9]{12}:inference-profile/(([a-z-]{2,8}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([0-9]{12}:(default-prompt-router|prompt-router)/[a-zA-Z0-9-:.]+)))|(([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}))|arn:aws(-[^:]+)?:sagemaker:[a-z0-9-]{1,20}:[0-9]{12}:endpoint/[a-z0-9-]{1,63}"
2465-
},
2466-
"EvaluationModelIdentifiers":{
2467-
"type":"list",
2468-
"member":{"shape":"EvaluationModelIdentifier"},
2469-
"max":2,
2470-
"min":0
2471-
},
24722510
"EvaluationModelInferenceParams":{
24732511
"type":"string",
24742512
"max":1023,
@@ -2486,6 +2524,92 @@
24862524
},
24872525
"documentation":"<p>The Amazon S3 location where the results of your evaluation job are saved.</p>"
24882526
},
2527+
"EvaluationPrecomputedInferenceSource":{
2528+
"type":"structure",
2529+
"required":["inferenceSourceIdentifier"],
2530+
"members":{
2531+
"inferenceSourceIdentifier":{
2532+
"shape":"EvaluationPrecomputedInferenceSourceIdentifier",
2533+
"documentation":"<p>A label that identifies a model used in a model evaluation job where you provide your own inference response data.</p>"
2534+
}
2535+
},
2536+
"documentation":"<p>A summary of a model used for a model evaluation job where you provide your own inference response data.</p>"
2537+
},
2538+
"EvaluationPrecomputedInferenceSourceIdentifier":{
2539+
"type":"string",
2540+
"max":256,
2541+
"min":1,
2542+
"pattern":"[a-zA-Z0-9]([a-zA-Z0-9._-]){0,255}"
2543+
},
2544+
"EvaluationPrecomputedInferenceSourceIdentifiers":{
2545+
"type":"list",
2546+
"member":{"shape":"EvaluationPrecomputedInferenceSourceIdentifier"},
2547+
"max":2,
2548+
"min":0
2549+
},
2550+
"EvaluationPrecomputedRagSourceConfig":{
2551+
"type":"structure",
2552+
"members":{
2553+
"retrieveSourceConfig":{
2554+
"shape":"EvaluationPrecomputedRetrieveSourceConfig",
2555+
"documentation":"<p>A summary of a RAG source used for a retrieve-only Knowledge Base evaluation job where you provide your own inference response data.</p>"
2556+
},
2557+
"retrieveAndGenerateSourceConfig":{
2558+
"shape":"EvaluationPrecomputedRetrieveAndGenerateSourceConfig",
2559+
"documentation":"<p>A summary of a RAG source used for a retrieve-and-generate Knowledge Base evaluation job where you provide your own inference response data.</p>"
2560+
}
2561+
},
2562+
"documentation":"<p>A summary of a RAG source used for a Knowledge Base evaluation job where you provide your own inference response data.</p>",
2563+
"union":true
2564+
},
2565+
"EvaluationPrecomputedRagSourceIdentifier":{
2566+
"type":"string",
2567+
"max":256,
2568+
"min":1,
2569+
"pattern":"[a-zA-Z0-9]([a-zA-Z0-9._-]){0,255}"
2570+
},
2571+
"EvaluationPrecomputedRagSourceIdentifiers":{
2572+
"type":"list",
2573+
"member":{"shape":"EvaluationPrecomputedRagSourceIdentifier"},
2574+
"max":1,
2575+
"min":0
2576+
},
2577+
"EvaluationPrecomputedRetrieveAndGenerateSourceConfig":{
2578+
"type":"structure",
2579+
"required":["ragSourceIdentifier"],
2580+
"members":{
2581+
"ragSourceIdentifier":{
2582+
"shape":"EvaluationPrecomputedRagSourceIdentifier",
2583+
"documentation":"<p>A label that identifies the RAG source used for a retrieve-and-generate Knowledge Base evaluation job where you provide your own inference response data.</p>"
2584+
}
2585+
},
2586+
"documentation":"<p>A summary of a RAG source used for a retrieve-and-generate Knowledge Base evaluation job where you provide your own inference response data.</p>"
2587+
},
2588+
"EvaluationPrecomputedRetrieveSourceConfig":{
2589+
"type":"structure",
2590+
"required":["ragSourceIdentifier"],
2591+
"members":{
2592+
"ragSourceIdentifier":{
2593+
"shape":"EvaluationPrecomputedRagSourceIdentifier",
2594+
"documentation":"<p>A label that identifies the RAG source used for a retrieve-only Knowledge Base evaluation job where you provide your own inference response data.</p>"
2595+
}
2596+
},
2597+
"documentation":"<p>A summary of a RAG source used for a retrieve-only Knowledge Base evaluation job where you provide your own inference response data.</p>"
2598+
},
2599+
"EvaluationRagConfigSummary":{
2600+
"type":"structure",
2601+
"members":{
2602+
"bedrockKnowledgeBaseIdentifiers":{
2603+
"shape":"EvaluationBedrockKnowledgeBaseIdentifiers",
2604+
"documentation":"<p>The Amazon Resource Names (ARNs) of the Knowledge Base resources used for a Knowledge Base evaluation job where Amazon Bedrock invokes the Knowledge Base for you.</p>"
2605+
},
2606+
"precomputedRagSourceIdentifiers":{
2607+
"shape":"EvaluationPrecomputedRagSourceIdentifiers",
2608+
"documentation":"<p>A label that identifies the RAG sources used for a Knowledge Base evaluation job where you provide your own inference response data.</p>"
2609+
}
2610+
},
2611+
"documentation":"<p>A summary of the RAG resources used in an Amazon Bedrock Knowledge Base evaluation job. These resources can be Knowledge Bases in Amazon Bedrock or RAG sources outside of Amazon Bedrock that you use to generate your own inference response data.</p>"
2612+
},
24892613
"EvaluationRatingMethod":{
24902614
"type":"string",
24912615
"max":100,
@@ -2534,17 +2658,25 @@
25342658
"documentation":"<p>The type of task for model evaluation.</p>"
25352659
},
25362660
"modelIdentifiers":{
2537-
"shape":"EvaluationModelIdentifiers",
2538-
"documentation":"<p>The Amazon Resource Names (ARNs) of the model(s) used for the evaluation job.</p>"
2661+
"shape":"EvaluationBedrockModelIdentifiers",
2662+
"documentation":"<p>The Amazon Resource Names (ARNs) of the model(s) used for the evaluation job.</p>",
2663+
"deprecated":true,
2664+
"deprecatedMessage":"Inference identifiers should be retrieved from the inferenceConfigSummary"
25392665
},
25402666
"ragIdentifiers":{
2541-
"shape":"RAGIdentifiers",
2542-
"documentation":"<p>The Amazon Resource Names (ARNs) of the knowledge base resources used for a knowledge base evaluation job.</p>"
2667+
"shape":"EvaluationBedrockKnowledgeBaseIdentifiers",
2668+
"documentation":"<p>The Amazon Resource Names (ARNs) of the knowledge base resources used for a knowledge base evaluation job.</p>",
2669+
"deprecated":true,
2670+
"deprecatedMessage":"Inference identifiers should be retrieved from the inferenceConfigSummary"
25432671
},
25442672
"evaluatorModelIdentifiers":{
25452673
"shape":"EvaluatorModelIdentifiers",
25462674
"documentation":"<p>The Amazon Resource Names (ARNs) of the models used to compute the metrics for a knowledge base evaluation job.</p>"
25472675
},
2676+
"inferenceConfigSummary":{
2677+
"shape":"EvaluationInferenceConfigSummary",
2678+
"documentation":"<p>Identifies the models, Knowledge Bases, or other RAG sources evaluated in a model or Knowledge Base evaluation job.</p>"
2679+
},
25482680
"applicationType":{
25492681
"shape":"ApplicationType",
25502682
"documentation":"<p>Specifies whether the evaluation job is for evaluating a model or evaluating a knowledge base (retrieval and response generation).</p>"
@@ -2586,7 +2718,7 @@
25862718
"type":"string",
25872719
"max":2048,
25882720
"min":1,
2589-
"pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/[a-z0-9-]{1,63}[.]{1}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}$|(^[a-z0-9-]+[.][a-z0-9-]+([.][a-z0-9-]+)*(:[a-z0-9-]+)?$)|^[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}(/[a-z0-9]{12}|)"
2721+
"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}:inference-profile/(([a-z-]{2,8}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))))$|(^[a-z0-9-]+[.][a-z0-9-]+([.][a-z0-9-]+)*(:[a-z0-9-]+)?$)|^[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}(/[a-z0-9]{12}|)"
25902722
},
25912723
"EvaluatorModelIdentifiers":{
25922724
"type":"list",
@@ -6159,7 +6291,7 @@
61596291
"type":"string",
61606292
"max":2048,
61616293
"min":1,
6162-
"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}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)"
6294+
"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})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)$)|([0-9]{12}:(inference-profile|application-inference-profile)/[a-zA-Z0-9-:.]+$)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)"
61636295
},
61646296
"ModelIdentifier":{
61656297
"type":"string",
@@ -6750,17 +6882,15 @@
67506882
"knowledgeBaseConfig":{
67516883
"shape":"KnowledgeBaseConfig",
67526884
"documentation":"<p>Contains configuration details for knowledge base retrieval and response generation.</p>"
6885+
},
6886+
"precomputedRagSourceConfig":{
6887+
"shape":"EvaluationPrecomputedRagSourceConfig",
6888+
"documentation":"<p>Contains configuration details about the RAG source used to generate inference response data for a Knowledge Base evaluation job.</p>"
67536889
}
67546890
},
67556891
"documentation":"<p>Contains configuration details for retrieval of information and response generation.</p>",
67566892
"union":true
67576893
},
6758-
"RAGIdentifiers":{
6759-
"type":"list",
6760-
"member":{"shape":"KnowledgeBaseId"},
6761-
"max":1,
6762-
"min":0
6763-
},
67646894
"RAGStopSequences":{
67656895
"type":"list",
67666896
"member":{"shape":"RAGStopSequencesMemberString"},

0 commit comments

Comments
 (0)