@ai-sdk/openai 4.0.0-beta.35 → 4.0.0-beta.36

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @ai-sdk/openai
 
+## 4.0.0-beta.36
+
+### Patch Changes
+
+- f807e45: Extract shared `StreamingToolCallTracker` class into `@ai-sdk/provider-utils` to deduplicate streaming tool call handling across OpenAI-compatible providers. Also adds missing `generateId()` fallback for `toolCallId` in Alibaba's `doGenerate` path and ensures all providers finalize unfinished tool calls during stream flush.
+- Updated dependencies [f807e45]
+  - @ai-sdk/provider-utils@5.0.0-beta.24
+
 ## 4.0.0-beta.35
 
 ### Patch Changes

package/dist/index.js

@@ -8,15 +8,12 @@ import {
 
 // src/chat/openai-chat-language-model.ts
 import {
-  InvalidResponseDataError
-} from "@ai-sdk/provider";
-import {
+  StreamingToolCallTracker,
   combineHeaders,
   createEventSourceResponseHandler,
   createJsonResponseHandler,
   generateId,
   isCustomReasoning,
-  isParsableJson,
   parseProviderOptions,
   postJsonToApi,
   serializeModelOptions,
@@ -958,7 +955,10 @@ var OpenAIChatLanguageModel = class _OpenAIChatLanguageModel {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const toolCalls = [];
+    const toolCallTracker = new StreamingToolCallTracker({
+      generateId,
+      typeValidation: "if-present"
+    });
     let finishReason = {
       unified: "other",
       raw: void 0
@@ -974,7 +974,7 @@ var OpenAIChatLanguageModel = class _OpenAIChatLanguageModel {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+            var _a2, _b2, _c, _d, _e;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -1035,90 +1035,10 @@ var OpenAIChatLanguageModel = class _OpenAIChatLanguageModel {
             }
             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 (((_f = toolCallDelta.function) == null ? void 0 : _f.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: (_g = toolCallDelta.function.arguments) != null ? _g : ""
-                    },
-                    hasFinished: false
-                  };
-                  const toolCall2 = toolCalls[index];
-                  if (((_h = toolCall2.function) == null ? void 0 : _h.name) != null && ((_i = toolCall2.function) == null ? void 0 : _i.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: (_j = toolCall2.id) != null ? _j : generateId(),
-                        toolName: toolCall2.function.name,
-                        input: toolCall2.function.arguments
-                      });
-                      toolCall2.hasFinished = true;
-                    }
-                  }
-                  continue;
-                }
-                const toolCall = toolCalls[index];
-                if (toolCall.hasFinished) {
-                  continue;
-                }
-                if (((_k = toolCallDelta.function) == null ? void 0 : _k.arguments) != null) {
-                  toolCall.function.arguments += (_m = (_l = toolCallDelta.function) == null ? void 0 : _l.arguments) != null ? _m : "";
-                }
-                controller.enqueue({
-                  type: "tool-input-delta",
-                  id: toolCall.id,
-                  delta: (_n = toolCallDelta.function.arguments) != null ? _n : ""
-                });
-                if (((_o = toolCall.function) == null ? void 0 : _o.name) != null && ((_p = toolCall.function) == null ? void 0 : _p.arguments) != null && isParsableJson(toolCall.function.arguments)) {
-                  controller.enqueue({
-                    type: "tool-input-end",
-                    id: toolCall.id
-                  });
-                  controller.enqueue({
-                    type: "tool-call",
-                    toolCallId: (_q = toolCall.id) != null ? _q : generateId(),
-                    toolName: toolCall.function.name,
-                    input: toolCall.function.arguments
-                  });
-                  toolCall.hasFinished = true;
-                }
+                toolCallTracker.processDelta(
+                  toolCallDelta,
+                  controller.enqueue.bind(controller)
+                );
               }
             }
             if (delta.annotations != null) {
@@ -1137,6 +1057,7 @@ var OpenAIChatLanguageModel = class _OpenAIChatLanguageModel {
             if (isActiveText) {
               controller.enqueue({ type: "text-end", id: "0" });
             }
+            toolCallTracker.flush(controller.enqueue.bind(controller));
             controller.enqueue({
               type: "finish",
               finishReason,
@@ -7148,7 +7069,7 @@ var OpenAISkills = class {
 };
 
 // src/version.ts
-var VERSION = true ? "4.0.0-beta.35" : "0.0.0-test";
+var VERSION = true ? "4.0.0-beta.36" : "0.0.0-test";
 
 // src/openai-provider.ts
 function createOpenAI(options = {}) {