@ai-sdk/amazon-bedrock 3.0.0-canary.7 → 3.0.0-canary.9

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @ai-sdk/amazon-bedrock
 
+## 3.0.0-canary.9
+
+### Patch Changes
+
+- 92c0b4b: chore(providers/bedrock): update embedding model to use providerOptions
+- Updated dependencies [95857aa]
+- Updated dependencies [7ea4132]
+  - @ai-sdk/provider@2.0.0-canary.8
+  - @ai-sdk/provider-utils@3.0.0-canary.9
+
+## 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

package/dist/index.d.mts

@@ -36,18 +36,6 @@ declare const bedrockProviderOptions: z.ZodObject<{
 type BedrockProviderOptions = z.infer<typeof bedrockProviderOptions>;
 
 type BedrockEmbeddingModelId = 'amazon.titan-embed-text-v1' | 'amazon.titan-embed-text-v2:0' | 'cohere.embed-english-v3' | 'cohere.embed-multilingual-v3' | (string & {});
-interface BedrockEmbeddingSettings {
-    /**
-  The number of dimensions the resulting output embeddings should have (defaults to 1024).
-  Only supported in amazon.titan-embed-text-v2:0.
-     */
-    dimensions?: 1024 | 512 | 256;
-    /**
-  Flag indicating whether or not to normalize the output embeddings. Defaults to true
-  Only supported in amazon.titan-embed-text-v2:0.
-     */
-    normalize?: boolean;
-}
 
 type BedrockImageModelId = 'amazon.nova-canvas-v1:0' | (string & {});
 interface BedrockImageSettings {
@@ -111,7 +99,7 @@ interface AmazonBedrockProviderSettings {
 interface AmazonBedrockProvider extends ProviderV2 {
     (modelId: BedrockChatModelId): LanguageModelV2;
     languageModel(modelId: BedrockChatModelId): LanguageModelV2;
-    embedding(modelId: BedrockEmbeddingModelId, settings?: BedrockEmbeddingSettings): EmbeddingModelV2<string>;
+    embedding(modelId: BedrockEmbeddingModelId): EmbeddingModelV2<string>;
     image(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
     imageModel(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
 }

package/dist/index.d.ts

@@ -36,18 +36,6 @@ declare const bedrockProviderOptions: z.ZodObject<{
 type BedrockProviderOptions = z.infer<typeof bedrockProviderOptions>;
 
 type BedrockEmbeddingModelId = 'amazon.titan-embed-text-v1' | 'amazon.titan-embed-text-v2:0' | 'cohere.embed-english-v3' | 'cohere.embed-multilingual-v3' | (string & {});
-interface BedrockEmbeddingSettings {
-    /**
-  The number of dimensions the resulting output embeddings should have (defaults to 1024).
-  Only supported in amazon.titan-embed-text-v2:0.
-     */
-    dimensions?: 1024 | 512 | 256;
-    /**
-  Flag indicating whether or not to normalize the output embeddings. Defaults to true
-  Only supported in amazon.titan-embed-text-v2:0.
-     */
-    normalize?: boolean;
-}
 
 type BedrockImageModelId = 'amazon.nova-canvas-v1:0' | (string & {});
 interface BedrockImageSettings {
@@ -111,7 +99,7 @@ interface AmazonBedrockProviderSettings {
 interface AmazonBedrockProvider extends ProviderV2 {
     (modelId: BedrockChatModelId): LanguageModelV2;
     languageModel(modelId: BedrockChatModelId): LanguageModelV2;
-    embedding(modelId: BedrockEmbeddingModelId, settings?: BedrockEmbeddingSettings): EmbeddingModelV2<string>;
+    embedding(modelId: BedrockEmbeddingModelId): EmbeddingModelV2<string>;
     image(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
     imageModel(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
 }

package/dist/index.js

@@ -502,8 +502,6 @@ var BedrockChatLanguageModel = class {
     this.config = config;
     this.specificationVersion = "v2";
     this.provider = "amazon-bedrock";
-    this.defaultObjectGenerationMode = "tool";
-    this.supportsImageUrls = false;
   }
   getArgs({
     prompt,
@@ -612,8 +610,13 @@ var BedrockChatLanguageModel = class {
       warnings: [...warnings, ...toolWarnings]
     };
   }
+  async getSupportedUrls() {
+    return {
+      // no supported urls for bedrock
+    };
+  }
   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,71 +639,68 @@ var BedrockChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    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
-          }
-        }
+    const content = [];
+    for (const part of response.output.message.content) {
+      if (part.text) {
+        content.push({ type: "text", text: part.text });
       }
-    } : void 0;
-    const reasoning = [];
-    for (const content of response.output.message.content) {
-      if (content.reasoningContent) {
-        if ("reasoningText" in content.reasoningContent) {
-          reasoning.push({
+      if (part.reasoningContent) {
+        if ("reasoningText" in part.reasoningContent) {
+          content.push({
             type: "reasoning",
             reasoningType: "text",
-            text: content.reasoningContent.reasoningText.text
+            text: part.reasoningContent.reasoningText.text
           });
-          if (content.reasoningContent.reasoningText.signature) {
-            reasoning.push({
+          if (part.reasoningContent.reasoningText.signature) {
+            content.push({
               type: "reasoning",
               reasoningType: "signature",
-              signature: content.reasoningContent.reasoningText.signature
+              signature: part.reasoningContent.reasoningText.signature
             });
           }
-        } else if ("redactedReasoning" in content.reasoningContent) {
-          reasoning.push({
+        } else if ("redactedReasoning" in part.reasoningContent) {
+          content.push({
             type: "reasoning",
             reasoningType: "redacted",
-            data: (_e = content.reasoningContent.redactedReasoning.data) != null ? _e : ""
+            data: (_a = part.reasoningContent.redactedReasoning.data) != null ? _a : ""
           });
         }
       }
-    }
-    const text = (_h = (_g = (_f = response.output) == null ? void 0 : _f.message) == null ? void 0 : _g.content) == null ? void 0 : _h.map((part) => {
-      var _a2;
-      return (_a2 = part.text) != null ? _a2 : "";
-    }).join("");
-    return {
-      text: text != null ? { type: "text", text } : 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 {
+      if (part.toolUse) {
+        content.push({
           type: "tool-call",
           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 : "")
-        };
-      }),
+          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: (_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;
+    return {
+      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 }
     };
   }
@@ -732,6 +732,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) {
@@ -861,8 +864,8 @@ var BedrockChatLanguageModel = class {
           }
         })
       ),
-      response: { headers: responseHeaders },
-      warnings
+      // TODO request?
+      response: { headers: responseHeaders }
     };
   }
   getUrl(modelId) {
@@ -968,11 +971,27 @@ var BedrockStreamSchema = import_zod3.z.object({
 
 // src/bedrock-embedding-model.ts
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
+
+// src/bedrock-embedding-options.ts
 var import_zod4 = require("zod");
+var bedrockEmbeddingProviderOptions = import_zod4.z.object({
+  /**
+  The number of dimensions the resulting output embeddings should have (defaults to 1024).
+  Only supported in amazon.titan-embed-text-v2:0.
+     */
+  dimensions: import_zod4.z.union([import_zod4.z.literal(1024), import_zod4.z.literal(512), import_zod4.z.literal(256)]).optional(),
+  /**
+  Flag indicating whether or not to normalize the output embeddings. Defaults to true
+  Only supported in amazon.titan-embed-text-v2:0.
+   */
+  normalize: import_zod4.z.boolean().optional()
+});
+
+// src/bedrock-embedding-model.ts
+var import_zod5 = require("zod");
 var BedrockEmbeddingModel = class {
-  constructor(modelId, settings, config) {
+  constructor(modelId, config) {
     this.modelId = modelId;
-    this.settings = settings;
     this.config = config;
     this.specificationVersion = "v2";
     this.provider = "amazon-bedrock";
@@ -986,13 +1005,20 @@ var BedrockEmbeddingModel = class {
   async doEmbed({
     values,
     headers,
-    abortSignal
+    abortSignal,
+    providerOptions
   }) {
+    var _a;
+    const bedrockOptions = (_a = (0, import_provider_utils4.parseProviderOptions)({
+      provider: "bedrock",
+      providerOptions,
+      schema: bedrockEmbeddingProviderOptions
+    })) != null ? _a : {};
     const embedSingleText = async (inputText) => {
       const args = {
         inputText,
-        dimensions: this.settings.dimensions,
-        normalize: this.settings.normalize
+        dimensions: bedrockOptions.dimensions,
+        normalize: bedrockOptions.normalize
       };
       const url = this.getUrl(this.modelId);
       const { value: response } = await (0, import_provider_utils4.postJsonToApi)({
@@ -1027,9 +1053,9 @@ var BedrockEmbeddingModel = class {
     );
   }
 };
-var BedrockEmbeddingResponseSchema = import_zod4.z.object({
-  embedding: import_zod4.z.array(import_zod4.z.number()),
-  inputTextTokenCount: import_zod4.z.number()
+var BedrockEmbeddingResponseSchema = import_zod5.z.object({
+  embedding: import_zod5.z.array(import_zod5.z.number()),
+  inputTextTokenCount: import_zod5.z.number()
 });
 
 // src/bedrock-image-model.ts
@@ -1041,7 +1067,7 @@ var modelMaxImagesPerCall = {
 };
 
 // src/bedrock-image-model.ts
-var import_zod5 = require("zod");
+var import_zod6 = require("zod");
 var BedrockImageModel = class {
   constructor(modelId, settings, config) {
     this.modelId = modelId;
@@ -1123,8 +1149,8 @@ var BedrockImageModel = class {
     };
   }
 };
-var bedrockImageResponseSchema = import_zod5.z.object({
-  images: import_zod5.z.array(import_zod5.z.string())
+var bedrockImageResponseSchema = import_zod6.z.object({
+  images: import_zod6.z.array(import_zod6.z.string())
 });
 
 // src/headers-utils.ts
@@ -1263,9 +1289,9 @@ function createAmazonBedrock(options = {}) {
     }
     return createChatModel(modelId);
   };
-  const createEmbeddingModel = (modelId, settings = {}) => {
+  const createEmbeddingModel = (modelId) => {
     var _a;
-    return new BedrockEmbeddingModel(modelId, settings, {
+    return new BedrockEmbeddingModel(modelId, {
       baseUrl: getBaseUrl,
       headers: (_a = options.headers) != null ? _a : {},
       fetch: sigv4Fetch