@ai-sdk/openai-compatible 1.0.55 → 1.0.57

package/dist/index.mjs

@@ -3,12 +3,12 @@ import {
   InvalidResponseDataError
 } from "@ai-sdk/provider";
 import {
+  StreamingToolCallTracker,
   combineHeaders,
   createEventSourceResponseHandler,
   createJsonErrorResponseHandler,
   createJsonResponseHandler,
   generateId,
-  isParsableJson,
   parseProviderOptions,
   postJsonToApi
 } from "@ai-sdk/provider-utils";
@@ -487,7 +487,7 @@ var OpenAICompatibleChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const toolCalls = [];
+    let toolCallTracker;
     let finishReason = "unknown";
     const usage = {
       completionTokens: void 0,
@@ -523,11 +523,14 @@ var OpenAICompatibleChatLanguageModel = class {
       stream: response.pipeThrough(
         new TransformStream({
           start(controller) {
+            toolCallTracker = new StreamingToolCallTracker(controller, {
+              generateId
+            });
             controller.enqueue({ type: "stream-start", warnings });
           },
           // 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;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -601,109 +604,21 @@ var OpenAICompatibleChatLanguageModel = class {
                 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 InvalidResponseDataError({
-                      data: toolCallDelta,
-                      message: `Expected 'id' to be a string.`
-                    });
-                  }
-                  if (((_c = toolCallDelta.function) == null ? void 0 : _c.name) == null) {
-                    throw new 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: (_d = toolCallDelta.function.arguments) != null ? _d : ""
-                    },
-                    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 (toolCall2.function.arguments.length > 0) {
-                      controller.enqueue({
-                        type: "tool-input-delta",
-                        id: toolCall2.id,
-                        delta: toolCall2.function.arguments
-                      });
-                    }
-                    if (isParsableJson(toolCall2.function.arguments)) {
-                      controller.enqueue({
-                        type: "tool-input-end",
-                        id: toolCall2.id
-                      });
-                      controller.enqueue({
-                        type: "tool-call",
-                        toolCallId: (_g = toolCall2.id) != null ? _g : generateId(),
-                        toolName: toolCall2.function.name,
-                        input: toolCall2.function.arguments
-                      });
-                      toolCall2.hasFinished = true;
-                    }
-                  }
-                  continue;
-                }
-                const toolCall = toolCalls[index];
-                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 : "";
-                }
-                controller.enqueue({
-                  type: "tool-input-delta",
-                  id: toolCall.id,
-                  delta: (_k = toolCallDelta.function.arguments) != null ? _k : ""
+                toolCallTracker.processDelta({
+                  ...toolCallDelta,
+                  index: (_b = toolCallDelta.index) != null ? _b : fallbackIndex
                 });
-                if (((_l = toolCall.function) == null ? void 0 : _l.name) != null && ((_m = toolCall.function) == null ? void 0 : _m.arguments) != null && isParsableJson(toolCall.function.arguments)) {
-                  controller.enqueue({
-                    type: "tool-input-end",
-                    id: toolCall.id
-                  });
-                  controller.enqueue({
-                    type: "tool-call",
-                    toolCallId: (_n = toolCall.id) != null ? _n : generateId(),
-                    toolName: toolCall.function.name,
-                    input: toolCall.function.arguments
-                  });
-                  toolCall.hasFinished = true;
-                }
               }
             }
           },
           flush(controller) {
-            var _a2;
             if (isActiveReasoning) {
               controller.enqueue({ type: "reasoning-end", id: "reasoning-0" });
             }
             if (isActiveText) {
               controller.enqueue({ type: "text-end", id: "txt-0" });
             }
-            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 : generateId(),
-                toolName: toolCall.function.name,
-                input: toolCall.function.arguments
-              });
-            }
+            toolCallTracker.flush();
             const providerMetadata = {
               [providerOptionsName]: {},
               ...metadataExtractor == null ? void 0 : metadataExtractor.buildMetadata()
@@ -1427,7 +1342,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "1.0.55" : "0.0.0-test";
+var VERSION = true ? "1.0.57" : "0.0.0-test";
 
 // src/openai-compatible-provider.ts
 function createOpenAICompatible(options) {