ai 5.0.0-canary.2 → 5.0.0-canary.3

package/dist/index.mjs

@@ -1247,7 +1247,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
       return {
         role: "system",
         content: message.content,
-        providerMetadata: (_a17 = message.providerOptions) != null ? _a17 : message.experimental_providerMetadata
+        providerOptions: (_a17 = message.providerOptions) != null ? _a17 : message.experimental_providerMetadata
       };
     }
     case "user": {
@@ -1255,13 +1255,13 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
         return {
           role: "user",
           content: [{ type: "text", text: message.content }],
-          providerMetadata: (_b = message.providerOptions) != null ? _b : message.experimental_providerMetadata
+          providerOptions: (_b = message.providerOptions) != null ? _b : message.experimental_providerMetadata
         };
       }
       return {
         role: "user",
         content: message.content.map((part) => convertPartToLanguageModelPart(part, downloadedAssets)).filter((part) => part.type !== "text" || part.text !== ""),
-        providerMetadata: (_c = message.providerOptions) != null ? _c : message.experimental_providerMetadata
+        providerOptions: (_c = message.providerOptions) != null ? _c : message.experimental_providerMetadata
       };
     }
     case "assistant": {
@@ -1269,7 +1269,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
         return {
           role: "assistant",
           content: [{ type: "text", text: message.content }],
-          providerMetadata: (_d = message.providerOptions) != null ? _d : message.experimental_providerMetadata
+          providerOptions: (_d = message.providerOptions) != null ? _d : message.experimental_providerMetadata
         };
       }
       return {
@@ -1287,7 +1287,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
                 data: part.data instanceof URL ? part.data : convertDataContentToBase64String(part.data),
                 filename: part.filename,
                 mimeType: part.mimeType,
-                providerMetadata: providerOptions
+                providerOptions
               };
             }
             case "reasoning": {
@@ -1295,21 +1295,21 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
                 type: "reasoning",
                 text: part.text,
                 signature: part.signature,
-                providerMetadata: providerOptions
+                providerOptions
               };
             }
             case "redacted-reasoning": {
               return {
                 type: "redacted-reasoning",
                 data: part.data,
-                providerMetadata: providerOptions
+                providerOptions
               };
             }
             case "text": {
               return {
                 type: "text",
                 text: part.text,
-                providerMetadata: providerOptions
+                providerOptions
               };
             }
             case "tool-call": {
@@ -1318,12 +1318,12 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
                 args: part.args,
-                providerMetadata: providerOptions
+                providerOptions
               };
             }
           }
         }),
-        providerMetadata: (_e = message.providerOptions) != null ? _e : message.experimental_providerMetadata
+        providerOptions: (_e = message.providerOptions) != null ? _e : message.experimental_providerMetadata
       };
     }
     case "tool": {
@@ -1338,10 +1338,10 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
             result: part.result,
             content: part.experimental_content,
             isError: part.isError,
-            providerMetadata: (_a18 = part.providerOptions) != null ? _a18 : part.experimental_providerMetadata
+            providerOptions: (_a18 = part.providerOptions) != null ? _a18 : part.experimental_providerMetadata
           };
         }),
-        providerMetadata: (_f = message.providerOptions) != null ? _f : message.experimental_providerMetadata
+        providerOptions: (_f = message.providerOptions) != null ? _f : message.experimental_providerMetadata
       };
     }
     default: {
@@ -1379,7 +1379,7 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
     return {
       type: "text",
       text: part.text,
-      providerMetadata: (_a17 = part.providerOptions) != null ? _a17 : part.experimental_providerMetadata
+      providerOptions: (_a17 = part.providerOptions) != null ? _a17 : part.experimental_providerMetadata
     };
   }
   let mimeType = part.mimeType;
@@ -1433,7 +1433,7 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
         type: "image",
         image: normalizedData,
         mimeType,
