@ai-sdk/openai-compatible 1.0.0-canary.13 → 1.0.0-canary.15

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @ai-sdk/openai-compatible
 
+## 1.0.0-canary.15
+
+### Patch Changes
+
+- Updated dependencies [a571d6e]
+- Updated dependencies [a8c8bd5]
+- Updated dependencies [7979f7f]
+- Updated dependencies [41fa418]
+  - @ai-sdk/provider-utils@3.0.0-canary.15
+  - @ai-sdk/provider@2.0.0-canary.14
+
+## 1.0.0-canary.14
+
+### Patch Changes
+
+- Updated dependencies [957b739]
+- Updated dependencies [9bd5ab5]
+  - @ai-sdk/provider-utils@3.0.0-canary.14
+  - @ai-sdk/provider@2.0.0-canary.13
+
 ## 1.0.0-canary.13
 
 ### Patch Changes

package/README.md

@@ -97,4 +97,4 @@ const { text } = await generateText({
 });
 ```
 
-For more examples, see the [OpenAI Compatible Providers](https://sdk.vercel.ai/providers/openai-compatible-providers) documentation.
+For more examples, see the [OpenAI Compatible Providers](https://ai-sdk.dev/providers/openai-compatible-providers) documentation.

package/dist/index.js

@@ -361,7 +361,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, _l, _m, _n, _o, _p;
     const { args, warnings } = await this.getArgs({ ...options });
     const body = JSON.stringify(args);
     const {
@@ -413,25 +413,21 @@ var OpenAICompatibleChatLanguageModel = class {
       }))
     };
     const completionTokenDetails = (_d = responseBody.usage) == null ? void 0 : _d.completion_tokens_details;
-    const promptTokenDetails = (_e = responseBody.usage) == null ? void 0 : _e.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 {
       content,
       finishReason: mapOpenAICompatibleFinishReason(choice.finish_reason),
       usage: {
-        inputTokens: (_g = (_f = responseBody.usage) == null ? void 0 : _f.prompt_tokens) != null ? _g : void 0,
-        outputTokens: (_i = (_h = responseBody.usage) == null ? void 0 : _h.completion_tokens) != null ? _i : void 0
+        inputTokens: (_f = (_e = responseBody.usage) == null ? void 0 : _e.prompt_tokens) != null ? _f : void 0,
+        outputTokens: (_h = (_g = responseBody.usage) == null ? void 0 : _g.completion_tokens) != null ? _h : void 0,
+        totalTokens: (_j = (_i = responseBody.usage) == null ? void 0 : _i.total_tokens) != null ? _j : void 0,
+        reasoningTokens: (_m = (_l = (_k = responseBody.usage) == null ? void 0 : _k.completion_tokens_details) == null ? void 0 : _l.reasoning_tokens) != null ? _m : void 0,
+        cachedInputTokens: (_p = (_o = (_n = responseBody.usage) == null ? void 0 : _n.prompt_tokens_details) == null ? void 0 : _o.cached_tokens) != null ? _p : void 0
       },
       providerMetadata,
       request: { body },
@@ -469,7 +465,7 @@ var OpenAICompatibleChatLanguageModel = class {
     });
     const toolCalls = [];
     let finishReason = "unknown";
-    let usage = {
+    const usage = {
       completionTokens: void 0,
       completionTokensDetails: {
         reasoningTokens: void 0,
@@ -479,10 +475,11 @@ var OpenAICompatibleChatLanguageModel = class {
       promptTokens: void 0,
       promptTokensDetails: {
         cachedTokens: void 0
-      }
+      },
+      totalTokens: void 0
     };
     let isFirstChunk = true;
-    let providerOptionsName = this.providerOptionsName;
+    const providerOptionsName = this.providerOptionsName;
     return {
       stream: response.pipeThrough(
         new TransformStream({
@@ -515,11 +512,13 @@ var OpenAICompatibleChatLanguageModel = class {
               const {
                 prompt_tokens,
                 completion_tokens,
+                total_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;
+              usage.totalTokens = total_tokens != null ? total_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;
               }
@@ -638,29 +637,26 @@ var OpenAICompatibleChatLanguageModel = class {
             }
           },
           flush(controller) {
-            var _a2, _b;
+            var _a2, _b, _c, _d, _e;
             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,
               usage: {
                 inputTokens: (_a2 = usage.promptTokens) != null ? _a2 : void 0,
-                outputTokens: (_b = usage.completionTokens) != null ? _b : void 0
+                outputTokens: (_b = usage.completionTokens) != null ? _b : void 0,
+                totalTokens: (_c = usage.totalTokens) != null ? _c : void 0,
+                reasoningTokens: (_d = usage.completionTokensDetails.reasoningTokens) != null ? _d : void 0,
+                cachedInputTokens: (_e = usage.promptTokensDetails.cachedTokens) != null ? _e : void 0
               },
               providerMetadata
             });
@@ -675,6 +671,7 @@ var OpenAICompatibleChatLanguageModel = class {
 var openaiCompatibleTokenUsageSchema = import_zod3.z.object({
   prompt_tokens: import_zod3.z.number().nullish(),
   completion_tokens: import_zod3.z.number().nullish(),
+  total_tokens: import_zod3.z.number().nullish(),
   prompt_tokens_details: import_zod3.z.object({
     cached_tokens: import_zod3.z.number().nullish()
   }).nullish(),
@@ -935,7 +932,7 @@ var OpenAICompatibleCompletionLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const { args, warnings } = await this.getArgs(options);
     const {
       responseHeaders,
@@ -964,7 +961,8 @@ var OpenAICompatibleCompletionLanguageModel = class {
       content,
       usage: {
         inputTokens: (_b = (_a = response.usage) == null ? void 0 : _a.prompt_tokens) != null ? _b : void 0,
-        outputTokens: (_d = (_c = response.usage) == null ? void 0 : _c.completion_tokens) != null ? _d : void 0
+        outputTokens: (_d = (_c = response.usage) == null ? void 0 : _c.completion_tokens) != null ? _d : void 0,
+        totalTokens: (_f = (_e = response.usage) == null ? void 0 : _e.total_tokens) != null ? _f : void 0
       },
       finishReason: mapOpenAICompatibleFinishReason(choice.finish_reason),
       request: { body: args },
@@ -1001,7 +999,8 @@ var OpenAICompatibleCompletionLanguageModel = class {
     let finishReason = "unknown";
     const usage = {
       inputTokens: void 0,
-      outputTokens: void 0
+      outputTokens: void 0,
+      totalTokens: void 0
     };
     let isFirstChunk = true;
     return {
@@ -1011,7 +1010,7 @@ var OpenAICompatibleCompletionLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b;
+            var _a, _b, _c;
             if (!chunk.success) {
               finishReason = "error";
               controller.enqueue({ type: "error", error: chunk.error });
@@ -1033,6 +1032,7 @@ var OpenAICompatibleCompletionLanguageModel = 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;
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
@@ -1061,6 +1061,11 @@ var OpenAICompatibleCompletionLanguageModel = class {
     };
   }
 };
+var usageSchema = import_zod5.z.object({
+  prompt_tokens: import_zod5.z.number(),
+  completion_tokens: import_zod5.z.number(),
+  total_tokens: import_zod5.z.number()
+});
 var openaiCompatibleCompletionResponseSchema = import_zod5.z.object({
   id: import_zod5.z.string().nullish(),
   created: import_zod5.z.number().nullish(),
@@ -1071,10 +1076,7 @@ var openaiCompatibleCompletionResponseSchema = import_zod5.z.object({
       finish_reason: import_zod5.z.string()
     })
   ),
-  usage: import_zod5.z.object({
-    prompt_tokens: import_zod5.z.number(),
-    completion_tokens: import_zod5.z.number()
-  }).nullish()
+  usage: usageSchema.nullish()
 });
 var createOpenAICompatibleCompletionChunkSchema = (errorSchema) => import_zod5.z.union([
   import_zod5.z.object({
@@ -1088,10 +1090,7 @@ var createOpenAICompatibleCompletionChunkSchema = (errorSchema) => import_zod5.z
         index: import_zod5.z.number()
       })
     ),
-    usage: import_zod5.z.object({
-      prompt_tokens: import_zod5.z.number(),
-      completion_tokens: import_zod5.z.number()
-    }).nullish()
+    usage: usageSchema.nullish()
   }),
   errorSchema
 ]);