@ai-sdk/amazon-bedrock 3.0.0-canary.6 → 3.0.0-canary.8

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @ai-sdk/amazon-bedrock
 
+## 3.0.0-canary.8
+
+### Patch Changes
+
+- Updated dependencies [5d142ab]
+- Updated dependencies [b6b43c7]
+- Updated dependencies [8aa9e20]
+- Updated dependencies [3795467]
+  - @ai-sdk/provider-utils@3.0.0-canary.8
+  - @ai-sdk/provider@2.0.0-canary.7
+
+## 3.0.0-canary.7
+
+### Patch Changes
+
+- fa49207: feat(providers/openai-compatible): convert to providerOptions
+- 26735b5: chore(embedding-model): add v2 interface
+- Updated dependencies [26735b5]
+- Updated dependencies [443d8ec]
+- Updated dependencies [14c9410]
+- Updated dependencies [d9c98f4]
+- Updated dependencies [c4a2fec]
+- Updated dependencies [0054544]
+- Updated dependencies [9e9c809]
+- Updated dependencies [32831c6]
+- Updated dependencies [d0f9495]
+- Updated dependencies [fd65bc6]
+- Updated dependencies [393138b]
+- Updated dependencies [7182d14]
+  - @ai-sdk/provider@2.0.0-canary.6
+  - @ai-sdk/provider-utils@3.0.0-canary.7
+
 ## 3.0.0-canary.6
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ProviderV2, LanguageModelV2, EmbeddingModelV1, ImageModelV1 } from '@ai-sdk/provider';
+import { ProviderV2, LanguageModelV2, EmbeddingModelV2, ImageModelV1 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 import { z } from 'zod';
 
@@ -73,6 +73,7 @@ interface AmazonBedrockProviderSettings {
     region?: string;
     /**
   The AWS access key ID to use for the Bedrock provider. Defaults to the value of the
+  `AWS_ACCESS_KEY_ID` environment variable.
      */
     accessKeyId?: string;
     /**
@@ -110,7 +111,7 @@ interface AmazonBedrockProviderSettings {
 interface AmazonBedrockProvider extends ProviderV2 {
     (modelId: BedrockChatModelId): LanguageModelV2;
     languageModel(modelId: BedrockChatModelId): LanguageModelV2;
-    embedding(modelId: BedrockEmbeddingModelId, settings?: BedrockEmbeddingSettings): EmbeddingModelV1<string>;
+    embedding(modelId: BedrockEmbeddingModelId, settings?: BedrockEmbeddingSettings): EmbeddingModelV2<string>;
     image(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
     imageModel(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
 }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ProviderV2, LanguageModelV2, EmbeddingModelV1, ImageModelV1 } from '@ai-sdk/provider';
+import { ProviderV2, LanguageModelV2, EmbeddingModelV2, ImageModelV1 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 import { z } from 'zod';
 
@@ -73,6 +73,7 @@ interface AmazonBedrockProviderSettings {
     region?: string;
     /**
   The AWS access key ID to use for the Bedrock provider. Defaults to the value of the
+  `AWS_ACCESS_KEY_ID` environment variable.
      */
     accessKeyId?: string;
     /**
@@ -110,7 +111,7 @@ interface AmazonBedrockProviderSettings {
 interface AmazonBedrockProvider extends ProviderV2 {
     (modelId: BedrockChatModelId): LanguageModelV2;
     languageModel(modelId: BedrockChatModelId): LanguageModelV2;
-    embedding(modelId: BedrockEmbeddingModelId, settings?: BedrockEmbeddingSettings): EmbeddingModelV1<string>;
+    embedding(modelId: BedrockEmbeddingModelId, settings?: BedrockEmbeddingSettings): EmbeddingModelV2<string>;
     image(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
     imageModel(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
 }

package/dist/index.js

@@ -613,7 +613,7 @@ var BedrockChatLanguageModel = class {
     };
   }
   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;
     const { command: args, warnings } = this.getArgs(options);
     const url = `${this.getUrl(this.modelId)}/converse`;
     const { value: response, responseHeaders } = await (0, import_provider_utils3.postJsonToApi)({
@@ -636,63 +636,68 @@ var BedrockChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
+    const content = [];
+    for (const part of response.output.message.content) {
+      if (part.text) {
+        content.push({ type: "text", text: part.text });
+      }
+      if (part.reasoningContent) {
+        if ("reasoningText" in part.reasoningContent) {
+          content.push({
+            type: "reasoning",
+            reasoningType: "text",
+            text: part.reasoningContent.reasoningText.text
+          });
+          if (part.reasoningContent.reasoningText.signature) {
+            content.push({
+              type: "reasoning",
+              reasoningType: "signature",
+              signature: part.reasoningContent.reasoningText.signature
+            });
+          }
+        } else if ("redactedReasoning" in part.reasoningContent) {
+          content.push({
+            type: "reasoning",
+            reasoningType: "redacted",
+            data: (_a = part.reasoningContent.redactedReasoning.data) != null ? _a : ""
+          });
+        }
+      }
+      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 : "")
+        });
+      }
+    }
     const providerMetadata = response.trace || response.usage ? {
       bedrock: {
         ...response.trace && typeof response.trace === "object" ? { trace: response.trace } : {},
         ...response.usage && {
           usage: {
-            cacheReadInputTokens: (_b = (_a = response.usage) == null ? void 0 : _a.cacheReadInputTokens) != null ? _b : Number.NaN,
-            cacheWriteInputTokens: (_d = (_c = response.usage) == null ? void 0 : _c.cacheWriteInputTokens) != null ? _d : Number.NaN
+            cacheReadInputTokens: (_i = (_h = response.usage) == null ? void 0 : _h.cacheReadInputTokens) != null ? _i : Number.NaN,
+            cacheWriteInputTokens: (_k = (_j = response.usage) == null ? void 0 : _j.cacheWriteInputTokens) != null ? _k : Number.NaN
           }
         }
       }
     } : void 0;
-    const reasoning = response.output.message.content.filter((content) => content.reasoningContent).map((content) => {
-      var _a2;
-      if (content.reasoningContent && "reasoningText" in content.reasoningContent) {
-        return {
-          type: "text",
-          text: content.reasoningContent.reasoningText.text,
-          ...content.reasoningContent.reasoningText.signature && {
-            signature: content.reasoningContent.reasoningText.signature
-          }
-        };
-      } else if (content.reasoningContent && "redactedReasoning" in content.reasoningContent) {
-        return {
-          type: "redacted",
-          data: (_a2 = content.reasoningContent.redactedReasoning.data) != null ? _a2 : ""
-        };
-      } else {
-        return void 0;
-      }
-    }).filter((item) => item !== void 0);
     return {
-      text: (_h = (_g = (_f = (_e = response.output) == null ? void 0 : _e.message) == null ? void 0 : _f.content) == null ? void 0 : _g.map((part) => {
-        var _a2;
-        return (_a2 = part.text) != null ? _a2 : "";
-      }).join("")) != null ? _h : void 0,
-      toolCalls: (_l = (_k = (_j = (_i = response.output) == null ? void 0 : _i.message) == null ? void 0 : _j.content) == null ? void 0 : _k.filter((part) => !!part.toolUse)) == null ? void 0 : _l.map((part) => {
-        var _a2, _b2, _c2, _d2, _e2, _f2;
-        return {
-          toolCallType: "function",
-          toolCallId: (_b2 = (_a2 = part.toolUse) == null ? void 0 : _a2.toolUseId) != null ? _b2 : this.config.generateId(),
-          toolName: (_d2 = (_c2 = part.toolUse) == null ? void 0 : _c2.name) != null ? _d2 : `tool-${this.config.generateId()}`,
-          args: JSON.stringify((_f2 = (_e2 = part.toolUse) == null ? void 0 : _e2.input) != null ? _f2 : "")
-        };
-      }),
+      content,
       finishReason: mapBedrockFinishReason(
         response.stopReason
       ),
       usage: {
-        inputTokens: (_m = response.usage) == null ? void 0 : _m.inputTokens,
-        outputTokens: (_n = response.usage) == null ? void 0 : _n.outputTokens
+        inputTokens: (_l = response.usage) == null ? void 0 : _l.inputTokens,
+        outputTokens: (_m = response.usage) == null ? void 0 : _m.outputTokens
       },
       response: {
         // TODO add id, timestamp, etc
         headers: responseHeaders
       },
       warnings,
-      reasoning: reasoning.length > 0 ? reasoning : void 0,
       ...providerMetadata && { providerMetadata }
     };
   }
@@ -724,6 +729,9 @@ var BedrockChatLanguageModel = class {
     return {
       stream: response.pipeThrough(
         new TransformStream({
+          start(controller) {
+            controller.enqueue({ type: "stream-start", warnings });
+          },
           transform(chunk, controller) {
             var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
             function enqueueError(bedrockError) {
@@ -779,8 +787,8 @@ var BedrockChatLanguageModel = class {
             }
             if (((_k = value.contentBlockDelta) == null ? void 0 : _k.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
               controller.enqueue({
-                type: "text-delta",
-                textDelta: value.contentBlockDelta.delta.text
+                type: "text",
+                text: value.contentBlockDelta.delta.text
               });
             }
             if (((_l = value.contentBlockDelta) == null ? void 0 : _l.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
@@ -788,16 +796,19 @@ var BedrockChatLanguageModel = class {
               if ("text" in reasoningContent && reasoningContent.text) {
                 controller.enqueue({
                   type: "reasoning",
-                  textDelta: reasoningContent.text
+                  reasoningType: "text",
+                  text: reasoningContent.text
                 });
               } else if ("signature" in reasoningContent && reasoningContent.signature) {
                 controller.enqueue({
-                  type: "reasoning-signature",
+                  type: "reasoning",
+                  reasoningType: "signature",
                   signature: reasoningContent.signature
                 });
               } else if ("data" in reasoningContent && reasoningContent.data) {
                 controller.enqueue({
-                  type: "redacted-reasoning",
+                  type: "reasoning",
+                  reasoningType: "redacted",
                   data: reasoningContent.data
                 });
               }
@@ -850,8 +861,8 @@ var BedrockChatLanguageModel = class {
           }
         })
       ),
-      response: { headers: responseHeaders },
-      warnings
+      // TODO request?
+      response: { headers: responseHeaders }
     };
   }
   getUrl(modelId) {
@@ -963,7 +974,7 @@ var BedrockEmbeddingModel = class {
     this.modelId = modelId;
     this.settings = settings;
     this.config = config;
-    this.specificationVersion = "v1";
+    this.specificationVersion = "v2";
     this.provider = "amazon-bedrock";
     this.maxEmbeddingsPerCall = void 0;
     this.supportsParallelCalls = true;