-        providerMetadata: (_c = part.providerOptions) != null ? _c : part.experimental_providerMetadata
+        providerOptions: (_c = part.providerOptions) != null ? _c : part.experimental_providerMetadata
       };
     }
     case "file": {
@@ -1445,7 +1445,7 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
         data: normalizedData instanceof Uint8Array ? convertDataContentToBase64String(normalizedData) : normalizedData,
         filename: part.filename,
         mimeType,
-        providerMetadata: (_d = part.providerOptions) != null ? _d : part.experimental_providerMetadata
+        providerOptions: (_d = part.providerOptions) != null ? _d : part.experimental_providerMetadata
       };
     }
   }
@@ -2689,8 +2689,8 @@ async function generateObject({
               fn: async (span2) => {
                 var _a18, _b2, _c2, _d2, _e, _f;
                 const result2 = await model.doGenerate({
-                  mode: {
-                    type: "object-json",
+                  responseFormat: {
+                    type: "json",
                     schema: outputStrategy.jsonSchema,
                     name: schemaName,
                     description: schemaDescription
@@ -2698,7 +2698,7 @@ async function generateObject({
                   ...prepareCallSettings(settings),
                   inputFormat: standardizedPrompt.type,
                   prompt: promptMessages,
-                  providerMetadata: providerOptions,
+                  providerOptions,
                   abortSignal,
                   headers
                 });
@@ -2795,19 +2795,19 @@ async function generateObject({
               fn: async (span2) => {
                 var _a18, _b2, _c2, _d2, _e, _f, _g, _h;
                 const result2 = await model.doGenerate({
-                  mode: {
-                    type: "object-tool",
-                    tool: {
+                  tools: [
+                    {
                       type: "function",
                       name: schemaName != null ? schemaName : "json",
                       description: schemaDescription != null ? schemaDescription : "Respond with a JSON object.",
                       parameters: outputStrategy.jsonSchema
                     }
-                  },
+                  ],
+                  toolChoice: { type: "required" },
                   ...prepareCallSettings(settings),
                   inputFormat,
                   prompt: promptMessages,
-                  providerMetadata: providerOptions,
+                  providerOptions,
                   abortSignal,
                   headers
                 });
@@ -3273,8 +3273,8 @@ var DefaultStreamObjectResult = class {
               tools: void 0
             });
             callOptions = {
-              mode: {
-                type: "object-json",
+              responseFormat: {
+                type: "json",
                 schema: outputStrategy.jsonSchema,
                 name: schemaName,
                 description: schemaDescription
@@ -3287,7 +3287,7 @@ var DefaultStreamObjectResult = class {
                 modelSupportsUrl: (_a17 = model.supportsUrl) == null ? void 0 : _a17.bind(model)
                 // support 'this' context
               }),
-              providerMetadata: providerOptions,
+              providerOptions,
               abortSignal,
               headers
             };
@@ -3313,15 +3313,15 @@ var DefaultStreamObjectResult = class {
               tools: void 0
             });
             callOptions = {
-              mode: {
-                type: "object-tool",
-                tool: {
+              tools: [
+                {
                   type: "function",
                   name: schemaName != null ? schemaName : "json",
                   description: schemaDescription != null ? schemaDescription : "Respond with a JSON object.",
                   parameters: outputStrategy.jsonSchema
                 }
-              },
+              ],
+              toolChoice: { type: "required" },
               ...prepareCallSettings(settings),
               inputFormat: standardizedPrompt.type,
               prompt: await convertToLanguageModelPrompt({
@@ -3330,7 +3330,7 @@ var DefaultStreamObjectResult = class {
                 modelSupportsUrl: (_b = model.supportsUrl) == null ? void 0 : _b.bind(model)
                 // support 'this' context,
               }),
-              providerMetadata: providerOptions,
+              providerOptions,
               abortSignal,
               headers
             };
@@ -4087,8 +4087,7 @@ async function generateText({
     tracer,
     fn: async (span) => {
       var _a18, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-      const mode = {
-        type: "regular",
+      const toolsAndToolChoice = {
         ...prepareToolsAndToolChoice({ tools, toolChoice, activeTools })
       };
       const callSettings = prepareCallSettings(settings);
@@ -4142,11 +4141,11 @@ async function generateText({
                   // convert the language model level tools:
                   input: () => {
                     var _a19;
-                    return (_a19 = mode.tools) == null ? void 0 : _a19.map((tool2) => JSON.stringify(tool2));
+                    return (_a19 = toolsAndToolChoice.tools) == null ? void 0 : _a19.map((tool2) => JSON.stringify(tool2));
                   }
                 },
                 "ai.prompt.toolChoice": {
-                  input: () => mode.toolChoice != null ? JSON.stringify(mode.toolChoice) : void 0
+                  input: () => toolsAndToolChoice.toolChoice != null ? JSON.stringify(toolsAndToolChoice.toolChoice) : void 0
                 },
                 // standardized gen-ai llm span attributes:
                 "gen_ai.system": model.provider,
@@ -4164,12 +4163,12 @@ async function generateText({
             fn: async (span2) => {
               var _a19, _b2, _c2, _d2, _e2, _f2;
               const result = await model.doGenerate({
-                mode,
                 ...callSettings,
+                ...toolsAndToolChoice,
                 inputFormat: promptFormat,
                 responseFormat: output == null ? void 0 : output.responseFormat({ model }),
                 prompt: promptMessages,
-                providerMetadata: providerOptions,
+                providerOptions,
                 abortSignal,
                 headers
               });
@@ -5474,8 +5473,7 @@ var DefaultStreamTextResult = class {
             modelSupportsUrl: (_a18 = model.supportsUrl) == null ? void 0 : _a18.bind(model)
             // support 'this' context
           });
-          const mode = {
-            type: "regular",
+          const toolsAndToolChoice = {
             ...prepareToolsAndToolChoice({ tools, toolChoice, activeTools })
           };
           const {
@@ -5503,11 +5501,13 @@ var DefaultStreamTextResult = class {
                     // convert the language model level tools:
                     input: () => {
                       var _a19;
-                      return (_a19 = mode.tools) == null ? void 0 : _a19.map((tool2) => JSON.stringify(tool2));
+                      return (_a19 = toolsAndToolChoice.tools) == null ? void 0 : _a19.map(
+                        (tool2) => JSON.stringify(tool2)
+                      );
                     }
                   },
                   "ai.prompt.toolChoice": {
-                    input: () => mode.toolChoice != null ? JSON.stringify(mode.toolChoice) : void 0
+                    input: () => toolsAndToolChoice.toolChoice != null ? JSON.stringify(toolsAndToolChoice.toolChoice) : void 0
                   },
                   // standardized gen-ai llm span attributes:
                   "gen_ai.system": model.provider,
@@ -5528,12 +5528,12 @@ var DefaultStreamTextResult = class {
                 // get before the call
                 doStreamSpan: doStreamSpan2,
                 result: await model.doStream({
-                  mode,
                   ...prepareCallSettings(settings),
+                  ...toolsAndToolChoice,
                   inputFormat: promptFormat,
                   responseFormat: output == null ? void 0 : output.responseFormat({ model }),
                   prompt: promptMessages,
-                  providerMetadata: providerOptions,
+                  providerOptions,
                   abortSignal,
                   headers
                 })
@@ -6283,9 +6283,9 @@ function defaultSettingsMiddleware({
       return {
         ...settings,
         ...params,
-        providerMetadata: mergeObjects(
-          settings.providerMetadata,
-          params.providerMetadata
+        providerOptions: mergeObjects(
+          settings.providerOptions,
+          params.providerOptions
         ),
         // special case for temperature 0
         // TODO remove when temperature defaults to undefined