@ai-sdk/amazon-bedrock 3.0.0-alpha.9 → 3.0.0-beta.1

package/dist/index.mjs

@@ -157,7 +157,7 @@ function prepareTools({
           name: tool.name,
           description: tool.description,
           inputSchema: {
-            json: tool.parameters
+            json: tool.inputSchema
           }
         }
       });
@@ -207,12 +207,7 @@ function prepareTools({
 import {
   UnsupportedFunctionalityError as UnsupportedFunctionalityError2
 } from "@ai-sdk/provider";
-import {
-  convertToBase64,
-  createIdGenerator,
-  parseProviderOptions
-} from "@ai-sdk/provider-utils";
-var generateFileId = createIdGenerator({ prefix: "file", size: 16 });
+import { convertToBase64, parseProviderOptions } from "@ai-sdk/provider-utils";
 function getCachePoint(providerMetadata) {
   var _a;
   return (_a = providerMetadata == null ? void 0 : providerMetadata.bedrock) == null ? void 0 : _a.cachePoint;
@@ -222,6 +217,8 @@ async function convertToBedrockChatMessages(prompt) {
   const blocks = groupIntoBlocks(prompt);
   let system = [];
   const messages = [];
+  let documentCounter = 0;
+  const generateDocumentName = () => `document-${++documentCounter}`;
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];
     const isLastBlock = i === blocks.length - 1;
@@ -276,7 +273,7 @@ async function convertToBedrockChatMessages(prompt) {
                           format: (_d = (_c = part.mediaType) == null ? void 0 : _c.split(
                             "/"
                           )) == null ? void 0 : _d[1],
-                          name: generateFileId(),
+                          name: generateDocumentName(),
                           source: { bytes: convertToBase64(part.data) }
                         }
                       });
@@ -288,36 +285,49 @@ async function convertToBedrockChatMessages(prompt) {
               break;
             }
             case "tool": {
-              for (let i2 = 0; i2 < content.length; i2++) {
-                const part = content[i2];
-                const toolResultContent = part.content != void 0 ? part.content.map((part2) => {
-                  switch (part2.type) {
-                    case "text":
-                      return {
-                        text: part2.text
-                      };
-                    case "image":
-                      if (!part2.mediaType) {
-                        throw new Error(
-                          "Image mime type is required in tool result part content"
-                        );
-                      }
-                      const format = part2.mediaType.split("/")[1];
-                      if (!isBedrockImageFormat(format)) {
-                        throw new Error(
-                          `Unsupported image format: ${format}`
-                        );
-                      }
-                      return {
-                        image: {
-                          format,
-                          source: {
-                            bytes: part2.data
+              for (const part of content) {
+                let toolResultContent;
+                const output = part.output;
+                switch (output.type) {
+                  case "content": {
+                    toolResultContent = output.value.map((contentPart) => {
+                      switch (contentPart.type) {
+                        case "text":
+                          return { text: contentPart.text };
+                        case "media":
+                          if (!contentPart.mediaType.startsWith("image/")) {
+                            throw new UnsupportedFunctionalityError2({
+                              functionality: `media type: ${contentPart.mediaType}`
+                            });
                           }
-                        }
-                      };
+                          const format = contentPart.mediaType.split("/")[1];
+                          if (!isBedrockImageFormat(format)) {
+                            throw new UnsupportedFunctionalityError2({
+                              functionality: `media type: ${contentPart.mediaType}`
+                            });
+                          }
+                          return {
+                            image: {
+                              format,
+                              source: { bytes: contentPart.data }
+                            }
+                          };
+                      }
+                    });
+                    break;
                   }
-                }) : [{ text: JSON.stringify(part.result) }];
+                  case "text":
+                  case "error-text":
+                    toolResultContent = [{ text: output.value }];
+                    break;
+                  case "json":
+                  case "error-json":
+                  default:
+                    toolResultContent = [
+                      { text: JSON.stringify(output.value) }
+                    ];
+                    break;
+                }
                 bedrockContent.push({
                   toolResult: {
                     toolUseId: part.toolCallId,
@@ -406,7 +416,7 @@ async function convertToBedrockChatMessages(prompt) {
                   toolUse: {
                     toolUseId: part.toolCallId,
                     name: part.toolName,
-                    input: part.args
+                    input: part.input
                   }
                 });
                 break;
@@ -675,10 +685,9 @@ var BedrockChatLanguageModel = class {
       if (part.toolUse) {
         content.push({
           type: "tool-call",
-          toolCallType: "function",
           toolCallId: (_c = (_b = part.toolUse) == null ? void 0 : _b.toolUseId) != null ? _c : this.config.generateId(),
           toolName: (_e = (_d = part.toolUse) == null ? void 0 : _d.name) != null ? _e : `tool-${this.config.generateId()}`,
-          args: JSON.stringify((_g = (_f = part.toolUse) == null ? void 0 : _f.input) != null ? _g : "")
+          input: JSON.stringify((_g = (_f = part.toolUse) == null ? void 0 : _f.input) != null ? _g : "")
         });
       }
     }
@@ -736,7 +745,7 @@ var BedrockChatLanguageModel = class {
       totalTokens: void 0
     };
     let providerMetadata = void 0;
-    const toolCallContentBlocks = {};
+    const contentBlocks = {};
     return {
       stream: response.pipeThrough(
         new TransformStream({
@@ -744,11 +753,14 @@ var BedrockChatLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
             function enqueueError(bedrockError) {
               finishReason = "error";
               controller.enqueue({ type: "error", error: bedrockError });
             }
+            if (options.includeRawChunks) {
+              controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
+            }
             if (!chunk.success) {
               enqueueError(chunk.error);
               return;
@@ -797,78 +809,126 @@ var BedrockChatLanguageModel = class {
                 };
               }
             }
-            if (((_j = value.contentBlockDelta) == null ? void 0 : _j.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
+            if (((_j = value.contentBlockStart) == null ? void 0 : _j.contentBlockIndex) != null && !((_l = (_k = value.contentBlockStart) == null ? void 0 : _k.start) == null ? void 0 : _l.toolUse)) {
+              const blockIndex = value.contentBlockStart.contentBlockIndex;
+              contentBlocks[blockIndex] = { type: "text" };
+              controller.enqueue({
+                type: "text-start",
+                id: String(blockIndex)
+              });
+            }
+            if (((_m = value.contentBlockDelta) == null ? void 0 : _m.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
+              const blockIndex = value.contentBlockDelta.contentBlockIndex || 0;
+              if (contentBlocks[blockIndex] == null) {
+                contentBlocks[blockIndex] = { type: "text" };
+                controller.enqueue({
+                  type: "text-start",
+                  id: String(blockIndex)
+                });
+              }
               controller.enqueue({
-                type: "text",
-                text: value.contentBlockDelta.delta.text
+                type: "text-delta",
+                id: String(blockIndex),
+                delta: value.contentBlockDelta.delta.text
               });
             }
-            if (((_k = value.contentBlockDelta) == null ? void 0 : _k.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
+            if (((_n = value.contentBlockStop) == null ? void 0 : _n.contentBlockIndex) != null) {
+              const blockIndex = value.contentBlockStop.contentBlockIndex;
+              const contentBlock = contentBlocks[blockIndex];
+              if (contentBlock != null) {
+                if (contentBlock.type === "reasoning") {
+                  controller.enqueue({
+                    type: "reasoning-end",
+                    id: String(blockIndex)
+                  });
+                } else if (contentBlock.type === "text") {
+                  controller.enqueue({
+                    type: "text-end",
+                    id: String(blockIndex)
+                  });
+                } else if (contentBlock.type === "tool-call") {
+                  controller.enqueue({
+                    type: "tool-input-end",
+                    id: contentBlock.toolCallId
+                  });
+                  controller.enqueue({
+                    type: "tool-call",
+                    toolCallId: contentBlock.toolCallId,
+                    toolName: contentBlock.toolName,
+                    input: contentBlock.jsonText
+                  });
+                }
+                delete contentBlocks[blockIndex];
+              }
+            }
+            if (((_o = value.contentBlockDelta) == null ? void 0 : _o.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
+              const blockIndex = value.contentBlockDelta.contentBlockIndex || 0;
               const reasoningContent = value.contentBlockDelta.delta.reasoningContent;
               if ("text" in reasoningContent && reasoningContent.text) {
+                if (contentBlocks[blockIndex] == null) {
+                  contentBlocks[blockIndex] = { type: "reasoning" };
+                  controller.enqueue({
+                    type: "reasoning-start",
+                    id: String(blockIndex)
+                  });
+                }
                 controller.enqueue({
-                  type: "reasoning",
-                  text: reasoningContent.text
+                  type: "reasoning-delta",
+                  id: String(blockIndex),
+                  delta: reasoningContent.text
                 });
               } else if ("signature" in reasoningContent && reasoningContent.signature) {
                 controller.enqueue({
-                  type: "reasoning",
-                  text: "",
+                  type: "reasoning-delta",
+                  id: String(blockIndex),
+                  delta: "",
                   providerMetadata: {
                     bedrock: {
                       signature: reasoningContent.signature
                     }
                   }
                 });
-                controller.enqueue({ type: "reasoning-part-finish" });
               } else if ("data" in reasoningContent && reasoningContent.data) {
                 controller.enqueue({
-                  type: "reasoning",
-                  text: "",
+                  type: "reasoning-delta",
+                  id: String(blockIndex),
+                  delta: "",
                   providerMetadata: {
                     bedrock: {
                       redactedData: reasoningContent.data
                     }
                   }
                 });
-                controller.enqueue({ type: "reasoning-part-finish" });
               }
             }
             const contentBlockStart = value.contentBlockStart;
-            if (((_l = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _l.toolUse) != null) {
+            if (((_p = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _p.toolUse) != null) {
               const toolUse = contentBlockStart.start.toolUse;
-              toolCallContentBlocks[contentBlockStart.contentBlockIndex] = {
+              const blockIndex = contentBlockStart.contentBlockIndex;
+              contentBlocks[blockIndex] = {
+                type: "tool-call",
                 toolCallId: toolUse.toolUseId,
                 toolName: toolUse.name,
                 jsonText: ""
               };
-            }
-            const contentBlockDelta = value.contentBlockDelta;
-            if ((contentBlockDelta == null ? void 0 : contentBlockDelta.delta) && "toolUse" in contentBlockDelta.delta && contentBlockDelta.delta.toolUse) {
-              const contentBlock = toolCallContentBlocks[contentBlockDelta.contentBlockIndex];
-              const delta = (_m = contentBlockDelta.delta.toolUse.input) != null ? _m : "";
               controller.enqueue({
-                type: "tool-call-delta",
-                toolCallType: "function",
-                toolCallId: contentBlock.toolCallId,
-                toolName: contentBlock.toolName,
-                argsTextDelta: delta
+                type: "tool-input-start",
+                id: toolUse.toolUseId,
+                toolName: toolUse.name
               });
-              contentBlock.jsonText += delta;
             }
-            const contentBlockStop = value.contentBlockStop;
-            if (contentBlockStop != null) {
-              const index = contentBlockStop.contentBlockIndex;
-              const contentBlock = toolCallContentBlocks[index];
-              if (contentBlock != null) {
+            const contentBlockDelta = value.contentBlockDelta;
+            if ((contentBlockDelta == null ? void 0 : contentBlockDelta.delta) && "toolUse" in contentBlockDelta.delta && contentBlockDelta.delta.toolUse) {
+              const blockIndex = contentBlockDelta.contentBlockIndex;
+              const contentBlock = contentBlocks[blockIndex];
+              if ((contentBlock == null ? void 0 : contentBlock.type) === "tool-call") {
+                const delta = (_q = contentBlockDelta.delta.toolUse.input) != null ? _q : "";
                 controller.enqueue({
-                  type: "tool-call",
-                  toolCallType: "function",
-                  toolCallId: contentBlock.toolCallId,
-                  toolName: contentBlock.toolName,
-                  args: contentBlock.jsonText
+                  type: "tool-input-delta",
+                  id: contentBlock.toolCallId,
+                  delta
                 });
-                delete toolCallContentBlocks[index];
+                contentBlock.jsonText += delta;
               }
             }
           },