@ai-sdk/openai-compatible 1.0.48 → 1.0.52

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @ai-sdk/openai-compatible
 
+## 1.0.52
+
+### Patch Changes
+
+- Updated dependencies [77d33c0]
+  - @ai-sdk/provider-utils@3.0.35
+
+## 1.0.51
+
+### Patch Changes
+
+- e264a35: Accept streaming tool calls without explicit indices and preserve choice-level usage with top-level precedence.
+
+## 1.0.50
+
+### Patch Changes
+
+- Updated dependencies [2fff9f1]
+- Updated dependencies [f364ea0]
+  - @ai-sdk/provider-utils@3.0.34
+
+## 1.0.49
+
+### Patch Changes
+
+- Updated dependencies [9e8e087]
+  - @ai-sdk/provider-utils@3.0.33
+
 ## 1.0.48
 
 ### Patch Changes

package/dist/index.js

@@ -512,12 +512,23 @@ var OpenAICompatibleChatLanguageModel = class {
       },
       totalTokens: void 0
     };
-    let lastUsage = void 0;
+    let topLevelUsage = void 0;
+    let choiceUsage = void 0;
     let isFirstChunk = true;
     const providerOptionsName = this.providerOptionsName;
     let isActiveReasoning = false;
     let isActiveText = false;
     const convertUsage = (usage2) => this.convertUsage(usage2);
+    const setUsage = (tokenUsage) => {
+      var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+      usage.promptTokens = (_a2 = tokenUsage.prompt_tokens) != null ? _a2 : void 0;
+      usage.completionTokens = (_b = tokenUsage.completion_tokens) != null ? _b : void 0;
+      usage.totalTokens = (_c = tokenUsage.total_tokens) != null ? _c : void 0;
+      usage.completionTokensDetails.reasoningTokens = (_e = (_d = tokenUsage.completion_tokens_details) == null ? void 0 : _d.reasoning_tokens) != null ? _e : void 0;
+      usage.completionTokensDetails.acceptedPredictionTokens = (_g = (_f = tokenUsage.completion_tokens_details) == null ? void 0 : _f.accepted_prediction_tokens) != null ? _g : void 0;
+      usage.completionTokensDetails.rejectedPredictionTokens = (_i = (_h = tokenUsage.completion_tokens_details) == null ? void 0 : _h.rejected_prediction_tokens) != null ? _i : void 0;
+      usage.promptTokensDetails.cachedTokens = (_k = (_j = tokenUsage.prompt_tokens_details) == null ? void 0 : _j.cached_tokens) != null ? _k : void 0;
+    };
     return {
       stream: response.pipeThrough(
         new TransformStream({
@@ -526,7 +537,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, _m;
+            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -550,31 +561,16 @@ var OpenAICompatibleChatLanguageModel = class {
               });
             }
             if (value.usage != null) {
-              lastUsage = value.usage;
-              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;
-              }
-              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;
-              }
+              topLevelUsage = value.usage;
+              setUsage(value.usage);
             }
             const choice = value.choices[0];
