@ai-sdk/openai-compatible 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/openai-compatible
 
+## 0.2.6
+
+### Patch Changes
+
+- Updated dependencies [2c19b9a]
+  - @ai-sdk/provider-utils@2.2.4
+
+## 0.2.5
+
+### Patch Changes
+
+- d186cca: feat (provider/openai-compatible): add additional token usage metrics
+
 ## 0.2.4
 
 ### Patch Changes

package/dist/index.js

@@ -381,7 +381,7 @@ var OpenAICompatibleChatLanguageModel = class {
     }
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const { args, warnings } = this.getArgs({ ...options });
     const body = JSON.stringify(args);
     const {
@@ -404,13 +404,30 @@ var OpenAICompatibleChatLanguageModel = class {
     });
     const { messages: rawPrompt, ...rawSettings } = args;
     const choice = responseBody.choices[0];
-    const providerMetadata = (_b = (_a = this.config.metadataExtractor) == null ? void 0 : _a.extractMetadata) == null ? void 0 : _b.call(_a, {
-      parsedBody: rawResponse
-    });
+    const providerMetadata = {
+      [this.providerOptionsName]: {},
+      ...(_b = (_a = this.config.metadataExtractor) == null ? void 0 : _a.extractMetadata) == null ? void 0 : _b.call(_a, {
+        parsedBody: rawResponse
+      })
+    };
+    const completionTokenDetails = (_c = responseBody.usage) == null ? void 0 : _c.completion_tokens_details;
+    const promptTokenDetails = (_d = responseBody.usage) == null ? void 0 : _d.prompt_tokens_details;
+    if ((completionTokenDetails == null ? void 0 : completionTokenDetails.reasoning_tokens) != null) {
+      providerMetadata[this.providerOptionsName].reasoningTokens = completionTokenDetails == null ? void 0 : completionTokenDetails.reasoning_tokens;
+    }
+    if ((completionTokenDetails == null ? void 0 : completionTokenDetails.accepted_prediction_tokens) != null) {
+      providerMetadata[this.providerOptionsName].acceptedPredictionTokens = completionTokenDetails == null ? void 0 : completionTokenDetails.accepted_prediction_tokens;
+    }
+    if ((completionTokenDetails == null ? void 0 : completionTokenDetails.rejected_prediction_tokens) != null) {
+      providerMetadata[this.providerOptionsName].rejectedPredictionTokens = completionTokenDetails == null ? void 0 : completionTokenDetails.rejected_prediction_tokens;
+    }
+    if ((promptTokenDetails == null ? void 0 : promptTokenDetails.cached_tokens) != null) {
+      providerMetadata[this.providerOptionsName].cachedPromptTokens = promptTokenDetails == null ? void 0 : promptTokenDetails.cached_tokens;
+    }
     return {
-      text: (_c = choice.message.content) != null ? _c : void 0,
-      reasoning: (_d = choice.message.reasoning_content) != null ? _d : void 0,
-      toolCalls: (_e = choice.message.tool_calls) == null ? void 0 : _e.map((toolCall) => {
+      text: (_e = choice.message.content) != null ? _e : void 0,
+      reasoning: (_f = choice.message.reasoning_content) != null ? _f : void 0,
+      toolCalls: (_g = choice.message.tool_calls) == null ? void 0 : _g.map((toolCall) => {
         var _a2;
         return {
           toolCallType: "function",
@@ -421,10 +438,10 @@ var OpenAICompatibleChatLanguageModel = class {
       }),
       finishReason: mapOpenAICompatibleFinishReason(choice.finish_reason),
       usage: {
-        promptTokens: (_g = (_f = responseBody.usage) == null ? void 0 : _f.prompt_tokens) != null ? _g : NaN,
-        completionTokens: (_i = (_h = responseBody.usage) == null ? void 0 : _h.completion_tokens) != null ? _i : NaN
+        promptTokens: (_i = (_h = responseBody.usage) == null ? void 0 : _h.prompt_tokens) != null ? _i : NaN,
+        completionTokens: (_k = (_j = responseBody.usage) == null ? void 0 : _j.completion_tokens) != null ? _k : NaN
       },
-      ...providerMetadata && { providerMetadata },
+      providerMetadata,
       rawCall: { rawPrompt, rawSettings },
       rawResponse: { headers: responseHeaders, body: rawResponse },
       response: getResponseMetadata(responseBody),
@@ -511,16 +528,25 @@ var OpenAICompatibleChatLanguageModel = class {
     const toolCalls = [];
     let finishReason = "unknown";
     let usage = {
+      completionTokens: void 0,
+      completionTokensDetails: {
+        reasoningTokens: void 0,
+        acceptedPredictionTokens: void 0,
+        rejectedPredictionTokens: void 0
+      },
       promptTokens: void 0,
-      completionTokens: void 0
+      promptTokensDetails: {
+        cachedTokens: void 0
+      }
     };
     let isFirstChunk = true;
+    let providerOptionsName = this.providerOptionsName;
     return {
       stream: response.pipeThrough(
         new TransformStream({
           // TODO we lost type safety on Chunk, most likely due to the error schema. MUST FIX
           transform(chunk, controller) {
-            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
             if (!chunk.success) {
               finishReason = "error";
               controller.enqueue({ type: "error", error: chunk.error });
@@ -541,10 +567,26 @@ var OpenAICompatibleChatLanguageModel = class {
               });
             }
             if (value.usage != null) {
-              usage = {
-                promptTokens: (_a2 = value.usage.prompt_tokens) != null ? _a2 : void 0,
-                completionTokens: (_b = value.usage.completion_tokens) != null ? _b : void 0
-              };
+              const {
+                prompt_tokens,
+                completion_tokens,
+                prompt_tokens_details,
+                completion_tokens_details
+              } = value.usage;
+              usage.promptTokens = prompt_tokens != null ? prompt_tokens : void 0;
+              usage.completionTokens = completion_tokens != null ? completion_tokens : void 0;
+              if ((completion_tokens_details == null ? void 0 : completion_tokens_details.reasoning_tokens) != null) {
+                usage.completionTokensDetails.reasoningTokens = completion_tokens_details == null ? void 0 : completion_tokens_details.reasoning_tokens;
+              }
+              if ((completion_tokens_details == null ? void 0 : completion_tokens_details.accepted_prediction_tokens) != null) {
+                usage.completionTokensDetails.acceptedPredictionTokens = completion_tokens_details == null ? void 0 : completion_tokens_details.accepted_prediction_tokens;
+              }
+              if ((completion_tokens_details == null ? void 0 : completion_tokens_details.rejected_prediction_tokens) != null) {
+                usage.completionTokensDetails.rejectedPredictionTokens = completion_tokens_details == null ? void 0 : completion_tokens_details.rejected_prediction_tokens;
+              }
+              if ((prompt_tokens_details == null ? void 0 : prompt_tokens_details.cached_tokens) != null) {
+                usage.promptTokensDetails.cachedTokens = prompt_tokens_details == null ? void 0 : prompt_tokens_details.cached_tokens;
+              }
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
@@ -584,7 +626,7 @@ var OpenAICompatibleChatLanguageModel = class {
                       message: `Expected 'id' to be a string.`
                     });
                   }
-                  if (((_c = toolCallDelta.function) == null ? void 0 : _c.name) == null) {
+                  if (((_a2 = toolCallDelta.function) == null ? void 0 : _a2.name) == null) {
                     throw new import_provider3.InvalidResponseDataError({
                       data: toolCallDelta,
                       message: `Expected 'function.name' to be a string.`
@@ -595,12 +637,12 @@ var OpenAICompatibleChatLanguageModel = class {
                     type: "function",
                     function: {
                       name: toolCallDelta.function.name,
-                      arguments: (_d = toolCallDelta.function.arguments) != null ? _d : ""
+                      arguments: (_b = toolCallDelta.function.arguments) != null ? _b : ""
                     },
                     hasFinished: false
                   };
                   const toolCall2 = toolCalls[index];
-                  if (((_e = toolCall2.function) == null ? void 0 : _e.name) != null && ((_f = toolCall2.function) == null ? void 0 : _f.arguments) != null) {
+                  if (((_c = toolCall2.function) == null ? void 0 : _c.name) != null && ((_d = toolCall2.function) == null ? void 0 : _d.arguments) != null) {
                     if (toolCall2.function.arguments.length > 0) {
                       controller.enqueue({
                         type: "tool-call-delta",
@@ -614,7 +656,7 @@ var OpenAICompatibleChatLanguageModel = class {
                       controller.enqueue({
                         type: "tool-call",
                         toolCallType: "function",
-                        toolCallId: (_g = toolCall2.id) != null ? _g : (0, import_provider_utils2.generateId)(),
+                        toolCallId: (_e = toolCall2.id) != null ? _e : (0, import_provider_utils2.generateId)(),
                         toolName: toolCall2.function.name,
                         args: toolCall2.function.arguments
                       });
@@ -627,21 +669,21 @@ var OpenAICompatibleChatLanguageModel = class {
                 if (toolCall.hasFinished) {
                   continue;
                 }
-                if (((_h = toolCallDelta.function) == null ? void 0 : _h.arguments) != null) {
-                  toolCall.function.arguments += (_j = (_i = toolCallDelta.function) == null ? void 0 : _i.arguments) != null ? _j : "";
+                if (((_f = toolCallDelta.function) == null ? void 0 : _f.arguments) != null) {
+                  toolCall.function.arguments += (_h = (_g = toolCallDelta.function) == null ? void 0 : _g.arguments) != null ? _h : "";
                 }
                 controller.enqueue({
                   type: "tool-call-delta",
                   toolCallType: "function",
                   toolCallId: toolCall.id,
                   toolName: toolCall.function.name,
-                  argsTextDelta: (_k = toolCallDelta.function.arguments) != null ? _k : ""
+                  argsTextDelta: (_i = toolCallDelta.function.arguments) != null ? _i : ""
                 });
-                if (((_l = toolCall.function) == null ? void 0 : _l.name) != null && ((_m = toolCall.function) == null ? void 0 : _m.arguments) != null && (0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
+                if (((_j = toolCall.function) == null ? void 0 : _j.name) != null && ((_k = toolCall.function) == null ? void 0 : _k.arguments) != null && (0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
                   controller.enqueue({
                     type: "tool-call",
                     toolCallType: "function",
-                    toolCallId: (_n = toolCall.id) != null ? _n : (0, import_provider_utils2.generateId)(),
+                    toolCallId: (_l = toolCall.id) != null ? _l : (0, import_provider_utils2.generateId)(),
                     toolName: toolCall.function.name,
                     args: toolCall.function.arguments
                   });
@@ -652,7 +694,22 @@ var OpenAICompatibleChatLanguageModel = class {
           },
           flush(controller) {
             var _a2, _b;
-            const metadata = metadataExtractor == null ? void 0 : metadataExtractor.buildMetadata();
+            const providerMetadata = {
+              [providerOptionsName]: {},
+              ...metadataExtractor == null ? void 0 : metadataExtractor.buildMetadata()
+            };
+            if (usage.completionTokensDetails.reasoningTokens != null) {
+              providerMetadata[providerOptionsName].reasoningTokens = usage.completionTokensDetails.reasoningTokens;
+            }
+            if (usage.completionTokensDetails.acceptedPredictionTokens != null) {
+              providerMetadata[providerOptionsName].acceptedPredictionTokens = usage.completionTokensDetails.acceptedPredictionTokens;
+            }
+            if (usage.completionTokensDetails.rejectedPredictionTokens != null) {
+              providerMetadata[providerOptionsName].rejectedPredictionTokens = usage.completionTokensDetails.rejectedPredictionTokens;
+            }
+            if (usage.promptTokensDetails.cachedTokens != null) {
+              providerMetadata[providerOptionsName].cachedPromptTokens = usage.promptTokensDetails.cachedTokens;
+            }
             controller.enqueue({
               type: "finish",
               finishReason,
@@ -660,7 +717,7 @@ var OpenAICompatibleChatLanguageModel = class {
                 promptTokens: (_a2 = usage.promptTokens) != null ? _a2 : NaN,
                 completionTokens: (_b = usage.completionTokens) != null ? _b : NaN
               },
-              ...metadata && { providerMetadata: metadata }
+              providerMetadata
             });
           }
         })
@@ -672,6 +729,18 @@ var OpenAICompatibleChatLanguageModel = class {
     };
   }
 };
+var openaiCompatibleTokenUsageSchema = import_zod2.z.object({
+  prompt_tokens: import_zod2.z.number().nullish(),
+  completion_tokens: import_zod2.z.number().nullish(),
+  prompt_tokens_details: import_zod2.z.object({
+    cached_tokens: import_zod2.z.number().nullish()
+  }).nullish(),
+  completion_tokens_details: import_zod2.z.object({
+    reasoning_tokens: import_zod2.z.number().nullish(),
+    accepted_prediction_tokens: import_zod2.z.number().nullish(),
+    rejected_prediction_tokens: import_zod2.z.number().nullish()
+  }).nullish()
+}).nullish();
 var OpenAICompatibleChatResponseSchema = import_zod2.z.object({
   id: import_zod2.z.string().nullish(),
   created: import_zod2.z.number().nullish(),
@@ -696,10 +765,7 @@ var OpenAICompatibleChatResponseSchema = import_zod2.z.object({
       finish_reason: import_zod2.z.string().nullish()
     })
   ),
-  usage: import_zod2.z.object({
-    prompt_tokens: import_zod2.z.number().nullish(),
-    completion_tokens: import_zod2.z.number().nullish()
-  }).nullish()
+  usage: openaiCompatibleTokenUsageSchema
 });
 var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_zod2.z.union([
   import_zod2.z.object({
@@ -727,10 +793,7 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_zod2.z.union
         finish_reason: import_zod2.z.string().nullish()
       })
     ),
-    usage: import_zod2.z.object({
-      prompt_tokens: import_zod2.z.number().nullish(),
-      completion_tokens: import_zod2.z.number().nullish()
-    }).nullish()
+    usage: openaiCompatibleTokenUsageSchema
   }),
   errorSchema
 ]);