@ai-sdk/openai-compatible 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/openai-compatible
 
+## 1.0.4
+
+### Patch Changes
+
+- 5f4c71f: feat (provider/openai-compatible): fall back to look for usage in choices
+- da314cd: chore (provider/openai-compatible): inline usage fallback logic
+
+## 1.0.3
+
+### Patch Changes
+
+- a0934f8: feat (provider/openai-compatible): look for reasoning in 'reasoning' field as well
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/index.js

@@ -374,7 +374,7 @@ var OpenAICompatibleChatLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const { args, warnings } = await this.getArgs({ ...options });
     const body = JSON.stringify(args);
     const {
@@ -401,7 +401,7 @@ var OpenAICompatibleChatLanguageModel = class {
     if (text != null && text.length > 0) {
       content.push({ type: "text", text });
     }
-    const reasoning = choice.message.reasoning_content;
+    const reasoning = (_a = choice.message.reasoning_content) != null ? _a : choice.message.reasoning;
     if (reasoning != null && reasoning.length > 0) {
       content.push({
         type: "reasoning",
@@ -412,7 +412,7 @@ var OpenAICompatibleChatLanguageModel = class {
       for (const toolCall of choice.message.tool_calls) {
         content.push({
           type: "tool-call",
-          toolCallId: (_a = toolCall.id) != null ? _a : (0, import_provider_utils.generateId)(),
+          toolCallId: (_b = toolCall.id) != null ? _b : (0, import_provider_utils.generateId)(),
           toolName: toolCall.function.name,
           input: toolCall.function.arguments
         });
@@ -420,11 +420,11 @@ var OpenAICompatibleChatLanguageModel = class {
     }
     const providerMetadata = {
       [this.providerOptionsName]: {},
-      ...await ((_c = (_b = this.config.metadataExtractor) == null ? void 0 : _b.extractMetadata) == null ? void 0 : _c.call(_b, {
+      ...await ((_d = (_c = this.config.metadataExtractor) == null ? void 0 : _c.extractMetadata) == null ? void 0 : _d.call(_c, {
         parsedBody: rawResponse
       }))
     };
-    const completionTokenDetails = (_d = responseBody.usage) == null ? void 0 : _d.completion_tokens_details;
+    const completionTokenDetails = (_e = responseBody.usage) == null ? void 0 : _e.completion_tokens_details;
     if ((completionTokenDetails == null ? void 0 : completionTokenDetails.accepted_prediction_tokens) != null) {
       providerMetadata[this.providerOptionsName].acceptedPredictionTokens = completionTokenDetails == null ? void 0 : completionTokenDetails.accepted_prediction_tokens;
     }
@@ -435,11 +435,11 @@ var OpenAICompatibleChatLanguageModel = class {
       content,
       finishReason: mapOpenAICompatibleFinishReason(choice.finish_reason),
       usage: {
-        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
+        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,
+        totalTokens: (_k = (_j = responseBody.usage) == null ? void 0 : _j.total_tokens) != null ? _k : void 0,
+        reasoningTokens: (_n = (_m = (_l = responseBody.usage) == null ? void 0 : _l.completion_tokens_details) == null ? void 0 : _m.reasoning_tokens) != null ? _n : void 0,
+        cachedInputTokens: (_q = (_p = (_o = responseBody.usage) == null ? void 0 : _o.prompt_tokens_details) == null ? void 0 : _p.cached_tokens) != null ? _q : void 0
       },
       providerMetadata,
       request: { body },
@@ -502,7 +502,7 @@ var OpenAICompatibleChatLanguageModel = class {
           },
           // 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;
+            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -525,14 +525,15 @@ var OpenAICompatibleChatLanguageModel = class {
                 ...getResponseMetadata(value)
               });
             }
-            if (value.usage != null) {
+            const effectiveUsage = (_c = value.usage) != null ? _c : (_b = (_a2 = value.choices) == null ? void 0 : _a2[0]) == null ? void 0 : _b.usage;
+            if (effectiveUsage != null) {
               const {
                 prompt_tokens,
                 completion_tokens,
                 total_tokens,
                 prompt_tokens_details,
                 completion_tokens_details
-              } = value.usage;
+              } = effectiveUsage;
               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;
@@ -559,7 +560,8 @@ var OpenAICompatibleChatLanguageModel = class {
               return;
             }
             const delta = choice.delta;
-            if (delta.reasoning_content) {
+            const reasoningContent = (_d = delta.reasoning_content) != null ? _d : delta.reasoning;
+            if (reasoningContent) {
               if (!isActiveReasoning) {
                 controller.enqueue({
                   type: "reasoning-start",
@@ -570,7 +572,7 @@ var OpenAICompatibleChatLanguageModel = class {
               controller.enqueue({
                 type: "reasoning-delta",
                 id: "reasoning-0",
-                delta: delta.reasoning_content
+                delta: reasoningContent
               });
             }
             if (delta.content) {
@@ -594,7 +596,7 @@ var OpenAICompatibleChatLanguageModel = class {
                       message: `Expected 'id' to be a string.`
                     });
                   }
-                  if (((_a2 = toolCallDelta.function) == null ? void 0 : _a2.name) == null) {
+                  if (((_e = toolCallDelta.function) == null ? void 0 : _e.name) == null) {
                     throw new import_provider3.InvalidResponseDataError({
                       data: toolCallDelta,
                       message: `Expected 'function.name' to be a string.`
@@ -610,12 +612,12 @@ var OpenAICompatibleChatLanguageModel = class {
                     type: "function",
                     function: {
                       name: toolCallDelta.function.name,
-                      arguments: (_b = toolCallDelta.function.arguments) != null ? _b : ""
+                      arguments: (_f = toolCallDelta.function.arguments) != null ? _f : ""
                     },
                     hasFinished: false
                   };
                   const toolCall2 = toolCalls[index];
-                  if (((_c = toolCall2.function) == null ? void 0 : _c.name) != null && ((_d = toolCall2.function) == null ? void 0 : _d.arguments) != null) {
+                  if (((_g = toolCall2.function) == null ? void 0 : _g.name) != null && ((_h = toolCall2.function) == null ? void 0 : _h.arguments) != null) {
                     if (toolCall2.function.arguments.length > 0) {
                       controller.enqueue({
                         type: "tool-input-start",
@@ -630,7 +632,7 @@ var OpenAICompatibleChatLanguageModel = class {
                       });
                       controller.enqueue({
                         type: "tool-call",
-                        toolCallId: (_e = toolCall2.id) != null ? _e : (0, import_provider_utils.generateId)(),
+                        toolCallId: (_i = toolCall2.id) != null ? _i : (0, import_provider_utils.generateId)(),
                         toolName: toolCall2.function.name,
                         input: toolCall2.function.arguments
                       });
@@ -643,22 +645,22 @@ var OpenAICompatibleChatLanguageModel = class {
                 if (toolCall.hasFinished) {
                   continue;
                 }
-                if (((_f = toolCallDelta.function) == null ? void 0 : _f.arguments) != null) {
-                  toolCall.function.arguments += (_h = (_g = toolCallDelta.function) == null ? void 0 : _g.arguments) != null ? _h : "";
+                if (((_j = toolCallDelta.function) == null ? void 0 : _j.arguments) != null) {
+                  toolCall.function.arguments += (_l = (_k = toolCallDelta.function) == null ? void 0 : _k.arguments) != null ? _l : "";
                 }
                 controller.enqueue({
                   type: "tool-input-delta",
                   id: toolCall.id,
-                  delta: (_i = toolCallDelta.function.arguments) != null ? _i : ""
+                  delta: (_m = toolCallDelta.function.arguments) != null ? _m : ""
                 });
-                if (((_j = toolCall.function) == null ? void 0 : _j.name) != null && ((_k = toolCall.function) == null ? void 0 : _k.arguments) != null && (0, import_provider_utils.isParsableJson)(toolCall.function.arguments)) {
+                if (((_n = toolCall.function) == null ? void 0 : _n.name) != null && ((_o = toolCall.function) == null ? void 0 : _o.arguments) != null && (0, import_provider_utils.isParsableJson)(toolCall.function.arguments)) {
                   controller.enqueue({
                     type: "tool-input-end",
                     id: toolCall.id
                   });
                   controller.enqueue({
                     type: "tool-call",
-                    toolCallId: (_l = toolCall.id) != null ? _l : (0, import_provider_utils.generateId)(),
+                    toolCallId: (_p = toolCall.id) != null ? _p : (0, import_provider_utils.generateId)(),
                     toolName: toolCall.function.name,
                     input: toolCall.function.arguments
                   });
@@ -742,6 +744,7 @@ var OpenAICompatibleChatResponseSchema = import_v43.z.object({
         role: import_v43.z.literal("assistant").nullish(),
         content: import_v43.z.string().nullish(),
         reasoning_content: import_v43.z.string().nullish(),
+        reasoning: import_v43.z.string().nullish(),
         tool_calls: import_v43.z.array(
           import_v43.z.object({
             id: import_v43.z.string().nullish(),
@@ -767,7 +770,10 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_v43.z.union(
         delta: import_v43.z.object({
           role: import_v43.z.enum(["assistant"]).nullish(),
           content: import_v43.z.string().nullish(),
+          // Most openai-compatible models set `reasoning_content`, but some
+          // providers serving `gpt-oss` set `reasoning`. See #7866
           reasoning_content: import_v43.z.string().nullish(),
+          reasoning: import_v43.z.string().nullish(),
           tool_calls: import_v43.z.array(
             import_v43.z.object({
               index: import_v43.z.number(),
@@ -779,7 +785,9 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_v43.z.union(
             })
           ).nullish()
         }).nullish(),
-        finish_reason: import_v43.z.string().nullish()
+        finish_reason: import_v43.z.string().nullish(),
+        // Some providers report usage within each choice in streaming chunks
+        usage: openaiCompatibleTokenUsageSchema
       })
     ),
     usage: openaiCompatibleTokenUsageSchema