@ai-sdk/amazon-bedrock 3.0.69 → 3.0.71

package/dist/index.mjs

@@ -8,7 +8,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "3.0.69" : "0.0.0-test";
+var VERSION = true ? "3.0.71" : "0.0.0-test";
 
 // src/bedrock-provider.ts
 import { anthropicTools as anthropicTools2 } from "@ai-sdk/anthropic/internal";
@@ -872,6 +872,7 @@ var BedrockChatLanguageModel = class {
         system,
         messages,
         additionalModelRequestFields: bedrockOptions.additionalModelRequestFields,
+        additionalModelResponseFieldPaths: ["/stop_sequence"],
         ...Object.keys(inferenceConfig).length > 0 && {
           inferenceConfig
         },
@@ -889,7 +890,7 @@ var BedrockChatLanguageModel = class {
     return combineHeaders(await resolve(this.config.headers), headers);
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       command: args,
       warnings,
@@ -963,15 +964,17 @@ var BedrockChatLanguageModel = class {
         }
       }
     }
-    const providerMetadata = response.trace || response.usage || isJsonResponseFromTool ? {
+    const stopSequence = (_i = (_h = response.additionalModelResponseFields) == null ? void 0 : _h.stop_sequence) != null ? _i : null;
+    const providerMetadata = response.trace || response.usage || isJsonResponseFromTool || stopSequence ? {
       bedrock: {
         ...response.trace && typeof response.trace === "object" ? { trace: response.trace } : {},
-        ...((_h = response.usage) == null ? void 0 : _h.cacheWriteInputTokens) != null && {
+        ...((_j = response.usage) == null ? void 0 : _j.cacheWriteInputTokens) != null && {
           usage: {
             cacheWriteInputTokens: response.usage.cacheWriteInputTokens
           }
         },
-        ...isJsonResponseFromTool && { isJsonResponseFromTool: true }
+        ...isJsonResponseFromTool && { isJsonResponseFromTool: true },
+        stopSequence
       }
     } : void 0;
     return {
@@ -981,10 +984,10 @@ var BedrockChatLanguageModel = class {
         isJsonResponseFromTool
       ),
       usage: {
-        inputTokens: (_i = response.usage) == null ? void 0 : _i.inputTokens,
-        outputTokens: (_j = response.usage) == null ? void 0 : _j.outputTokens,
-        totalTokens: ((_k = response.usage) == null ? void 0 : _k.inputTokens) + ((_l = response.usage) == null ? void 0 : _l.outputTokens),
-        cachedInputTokens: (_n = (_m = response.usage) == null ? void 0 : _m.cacheReadInputTokens) != null ? _n : void 0
+        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
       },
       response: {
         // TODO add id, timestamp, etc
@@ -1021,6 +1024,7 @@ var BedrockChatLanguageModel = class {
     };
     let providerMetadata = void 0;
     let isJsonResponseFromTool = false;
+    let stopSequence = null;
     const contentBlocks = {};
     return {
       stream: response.pipeThrough(
@@ -1029,7 +1033,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;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
             function enqueueError(bedrockError) {
               finishReason = "error";
               controller.enqueue({ type: "error", error: bedrockError });
@@ -1063,13 +1067,14 @@ var BedrockChatLanguageModel = class {
                 value.messageStop.stopReason,
                 isJsonResponseFromTool
               );
+              stopSequence = (_b = (_a = value.messageStop.additionalModelResponseFields) == null ? void 0 : _a.stop_sequence) != null ? _b : null;
             }
             if (value.metadata) {
-              usage.inputTokens = (_b = (_a = value.metadata.usage) == null ? void 0 : _a.inputTokens) != null ? _b : usage.inputTokens;
-              usage.outputTokens = (_d = (_c = value.metadata.usage) == null ? void 0 : _c.outputTokens) != null ? _d : usage.outputTokens;
-              usage.totalTokens = ((_e = usage.inputTokens) != null ? _e : 0) + ((_f = usage.outputTokens) != null ? _f : 0);
-              usage.cachedInputTokens = (_h = (_g = value.metadata.usage) == null ? void 0 : _g.cacheReadInputTokens) != null ? _h : usage.cachedInputTokens;
-              const cacheUsage = ((_i = value.metadata.usage) == null ? void 0 : _i.cacheWriteInputTokens) != null ? {
+              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: {
                   cacheWriteInputTokens: value.metadata.usage.cacheWriteInputTokens
                 }
@@ -1086,7 +1091,7 @@ var BedrockChatLanguageModel = class {
                 };
               }
             }
-            if (((_j = value.contentBlockStart) == null ? void 0 : _j.contentBlockIndex) != null && !((_l = (_k = value.contentBlockStart) == null ? void 0 : _k.start) == null ? void 0 : _l.toolUse)) {
+            if (((_l = value.contentBlockStart) == null ? void 0 : _l.contentBlockIndex) != null && !((_n = (_m = value.contentBlockStart) == null ? void 0 : _m.start) == null ? void 0 : _n.toolUse)) {
               const blockIndex = value.contentBlockStart.contentBlockIndex;
               contentBlocks[blockIndex] = { type: "text" };
               controller.enqueue({
@@ -1094,7 +1099,7 @@ var BedrockChatLanguageModel = class {
                 id: String(blockIndex)
               });
             }
-            if (((_m = value.contentBlockDelta) == null ? void 0 : _m.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
+            if (((_o = value.contentBlockDelta) == null ? void 0 : _o.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
               const blockIndex = value.contentBlockDelta.contentBlockIndex || 0;
               if (contentBlocks[blockIndex] == null) {
                 contentBlocks[blockIndex] = { type: "text" };
@@ -1109,7 +1114,7 @@ var BedrockChatLanguageModel = class {
                 delta: value.contentBlockDelta.delta.text
               });
             }
-            if (((_n = value.contentBlockStop) == null ? void 0 : _n.contentBlockIndex) != null) {
+            if (((_p = value.contentBlockStop) == null ? void 0 : _p.contentBlockIndex) != null) {
               const blockIndex = value.contentBlockStop.contentBlockIndex;
               const contentBlock = contentBlocks[blockIndex];
               if (contentBlock != null) {
@@ -1155,7 +1160,7 @@ var BedrockChatLanguageModel = class {
                 delete contentBlocks[blockIndex];
               }
             }
-            if (((_o = value.contentBlockDelta) == null ? void 0 : _o.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
+            if (((_q = value.contentBlockDelta) == null ? void 0 : _q.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) {
@@ -1196,7 +1201,7 @@ var BedrockChatLanguageModel = class {
               }
             }
             const contentBlockStart = value.contentBlockStart;
-            if (((_p = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _p.toolUse) != null) {
+            if (((_r = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _r.toolUse) != null) {
               const toolUse = contentBlockStart.start.toolUse;
               const blockIndex = contentBlockStart.contentBlockIndex;
               const isJsonResponseTool = usesJsonResponseTool && toolUse.name === "json";
@@ -1220,7 +1225,7 @@ var BedrockChatLanguageModel = class {
               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 : "";
+                const delta = (_s = contentBlockDelta.delta.toolUse.input) != null ? _s : "";
                 if (!contentBlock.isJsonResponseTool) {
                   controller.enqueue({
                     type: "tool-input-delta",
@@ -1233,16 +1238,22 @@ var BedrockChatLanguageModel = class {
             }
           },
           flush(controller) {
-            if (isJsonResponseFromTool) {
+            if (isJsonResponseFromTool || stopSequence != null) {
               if (providerMetadata) {
                 providerMetadata.bedrock = {
                   ...providerMetadata.bedrock,
-                  isJsonResponseFromTool: true
+                  ...isJsonResponseFromTool && {
+                    isJsonResponseFromTool: true
+                  },
+                  stopSequence
                 };
               } else {
                 providerMetadata = {
                   bedrock: {
-                    isJsonResponseFromTool: true
+                    ...isJsonResponseFromTool && {
+                      isJsonResponseFromTool: true
+                    },
+                    stopSequence
                   }
                 };
               }
@@ -1269,6 +1280,9 @@ var BedrockStopReasonSchema = z3.union([
   z3.enum(BEDROCK_STOP_REASONS),
   z3.string()
 ]);
+var BedrockAdditionalModelResponseFieldsSchema = z3.object({
+  stop_sequence: z3.string().optional()
+}).catchall(z3.unknown());
 var BedrockToolUseSchema = z3.object({
   toolUseId: z3.string(),
   name: z3.string(),
@@ -1305,6 +1319,7 @@ var BedrockResponseSchema = z3.object({
     })
   }),
   stopReason: BedrockStopReasonSchema,
+  additionalModelResponseFields: BedrockAdditionalModelResponseFieldsSchema.nullish(),
   trace: z3.unknown().nullish(),
   usage: z3.object({
     inputTokens: z3.number(),
@@ -1344,7 +1359,7 @@ var BedrockStreamSchema = z3.object({
   }).nullish(),
   internalServerException: z3.record(z3.string(), z3.unknown()).nullish(),
   messageStop: z3.object({
-    additionalModelResponseFields: z3.record(z3.string(), z3.unknown()).nullish(),
+    additionalModelResponseFields: BedrockAdditionalModelResponseFieldsSchema.nullish(),
     stopReason: BedrockStopReasonSchema
   }).nullish(),
   metadata: z3.object({