@ai-sdk/amazon-bedrock 3.0.71 → 3.0.72

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ai-sdk/amazon-bedrock
 
+## 3.0.72
+
+### Patch Changes
+
+- 4f0e5af: Fix bedrock ConverseStream using /delta/stop_sequence
+
 ## 3.0.71
 
 ### Patch Changes

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(src_exports);
 var import_provider_utils8 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.71" : "0.0.0-test";
+var VERSION = true ? "3.0.72" : "0.0.0-test";
 
 // src/bedrock-provider.ts
 var import_internal2 = require("@ai-sdk/anthropic/internal");
@@ -871,12 +871,15 @@ var BedrockChatLanguageModel = class {
       additionalModelRequestFields: __,
       ...filteredBedrockOptions
     } = (providerOptions == null ? void 0 : providerOptions.bedrock) || {};
+    const additionalModelResponseFieldPaths = isAnthropicModel ? ["/delta/stop_sequence"] : void 0;
     return {
       command: {
         system,
         messages,
         additionalModelRequestFields: bedrockOptions.additionalModelRequestFields,
-        additionalModelResponseFieldPaths: ["/stop_sequence"],
+        ...additionalModelResponseFieldPaths && {
+          additionalModelResponseFieldPaths
+        },
         ...Object.keys(inferenceConfig).length > 0 && {
           inferenceConfig
         },
@@ -894,7 +897,7 @@ var BedrockChatLanguageModel = class {
     return (0, import_provider_utils4.combineHeaders)(await (0, import_provider_utils4.resolve)(this.config.headers), headers);
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const {
       command: args,
       warnings,
@@ -968,11 +971,11 @@ var BedrockChatLanguageModel = class {
         }
       }
     }
-    const stopSequence = (_i = (_h = response.additionalModelResponseFields) == null ? void 0 : _h.stop_sequence) != null ? _i : null;
+    const stopSequence = (_j = (_i = (_h = response.additionalModelResponseFields) == null ? void 0 : _h.delta) == null ? void 0 : _i.stop_sequence) != null ? _j : null;
     const providerMetadata = response.trace || response.usage || isJsonResponseFromTool || stopSequence ? {
       bedrock: {
         ...response.trace && typeof response.trace === "object" ? { trace: response.trace } : {},
-        ...((_j = response.usage) == null ? void 0 : _j.cacheWriteInputTokens) != null && {
+        ...((_k = response.usage) == null ? void 0 : _k.cacheWriteInputTokens) != null && {
           usage: {
             cacheWriteInputTokens: response.usage.cacheWriteInputTokens
           }
@@ -988,10 +991,10 @@ var BedrockChatLanguageModel = class {
         isJsonResponseFromTool
       ),
       usage: {
-        inputTokens: (_k = response.usage) == null ? void 0 : _k.inputTokens,
-        outputTokens: (_l = response.usage) == null ? void 0 : _l.outputTokens,
-        totalTokens: ((_m = response.usage) == null ? void 0 : _m.inputTokens) + ((_n = response.usage) == null ? void 0 : _n.outputTokens),
-        cachedInputTokens: (_p = (_o = response.usage) == null ? void 0 : _o.cacheReadInputTokens) != null ? _p : void 0
+        inputTokens: (_l = response.usage) == null ? void 0 : _l.inputTokens,
+        outputTokens: (_m = response.usage) == null ? void 0 : _m.outputTokens,
+        totalTokens: ((_n = response.usage) == null ? void 0 : _n.inputTokens) + ((_o = response.usage) == null ? void 0 : _o.outputTokens),
+        cachedInputTokens: (_q = (_p = response.usage) == null ? void 0 : _p.cacheReadInputTokens) != null ? _q : void 0
       },
       response: {
         // TODO add id, timestamp, etc
@@ -1037,7 +1040,7 @@ 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, _n, _o, _p, _q, _r, _s;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
             function enqueueError(bedrockError) {
               finishReason = "error";
               controller.enqueue({ type: "error", error: bedrockError });
@@ -1071,14 +1074,14 @@ var BedrockChatLanguageModel = class {
                 value.messageStop.stopReason,
                 isJsonResponseFromTool
               );
-              stopSequence = (_b = (_a = value.messageStop.additionalModelResponseFields) == null ? void 0 : _a.stop_sequence) != null ? _b : null;
+              stopSequence = (_c = (_b = (_a = value.messageStop.additionalModelResponseFields) == null ? void 0 : _a.delta) == null ? void 0 : _b.stop_sequence) != null ? _c : null;
             }
             if (value.metadata) {
-              usage.inputTokens = (_d = (_c = value.metadata.usage) == null ? void 0 : _c.inputTokens) != null ? _d : usage.inputTokens;
-              usage.outputTokens = (_f = (_e = value.metadata.usage) == null ? void 0 : _e.outputTokens) != null ? _f : usage.outputTokens;
-              usage.totalTokens = ((_g = usage.inputTokens) != null ? _g : 0) + ((_h = usage.outputTokens) != null ? _h : 0);
-              usage.cachedInputTokens = (_j = (_i = value.metadata.usage) == null ? void 0 : _i.cacheReadInputTokens) != null ? _j : usage.cachedInputTokens;
-              const cacheUsage = ((_k = value.metadata.usage) == null ? void 0 : _k.cacheWriteInputTokens) != null ? {
+              usage.inputTokens = (_e = (_d = value.metadata.usage) == null ? void 0 : _d.inputTokens) != null ? _e : usage.inputTokens;
+              usage.outputTokens = (_g = (_f = value.metadata.usage) == null ? void 0 : _f.outputTokens) != null ? _g : usage.outputTokens;
+              usage.totalTokens = ((_h = usage.inputTokens) != null ? _h : 0) + ((_i = usage.outputTokens) != null ? _i : 0);
+              usage.cachedInputTokens = (_k = (_j = value.metadata.usage) == null ? void 0 : _j.cacheReadInputTokens) != null ? _k : usage.cachedInputTokens;
+              const cacheUsage = ((_l = value.metadata.usage) == null ? void 0 : _l.cacheWriteInputTokens) != null ? {
                 usage: {
                   cacheWriteInputTokens: value.metadata.usage.cacheWriteInputTokens
                 }
@@ -1095,7 +1098,7 @@ var BedrockChatLanguageModel = class {
                 };
               }
             }
-            if (((_l = value.contentBlockStart) == null ? void 0 : _l.contentBlockIndex) != null && !((_n = (_m = value.contentBlockStart) == null ? void 0 : _m.start) == null ? void 0 : _n.toolUse)) {
+            if (((_m = value.contentBlockStart) == null ? void 0 : _m.contentBlockIndex) != null && !((_o = (_n = value.contentBlockStart) == null ? void 0 : _n.start) == null ? void 0 : _o.toolUse)) {
               const blockIndex = value.contentBlockStart.contentBlockIndex;
               contentBlocks[blockIndex] = { type: "text" };
               controller.enqueue({
@@ -1103,7 +1106,7 @@ var BedrockChatLanguageModel = class {
                 id: String(blockIndex)
               });
             }
-            if (((_o = value.contentBlockDelta) == null ? void 0 : _o.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
+            if (((_p = value.contentBlockDelta) == null ? void 0 : _p.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
               const blockIndex = value.contentBlockDelta.contentBlockIndex || 0;
               if (contentBlocks[blockIndex] == null) {
                 contentBlocks[blockIndex] = { type: "text" };
@@ -1118,7 +1121,7 @@ var BedrockChatLanguageModel = class {
                 delta: value.contentBlockDelta.delta.text
               });
             }
-            if (((_p = value.contentBlockStop) == null ? void 0 : _p.contentBlockIndex) != null) {
+            if (((_q = value.contentBlockStop) == null ? void 0 : _q.contentBlockIndex) != null) {
               const blockIndex = value.contentBlockStop.contentBlockIndex;
               const contentBlock = contentBlocks[blockIndex];
               if (contentBlock != null) {
@@ -1164,7 +1167,7 @@ var BedrockChatLanguageModel = class {
                 delete contentBlocks[blockIndex];
               }
             }
-            if (((_q = value.contentBlockDelta) == null ? void 0 : _q.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
+            if (((_r = value.contentBlockDelta) == null ? void 0 : _r.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) {
@@ -1205,7 +1208,7 @@ var BedrockChatLanguageModel = class {
               }
             }
             const contentBlockStart = value.contentBlockStart;
-            if (((_r = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _r.toolUse) != null) {
+            if (((_s = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _s.toolUse) != null) {
               const toolUse = contentBlockStart.start.toolUse;
               const blockIndex = contentBlockStart.contentBlockIndex;
               const isJsonResponseTool = usesJsonResponseTool && toolUse.name === "json";
@@ -1229,7 +1232,7 @@ var BedrockChatLanguageModel = class {
               const blockIndex = contentBlockDelta.contentBlockIndex;
               const contentBlock = contentBlocks[blockIndex];
               if ((contentBlock == null ? void 0 : contentBlock.type) === "tool-call") {
-                const delta = (_s = contentBlockDelta.delta.toolUse.input) != null ? _s : "";
+                const delta = (_t = contentBlockDelta.delta.toolUse.input) != null ? _t : "";
                 if (!contentBlock.isJsonResponseTool) {
                   controller.enqueue({
                     type: "tool-input-delta",
@@ -1285,7 +1288,9 @@ var BedrockStopReasonSchema = import_v43.z.union([
   import_v43.z.string()
 ]);
 var BedrockAdditionalModelResponseFieldsSchema = import_v43.z.object({
-  stop_sequence: import_v43.z.string().optional()
+  delta: import_v43.z.object({
+    stop_sequence: import_v43.z.string().nullish()
+  }).nullish()
 }).catchall(import_v43.z.unknown());
 var BedrockToolUseSchema = import_v43.z.object({
   toolUseId: import_v43.z.string(),