ai 3.0.0 → 3.0.1

package/rsc/dist/rsc-server.mjs

@@ -418,10 +418,14 @@ function createCallbacksTransformer(cb) {
         await callbacks.onStart();
     },
     async transform(message, controller) {
-      controller.enqueue(textEncoder.encode(message));
-      aggregatedResponse += message;
+      const content = typeof message === "string" ? message : message.content;
+      controller.enqueue(textEncoder.encode(content));
+      aggregatedResponse += content;
       if (callbacks.onToken)
-        await callbacks.onToken(message);
+        await callbacks.onToken(content);
+      if (callbacks.onText && typeof message === "string") {
+        await callbacks.onText(message);
+      }
     },
     async flush() {
       const isOpenAICallbacks = isOfTypeOpenAIStreamCallbacks(callbacks);
@@ -565,25 +569,46 @@ function chunkToText() {
       const delta = (_a = json.choices[0]) == null ? void 0 : _a.delta;
       if ((_b = delta.function_call) == null ? void 0 : _b.name) {
         isFunctionStreamingIn = true;
-        return `{"function_call": {"name": "${delta.function_call.name}", "arguments": "`;
+        return {
+          isText: false,
+          content: `{"function_call": {"name": "${delta.function_call.name}", "arguments": "`
+        };
       } else if ((_e = (_d = (_c = delta.tool_calls) == null ? void 0 : _c[0]) == null ? void 0 : _d.function) == null ? void 0 : _e.name) {
         isFunctionStreamingIn = true;
         const toolCall = delta.tool_calls[0];
         if (toolCall.index === 0) {
-          return `{"tool_calls":[ {"id": "${toolCall.id}", "type": "function", "function": {"name": "${(_f = toolCall.function) == null ? void 0 : _f.name}", "arguments": "`;
+          return {
+            isText: false,
+            content: `{"tool_calls":[ {"id": "${toolCall.id}", "type": "function", "function": {"name": "${(_f = toolCall.function) == null ? void 0 : _f.name}", "arguments": "`
+          };
         } else {
-          return `"}}, {"id": "${toolCall.id}", "type": "function", "function": {"name": "${(_g = toolCall.function) == null ? void 0 : _g.name}", "arguments": "`;
+          return {
+            isText: false,
+            content: `"}}, {"id": "${toolCall.id}", "type": "function", "function": {"name": "${(_g = toolCall.function) == null ? void 0 : _g.name}", "arguments": "`
+          };
         }
       } else if ((_h = delta.function_call) == null ? void 0 : _h.arguments) {
-        return cleanupArguments((_i = delta.function_call) == null ? void 0 : _i.arguments);
+        return {
+          isText: false,
+          content: cleanupArguments((_i = delta.function_call) == null ? void 0 : _i.arguments)
+        };
       } else if ((_l = (_k = (_j = delta.tool_calls) == null ? void 0 : _j[0]) == null ? void 0 : _k.function) == null ? void 0 : _l.arguments) {
-        return cleanupArguments((_o = (_n = (_m = delta.tool_calls) == null ? void 0 : _m[0]) == null ? void 0 : _n.function) == null ? void 0 : _o.arguments);
+        return {
+          isText: false,
+          content: cleanupArguments((_o = (_n = (_m = delta.tool_calls) == null ? void 0 : _m[0]) == null ? void 0 : _n.function) == null ? void 0 : _o.arguments)
+        };
       } else if (isFunctionStreamingIn && (((_p = json.choices[0]) == null ? void 0 : _p.finish_reason) === "function_call" || ((_q = json.choices[0]) == null ? void 0 : _q.finish_reason) === "stop")) {
         isFunctionStreamingIn = false;
-        return '"}}';
+        return {
+          isText: false,
+          content: '"}}'
+        };
       } else if (isFunctionStreamingIn && ((_r = json.choices[0]) == null ? void 0 : _r.finish_reason) === "tool_calls") {
         isFunctionStreamingIn = false;
-        return '"}}]}';
+        return {
+          isText: false,
+          content: '"}}]}'
+        };
       }
     }
     const text = trimStartOfStream(
@@ -941,6 +966,11 @@ function render(options) {
       };
     }
   ) : void 0;
+  if (functions && tools) {
+    throw new Error(
+      "You can't have both functions and tools defined. Please choose one or the other."
+    );
+  }
   let finished;
   async function handleRender(args, renderer, res) {
     if (!renderer)
@@ -954,17 +984,21 @@ function render(options) {
       res.update(node);
       finished == null ? void 0 : finished.resolve(void 0);
     } else if (value && typeof value === "object" && Symbol.asyncIterator in value) {
-      for await (const node of value) {
-        res.update(node);
+      const it = value;
+      while (true) {
+        const { done, value: value2 } = await it.next();
+        res.update(value2);
+        if (done)
+          break;
       }
       finished == null ? void 0 : finished.resolve(void 0);
     } else if (value && typeof value === "object" && Symbol.iterator in value) {
       const it = value;
       while (true) {
         const { done, value: value2 } = it.next();
+        res.update(value2);
         if (done)
           break;
-        res.update(value2);
       }
       finished == null ? void 0 : finished.resolve(void 0);
     } else {
@@ -990,15 +1024,17 @@ function render(options) {
           } : {}
         }),
         {
-          async experimental_onFunctionCall(functionCallPayload) {
-            var _a, _b;
-            hasFunction = true;
-            handleRender(
-              functionCallPayload.arguments,
-              (_b = (_a = options.functions) == null ? void 0 : _a[functionCallPayload.name]) == null ? void 0 : _b.render,
-              ui
-            );
-          },
+          ...functions ? {
+            async experimental_onFunctionCall(functionCallPayload) {
+              var _a, _b;
+              hasFunction = true;
+              handleRender(
+                functionCallPayload.arguments,
+                (_b = (_a = options.functions) == null ? void 0 : _a[functionCallPayload.name]) == null ? void 0 : _b.render,
+                ui
+              );
+            }
+          } : {},
           ...tools ? {
             async experimental_onToolCall(toolCallPayload) {
               var _a, _b;
@@ -1012,15 +1048,16 @@ function render(options) {
               }
             }
           } : {},
-          onToken(token) {
-            text += token;
-            if (hasFunction)
-              return;
+          onText(chunk) {
+            text += chunk;
             handleRender({ content: text, done: false }, options.text, ui);
           },
           async onFinal() {
-            if (hasFunction)
+            if (hasFunction) {
+              await (finished == null ? void 0 : finished.promise);
+              ui.done();
               return;
+            }
             handleRender({ content: text, done: true }, options.text, ui);
             await (finished == null ? void 0 : finished.promise);
             ui.done();