@ai-sdk/openai-compatible 2.0.79 → 2.0.80

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @ai-sdk/openai-compatible
 
+## 2.0.80
+
+### Patch Changes
+
+- 29dc427: fix(provider-utils): preserve streamed tool calls with unreliable IDs and indices
+- Updated dependencies [29dc427]
+  - @ai-sdk/provider-utils@4.0.56
+
 ## 2.0.79
 
 ### Patch Changes

package/dist/index.js

@@ -672,12 +672,55 @@ var OpenAICompatibleChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const toolCalls = [];
+    const providerOptionsName = metadataKey;
+    let toolCallTracker;
     const pendingToolCalls = /* @__PURE__ */ new Map();
+    const forwardedToolCallIndices = /* @__PURE__ */ new Set();
+    const processToolCallDelta = (toolCallDelta) => {
+      var _a2, _b, _c, _d, _e;
+      const index = toolCallDelta.index;
+      if (index == null || forwardedToolCallIndices.has(index)) {
+        toolCallTracker.processDelta(toolCallDelta);
+        return;
+      }
+      let pending = pendingToolCalls.get(index);
+      if (pending == null) {
+        pending = {
+          id: (_a2 = toolCallDelta.id) != null ? _a2 : null,
+          bufferedArguments: "",
+          extraContent: (_b = toolCallDelta.extra_content) != null ? _b : null
+        };
+        pendingToolCalls.set(index, pending);
+      } else {
+        if (pending.id == null && toolCallDelta.id != null) {
+          pending.id = toolCallDelta.id;
+        }
+        if (pending.extraContent == null && toolCallDelta.extra_content != null) {
+          pending.extraContent = toolCallDelta.extra_content;
+        }
+      }
+      const argumentsDelta = (_c = toolCallDelta.function) == null ? void 0 : _c.arguments;
+      if (argumentsDelta != null) {
+        pending.bufferedArguments += argumentsDelta;
+      }
+      const name = (_d = toolCallDelta.function) == null ? void 0 : _d.name;
+      if (name != null) {
+        toolCallTracker.processDelta({
+          index,
+          id: pending.id,
+          function: {
+            name,
+            arguments: pending.bufferedArguments
+          },
+          extra_content: (_e = pending.extraContent) != null ? _e : void 0
+        });
+        pendingToolCalls.delete(index);
+        forwardedToolCallIndices.add(index);
+      }
+    };
     let finishReason;
     let usage = void 0;
     let isFirstChunk = true;
-    const providerOptionsName = metadataKey;
     let isActiveReasoning = false;
     let isActiveText = false;
     const convertUsage = (usage2) => this.convertUsage(usage2);
