feat(client-bedrock-runtime): Added support for Intelligent Prompt Ro…

…uter in Invoke, InvokeStream, Converse and ConverseStream. Add support for Bedrock Guardrails image content filter. New Bedrock Marketplace feature enabling a wider range of bedrock compatible models with self-hosted capability.
aws · Dec 4, 2024 · 8b3d71d · 8b3d71d
1 parent 728fa5a
commit 8b3d71d
Show file tree

Hide file tree

Showing 6 changed files with 751 additions and 22 deletions.
diff --git a/clients/client-bedrock-runtime/src/commands/ApplyGuardrailCommand.ts b/clients/client-bedrock-runtime/src/commands/ApplyGuardrailCommand.ts
@@ -6,7 +6,11 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
 
 import { BedrockRuntimeClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../BedrockRuntimeClient";
 import { commonParams } from "../endpoint/EndpointParameters";
-import { ApplyGuardrailRequest, ApplyGuardrailResponse } from "../models/models_0";
+import {
+  ApplyGuardrailRequest,
+  ApplyGuardrailRequestFilterSensitiveLog,
+  ApplyGuardrailResponse,
+} from "../models/models_0";
 import { de_ApplyGuardrailCommand, se_ApplyGuardrailCommand } from "../protocols/Aws_restJson1";
 
 /**
@@ -49,6 +53,12 @@ export interface ApplyGuardrailCommandOutput extends ApplyGuardrailResponse, __M
  *           "grounding_source" || "query" || "guard_content",
  *         ],
  *       },
+ *       image: { // GuardrailImageBlock
+ *         format: "png" || "jpeg", // required
+ *         source: { // GuardrailImageSource Union: only one key present
+ *           bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *         },
+ *       },
  *     },
  *   ],
  * };
@@ -147,6 +157,10 @@ export interface ApplyGuardrailCommandOutput extends ApplyGuardrailResponse, __M
  * //             guarded: Number("int"),
  * //             total: Number("int"),
  * //           },
+ * //           images: { // GuardrailImageCoverage
+ * //             guarded: Number("int"),
+ * //             total: Number("int"),
+ * //           },
  * //         },
  * //       },
  * //     },
@@ -156,6 +170,10 @@ export interface ApplyGuardrailCommandOutput extends ApplyGuardrailResponse, __M
  * //       guarded: Number("int"),
  * //       total: Number("int"),
  * //     },
+ * //     images: {
+ * //       guarded: Number("int"),
+ * //       total: Number("int"),
+ * //     },
  * //   },
  * // };
  *
@@ -212,7 +230,7 @@ export class ApplyGuardrailCommand extends $Command
   })
   .s("AmazonBedrockFrontendService", "ApplyGuardrail", {})
   .n("BedrockRuntimeClient", "ApplyGuardrailCommand")
-  .f(void 0, void 0)
+  .f(ApplyGuardrailRequestFilterSensitiveLog, void 0)
   .ser(se_ApplyGuardrailCommand)
   .de(de_ApplyGuardrailCommand)
   .build() {

diff --git a/clients/client-bedrock-runtime/src/commands/ConverseCommand.ts b/clients/client-bedrock-runtime/src/commands/ConverseCommand.ts
@@ -6,7 +6,12 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
 
 import { BedrockRuntimeClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../BedrockRuntimeClient";
 import { commonParams } from "../endpoint/EndpointParameters";
-import { ConverseRequest, ConverseRequestFilterSensitiveLog, ConverseResponse } from "../models/models_0";
+import {
+  ConverseRequest,
+  ConverseRequestFilterSensitiveLog,
+  ConverseResponse,
+  ConverseResponseFilterSensitiveLog,
+} from "../models/models_0";
 import { de_ConverseCommand, se_ConverseCommand } from "../protocols/Aws_restJson1";
 
 /**
@@ -134,6 +139,12 @@ export interface ConverseCommandOutput extends ConverseResponse, __MetadataBeare
  *                 "grounding_source" || "query" || "guard_content",
  *               ],
  *             },
+ *             image: { // GuardrailConverseImageBlock
+ *               format: "png" || "jpeg", // required
+ *               source: { // GuardrailConverseImageSource Union: only one key present
+ *                 bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *               },
+ *             },
  *           },
  *         },
  *       ],
@@ -149,6 +160,12 @@ export interface ConverseCommandOutput extends ConverseResponse, __MetadataBeare
  *             "grounding_source" || "query" || "guard_content",
  *           ],
  *         },
+ *         image: {
+ *           format: "png" || "jpeg", // required
+ *           source: {//  Union: only one key present
+ *             bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *           },
+ *         },
  *       },
  *     },
  *   ],
@@ -278,6 +295,12 @@ export interface ConverseCommandOutput extends ConverseResponse, __MetadataBeare
  * //                 "grounding_source" || "query" || "guard_content",
  * //               ],
  * //             },
+ * //             image: { // GuardrailConverseImageBlock
+ * //               format: "png" || "jpeg", // required
+ * //               source: { // GuardrailConverseImageSource Union: only one key present
+ * //                 bytes: new Uint8Array(),
+ * //               },
+ * //             },
  * //           },
  * //         },
  * //       ],
@@ -376,6 +399,10 @@ export interface ConverseCommandOutput extends ConverseResponse, __MetadataBeare
  * //                 guarded: Number("int"),
  * //                 total: Number("int"),
  * //               },
+ * //               images: { // GuardrailImageCoverage
+ * //                 guarded: Number("int"),
+ * //                 total: Number("int"),
+ * //               },
  * //             },
  * //           },
  * //         },
@@ -459,12 +486,19 @@ export interface ConverseCommandOutput extends ConverseResponse, __MetadataBeare
  * //                   guarded: Number("int"),
  * //                   total: Number("int"),
  * //                 },
+ * //                 images: {
+ * //                   guarded: Number("int"),
+ * //                   total: Number("int"),
+ * //                 },
  * //               },
  * //             },
  * //           },
  * //         ],
  * //       },
  * //     },
+ * //     promptRouter: { // PromptRouterTrace
+ * //       invokedModelId: "STRING_VALUE",
+ * //     },
  * //   },
  * //   performanceConfig: { // PerformanceConfiguration
  * //     latency: "standard" || "optimized",
@@ -537,7 +571,7 @@ export class ConverseCommand extends $Command
   })
   .s("AmazonBedrockFrontendService", "Converse", {})
   .n("BedrockRuntimeClient", "ConverseCommand")
-  .f(ConverseRequestFilterSensitiveLog, void 0)
+  .f(ConverseRequestFilterSensitiveLog, ConverseResponseFilterSensitiveLog)
   .ser(se_ConverseCommand)
   .de(de_ConverseCommand)
   .build() {

diff --git a/clients/client-bedrock-runtime/src/commands/ConverseStreamCommand.ts b/clients/client-bedrock-runtime/src/commands/ConverseStreamCommand.ts
@@ -145,6 +145,12 @@ export interface ConverseStreamCommandOutput extends ConverseStreamResponse, __M
  *                 "grounding_source" || "query" || "guard_content",
  *               ],
  *             },
+ *             image: { // GuardrailConverseImageBlock
+ *               format: "png" || "jpeg", // required
+ *               source: { // GuardrailConverseImageSource Union: only one key present
+ *                 bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *               },
+ *             },
  *           },
  *         },
  *       ],
@@ -160,6 +166,12 @@ export interface ConverseStreamCommandOutput extends ConverseStreamResponse, __M
  *             "grounding_source" || "query" || "guard_content",
  *           ],
  *         },
+ *         image: {
+ *           format: "png" || "jpeg", // required
+ *           source: {//  Union: only one key present
+ *             bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *           },
+ *         },
  *       },
  *     },
  *   ],
@@ -337,6 +349,10 @@ export interface ConverseStreamCommandOutput extends ConverseStreamResponse, __M
  * //                     guarded: Number("int"),
  * //                     total: Number("int"),
  * //                   },
+ * //                   images: { // GuardrailImageCoverage
+ * //                     guarded: Number("int"),
+ * //                     total: Number("int"),
+ * //                   },
  * //                 },
  * //               },
  * //             },
@@ -420,12 +436,19 @@ export interface ConverseStreamCommandOutput extends ConverseStreamResponse, __M
  * //                       guarded: Number("int"),
  * //                       total: Number("int"),
  * //                     },
+ * //                     images: {
+ * //                       guarded: Number("int"),
+ * //                       total: Number("int"),
+ * //                     },
  * //                   },
  * //                 },
  * //               },
  * //             ],
  * //           },
  * //         },
+ * //         promptRouter: { // PromptRouterTrace
+ * //           invokedModelId: "STRING_VALUE",
+ * //         },
  * //       },
  * //       performanceConfig: { // PerformanceConfiguration
  * //         latency: "standard" || "optimized",