@ai-sdk/amazon-bedrock 3.0.0-canary.1 → 3.0.0-canary.3

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @ai-sdk/amazon-bedrock
 
+## 3.0.0-canary.3
+
+### Patch Changes
+
+- Updated dependencies [a166433]
+- Updated dependencies [abf9a79]
+- Updated dependencies [9f95b35]
+- Updated dependencies [0a87932]
+- Updated dependencies [6dc848c]
+  - @ai-sdk/provider-utils@3.0.0-canary.3
+  - @ai-sdk/provider@2.0.0-canary.2
+
+## 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

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 },
@@ -191,7 +192,7 @@ function prepareTools(mode) {
     default: {
       const _exhaustiveCheck = type;
       throw new import_provider2.UnsupportedFunctionalityError({
-        functionality: `Unsupported tool choice type: ${_exhaustiveCheck}`
+        functionality: `tool choice type: ${_exhaustiveCheck}`
       });
     }
   }
@@ -206,7 +207,7 @@ function getCachePoint(providerMetadata) {
   return (_a = providerMetadata == null ? void 0 : providerMetadata.bedrock) == null ? void 0 : _a.cachePoint;
 }
 function convertToBedrockChatMessages(prompt) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const blocks = groupIntoBlocks(prompt);
   let system = [];
   const messages = [];
@@ -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++) {
@@ -244,43 +245,33 @@ function convertToBedrockChatMessages(prompt) {
                     });
                     break;
                   }
-                  case "image": {
-                    if (part.image instanceof URL) {
-                      throw new import_provider3.UnsupportedFunctionalityError({
-                        functionality: "Image URLs in user messages"
-                      });
-                    }
-                    bedrockContent.push({
-                      image: {
-                        format: (_b = (_a = part.mimeType) == null ? void 0 : _a.split(
-                          "/"
-                        )) == null ? void 0 : _b[1],
-                        source: {
-                          bytes: (0, import_provider_utils2.convertUint8ArrayToBase64)(
-                            (_c = part.image) != null ? _c : part.image
-                          )
-                        }
-                      }
-                    });
-                    break;
-                  }
                   case "file": {
                     if (part.data instanceof URL) {
                       throw new import_provider3.UnsupportedFunctionalityError({
-                        functionality: "File URLs in user messages"
+                        functionality: "File URL data"
                       });
                     }
-                    bedrockContent.push({
-                      document: {
-                        format: (_e = (_d = part.mimeType) == null ? void 0 : _d.split(
-                          "/"
-                        )) == null ? void 0 : _e[1],
-                        name: generateFileId(),
-                        source: {
-                          bytes: part.data
+                    if (part.mediaType.startsWith("image/")) {
+                      const bedrockImageFormat = part.mediaType === "image/*" ? void 0 : (_b = (_a = part.mediaType) == null ? void 0 : _a.split("/")) == null ? void 0 : _b[1];
+                      bedrockContent.push({
+                        image: {
+                          format: bedrockImageFormat,
+                          source: { bytes: part.data }
                         }
-                      }
-                    });
+                      });
+                    } else {
+                      bedrockContent.push({
+                        document: {
+                          format: (_d = (_c = part.mediaType) == null ? void 0 : _c.split(
+                            "/"
+                          )) == null ? void 0 : _d[1],
+                          name: generateFileId(),
+                          source: {
+                            bytes: part.data
+                          }
+                        }
+                      });
+                    }
                     break;
                   }
                 }
@@ -297,12 +288,12 @@ function convertToBedrockChatMessages(prompt) {
                         text: part2.text
                       };
                     case "image":
-                      if (!part2.mimeType) {
+                      if (!part2.mediaType) {
                         throw new Error(
                           "Image mime type is required in tool result part content"
                         );
                       }
-                      const format = part2.mimeType.split("/")[1];
+                      const format = part2.mediaType.split("/")[1];
                       if (!isBedrockImageFormat(format)) {
                         throw new Error(
                           `Unsupported image format: ${format}`
@@ -332,7 +323,7 @@ function convertToBedrockChatMessages(prompt) {
               throw new Error(`Unsupported role: ${_exhaustiveCheck}`);
             }
           }
-          if (getCachePoint(providerMetadata)) {
+          if (getCachePoint(providerOptions)) {
             bedrockContent.push(BEDROCK_CACHE_POINT);
           }
         }
@@ -406,7 +397,7 @@ function convertToBedrockChatMessages(prompt) {
               }
             }
           }
-          if (getCachePoint(message.providerMetadata)) {
+          if (getCachePoint(message.providerOptions)) {
             bedrockContent.push(BEDROCK_CACHE_POINT);
           }
         }
@@ -504,7 +495,6 @@ var BedrockChatLanguageModel = class {
     this.supportsImageUrls = false;
   }
   getArgs({
-    mode,
     prompt,
     maxTokens,
     temperature,
@@ -515,10 +505,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 +544,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 +591,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;