@@ -685,10 +728,22 @@ var OpenAICompatibleChatLanguageModel = class {
       stream: response.pipeThrough(
         new TransformStream({
           start(controller) {
+            toolCallTracker = new import_provider_utils2.StreamingToolCallTracker(
+              controller,
+              {
+                generateId: import_provider_utils2.generateId,
+                extractMetadata: (delta) => {
+                  var _a2, _b;
+                  const thoughtSignature = (_b = (_a2 = delta.extra_content) == null ? void 0 : _a2.google) == null ? void 0 : _b.thought_signature;
+                  return thoughtSignature ? { [providerOptionsName]: { thoughtSignature } } : void 0;
+                },
+                buildToolCallProviderMetadata: (metadata) => metadata
+              }
+            );
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
+            var _a2, _b;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -786,113 +841,12 @@ var OpenAICompatibleChatLanguageModel = class {
                 isActiveReasoning = false;
               }
               for (const toolCallDelta of delta.tool_calls) {
-                const index = (_c = toolCallDelta.index) != null ? _c : toolCalls.length;
-                if (toolCalls[index] == null) {
-                  if (toolCallDelta.index != null) {
-                    let pending = pendingToolCalls.get(index);
-                    if (pending == null) {
-                      pending = {
-                        id: (_d = toolCallDelta.id) != null ? _d : null,
-                        bufferedArguments: "",
-                        thoughtSignature: (_g = (_f = (_e = toolCallDelta.extra_content) == null ? void 0 : _e.google) == null ? void 0 : _f.thought_signature) != null ? _g : void 0
-                      };
-                      pendingToolCalls.set(index, pending);
-                    } else {
-                      if (pending.id == null && toolCallDelta.id != null) {
-                        pending.id = toolCallDelta.id;
-                      }
-                      if (pending.thoughtSignature == null && ((_i = (_h = toolCallDelta.extra_content) == null ? void 0 : _h.google) == null ? void 0 : _i.thought_signature) != null) {
-                        pending.thoughtSignature = toolCallDelta.extra_content.google.thought_signature;
-                      }
-                    }
-                    const argumentsDelta = (_j = toolCallDelta.function) == null ? void 0 : _j.arguments;
-                    if (argumentsDelta != null) {
-                      pending.bufferedArguments += argumentsDelta;
-                    }
-                    const name = (_k = toolCallDelta.function) == null ? void 0 : _k.name;
-                    if (name == null) {
-                      continue;
-                    }
-                    pendingToolCalls.delete(index);
-                    if (pending.id == null) {
-                      throw new import_provider3.InvalidResponseDataError({
-                        data: toolCallDelta,
-                        message: `Expected 'id' to be a string.`
-                      });
-                    }
-                    controller.enqueue({
-                      type: "tool-input-start",
-                      id: pending.id,
-                      toolName: name
-                    });
-                    toolCalls[index] = {
-                      id: pending.id,
-                      type: "function",
-                      function: {
-                        name,
-                        arguments: pending.bufferedArguments
-                      },
-                      hasFinished: false,
-                      thoughtSignature: pending.thoughtSignature
-                    };
-                  } else {
-                    if (toolCallDelta.id == null) {
-                      throw new import_provider3.InvalidResponseDataError({
-                        data: toolCallDelta,
-                        message: `Expected 'id' to be a string.`
-                      });
-                    }
-                    if (((_l = toolCallDelta.function) == null ? void 0 : _l.name) == null) {
-                      throw new import_provider3.InvalidResponseDataError({
-                        data: toolCallDelta,
-                        message: `Expected 'function.name' to be a string.`
-                      });
-                    }
-                    controller.enqueue({
-                      type: "tool-input-start",
-                      id: toolCallDelta.id,
-                      toolName: toolCallDelta.function.name
-                    });
-                    toolCalls[index] = {
-                      id: toolCallDelta.id,
-                      type: "function",
-                      function: {
-                        name: toolCallDelta.function.name,
-                        arguments: (_m = toolCallDelta.function.arguments) != null ? _m : ""
-                      },
-                      hasFinished: false,
-                      thoughtSignature: (_p = (_o = (_n = toolCallDelta.extra_content) == null ? void 0 : _n.google) == null ? void 0 : _o.thought_signature) != null ? _p : void 0
-                    };
-                  }
-                  const toolCall2 = toolCalls[index];
-                  if (((_q = toolCall2.function) == null ? void 0 : _q.name) != null && ((_r = toolCall2.function) == null ? void 0 : _r.arguments) != null) {
-                    if (toolCall2.function.arguments.length > 0) {
-                      controller.enqueue({
-                        type: "tool-input-delta",
-                        id: toolCall2.id,
-                        delta: toolCall2.function.arguments
-                      });
-                    }
-                  }
-                  continue;
-                }
-                const toolCall = toolCalls[index];
-                if (toolCall.hasFinished) {
-                  continue;
-                }
-                if (((_s = toolCallDelta.function) == null ? void 0 : _s.arguments) != null) {
-                  toolCall.function.arguments += (_u = (_t = toolCallDelta.function) == null ? void 0 : _t.arguments) != null ? _u : "";
-                }
-                controller.enqueue({
-                  type: "tool-input-delta",
-                  id: toolCall.id,
-                  delta: (_v = toolCallDelta.function.arguments) != null ? _v : ""
-                });
+                processToolCallDelta(toolCallDelta);
               }
             }
           },
           flush(controller) {
-            var _a2, _b, _c, _d, _e;
+            var _a2, _b, _c, _d;
             if (isActiveReasoning) {
               controller.enqueue({ type: "reasoning-end", id: "reasoning-0" });
             }
@@ -900,36 +854,14 @@ var OpenAICompatibleChatLanguageModel = class {
               controller.enqueue({ type: "text-end", id: "txt-0" });
             }
             for (const [index, pending] of pendingToolCalls) {
-              throw new import_provider3.InvalidResponseDataError({
-                data: {
-                  index,
-                  id: pending.id,
-                  function: { arguments: pending.bufferedArguments }
-                },
-                message: `Expected 'function.name' to be a string.`
-              });
-            }
-            for (const toolCall of toolCalls.filter(
-              (toolCall2) => !toolCall2.hasFinished
-            )) {
-              controller.enqueue({
-                type: "tool-input-end",
-                id: toolCall.id
-              });
-              controller.enqueue({
-                type: "tool-call",
-                toolCallId: (_a2 = toolCall.id) != null ? _a2 : (0, import_provider_utils2.generateId)(),
-                toolName: toolCall.function.name,
-                input: toolCall.function.arguments,
-                ...toolCall.thoughtSignature ? {
-                  providerMetadata: {
-                    [providerOptionsName]: {
-                      thoughtSignature: toolCall.thoughtSignature
-                    }
-                  }
-                } : {}
+              toolCallTracker.processDelta({
+                index,
+                id: pending.id,
+                function: { arguments: pending.bufferedArguments }
               });
             }
+            pendingToolCalls.clear();
+            toolCallTracker.flush();
             if (finishReason == null) {
               finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({
@@ -944,11 +876,11 @@ var OpenAICompatibleChatLanguageModel = class {
               [providerOptionsName]: {},
               ...metadataExtractor == null ? void 0 : metadataExtractor.buildMetadata()
             };
-            if (((_b = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _b.accepted_prediction_tokens) != null) {
-              providerMetadata[providerOptionsName].acceptedPredictionTokens = (_c = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _c.accepted_prediction_tokens;
+            if (((_a2 = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _a2.accepted_prediction_tokens) != null) {
+              providerMetadata[providerOptionsName].acceptedPredictionTokens = (_b = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _b.accepted_prediction_tokens;
             }
-            if (((_d = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _d.rejected_prediction_tokens) != null) {
-              providerMetadata[providerOptionsName].rejectedPredictionTokens = (_e = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _e.rejected_prediction_tokens;
+            if (((_c = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _c.rejected_prediction_tokens) != null) {
+              providerMetadata[providerOptionsName].rejectedPredictionTokens = (_d = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _d.rejected_prediction_tokens;
             }
             controller.enqueue({
               type: "finish",
@@ -1776,7 +1708,7 @@ async function fileToBlob(file) {
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "2.0.79" : "0.0.0-test";
+var VERSION = true ? "2.0.80" : "0.0.0-test";
 
 // src/openai-compatible-provider.ts
 function createOpenAICompatible(options) {