@ai-sdk/openai 2.0.130 → 2.0.132

package/dist/internal/index.mjs

@@ -3,11 +3,11 @@ import {
   InvalidResponseDataError
 } from "@ai-sdk/provider";
 import {
+  StreamingToolCallTracker,
   combineHeaders,
   createEventSourceResponseHandler,
   createJsonResponseHandler,
   generateId,
-  isParsableJson,
   parseProviderOptions,
   postJsonToApi
 } from "@ai-sdk/provider-utils";
@@ -1026,7 +1026,7 @@ var OpenAIChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const toolCalls = [];
+    let toolCallTracker;
     let finishReason = "unknown";
     const usage = {
       inputTokens: void 0,
@@ -1040,10 +1040,14 @@ var OpenAIChatLanguageModel = class {
       stream: response.pipeThrough(
         new TransformStream({
           start(controller) {
+            toolCallTracker = new StreamingToolCallTracker(controller, {
+              generateId,
+              typeValidation: "if-present"
+            });
             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, _w, _x, _y;
+            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -1110,90 +1114,7 @@ var OpenAIChatLanguageModel = class {
             }
             if (delta.tool_calls != null) {
               for (const toolCallDelta of delta.tool_calls) {
-                const index = toolCallDelta.index;
-                if (toolCalls[index] == null) {
-                  if (toolCallDelta.type != null && toolCallDelta.type !== "function") {
-                    throw new InvalidResponseDataError({
-                      data: toolCallDelta,
-                      message: `Expected 'function' type.`
-                    });
-                  }
-                  if (toolCallDelta.id == null) {
-                    throw new InvalidResponseDataError({
-                      data: toolCallDelta,
-                      message: `Expected 'id' to be a string.`
-                    });
-                  }
-                  if (((_n = toolCallDelta.function) == null ? void 0 : _n.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: (_o = toolCallDelta.function.arguments) != null ? _o : ""
-                    },
-                    hasFinished: false
-                  };
-                  const toolCall2 = toolCalls[index];
-                  if (((_p = toolCall2.function) == null ? void 0 : _p.name) != null && ((_q = toolCall2.function) == null ? void 0 : _q.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: (_r = toolCall2.id) != null ? _r : generateId(),
-                        toolName: toolCall2.function.name,
-                        input: toolCall2.function.arguments
-                      });
-                      toolCall2.hasFinished = true;
-                    }
-                  }
-                  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 : ""
-                });
-                if (((_w = toolCall.function) == null ? void 0 : _w.name) != null && ((_x = toolCall.function) == null ? void 0 : _x.arguments) != null && isParsableJson(toolCall.function.arguments)) {
-                  controller.enqueue({
-                    type: "tool-input-end",
-                    id: toolCall.id
-                  });
-                  controller.enqueue({
-                    type: "tool-call",
-                    toolCallId: (_y = toolCall.id) != null ? _y : generateId(),
-                    toolName: toolCall.function.name,
-                    input: toolCall.function.arguments
-                  });
-                  toolCall.hasFinished = true;
-                }
+                toolCallTracker.processDelta(toolCallDelta);
               }
             }
             if (delta.annotations != null) {
@@ -1212,6 +1133,7 @@ var OpenAIChatLanguageModel = class {
             if (isActiveText) {
               controller.enqueue({ type: "text-end", id: "0" });
             }
+            toolCallTracker.flush();
             controller.enqueue({
               type: "finish",
               finishReason,
@@ -2487,6 +2409,7 @@ var openaiResponsesReasoningModelIds = [
   "gpt-5.6-sol",
   "gpt-5.6-terra",
   "gpt-6-astra",
+  "gpt-6.1-sol",
   "gpt-6-luna",
   "gpt-6-sol"
 ];