@ai-sdk/openai 3.0.0-beta.88 → 3.0.0-beta.89

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @ai-sdk/openai
 
+## 3.0.0-beta.89
+
+### Patch Changes
+
+- 3bd2689: feat: extended token usage
+- Updated dependencies [3bd2689]
+  - @ai-sdk/provider@3.0.0-beta.26
+  - @ai-sdk/provider-utils@4.0.0-beta.45
+
 ## 3.0.0-beta.88
 
 ### Patch Changes

package/dist/index.js

@@ -68,6 +68,45 @@ function getOpenAILanguageModelCapabilities(modelId) {
   };
 }
 
+// src/chat/convert-openai-chat-usage.ts
+function convertOpenAIChatUsage(usage) {
+  var _a, _b, _c, _d, _e, _f;
+  if (usage == null) {
+    return {
+      inputTokens: {
+        total: void 0,
+        noCache: void 0,
+        cacheRead: void 0,
+        cacheWrite: void 0
+      },
+      outputTokens: {
+        total: void 0,
+        text: void 0,
+        reasoning: void 0
+      },
+      raw: void 0
+    };
+  }
+  const promptTokens = (_a = usage.prompt_tokens) != null ? _a : 0;
+  const completionTokens = (_b = usage.completion_tokens) != null ? _b : 0;
+  const cachedTokens = (_d = (_c = usage.prompt_tokens_details) == null ? void 0 : _c.cached_tokens) != null ? _d : 0;
+  const reasoningTokens = (_f = (_e = usage.completion_tokens_details) == null ? void 0 : _e.reasoning_tokens) != null ? _f : 0;
+  return {
+    inputTokens: {
+      total: promptTokens,
+      noCache: promptTokens - cachedTokens,
+      cacheRead: cachedTokens,
+      cacheWrite: void 0
+    },
+    outputTokens: {
+      total: completionTokens,
+      text: completionTokens - reasoningTokens,
+      reasoning: reasoningTokens
+    },
+    raw: usage
+  };
+}
+
 // src/chat/convert-to-openai-chat-messages.ts
 var import_provider = require("@ai-sdk/provider");
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
@@ -774,7 +813,7 @@ var OpenAIChatLanguageModel = class {
     };
   }
   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;
     const { args: body, warnings } = await this.getArgs(options);
     const {
       responseHeaders,
@@ -832,13 +871,7 @@ var OpenAIChatLanguageModel = class {
     return {
       content,
       finishReason: mapOpenAIFinishReason(choice.finish_reason),
-      usage: {
-        inputTokens: (_h = (_g = response.usage) == null ? void 0 : _g.prompt_tokens) != null ? _h : void 0,
-        outputTokens: (_j = (_i = response.usage) == null ? void 0 : _i.completion_tokens) != null ? _j : void 0,
-        totalTokens: (_l = (_k = response.usage) == null ? void 0 : _k.total_tokens) != null ? _l : void 0,
-        reasoningTokens: (_m = completionTokenDetails == null ? void 0 : completionTokenDetails.reasoning_tokens) != null ? _m : void 0,
-        cachedInputTokens: (_n = promptTokenDetails == null ? void 0 : promptTokenDetails.cached_tokens) != null ? _n : void 0
-      },
+      usage: convertOpenAIChatUsage(response.usage),
       request: { body },
       response: {
         ...getResponseMetadata(response),
@@ -874,11 +907,7 @@ var OpenAIChatLanguageModel = class {
     });
     const toolCalls = [];
     let finishReason = "unknown";
-    const usage = {
-      inputTokens: void 0,
-      outputTokens: void 0,
-      totalTokens: void 0
-    };
+    let usage = void 0;
     let metadataExtracted = false;
     let isActiveText = false;
     const providerMetadata = { openai: {} };
@@ -889,7 +918,7 @@ var OpenAIChatLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -915,23 +944,19 @@ var OpenAIChatLanguageModel = class {
               }
             }
             if (value.usage != null) {
-              usage.inputTokens = (_a = value.usage.prompt_tokens) != null ? _a : void 0;
-              usage.outputTokens = (_b = value.usage.completion_tokens) != null ? _b : void 0;
-              usage.totalTokens = (_c = value.usage.total_tokens) != null ? _c : void 0;
-              usage.reasoningTokens = (_e = (_d = value.usage.completion_tokens_details) == null ? void 0 : _d.reasoning_tokens) != null ? _e : void 0;
-              usage.cachedInputTokens = (_g = (_f = value.usage.prompt_tokens_details) == null ? void 0 : _f.cached_tokens) != null ? _g : void 0;
-              if (((_h = value.usage.completion_tokens_details) == null ? void 0 : _h.accepted_prediction_tokens) != null) {
-                providerMetadata.openai.acceptedPredictionTokens = (_i = value.usage.completion_tokens_details) == null ? void 0 : _i.accepted_prediction_tokens;
+              usage = value.usage;
+              if (((_a = value.usage.completion_tokens_details) == null ? void 0 : _a.accepted_prediction_tokens) != null) {
+                providerMetadata.openai.acceptedPredictionTokens = (_b = value.usage.completion_tokens_details) == null ? void 0 : _b.accepted_prediction_tokens;
               }
-              if (((_j = value.usage.completion_tokens_details) == null ? void 0 : _j.rejected_prediction_tokens) != null) {
-                providerMetadata.openai.rejectedPredictionTokens = (_k = value.usage.completion_tokens_details) == null ? void 0 : _k.rejected_prediction_tokens;
+              if (((_c = value.usage.completion_tokens_details) == null ? void 0 : _c.rejected_prediction_tokens) != null) {
+                providerMetadata.openai.rejectedPredictionTokens = (_d = value.usage.completion_tokens_details) == null ? void 0 : _d.rejected_prediction_tokens;
               }
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
               finishReason = mapOpenAIFinishReason(choice.finish_reason);
             }
-            if (((_l = choice == null ? void 0 : choice.logprobs) == null ? void 0 : _l.content) != null) {
+            if (((_e = choice == null ? void 0 : choice.logprobs) == null ? void 0 : _e.content) != null) {
               providerMetadata.openai.logprobs = choice.logprobs.content;
             }
             if ((choice == null ? void 0 : choice.delta) == null) {
@@ -965,7 +990,7 @@ var OpenAIChatLanguageModel = class {
                       message: `Expected 'id' to be a string.`
                     });
                   }
-                  if (((_m = toolCallDelta.function) == null ? void 0 : _m.name) == null) {
+                  if (((_f = toolCallDelta.function) == null ? void 0 : _f.name) == null) {
                     throw new import_provider3.InvalidResponseDataError({
                       data: toolCallDelta,
                       message: `Expected 'function.name' to be a string.`
@@ -981,12 +1006,12 @@ var OpenAIChatLanguageModel = class {
                     type: "function",
                     function: {
                       name: toolCallDelta.function.name,
-                      arguments: (_n = toolCallDelta.function.arguments) != null ? _n : ""
+                      arguments: (_g = toolCallDelta.function.arguments) != null ? _g : ""
                     },
                     hasFinished: false
                   };
                   const toolCall2 = toolCalls[index];
-                  if (((_o = toolCall2.function) == null ? void 0 : _o.name) != null && ((_p = toolCall2.function) == null ? void 0 : _p.arguments) != null) {
+                  if (((_h = toolCall2.function) == null ? void 0 : _h.name) != null && ((_i = toolCall2.function) == null ? void 0 : _i.arguments) != null) {
                     if (toolCall2.function.arguments.length > 0) {
                       controller.enqueue({
                         type: "tool-input-delta",
@@ -1001,7 +1026,7 @@ var OpenAIChatLanguageModel = class {
                       });
                       controller.enqueue({
                         type: "tool-call",
-                        toolCallId: (_q = toolCall2.id) != null ? _q : (0, import_provider_utils5.generateId)(),
+                        toolCallId: (_j = toolCall2.id) != null ? _j : (0, import_provider_utils5.generateId)(),
                         toolName: toolCall2.function.name,
                         input: toolCall2.function.arguments
                       });
@@ -1014,22 +1039,22 @@ var OpenAIChatLanguageModel = class {
                 if (toolCall.hasFinished) {
                   continue;
                 }
-                if (((_r = toolCallDelta.function) == null ? void 0 : _r.arguments) != null) {
-                  toolCall.function.arguments += (_t = (_s = toolCallDelta.function) == null ? void 0 : _s.arguments) != null ? _t : "";
+                if (((_k = toolCallDelta.function) == null ? void 0 : _k.arguments) != null) {
+                  toolCall.function.arguments += (_m = (_l = toolCallDelta.function) == null ? void 0 : _l.arguments) != null ? _m : "";
                 }
                 controller.enqueue({
                   type: "tool-input-delta",
                   id: toolCall.id,
-                  delta: (_u = toolCallDelta.function.arguments) != null ? _u : ""
+                  delta: (_n = toolCallDelta.function.arguments) != null ? _n : ""
                 });
-                if (((_v = toolCall.function) == null ? void 0 : _v.name) != null && ((_w = toolCall.function) == null ? void 0 : _w.arguments) != null && (0, import_provider_utils5.isParsableJson)(toolCall.function.arguments)) {
+                if (((_o = toolCall.function) == null ? void 0 : _o.name) != null && ((_p = toolCall.function) == null ? void 0 : _p.arguments) != null && (0, import_provider_utils5.isParsableJson)(toolCall.function.arguments)) {
                   controller.enqueue({
                     type: "tool-input-end",
                     id: toolCall.id
                   });
                   controller.enqueue({
                     type: "tool-call",
-                    toolCallId: (_x = toolCall.id) != null ? _x : (0, import_provider_utils5.generateId)(),
+                    toolCallId: (_q = toolCall.id) != null ? _q : (0, import_provider_utils5.generateId)(),
                     toolName: toolCall.function.name,
                     input: toolCall.function.arguments
                   });
@@ -1056,7 +1081,7 @@ var OpenAIChatLanguageModel = class {
             controller.enqueue({
               type: "finish",
               finishReason,
-              usage,
+              usage: convertOpenAIChatUsage(usage),
               ...providerMetadata != null ? { providerMetadata } : {}
             });
           }
@@ -1071,6 +1096,43 @@ var OpenAIChatLanguageModel = class {
 // src/completion/openai-completion-language-model.ts
 var import_provider_utils8 = require("@ai-sdk/provider-utils");
 
+// src/completion/convert-openai-completion-usage.ts
+function convertOpenAICompletionUsage(usage) {
+  var _a, _b, _c, _d;
+  if (usage == null) {
+    return {
+      inputTokens: {
+        total: void 0,
+        noCache: void 0,
+        cacheRead: void 0,
+        cacheWrite: void 0
+      },
+      outputTokens: {
+        total: void 0,
+        text: void 0,
+        reasoning: void 0
+      },
+      raw: void 0
+    };
+  }
+  const promptTokens = (_a = usage.prompt_tokens) != null ? _a : 0;
+  const completionTokens = (_b = usage.completion_tokens) != null ? _b : 0;
+  return {
+    inputTokens: {
+      total: (_c = usage.prompt_tokens) != null ? _c : void 0,
+      noCache: promptTokens,
+      cacheRead: void 0,
+      cacheWrite: void 0
+    },
+    outputTokens: {
+      total: (_d = usage.completion_tokens) != null ? _d : void 0,
+      text: completionTokens,
+      reasoning: void 0
+    },
+    raw: usage
+  };
+}
+
 // src/completion/convert-to-openai-completion-prompt.ts
 var import_provider4 = require("@ai-sdk/provider");
 function convertToOpenAICompletionPrompt({
@@ -1370,7 +1432,6 @@ var OpenAICompletionLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c;
     const { args, warnings } = await this.getArgs(options);
     const {
       responseHeaders,
@@ -1397,11 +1458,7 @@ var OpenAICompletionLanguageModel = class {
     }
     return {
       content: [{ type: "text", text: choice.text }],
-      usage: {
-        inputTokens: (_a = response.usage) == null ? void 0 : _a.prompt_tokens,
-        outputTokens: (_b = response.usage) == null ? void 0 : _b.completion_tokens,
-        totalTokens: (_c = response.usage) == null ? void 0 : _c.total_tokens
-      },
+      usage: convertOpenAICompletionUsage(response.usage),
       finishReason: mapOpenAIFinishReason2(choice.finish_reason),
       request: { body: args },
       response: {
@@ -1438,11 +1495,7 @@ var OpenAICompletionLanguageModel = class {
     });
     let finishReason = "unknown";
     const providerMetadata = { openai: {} };
-    const usage = {
-      inputTokens: void 0,
-      outputTokens: void 0,
-      totalTokens: void 0
-    };
+    let usage = void 0;
     let isFirstChunk = true;
     return {
       stream: response.pipeThrough(
@@ -1474,9 +1527,7 @@ var OpenAICompletionLanguageModel = class {
               controller.enqueue({ type: "text-start", id: "0" });
             }
             if (value.usage != null) {
-              usage.inputTokens = value.usage.prompt_tokens;
-              usage.outputTokens = value.usage.completion_tokens;
-              usage.totalTokens = value.usage.total_tokens;
+              usage = value.usage;
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
@@ -1501,7 +1552,7 @@ var OpenAICompletionLanguageModel = class {
               type: "finish",
               finishReason,
               providerMetadata,
-              usage
+              usage: convertOpenAICompletionUsage(usage)
             });
           }
         })
@@ -2270,6 +2321,45 @@ var openaiTools = {
 var import_provider8 = require("@ai-sdk/provider");
 var import_provider_utils27 = require("@ai-sdk/provider-utils");
 
+// src/responses/convert-openai-responses-usage.ts
+function convertOpenAIResponsesUsage(usage) {
+  var _a, _b, _c, _d;
+  if (usage == null) {
+    return {
+      inputTokens: {
+        total: void 0,
+        noCache: void 0,
+        cacheRead: void 0,
+        cacheWrite: void 0
+      },
+      outputTokens: {
+        total: void 0,
+        text: void 0,
+        reasoning: void 0
+      },
+      raw: void 0
+    };
+  }
+  const inputTokens = usage.input_tokens;
+  const outputTokens = usage.output_tokens;
+  const cachedTokens = (_b = (_a = usage.input_tokens_details) == null ? void 0 : _a.cached_tokens) != null ? _b : 0;
+  const reasoningTokens = (_d = (_c = usage.output_tokens_details) == null ? void 0 : _c.reasoning_tokens) != null ? _d : 0;
+  return {
+    inputTokens: {
+      total: inputTokens,
+      noCache: inputTokens - cachedTokens,
+      cacheRead: cachedTokens,
+      cacheWrite: void 0
+    },
+    outputTokens: {
+      total: outputTokens,
+      text: outputTokens - reasoningTokens,
+      reasoning: reasoningTokens
+    },
+    raw: usage
+  };
+}
+
 // src/responses/convert-to-openai-responses-input.ts
 var import_provider6 = require("@ai-sdk/provider");
 var import_provider_utils23 = require("@ai-sdk/provider-utils");
@@ -3929,7 +4019,7 @@ var OpenAIResponsesLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
     const {
       args: body,
       warnings,
@@ -4330,13 +4420,7 @@ var OpenAIResponsesLanguageModel = class {
         finishReason: (_x = response.incomplete_details) == null ? void 0 : _x.reason,
         hasFunctionCall
       }),
-      usage: {
-        inputTokens: usage.input_tokens,
-        outputTokens: usage.output_tokens,
-        totalTokens: usage.input_tokens + usage.output_tokens,
-        reasoningTokens: (_z = (_y = usage.output_tokens_details) == null ? void 0 : _y.reasoning_tokens) != null ? _z : void 0,
-        cachedInputTokens: (_B = (_A = usage.input_tokens_details) == null ? void 0 : _A.cached_tokens) != null ? _B : void 0
-      },
+      usage: convertOpenAIResponsesUsage(usage),
       request: { body },
       response: {
         id: response.id,
@@ -4377,11 +4461,7 @@ var OpenAIResponsesLanguageModel = class {
     const self = this;
     const providerKey = this.config.provider.replace(".responses", "");
     let finishReason = "unknown";
-    const usage = {
-      inputTokens: void 0,
-      outputTokens: void 0,
-      totalTokens: void 0
-    };
+    let usage = void 0;
     const logprobs = [];
     let responseId = null;
     const ongoingToolCalls = {};
@@ -4396,7 +4476,7 @@ var OpenAIResponsesLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -4904,11 +4984,7 @@ var OpenAIResponsesLanguageModel = class {
                 finishReason: (_i = value.response.incomplete_details) == null ? void 0 : _i.reason,
                 hasFunctionCall
               });
-              usage.inputTokens = value.response.usage.input_tokens;
-              usage.outputTokens = value.response.usage.output_tokens;
-              usage.totalTokens = value.response.usage.input_tokens + value.response.usage.output_tokens;
-              usage.reasoningTokens = (_k = (_j = value.response.usage.output_tokens_details) == null ? void 0 : _j.reasoning_tokens) != null ? _k : void 0;
-              usage.cachedInputTokens = (_m = (_l = value.response.usage.input_tokens_details) == null ? void 0 : _l.cached_tokens) != null ? _m : void 0;
+              usage = value.response.usage;
               if (typeof value.response.service_tier === "string") {
                 serviceTier = value.response.service_tier;
               }
@@ -4918,7 +4994,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "url",
-                  id: (_p = (_o = (_n = self.config).generateId) == null ? void 0 : _o.call(_n)) != null ? _p : (0, import_provider_utils27.generateId)(),
+                  id: (_l = (_k = (_j = self.config).generateId) == null ? void 0 : _k.call(_j)) != null ? _l : (0, import_provider_utils27.generateId)(),
                   url: value.annotation.url,
                   title: value.annotation.title
                 });
@@ -4926,10 +5002,10 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_s = (_r = (_q = self.config).generateId) == null ? void 0 : _r.call(_q)) != null ? _s : (0, import_provider_utils27.generateId)(),
+                  id: (_o = (_n = (_m = self.config).generateId) == null ? void 0 : _n.call(_m)) != null ? _o : (0, import_provider_utils27.generateId)(),
                   mediaType: "text/plain",
-                  title: (_u = (_t = value.annotation.quote) != null ? _t : value.annotation.filename) != null ? _u : "Document",
-                  filename: (_v = value.annotation.filename) != null ? _v : value.annotation.file_id,
+                  title: (_q = (_p = value.annotation.quote) != null ? _p : value.annotation.filename) != null ? _q : "Document",
+                  filename: (_r = value.annotation.filename) != null ? _r : value.annotation.file_id,
                   ...value.annotation.file_id ? {
                     providerMetadata: {
                       [providerKey]: {
@@ -4942,10 +5018,10 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_y = (_x = (_w = self.config).generateId) == null ? void 0 : _x.call(_w)) != null ? _y : (0, import_provider_utils27.generateId)(),
+                  id: (_u = (_t = (_s = self.config).generateId) == null ? void 0 : _t.call(_s)) != null ? _u : (0, import_provider_utils27.generateId)(),
                   mediaType: "text/plain",
-                  title: (_A = (_z = value.annotation.filename) != null ? _z : value.annotation.file_id) != null ? _A : "Document",
-                  filename: (_B = value.annotation.filename) != null ? _B : value.annotation.file_id,
+                  title: (_w = (_v = value.annotation.filename) != null ? _v : value.annotation.file_id) != null ? _w : "Document",
+                  filename: (_x = value.annotation.filename) != null ? _x : value.annotation.file_id,
                   providerMetadata: {
                     [providerKey]: {
                       fileId: value.annotation.file_id,
@@ -4958,7 +5034,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_E = (_D = (_C = self.config).generateId) == null ? void 0 : _D.call(_C)) != null ? _E : (0, import_provider_utils27.generateId)(),
+                  id: (_A = (_z = (_y = self.config).generateId) == null ? void 0 : _z.call(_y)) != null ? _A : (0, import_provider_utils27.generateId)(),
                   mediaType: "application/octet-stream",
                   title: value.annotation.file_id,
                   filename: value.annotation.file_id,
@@ -4989,7 +5065,7 @@ var OpenAIResponsesLanguageModel = class {
             controller.enqueue({
               type: "finish",
               finishReason,
-              usage,
+              usage: convertOpenAIResponsesUsage(usage),
               providerMetadata
             });
           }
@@ -5404,7 +5480,7 @@ var OpenAITranscriptionModel = class {
 };
 
 // src/version.ts
-var VERSION = true ? "3.0.0-beta.88" : "0.0.0-test";
+var VERSION = true ? "3.0.0-beta.89" : "0.0.0-test";
 
 // src/openai-provider.ts
 function createOpenAI(options = {}) {