Skip to content

Commit f3f90a0

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Introduced two APIs ListPromptRouters and GetPromptRouter for Intelligent Prompt Router feature. Add support for Bedrock Guardrails image content filter. New Bedrock Marketplace feature enabling a wider range of bedrock compatible models with self-hosted capability.
1 parent 2b9ed4c commit f3f90a0

File tree

78 files changed

+11511
-33
lines changed

Some content is hidden

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

78 files changed

+11511
-33
lines changed

‎generator/ServiceModels/bedrock/bedrock-2023-04-20.api.json

Lines changed: 584 additions & 3 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/bedrock/bedrock-2023-04-20.docs.json

Lines changed: 319 additions & 5 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/bedrock/bedrock-2023-04-20.normal.json

Lines changed: 800 additions & 3 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/bedrock/bedrock-2023-04-20.paginators.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
"limit_key": "maxResults",
3131
"result_key": "inferenceProfileSummaries"
3232
},
33+
"ListMarketplaceModelEndpoints": {
34+
"input_token": "nextToken",
35+
"output_token": "nextToken",
36+
"limit_key": "maxResults",
37+
"result_key": "marketplaceModelEndpoints"
38+
},
3339
"ListModelCopyJobs": {
3440
"input_token": "nextToken",
3541
"output_token": "nextToken",
@@ -54,6 +60,12 @@
5460
"limit_key": "maxResults",
5561
"result_key": "invocationJobSummaries"
5662
},
63+
"ListPromptRouters": {
64+
"input_token": "nextToken",
65+
"output_token": "nextToken",
66+
"limit_key": "maxResults",
67+
"result_key": "promptRouterSummaries"
68+
},
5769
"ListProvisionedModelThroughputs": {
5870
"input_token": "nextToken",
5971
"output_token": "nextToken",

‎sdk/code-analysis/ServiceAnalysis/Bedrock/Generated/PropertyValueRules.xml

Lines changed: 191 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,23 @@
138138
<max>2048</max>
139139
<pattern>arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{0,20}):(|[0-9]{12}):(inference-profile|application-inference-profile)/[a-zA-Z0-9-:.]+</pattern>
140140
</property-value-rule>
141+
<property-value-rule>
142+
<property>Amazon.Bedrock.Model.CreateMarketplaceModelEndpointRequest.ClientRequestToken</property>
143+
<min>1</min>
144+
<max>256</max>
145+
<pattern>[a-zA-Z0-9](-*[a-zA-Z0-9])*</pattern>
146+
</property-value-rule>
147+
<property-value-rule>
148+
<property>Amazon.Bedrock.Model.CreateMarketplaceModelEndpointRequest.EndpointName</property>
149+
<min>1</min>
150+
<max>30</max>
151+
</property-value-rule>
152+
<property-value-rule>
153+
<property>Amazon.Bedrock.Model.CreateMarketplaceModelEndpointRequest.ModelSourceIdentifier</property>
154+
<min>0</min>
155+
<max>2048</max>
156+
<pattern>.*arn:aws:sagemaker:.*:hub-content/SageMakerPublicHub/Model/.*</pattern>
157+
</property-value-rule>
141158
<property-value-rule>
142159
<property>Amazon.Bedrock.Model.CreateModelCopyJobRequest.ClientRequestToken</property>
143160
<min>1</min>
@@ -335,10 +352,20 @@
335352
<max>2048</max>
336353
<pattern>(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{0,20}):(|[0-9]{12}):(inference-profile|application-inference-profile)/)?[a-zA-Z0-9-:.]+</pattern>
337354
</property-value-rule>
355+
<property-value-rule>
356+
<property>Amazon.Bedrock.Model.DeleteMarketplaceModelEndpointRequest.EndpointArn</property>
357+
<min>0</min>
358+
<max>2048</max>
359+
</property-value-rule>
338360
<property-value-rule>
339361
<property>Amazon.Bedrock.Model.DeleteProvisionedModelThroughputRequest.ProvisionedModelId</property>
340362
<pattern>((([0-9a-zA-Z][_-]?)+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:provisioned-model/[a-z0-9]{12}))</pattern>
341363
</property-value-rule>
364+
<property-value-rule>
365+
<property>Amazon.Bedrock.Model.DeregisterMarketplaceModelEndpointRequest.EndpointArn</property>
366+
<min>0</min>
367+
<max>2048</max>
368+
</property-value-rule>
342369
<property-value-rule>
343370
<property>Amazon.Bedrock.Model.GetCustomModelRequest.ModelIdentifier</property>
344371
<min>1</min>
@@ -542,6 +569,11 @@
542569
<max>64</max>
543570
<pattern>([0-9a-zA-Z][ _-]?)+</pattern>
544571
</property-value-rule>
572+
<property-value-rule>
573+
<property>Amazon.Bedrock.Model.GetMarketplaceModelEndpointRequest.EndpointArn</property>
574+
<min>0</min>
575+
<max>2048</max>
576+
</property-value-rule>
545577
<property-value-rule>
546578
<property>Amazon.Bedrock.Model.GetModelCopyJobRequest.JobArn</property>
547579
<min>0</min>
@@ -743,6 +775,30 @@
743775
<min>24</min>
744776
<max>168</max>
745777
</property-value-rule>
778+
<property-value-rule>
779+
<property>Amazon.Bedrock.Model.GetPromptRouterRequest.PromptRouterArn</property>
780+
<min>1</min>
781+
<max>2048</max>
782+
<pattern>arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:default-prompt-router/[a-zA-Z0-9-:.]+</pattern>
783+
</property-value-rule>
784+
<property-value-rule>
785+
<property>Amazon.Bedrock.Model.GetPromptRouterResponse.Description</property>
786+
<min>1</min>
787+
<max>200</max>
788+
<pattern>([0-9a-zA-Z:.][ _-]?)+</pattern>
789+
</property-value-rule>
790+
<property-value-rule>
791+
<property>Amazon.Bedrock.Model.GetPromptRouterResponse.PromptRouterArn</property>
792+
<min>1</min>
793+
<max>2048</max>
794+
<pattern>arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:default-prompt-router/[a-zA-Z0-9-:.]+</pattern>
795+
</property-value-rule>
796+
<property-value-rule>
797+
<property>Amazon.Bedrock.Model.GetPromptRouterResponse.PromptRouterName</property>
798+
<min>1</min>
799+
<max>64</max>
800+
<pattern>([0-9a-zA-Z][ _-]?)+</pattern>
801+
</property-value-rule>
746802
<property-value-rule>
747803
<property>Amazon.Bedrock.Model.GetProvisionedModelThroughputRequest.ProvisionedModelId</property>
748804
<pattern>((([0-9a-zA-Z][_-]?)+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:provisioned-model/[a-z0-9]{12}))</pattern>
@@ -909,6 +965,29 @@
909965
<max>2048</max>
910966
<pattern>\S*</pattern>
911967
</property-value-rule>
968+
<property-value-rule>
969+
<property>Amazon.Bedrock.Model.ListMarketplaceModelEndpointsRequest.MaxResults</property>
970+
<min>1</min>
971+
<max>1000</max>
972+
</property-value-rule>
973+
<property-value-rule>
974+
<property>Amazon.Bedrock.Model.ListMarketplaceModelEndpointsRequest.ModelSourceEquals</property>
975+
<min>0</min>
976+
<max>2048</max>
977+
<pattern>.*arn:aws:sagemaker:.*:hub-content/SageMakerPublicHub/Model/.*</pattern>
978+
</property-value-rule>
979+
<property-value-rule>
980+
<property>Amazon.Bedrock.Model.ListMarketplaceModelEndpointsRequest.NextToken</property>
981+
<min>1</min>
982+
<max>2048</max>
983+
<pattern>\S*</pattern>
984+
</property-value-rule>
985+
<property-value-rule>
986+
<property>Amazon.Bedrock.Model.ListMarketplaceModelEndpointsResponse.NextToken</property>
987+
<min>1</min>
988+
<max>2048</max>
989+
<pattern>\S*</pattern>
990+
</property-value-rule>
912991
<property-value-rule>
913992
<property>Amazon.Bedrock.Model.ListModelCopyJobsRequest.MaxResults</property>
914993
<min>1</min>
@@ -1011,6 +1090,23 @@
10111090
<max>2048</max>
10121091
<pattern>\S*</pattern>
10131092
</property-value-rule>
1093+
<property-value-rule>
1094+
<property>Amazon.Bedrock.Model.ListPromptRoutersRequest.MaxResults</property>
1095+
<min>1</min>
1096+
<max>1000</max>
1097+
</property-value-rule>
1098+
<property-value-rule>
1099+
<property>Amazon.Bedrock.Model.ListPromptRoutersRequest.NextToken</property>
1100+
<min>1</min>
1101+
<max>2048</max>
1102+
<pattern>\S*</pattern>
1103+
</property-value-rule>
1104+
<property-value-rule>
1105+
<property>Amazon.Bedrock.Model.ListPromptRoutersResponse.NextToken</property>
1106+
<min>1</min>
1107+
<max>2048</max>
1108+
<pattern>\S*</pattern>
1109+
</property-value-rule>
10141110
<property-value-rule>
10151111
<property>Amazon.Bedrock.Model.ListProvisionedModelThroughputsRequest.MaxResults</property>
10161112
<min>1</min>
@@ -1046,6 +1142,17 @@
10461142
<max>1011</max>
10471143
<pattern>.*(^[a-zA-Z0-9][a-zA-Z0-9\-]*$)|(^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:([0-9]{12}|)((:(fine-tuning-job|model-customization-job|custom-model)/[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})$)|(:guardrail/[a-z0-9]+$)|(:(inference-profile|application-inference-profile)/[a-zA-Z0-9-:.]+$)|(:(provisioned-model|model-invocation-job|model-evaluation-job|evaluation-job|model-import-job|imported-model|async-invoke)/[a-z0-9]{12}$))).*</pattern>
10481144
</property-value-rule>
1145+
<property-value-rule>
1146+
<property>Amazon.Bedrock.Model.RegisterMarketplaceModelEndpointRequest.EndpointIdentifier</property>
1147+
<min>0</min>
1148+
<max>2048</max>
1149+
</property-value-rule>
1150+
<property-value-rule>
1151+
<property>Amazon.Bedrock.Model.RegisterMarketplaceModelEndpointRequest.ModelSourceIdentifier</property>
1152+
<min>0</min>
1153+
<max>2048</max>
1154+
<pattern>.*arn:aws:sagemaker:.*:hub-content/SageMakerPublicHub/Model/.*</pattern>
1155+
</property-value-rule>
10491156
<property-value-rule>
10501157
<property>Amazon.Bedrock.Model.StopEvaluationJobRequest.JobIdentifier</property>
10511158
<min>0</min>
@@ -1127,6 +1234,17 @@
11271234
<max>5</max>
11281235
<pattern>DRAFT</pattern>
11291236
</property-value-rule>
1237+
<property-value-rule>
1238+
<property>Amazon.Bedrock.Model.UpdateMarketplaceModelEndpointRequest.ClientRequestToken</property>
1239+
<min>1</min>
1240+
<max>256</max>
1241+
<pattern>[a-zA-Z0-9](-*[a-zA-Z0-9])*</pattern>
1242+
</property-value-rule>
1243+
<property-value-rule>
1244+
<property>Amazon.Bedrock.Model.UpdateMarketplaceModelEndpointRequest.EndpointArn</property>
1245+
<min>0</min>
1246+
<max>2048</max>
1247+
</property-value-rule>
11301248
<property-value-rule>
11311249
<property>Amazon.Bedrock.Model.UpdateProvisionedModelThroughputRequest.DesiredModelId</property>
11321250
<min>1</min>
@@ -1223,7 +1341,7 @@
12231341
<property>Amazon.Bedrock.Model.EvaluationBedrockModel.ModelIdentifier</property>
12241342
<min>1</min>
12251343
<max>2048</max>
1226-
<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}.)[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>
1344+
<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/[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}</pattern>
12271345
</property-value-rule>
12281346
<property-value-rule>
12291347
<property>Amazon.Bedrock.Model.EvaluationDataset.Name</property>
@@ -1524,6 +1642,28 @@
15241642
<min>1</min>
15251643
<max>100</max>
15261644
</property-value-rule>
1645+
<property-value-rule>
1646+
<property>Amazon.Bedrock.Model.MarketplaceModelEndpoint.EndpointArn</property>
1647+
<min>0</min>
1648+
<max>2048</max>
1649+
</property-value-rule>
1650+
<property-value-rule>
1651+
<property>Amazon.Bedrock.Model.MarketplaceModelEndpoint.ModelSourceIdentifier</property>
1652+
<min>0</min>
1653+
<max>2048</max>
1654+
<pattern>.*arn:aws:sagemaker:.*:hub-content/SageMakerPublicHub/Model/.*</pattern>
1655+
</property-value-rule>
1656+
<property-value-rule>
1657+
<property>Amazon.Bedrock.Model.MarketplaceModelEndpointSummary.EndpointArn</property>
1658+
<min>0</min>
1659+
<max>2048</max>
1660+
</property-value-rule>
1661+
<property-value-rule>
1662+
<property>Amazon.Bedrock.Model.MarketplaceModelEndpointSummary.ModelSourceIdentifier</property>
1663+
<min>0</min>
1664+
<max>2048</max>
1665+
<pattern>.*arn:aws:sagemaker:.*:hub-content/SageMakerPublicHub/Model/.*</pattern>
1666+
</property-value-rule>
15271667
<property-value-rule>
15281668
<property>Amazon.Bedrock.Model.ModelCopyJobSummary.FailureMessage</property>
15291669
<min>0</min>
@@ -1695,6 +1835,30 @@
16951835
<max>1024</max>
16961836
<pattern>s3://[a-z0-9][-.a-z0-9]{1,61}(?:/[-!_*'().a-z0-9A-Z]+(?:/[-!_*'().a-z0-9A-Z]+)*)?/?</pattern>
16971837
</property-value-rule>
1838+
<property-value-rule>
1839+
<property>Amazon.Bedrock.Model.PromptRouterSummary.Description</property>
1840+
<min>1</min>
1841+
<max>200</max>
1842+
<pattern>([0-9a-zA-Z:.][ _-]?)+</pattern>
1843+
</property-value-rule>
1844+
<property-value-rule>
1845+
<property>Amazon.Bedrock.Model.PromptRouterSummary.PromptRouterArn</property>
1846+
<min>1</min>
1847+
<max>2048</max>
1848+
<pattern>arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:default-prompt-router/[a-zA-Z0-9-:.]+</pattern>
1849+
</property-value-rule>
1850+
<property-value-rule>
1851+
<property>Amazon.Bedrock.Model.PromptRouterSummary.PromptRouterName</property>
1852+
<min>1</min>
1853+
<max>64</max>
1854+
<pattern>([0-9a-zA-Z][ _-]?)+</pattern>
1855+
</property-value-rule>
1856+
<property-value-rule>
1857+
<property>Amazon.Bedrock.Model.PromptRouterTargetModel.ModelArn</property>
1858+
<min>1</min>
1859+
<max>2048</max>
1860+
<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})|(^arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{0,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)</pattern>
1861+
</property-value-rule>
16981862
<property-value-rule>
16991863
<property>Amazon.Bedrock.Model.PromptTemplate.TextPromptTemplate</property>
17001864
<min>1</min>
@@ -1740,6 +1904,11 @@
17401904
<max>10</max>
17411905
<pattern>[0-9a-zA-Z]+</pattern>
17421906
</property-value-rule>
1907+
<property-value-rule>
1908+
<property>Amazon.Bedrock.Model.RoutingCriteria.ResponseQualityDifference</property>
1909+
<min>0</min>
1910+
<max>1</max>
1911+
</property-value-rule>
17431912
<property-value-rule>
17441913
<property>Amazon.Bedrock.Model.S3Config.BucketName</property>
17451914
<min>3</min>
@@ -1762,6 +1931,27 @@
17621931
<max>1024</max>
17631932
<pattern>s3://[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]/.{1,1024}</pattern>
17641933
</property-value-rule>
1934+
<property-value-rule>
1935+
<property>Amazon.Bedrock.Model.SageMakerEndpoint.ExecutionRole</property>
1936+
<min>0</min>
1937+
<max>2048</max>
1938+
<pattern>arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/.+</pattern>
1939+
</property-value-rule>
1940+
<property-value-rule>
1941+
<property>Amazon.Bedrock.Model.SageMakerEndpoint.InitialInstanceCount</property>
1942+
<min>1</min>
1943+
</property-value-rule>
1944+
<property-value-rule>
1945+
<property>Amazon.Bedrock.Model.SageMakerEndpoint.InstanceType</property>
1946+
<min>1</min>
1947+
<max>50</max>
1948+
</property-value-rule>
1949+
<property-value-rule>
1950+
<property>Amazon.Bedrock.Model.SageMakerEndpoint.KmsEncryptionKey</property>
1951+
<min>1</min>
1952+
<max>2048</max>
1953+
<pattern>(arn:aws(-[^:]+)?:kms:[a-zA-Z0-9-]*:[0-9]{12}:((key/[a-zA-Z0-9-]{36})|(alias/[a-zA-Z0-9-_/]+)))|([a-zA-Z0-9-]{36})|(alias/[a-zA-Z0-9-_/]+)</pattern>
1954+
</property-value-rule>
17651955
<property-value-rule>
17661956
<property>Amazon.Bedrock.Model.Tag.Key</property>
17671957
<min>1</min>

0 commit comments

Comments
 (0)