ai 6.0.0-beta.35 → 6.0.0-beta.37

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # ai
 
+## 6.0.0-beta.37
+
+### Patch Changes
+
+- Updated dependencies [7e32fea]
+  - @ai-sdk/provider-utils@4.0.0-beta.12
+  - @ai-sdk/gateway@2.0.0-beta.25
+
+## 6.0.0-beta.36
+
+### Patch Changes
+
+- Updated dependencies [0e29b8b]
+  - @ai-sdk/gateway@2.0.0-beta.24
+
 ## 6.0.0-beta.35
 
 ### Patch Changes

package/dist/index.d.mts

@@ -826,7 +826,7 @@ type PartialObject<ObjectType extends object> = {
 
 interface Output<OUTPUT, PARTIAL> {
     readonly type: 'object' | 'text';
-    responseFormat: LanguageModelV3CallOptions['responseFormat'];
+    responseFormat: PromiseLike<LanguageModelV3CallOptions['responseFormat']>;
     parsePartial(options: {
         text: string;
     }): Promise<{
@@ -980,7 +980,7 @@ type ToolCallRepairFunction<TOOLS extends ToolSet> = (options: {
     tools: TOOLS;
     inputSchema: (options: {
         toolName: string;
-    }) => JSONSchema7;
+    }) => PromiseLike<JSONSchema7>;
     error: NoSuchToolError | InvalidToolInputError;
 }) => Promise<LanguageModelV3ToolCall | null>;
 

package/dist/index.d.ts

@@ -826,7 +826,7 @@ type PartialObject<ObjectType extends object> = {
 
 interface Output<OUTPUT, PARTIAL> {
     readonly type: 'object' | 'text';
-    responseFormat: LanguageModelV3CallOptions['responseFormat'];
+    responseFormat: PromiseLike<LanguageModelV3CallOptions['responseFormat']>;
     parsePartial(options: {
         text: string;
     }): Promise<{
@@ -980,7 +980,7 @@ type ToolCallRepairFunction<TOOLS extends ToolSet> = (options: {
     tools: TOOLS;
     inputSchema: (options: {
         toolName: string;
-    }) => JSONSchema7;
+    }) => PromiseLike<JSONSchema7>;
     error: NoSuchToolError | InvalidToolInputError;
 }) => Promise<LanguageModelV3ToolCall | null>;
 

package/dist/index.js

@@ -823,7 +823,7 @@ function detectMediaType({
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.0-beta.35" : "0.0.0-test";
+var VERSION = true ? "6.0.0-beta.37" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -1320,7 +1320,7 @@ function isNonEmptyObject(object7) {
 }
 
 // src/prompt/prepare-tools-and-tool-choice.ts
-function prepareToolsAndToolChoice({
+async function prepareToolsAndToolChoice({
   tools,
   toolChoice,
   activeTools
@@ -1334,33 +1334,37 @@ function prepareToolsAndToolChoice({
   const filteredTools = activeTools != null ? Object.entries(tools).filter(
     ([name17]) => activeTools.includes(name17)
   ) : Object.entries(tools);
-  return {
-    tools: filteredTools.map(([name17, tool3]) => {
-      const toolType = tool3.type;
-      switch (toolType) {
-        case void 0:
-        case "dynamic":
-        case "function":
-          return {
-            type: "function",
-            name: name17,
-            description: tool3.description,
-            inputSchema: (0, import_provider_utils5.asSchema)(tool3.inputSchema).jsonSchema,
-            providerOptions: tool3.providerOptions
-          };
-        case "provider-defined":
-          return {
-            type: "provider-defined",
-            name: name17,
-            id: tool3.id,
-            args: tool3.args
-          };
-        default: {
-          const exhaustiveCheck = toolType;
-          throw new Error(`Unsupported tool type: ${exhaustiveCheck}`);
-        }
+  const languageModelTools = [];
+  for (const [name17, tool3] of filteredTools) {
+    const toolType = tool3.type;
+    switch (toolType) {
+      case void 0:
+      case "dynamic":
+      case "function":
+        languageModelTools.push({
+          type: "function",
+          name: name17,
+          description: tool3.description,
+          inputSchema: await (0, import_provider_utils5.asSchema)(tool3.inputSchema).jsonSchema,
+          providerOptions: tool3.providerOptions
+        });
+        break;
+      case "provider-defined":
+        languageModelTools.push({
+          type: "provider-defined",
+          name: name17,
+          id: tool3.id,
+          args: tool3.args
+        });
+        break;
+      default: {
+        const exhaustiveCheck = toolType;
+        throw new Error(`Unsupported tool type: ${exhaustiveCheck}`);
       }
-    }),
+    }
+  }
+  return {
+    tools: languageModelTools,
     toolChoice: toolChoice == null ? { type: "auto" } : typeof toolChoice === "string" ? { type: toolChoice } : { type: "tool", toolName: toolChoice.toolName }
   };
 }
@@ -1727,29 +1731,33 @@ function getTracer({
 
 // src/telemetry/record-span.ts
 var import_api2 = require("@opentelemetry/api");
-function recordSpan({
+async function recordSpan({
   name: name17,
   tracer,
   attributes,
   fn,
   endWhenDone = true
 }) {
-  return tracer.startActiveSpan(name17, { attributes }, async (span) => {
-    try {
-      const result = await fn(span);
-      if (endWhenDone) {
-        span.end();
-      }
-      return result;
-    } catch (error) {
+  return tracer.startActiveSpan(
+    name17,
+    { attributes: await attributes },
+    async (span) => {
       try {
-        recordErrorOnSpan(span, error);
-      } finally {
-        span.end();
+        const result = await fn(span);
+        if (endWhenDone) {
+          span.end();
+        }
+        return result;
+      } catch (error) {
+        try {
+          recordErrorOnSpan(span, error);
+        } finally {
+          span.end();
+        }
+        throw error;
       }
-      throw error;
     }
-  });
+  );
 }
 function recordErrorOnSpan(span, error) {
   if (error instanceof Error) {
@@ -1768,33 +1776,41 @@ function recordErrorOnSpan(span, error) {
 }
 
 // src/telemetry/select-telemetry-attributes.ts
-function selectTelemetryAttributes({
+async function selectTelemetryAttributes({
   telemetry,
   attributes
 }) {
   if ((telemetry == null ? void 0 : telemetry.isEnabled) !== true) {
     return {};
   }
-  return Object.entries(attributes).reduce((attributes2, [key, value]) => {
+  const resultAttributes = {};
+  for (const [key, value] of Object.entries(attributes)) {
     if (value == null) {
-      return attributes2;
+      continue;
     }
     if (typeof value === "object" && "input" in value && typeof value.input === "function") {
       if ((telemetry == null ? void 0 : telemetry.recordInputs) === false) {
-        return attributes2;
+        continue;
       }
-      const result = value.input();
-      return result == null ? attributes2 : { ...attributes2, [key]: result };
+      const result = await value.input();
+      if (result != null) {
+        resultAttributes[key] = result;
+      }
+      continue;
     }
     if (typeof value === "object" && "output" in value && typeof value.output === "function") {
       if ((telemetry == null ? void 0 : telemetry.recordOutputs) === false) {
-        return attributes2;
+        continue;
       }
-      const result = value.output();
-      return result == null ? attributes2 : { ...attributes2, [key]: result };
+      const result = await value.output();
+      if (result != null) {
+        resultAttributes[key] = result;
+      }
+      continue;
     }
-    return { ...attributes2, [key]: value };
-  }, {});
+    resultAttributes[key] = value;
+  }
+  return resultAttributes;
 }
 
 // src/telemetry/stringify-for-telemetry.ts
@@ -2101,7 +2117,7 @@ async function executeToolCall({
       }
       try {
         span.setAttributes(
-          selectTelemetryAttributes({
+          await selectTelemetryAttributes({
             telemetry,
             attributes: {
               "ai.toolCall.result": {
@@ -2213,9 +2229,9 @@ async function parseToolCall({
         repairedToolCall = await repairToolCall({
           toolCall,
           tools,
-          inputSchema: ({ toolName }) => {
+          inputSchema: async ({ toolName }) => {
             const { inputSchema } = tools[toolName];
-            return (0, import_provider_utils10.asSchema)(inputSchema).jsonSchema;
+            return await (0, import_provider_utils10.asSchema)(inputSchema).jsonSchema;
           },
           system,
           messages,
@@ -2608,7 +2624,7 @@ async function generateText({
             supportedUrls: await stepModel.supportedUrls,
             download: download2
           });
-          const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
+          const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
             tools,
             toolChoice: (_d = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _d : toolChoice,
             activeTools: (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools
@@ -2659,7 +2675,7 @@ async function generateText({
                     ...callSettings2,
                     tools: stepTools,
                     toolChoice: stepToolChoice,
-                    responseFormat: output == null ? void 0 : output.responseFormat,
+                    responseFormat: await (output == null ? void 0 : output.responseFormat),
                     prompt: promptMessages,
                     providerOptions,
                     abortSignal,
@@ -2673,7 +2689,7 @@ async function generateText({
                     body: (_h = result.response) == null ? void 0 : _h.body
                   };
                   span2.setAttributes(
-                    selectTelemetryAttributes({
+                    await selectTelemetryAttributes({
                       telemetry,
                       attributes: {
                         "ai.response.finishReason": result.finishReason,
@@ -2817,7 +2833,7 @@ async function generateText({
           !await isStopConditionMet({ stopConditions, steps })
         );
         span.setAttributes(
-          selectTelemetryAttributes({
+          await selectTelemetryAttributes({
             telemetry,
             attributes: {
               "ai.response.finishReason": currentModelResponse.finishReason,
@@ -4398,15 +4414,15 @@ async function consumeStream({
 
 // src/util/create-resolvable-promise.ts
 function createResolvablePromise() {
-  let resolve2;
+  let resolve3;
   let reject;
   const promise = new Promise((res, rej) => {
-    resolve2 = res;
+    resolve3 = res;
     reject = rej;
   });
   return {
     promise,
-    resolve: resolve2,
+    resolve: resolve3,
     reject
   };
 }
@@ -4503,13 +4519,13 @@ var DelayedPromise = class {
     if (this._promise) {
       return this._promise;
     }
-    this._promise = new Promise((resolve2, reject) => {
+    this._promise = new Promise((resolve3, reject) => {
       if (this.status.type === "resolved") {
-        resolve2(this.status.value);
+        resolve3(this.status.value);
       } else if (this.status.type === "rejected") {
         reject(this.status.error);
       }
-      this._resolve = resolve2;
+      this._resolve = resolve3;
       this._reject = reject;
     });
     return this._promise;
@@ -5110,7 +5126,7 @@ var DefaultStreamTextResult = class {
             steps: recordedSteps
           }));
           rootSpan.setAttributes(
-            selectTelemetryAttributes({
+            await selectTelemetryAttributes({
               telemetry,
               attributes: {
                 "ai.response.finishReason": finishReason,
@@ -5319,7 +5335,7 @@ var DefaultStreamTextResult = class {
             supportedUrls: await stepModel.supportedUrls,
             download: download2
           });
-          const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
+          const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
             tools,
             toolChoice: (_d = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _d : toolChoice,
             activeTools: (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools
@@ -5375,7 +5391,7 @@ var DefaultStreamTextResult = class {
                   ...callSettings,
                   tools: stepTools,
                   toolChoice: stepToolChoice,
-                  responseFormat: output == null ? void 0 : output.responseFormat,
+                  responseFormat: await (output == null ? void 0 : output.responseFormat),
                   prompt: promptMessages,
                   providerOptions,
                   abortSignal,
@@ -5578,7 +5594,7 @@ var DefaultStreamTextResult = class {
                   const stepToolCallsJson = stepToolCalls.length > 0 ? JSON.stringify(stepToolCalls) : void 0;
                   try {
                     doStreamSpan.setAttributes(
-                      selectTelemetryAttributes({
+                      await selectTelemetryAttributes({
                         telemetry,
                         attributes: {
                           "ai.response.finishReason": stepFinishReason,
@@ -6487,7 +6503,7 @@ async function embed({
               const embedding2 = modelResponse.embeddings[0];
               const usage2 = (_a17 = modelResponse.usage) != null ? _a17 : { tokens: NaN };
               doEmbedSpan.setAttributes(
-                selectTelemetryAttributes({
+                await selectTelemetryAttributes({
                   telemetry,
                   attributes: {
                     "ai.embeddings": {
@@ -6510,7 +6526,7 @@ async function embed({
         )
       );
       span.setAttributes(
-        selectTelemetryAttributes({
+        await selectTelemetryAttributes({
           telemetry,
           attributes: {
             "ai.embedding": { output: () => JSON.stringify(embedding) },
@@ -6631,7 +6647,7 @@ async function embedMany({
                 const embeddings3 = modelResponse.embeddings;
                 const usage2 = (_a18 = modelResponse.usage) != null ? _a18 : { tokens: NaN };
                 doEmbedSpan.setAttributes(
-                  selectTelemetryAttributes({
+                  await selectTelemetryAttributes({
                     telemetry,
                     attributes: {
                       "ai.embeddings": {
@@ -6654,7 +6670,7 @@ async function embedMany({
           }
         );
         span.setAttributes(
-          selectTelemetryAttributes({
+          await selectTelemetryAttributes({
             telemetry,
             attributes: {
               "ai.embeddings": {
@@ -6713,7 +6729,7 @@ async function embedMany({
                   const embeddings2 = modelResponse.embeddings;
                   const usage = (_a18 = modelResponse.usage) != null ? _a18 : { tokens: NaN };
                   doEmbedSpan.setAttributes(
-                    selectTelemetryAttributes({
+                    await selectTelemetryAttributes({
                       telemetry,
                       attributes: {
                         "ai.embeddings": {
@@ -6757,7 +6773,7 @@ async function embedMany({
         }
       }
       span.setAttributes(
-        selectTelemetryAttributes({
+        await selectTelemetryAttributes({
           telemetry,
           attributes: {
             "ai.embeddings": {
@@ -6921,7 +6937,7 @@ var import_provider25 = require("@ai-sdk/provider");
 var import_provider_utils20 = require("@ai-sdk/provider-utils");
 var noSchemaOutputStrategy = {
   type: "no-schema",
-  jsonSchema: void 0,
+  jsonSchema: async () => void 0,
   async validatePartialResult({ value, textDelta }) {
     return { success: true, value: { partial: value, textDelta } };
   },
@@ -6945,7 +6961,7 @@ var noSchemaOutputStrategy = {
 };
 var objectOutputStrategy = (schema) => ({
   type: "object",
-  jsonSchema: schema.jsonSchema,
+  jsonSchema: async () => await schema.jsonSchema,
   async validatePartialResult({ value, textDelta }) {
     return {
       success: true,
@@ -6966,20 +6982,22 @@ var objectOutputStrategy = (schema) => ({
   }
 });
 var arrayOutputStrategy = (schema) => {
-  const { $schema, ...itemSchema } = schema.jsonSchema;
   return {
     type: "enum",
     // wrap in object that contains array of elements, since most LLMs will not
     // be able to generate an array directly:
     // possible future optimization: use arrays directly when model supports grammar-guided generation
-    jsonSchema: {
-      $schema: "http://json-schema.org/draft-07/schema#",
-      type: "object",
-      properties: {
-        elements: { type: "array", items: itemSchema }
-      },
-      required: ["elements"],
-      additionalProperties: false
+    jsonSchema: async () => {
+      const { $schema, ...itemSchema } = await schema.jsonSchema;
+      return {
+        $schema: "http://json-schema.org/draft-07/schema#",
+        type: "object",
+        properties: {
+          elements: { type: "array", items: itemSchema }
+        },
+        required: ["elements"],
+        additionalProperties: false
+      };
     },
     async validatePartialResult({
       value,
@@ -7087,7 +7105,7 @@ var enumOutputStrategy = (enumValues) => {
     // wrap in object that contains result, since most LLMs will not
     // be able to generate an enum value directly:
     // possible future optimization: use enums directly when model supports top-level enums
-    jsonSchema: {
+    jsonSchema: async () => ({
       $schema: "http://json-schema.org/draft-07/schema#",
       type: "object",
       properties: {
@@ -7095,7 +7113,7 @@ var enumOutputStrategy = (enumValues) => {
       },
       required: ["result"],
       additionalProperties: false
-    },
+    }),
     async validateFinalResult(value) {
       if (!(0, import_provider25.isJSONObject)(value) || typeof value.result !== "string") {
         return {
@@ -7406,6 +7424,7 @@ async function generateObject(options) {
     settings: { ...callSettings, maxRetries }
   });
   const tracer = getTracer(telemetry);
+  const jsonSchema3 = await outputStrategy.jsonSchema();
   try {
     return await recordSpan({
       name: "ai.generateObject",
@@ -7421,7 +7440,7 @@ async function generateObject(options) {
           "ai.prompt": {
             input: () => JSON.stringify({ system, prompt, messages })
           },
-          "ai.schema": outputStrategy.jsonSchema != null ? { input: () => JSON.stringify(outputStrategy.jsonSchema) } : void 0,
+          "ai.schema": jsonSchema3 != null ? { input: () => JSON.stringify(jsonSchema3) } : void 0,
           "ai.schema.name": schemaName,
           "ai.schema.description": schemaDescription,
           "ai.settings.output": outputStrategy.type
@@ -7479,7 +7498,7 @@ async function generateObject(options) {
               const result2 = await model.doGenerate({
                 responseFormat: {
                   type: "json",
-                  schema: outputStrategy.jsonSchema,
+                  schema: jsonSchema3,
                   name: schemaName,
                   description: schemaDescription
                 },
@@ -7507,7 +7526,7 @@ async function generateObject(options) {
                 });
               }
               span2.setAttributes(
-                selectTelemetryAttributes({
+                await selectTelemetryAttributes({
                   telemetry,
                   attributes: {
                     "ai.response.finishReason": result2.finishReason,
@@ -7559,7 +7578,7 @@ async function generateObject(options) {
           }
         );
         span.setAttributes(
-          selectTelemetryAttributes({
+          await selectTelemetryAttributes({
             telemetry,
             attributes: {
               "ai.response.finishReason": finishReason,
@@ -7709,11 +7728,11 @@ var SerialJobExecutor = class {
     this.isProcessing = false;
   }
   async run(job) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       this.queue.push(async () => {
         try {
           await job();
-          resolve2();
+          resolve3();
         } catch (error) {
           reject(error);
         }
@@ -7882,7 +7901,9 @@ var DefaultStreamObjectResult = class {
           "ai.prompt": {
             input: () => JSON.stringify({ system, prompt, messages })
           },
-          "ai.schema": outputStrategy.jsonSchema != null ? { input: () => JSON.stringify(outputStrategy.jsonSchema) } : void 0,
+          "ai.schema": {
+            input: async () => JSON.stringify(await outputStrategy.jsonSchema())
+          },
           "ai.schema.name": schemaName,
           "ai.schema.description": schemaDescription,
           "ai.settings.output": outputStrategy.type
@@ -7899,7 +7920,7 @@ var DefaultStreamObjectResult = class {
         const callOptions = {
           responseFormat: {
             type: "json",
-            schema: outputStrategy.jsonSchema,
+            schema: await outputStrategy.jsonSchema(),
             name: schemaName,
             description: schemaDescription
           },
@@ -8102,7 +8123,7 @@ var DefaultStreamObjectResult = class {
                   totalTokens: NaN
                 };
                 doStreamSpan.setAttributes(
-                  selectTelemetryAttributes({
+                  await selectTelemetryAttributes({
                     telemetry,
                     attributes: {
                       "ai.response.finishReason": finishReason,
@@ -8129,7 +8150,7 @@ var DefaultStreamObjectResult = class {
                 );
                 doStreamSpan.end();
                 rootSpan.setAttributes(
-                  selectTelemetryAttributes({
+                  await selectTelemetryAttributes({
                     telemetry,
                     attributes: {
                       "ai.usage.inputTokens": finalUsage.inputTokens,
@@ -8374,7 +8395,7 @@ __export(output_exports, {
 var import_provider_utils26 = require("@ai-sdk/provider-utils");
 var text = () => ({
   type: "text",
-  responseFormat: { type: "text" },
+  responseFormat: Promise.resolve({ type: "text" }),
   async parsePartial({ text: text2 }) {
     return { partial: text2 };
   },
@@ -8388,10 +8409,10 @@ var object3 = ({
   const schema = (0, import_provider_utils26.asSchema)(inputSchema);
   return {
     type: "object",
-    responseFormat: {
+    responseFormat: (0, import_provider_utils26.resolve)(schema.jsonSchema).then((jsonSchema3) => ({
       type: "json",
-      schema: schema.jsonSchema
-    },
+      schema: jsonSchema3
+    })),
     async parsePartial({ text: text2 }) {
       const result = await parsePartialJson(text2);
       switch (result.state) {
@@ -9204,9 +9225,9 @@ var SseMCPTransport = class {
     this.headers = headers;
   }
   async start() {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       if (this.connected) {
-        return resolve2();
+        return resolve3();
       }
       this.abortController = new AbortController();
       const establishConnection = async () => {
@@ -9256,7 +9277,7 @@ var SseMCPTransport = class {
                     });
                   }
                   this.connected = true;
-                  resolve2();
+                  resolve3();
                 } else if (event === "message") {
                   try {
                     const message = JSONRPCMessageSchema.parse(
@@ -9459,7 +9480,7 @@ var DefaultMCPClient = class {
     resultSchema,
     options
   }) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       if (this.isClosed) {
         return reject(
           new MCPClientError({
@@ -9493,7 +9514,7 @@ var DefaultMCPClient = class {
         }
         try {
           const result = resultSchema.parse(response.result);
-          resolve2(result);
+          resolve3(result);
         } catch (error) {
           const parseError = new MCPClientError({
             message: "Failed to parse server response",
@@ -9856,11 +9877,11 @@ async function convertFileListToFileUIParts(files) {
   return Promise.all(
     Array.from(files).map(async (file) => {
       const { name: name17, type } = file;
-      const dataUrl = await new Promise((resolve2, reject) => {
+      const dataUrl = await new Promise((resolve3, reject) => {
         const reader = new FileReader();
         reader.onload = (readerEvent) => {
           var _a17;
-          resolve2((_a17 = readerEvent.target) == null ? void 0 : _a17.result);
+          resolve3((_a17 = readerEvent.target) == null ? void 0 : _a17.result);
         };
         reader.onerror = (error) => reject(error);
         reader.readAsDataURL(file);
@@ -10823,11 +10844,11 @@ function createUIMessageStream({
       errorText: onError(error)
     });
   }
-  const waitForStreams = new Promise(async (resolve2) => {
+  const waitForStreams = new Promise(async (resolve3) => {
     while (ongoingStreamPromises.length > 0) {
       await ongoingStreamPromises.shift();
     }
-    resolve2();
+    resolve3();
   });
   waitForStreams.finally(() => {
     try {