+            if ((choice == null ? void 0 : choice.usage) != null) {
+              choiceUsage = choice.usage;
+              if (topLevelUsage == null) {
+                setUsage(choice.usage);
+              }
+            }
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
               finishReason = mapOpenAICompatibleFinishReason(
                 choice.finish_reason
@@ -611,8 +607,11 @@ var OpenAICompatibleChatLanguageModel = class {
               });
             }
             if (delta.tool_calls != null) {
-              for (const toolCallDelta of delta.tool_calls) {
-                const index = toolCallDelta.index;
+              for (const [
+                fallbackIndex,
+                toolCallDelta
+              ] of delta.tool_calls.entries()) {
+                const index = (_b = toolCallDelta.index) != null ? _b : fallbackIndex;
                 if (toolCalls[index] == null) {
                   if (toolCallDelta.id == null) {
                     throw new import_provider3.InvalidResponseDataError({
@@ -620,7 +619,7 @@ var OpenAICompatibleChatLanguageModel = class {
                       message: `Expected 'id' to be a string.`
                     });
                   }
-                  if (((_b = toolCallDelta.function) == null ? void 0 : _b.name) == null) {
+                  if (((_c = toolCallDelta.function) == null ? void 0 : _c.name) == null) {
                     throw new import_provider3.InvalidResponseDataError({
                       data: toolCallDelta,
                       message: `Expected 'function.name' to be a string.`
@@ -636,12 +635,12 @@ var OpenAICompatibleChatLanguageModel = class {
                     type: "function",
                     function: {
                       name: toolCallDelta.function.name,
-                      arguments: (_c = toolCallDelta.function.arguments) != null ? _c : ""
+                      arguments: (_d = toolCallDelta.function.arguments) != null ? _d : ""
                     },
                     hasFinished: false
                   };
                   const toolCall2 = toolCalls[index];
-                  if (((_d = toolCall2.function) == null ? void 0 : _d.name) != null && ((_e = toolCall2.function) == null ? void 0 : _e.arguments) != null) {
+                  if (((_e = toolCall2.function) == null ? void 0 : _e.name) != null && ((_f = toolCall2.function) == null ? void 0 : _f.arguments) != null) {
                     if (toolCall2.function.arguments.length > 0) {
                       controller.enqueue({
                         type: "tool-input-delta",
@@ -656,7 +655,7 @@ var OpenAICompatibleChatLanguageModel = class {
                       });
                       controller.enqueue({
                         type: "tool-call",
-                        toolCallId: (_f = toolCall2.id) != null ? _f : (0, import_provider_utils2.generateId)(),
+                        toolCallId: (_g = toolCall2.id) != null ? _g : (0, import_provider_utils2.generateId)(),
                         toolName: toolCall2.function.name,
                         input: toolCall2.function.arguments
                       });
@@ -669,22 +668,22 @@ var OpenAICompatibleChatLanguageModel = class {
                 if (toolCall.hasFinished) {
                   continue;
                 }
-                if (((_g = toolCallDelta.function) == null ? void 0 : _g.arguments) != null) {
-                  toolCall.function.arguments += (_i = (_h = toolCallDelta.function) == null ? void 0 : _h.arguments) != null ? _i : "";
+                if (((_h = toolCallDelta.function) == null ? void 0 : _h.arguments) != null) {
+                  toolCall.function.arguments += (_j = (_i = toolCallDelta.function) == null ? void 0 : _i.arguments) != null ? _j : "";
                 }
                 controller.enqueue({
                   type: "tool-input-delta",
                   id: toolCall.id,
-                  delta: (_j = toolCallDelta.function.arguments) != null ? _j : ""
+                  delta: (_k = toolCallDelta.function.arguments) != null ? _k : ""
                 });
-                if (((_k = toolCall.function) == null ? void 0 : _k.name) != null && ((_l = toolCall.function) == null ? void 0 : _l.arguments) != null && (0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
+                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)) {
                   controller.enqueue({
                     type: "tool-input-end",
                     id: toolCall.id
                   });
                   controller.enqueue({
                     type: "tool-call",
-                    toolCallId: (_m = toolCall.id) != null ? _m : (0, import_provider_utils2.generateId)(),
+                    toolCallId: (_n = toolCall.id) != null ? _n : (0, import_provider_utils2.generateId)(),
                     toolName: toolCall.function.name,
                     input: toolCall.function.arguments
                   });
@@ -728,7 +727,7 @@ var OpenAICompatibleChatLanguageModel = class {
             controller.enqueue({
               type: "finish",
               finishReason,
-              usage: convertUsage(lastUsage),
+              usage: convertUsage(topLevelUsage != null ? topLevelUsage : choiceUsage),
               providerMetadata
             });
           }
@@ -804,7 +803,7 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_v43.z.union(
           reasoning: import_v43.z.string().nullish(),
           tool_calls: import_v43.z.array(
             import_v43.z.object({
-              index: import_v43.z.number(),
+              index: import_v43.z.number().nullish(),
               id: import_v43.z.string().nullish(),
               function: import_v43.z.object({
                 name: import_v43.z.string().nullish(),
@@ -813,7 +812,8 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_v43.z.union(
             })
           ).nullish()
         }).nullish(),
-        finish_reason: import_v43.z.string().nullish()
+        finish_reason: import_v43.z.string().nullish(),
+        usage: openaiCompatibleTokenUsageSchema
       })
     ),
     usage: openaiCompatibleTokenUsageSchema
@@ -1411,7 +1411,7 @@ var openaiCompatibleImageResponseSchema = import_v48.z.object({
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "1.0.48" : "0.0.0-test";
+var VERSION = true ? "1.0.52" : "0.0.0-test";
 
 // src/openai-compatible-provider.ts
 function createOpenAICompatible(options) {