@ai-sdk/amazon-bedrock 3.0.0-canary.0 → 3.0.0-canary.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @ai-sdk/amazon-bedrock
 
+## 3.0.0-canary.2
+
+### Patch Changes
+
+- Updated dependencies [c57e248]
+- Updated dependencies [33f4a6a]
+  - @ai-sdk/provider@2.0.0-canary.1
+  - @ai-sdk/provider-utils@3.0.0-canary.2
+
+## 3.0.0-canary.1
+
+### Patch Changes
+
+- Updated dependencies [060370c]
+- Updated dependencies [0c0c0b3]
+- Updated dependencies [63d791d]
+  - @ai-sdk/provider-utils@3.0.0-canary.1
+
 ## 3.0.0-canary.0
 
 ### Major Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ProviderV1, LanguageModelV1, EmbeddingModelV1, ImageModelV1 } from '@ai-sdk/provider';
+import { ProviderV2, LanguageModelV2, EmbeddingModelV1, ImageModelV1 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 
 type BedrockChatModelId = 'amazon.titan-tg1-large' | 'amazon.titan-text-express-v1' | 'anthropic.claude-v2' | 'anthropic.claude-v2:1' | 'anthropic.claude-instant-v1' | 'anthropic.claude-3-7-sonnet-20250219-v1:0' | 'anthropic.claude-3-5-sonnet-20240620-v1:0' | 'anthropic.claude-3-5-sonnet-20241022-v2:0' | 'anthropic.claude-3-5-haiku-20241022-v1:0' | 'anthropic.claude-3-sonnet-20240229-v1:0' | 'anthropic.claude-3-haiku-20240307-v1:0' | 'anthropic.claude-3-opus-20240229-v1:0' | 'cohere.command-text-v14' | 'cohere.command-light-text-v14' | 'cohere.command-r-v1:0' | 'cohere.command-r-plus-v1:0' | 'meta.llama3-70b-instruct-v1:0' | 'meta.llama3-8b-instruct-v1:0' | 'meta.llama3-1-405b-instruct-v1:0' | 'meta.llama3-1-70b-instruct-v1:0' | 'meta.llama3-1-8b-instruct-v1:0' | 'meta.llama3-2-11b-instruct-v1:0' | 'meta.llama3-2-1b-instruct-v1:0' | 'meta.llama3-2-3b-instruct-v1:0' | 'meta.llama3-2-90b-instruct-v1:0' | 'mistral.mistral-7b-instruct-v0:2' | 'mistral.mixtral-8x7b-instruct-v0:1' | 'mistral.mistral-large-2402-v1:0' | 'mistral.mistral-small-2402-v1:0' | 'amazon.titan-text-express-v1' | 'amazon.titan-text-lite-v1' | (string & {});
@@ -83,9 +83,9 @@ interface AmazonBedrockProviderSettings {
     credentialProvider?: () => PromiseLike<Omit<BedrockCredentials, 'region'>>;
     generateId?: () => string;
 }
-interface AmazonBedrockProvider extends ProviderV1 {
-    (modelId: BedrockChatModelId, settings?: BedrockChatSettings): LanguageModelV1;
-    languageModel(modelId: BedrockChatModelId, settings?: BedrockChatSettings): LanguageModelV1;
+interface AmazonBedrockProvider extends ProviderV2 {
+    (modelId: BedrockChatModelId, settings?: BedrockChatSettings): LanguageModelV2;
+    languageModel(modelId: BedrockChatModelId, settings?: BedrockChatSettings): LanguageModelV2;
     embedding(modelId: BedrockEmbeddingModelId, settings?: BedrockEmbeddingSettings): EmbeddingModelV1<string>;
     image(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
     imageModel(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ProviderV1, LanguageModelV1, EmbeddingModelV1, ImageModelV1 } from '@ai-sdk/provider';
+import { ProviderV2, LanguageModelV2, EmbeddingModelV1, ImageModelV1 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 
 type BedrockChatModelId = 'amazon.titan-tg1-large' | 'amazon.titan-text-express-v1' | 'anthropic.claude-v2' | 'anthropic.claude-v2:1' | 'anthropic.claude-instant-v1' | 'anthropic.claude-3-7-sonnet-20250219-v1:0' | 'anthropic.claude-3-5-sonnet-20240620-v1:0' | 'anthropic.claude-3-5-sonnet-20241022-v2:0' | 'anthropic.claude-3-5-haiku-20241022-v1:0' | 'anthropic.claude-3-sonnet-20240229-v1:0' | 'anthropic.claude-3-haiku-20240307-v1:0' | 'anthropic.claude-3-opus-20240229-v1:0' | 'cohere.command-text-v14' | 'cohere.command-light-text-v14' | 'cohere.command-r-v1:0' | 'cohere.command-r-plus-v1:0' | 'meta.llama3-70b-instruct-v1:0' | 'meta.llama3-8b-instruct-v1:0' | 'meta.llama3-1-405b-instruct-v1:0' | 'meta.llama3-1-70b-instruct-v1:0' | 'meta.llama3-1-8b-instruct-v1:0' | 'meta.llama3-2-11b-instruct-v1:0' | 'meta.llama3-2-1b-instruct-v1:0' | 'meta.llama3-2-3b-instruct-v1:0' | 'meta.llama3-2-90b-instruct-v1:0' | 'mistral.mistral-7b-instruct-v0:2' | 'mistral.mixtral-8x7b-instruct-v0:1' | 'mistral.mistral-large-2402-v1:0' | 'mistral.mistral-small-2402-v1:0' | 'amazon.titan-text-express-v1' | 'amazon.titan-text-lite-v1' | (string & {});
@@ -83,9 +83,9 @@ interface AmazonBedrockProviderSettings {
     credentialProvider?: () => PromiseLike<Omit<BedrockCredentials, 'region'>>;
     generateId?: () => string;
 }
-interface AmazonBedrockProvider extends ProviderV1 {
-    (modelId: BedrockChatModelId, settings?: BedrockChatSettings): LanguageModelV1;
-    languageModel(modelId: BedrockChatModelId, settings?: BedrockChatSettings): LanguageModelV1;
+interface AmazonBedrockProvider extends ProviderV2 {
+    (modelId: BedrockChatModelId, settings?: BedrockChatSettings): LanguageModelV2;
+    languageModel(modelId: BedrockChatModelId, settings?: BedrockChatSettings): LanguageModelV2;
     embedding(modelId: BedrockEmbeddingModelId, settings?: BedrockEmbeddingSettings): EmbeddingModelV1<string>;
     image(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;
     imageModel(modelId: BedrockImageModelId, settings?: BedrockImageSettings): ImageModelV1;

package/dist/index.js

@@ -130,9 +130,11 @@ var createBedrockEventStreamResponseHandler = (chunkSchema) => async ({ response
 
 // src/bedrock-prepare-tools.ts
 var import_provider2 = require("@ai-sdk/provider");
-function prepareTools(mode) {
-  var _a;
-  const tools = ((_a = mode.tools) == null ? void 0 : _a.length) ? mode.tools : void 0;
+function prepareTools({
+  tools,
+  toolChoice
+}) {
+  tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   if (tools == null) {
     return {
       toolConfig: { tools: void 0, toolChoice: void 0 },
@@ -156,7 +158,6 @@ function prepareTools(mode) {
       });
     }
   }
-  const toolChoice = mode.toolChoice;
   if (toolChoice == null) {
     return {
       toolConfig: { tools: bedrockTools, toolChoice: void 0 },
@@ -223,7 +224,7 @@ function convertToBedrockChatMessages(prompt) {
         }
         for (const message of block.messages) {
           system.push({ text: message.content });
-          if (getCachePoint(message.providerMetadata)) {
+          if (getCachePoint(message.providerOptions)) {
             system.push(BEDROCK_CACHE_POINT);
           }
         }
@@ -232,7 +233,7 @@ function convertToBedrockChatMessages(prompt) {
       case "user": {
         const bedrockContent = [];
         for (const message of block.messages) {
-          const { role, content, providerMetadata } = message;
+          const { role, content, providerOptions } = message;
           switch (role) {
             case "user": {
               for (let j = 0; j < content.length; j++) {
@@ -332,7 +333,7 @@ function convertToBedrockChatMessages(prompt) {
               throw new Error(`Unsupported role: ${_exhaustiveCheck}`);
             }
           }
-          if (getCachePoint(providerMetadata)) {
+          if (getCachePoint(providerOptions)) {
             bedrockContent.push(BEDROCK_CACHE_POINT);
           }
         }
@@ -406,7 +407,7 @@ function convertToBedrockChatMessages(prompt) {
               }
             }
           }
-          if (getCachePoint(message.providerMetadata)) {
+          if (getCachePoint(message.providerOptions)) {
             bedrockContent.push(BEDROCK_CACHE_POINT);
           }
         }
@@ -498,13 +499,12 @@ var BedrockChatLanguageModel = class {
     this.modelId = modelId;
     this.settings = settings;
     this.config = config;
-    this.specificationVersion = "v1";
+    this.specificationVersion = "v2";
     this.provider = "amazon-bedrock";
     this.defaultObjectGenerationMode = "tool";
     this.supportsImageUrls = false;
   }
   getArgs({
-    mode,
     prompt,
     maxTokens,
     temperature,
@@ -515,10 +515,11 @@ var BedrockChatLanguageModel = class {
     stopSequences,
     responseFormat,
     seed,
-    providerMetadata
+    tools,
+    toolChoice,
+    providerOptions
   }) {
     var _a, _b, _c, _d, _e, _f, _g;
-    const type = mode.type;
     const warnings = [];
     if (frequencyPenalty != null) {
       warnings.push({
@@ -553,7 +554,7 @@ var BedrockChatLanguageModel = class {
     }
     const { system, messages } = convertToBedrockChatMessages(prompt);
     const reasoningConfigOptions = BedrockReasoningConfigOptionsSchema.safeParse(
-      (_a = providerMetadata == null ? void 0 : providerMetadata.bedrock) == null ? void 0 : _a.reasoning_config
+      (_a = providerOptions == null ? void 0 : providerOptions.bedrock) == null ? void 0 : _a.reasoning_config
     );
     if (!reasoningConfigOptions.success) {
       throw new import_provider4.InvalidArgumentError({
@@ -600,58 +601,20 @@ var BedrockChatLanguageModel = class {
         details: "topP is not supported when thinking is enabled"
       });
     }
-    const baseArgs = {
-      system,
-      additionalModelRequestFields: this.settings.additionalModelRequestFields,
-      ...Object.keys(inferenceConfig).length > 0 && {
-        inferenceConfig
+    const { toolConfig, toolWarnings } = prepareTools({ tools, toolChoice });
+    return {
+      command: {
+        system,
+        messages,
+        additionalModelRequestFields: this.settings.additionalModelRequestFields,
+        ...Object.keys(inferenceConfig).length > 0 && {
+          inferenceConfig
+        },
+        ...providerOptions == null ? void 0 : providerOptions.bedrock,
+        ...((_g = toolConfig.tools) == null ? void 0 : _g.length) ? { toolConfig } : {}
       },
-      messages,
-      ...providerMetadata == null ? void 0 : providerMetadata.bedrock
+      warnings: [...warnings, ...toolWarnings]
     };
-    switch (type) {
-      case "regular": {
-        const { toolConfig, toolWarnings } = prepareTools(mode);
-        return {
-          command: {
-            ...baseArgs,
-            ...((_g = toolConfig.tools) == null ? void 0 : _g.length) ? { toolConfig } : {}
-          },
-          warnings: [...warnings, ...toolWarnings]
-        };
-      }
-      case "object-json": {
-        throw new import_provider4.UnsupportedFunctionalityError({
-          functionality: "json-mode object generation"
-        });
-      }
-      case "object-tool": {
-        return {
-          command: {
-            ...baseArgs,
-            toolConfig: {
-              tools: [
-                {
-                  toolSpec: {
-                    name: mode.tool.name,
-                    description: mode.tool.description,
-                    inputSchema: {
-                      json: mode.tool.parameters
-                    }
-                  }
-                }
-              ],
-              toolChoice: { tool: { name: mode.tool.name } }
-            }
-          },
-          warnings
-        };
-      }
-      default: {
-        const _exhaustiveCheck = type;
-        throw new Error(`Unsupported type: ${_exhaustiveCheck}`);
-      }
-    }
   }
   async doGenerate(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;