ai 2.1.19 → 2.1.21

package/dist/index.d.ts

@@ -268,7 +268,7 @@ type OpenAIStreamCallbacks = AIStreamCallbacks & {
      *     // ... run your custom logic here
      *     const result = await myFunction(functionCallPayload)
      *
-     *     // Ask for another completion
+     *     // Ask for another completion, or return a string to send to the client as an assistant message.
      *     return await openai.createChatCompletion({
      *       model: 'gpt-3.5-turbo-0613',
      *       stream: true,
@@ -280,7 +280,7 @@ type OpenAIStreamCallbacks = AIStreamCallbacks & {
      * })
      * ```
      */
-    experimental_onFunctionCall?: (functionCallPayload: FunctionCallPayload, createFunctionCallMessages: (functionCallResult: JSONValue) => CreateMessage[]) => Promise<Response | undefined>;
+    experimental_onFunctionCall?: (functionCallPayload: FunctionCallPayload, createFunctionCallMessages: (functionCallResult: JSONValue) => CreateMessage[]) => Promise<Response | undefined | void | string>;
 };
 declare function OpenAIStream(res: Response, callbacks?: OpenAIStreamCallbacks): ReadableStream;
 

package/dist/index.js

@@ -178,20 +178,23 @@ function createEmptyReadableStream() {
 // streams/openai-stream.ts
 function parseOpenAIStream() {
   const trimStartOfStream = trimStartOfStreamHelper();
+  let isFunctionStreamingIn;
   return (data) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     const json = JSON.parse(data);
     if ((_c = (_b = (_a = json.choices[0]) == null ? void 0 : _a.delta) == null ? void 0 : _b.function_call) == null ? void 0 : _c.name) {
+      isFunctionStreamingIn = true;
       return `{"function_call": {"name": "${(_e = (_d = json.choices[0]) == null ? void 0 : _d.delta) == null ? void 0 : _e.function_call.name}", "arguments": "`;
     } else if ((_h = (_g = (_f = json.choices[0]) == null ? void 0 : _f.delta) == null ? void 0 : _g.function_call) == null ? void 0 : _h.arguments) {
       const argumentChunk = json.choices[0].delta.function_call.arguments;
       let escapedPartialJson = argumentChunk.replace(/\\/g, "\\\\").replace(/\//g, "\\/").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t").replace(/\f/g, "\\f");
       return `${escapedPartialJson}`;
-    } else if (((_i = json.choices[0]) == null ? void 0 : _i.finish_reason) === "function_call") {
+    } else if ((((_i = json.choices[0]) == null ? void 0 : _i.finish_reason) === "function_call" || ((_j = json.choices[0]) == null ? void 0 : _j.finish_reason) === "stop") && isFunctionStreamingIn) {
+      isFunctionStreamingIn = false;
       return '"}}';
     }
     const text = trimStartOfStream(
-      (_n = (_m = (_k = (_j = json.choices[0]) == null ? void 0 : _j.delta) == null ? void 0 : _k.content) != null ? _m : (_l = json.choices[0]) == null ? void 0 : _l.text) != null ? _n : ""
+      (_o = (_n = (_l = (_k = json.choices[0]) == null ? void 0 : _k.delta) == null ? void 0 : _l.content) != null ? _n : (_m = json.choices[0]) == null ? void 0 : _m.text) != null ? _o : ""
     );
     return text;
   };
@@ -265,6 +268,9 @@ function createFunctionCallTransformer(callbacks) {
           if (!functionResponse) {
             controller.enqueue(textEncoder.encode(aggregatedResponse));
             return;
+          } else if (typeof functionResponse === "string") {
+            controller.enqueue(textEncoder.encode(functionResponse));
+            return;
           }
           const openAIStream = OpenAIStream(functionResponse, __spreadProps(__spreadValues({}, callbacks), {
             [__internal__OpenAIFnMessagesSymbol]: newFunctionCallMessages

package/dist/index.mjs

@@ -145,20 +145,23 @@ function createEmptyReadableStream() {
 // streams/openai-stream.ts
 function parseOpenAIStream() {
   const trimStartOfStream = trimStartOfStreamHelper();
+  let isFunctionStreamingIn;
   return (data) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     const json = JSON.parse(data);
     if ((_c = (_b = (_a = json.choices[0]) == null ? void 0 : _a.delta) == null ? void 0 : _b.function_call) == null ? void 0 : _c.name) {
+      isFunctionStreamingIn = true;
       return `{"function_call": {"name": "${(_e = (_d = json.choices[0]) == null ? void 0 : _d.delta) == null ? void 0 : _e.function_call.name}", "arguments": "`;
     } else if ((_h = (_g = (_f = json.choices[0]) == null ? void 0 : _f.delta) == null ? void 0 : _g.function_call) == null ? void 0 : _h.arguments) {
       const argumentChunk = json.choices[0].delta.function_call.arguments;
       let escapedPartialJson = argumentChunk.replace(/\\/g, "\\\\").replace(/\//g, "\\/").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t").replace(/\f/g, "\\f");
       return `${escapedPartialJson}`;
-    } else if (((_i = json.choices[0]) == null ? void 0 : _i.finish_reason) === "function_call") {
+    } else if ((((_i = json.choices[0]) == null ? void 0 : _i.finish_reason) === "function_call" || ((_j = json.choices[0]) == null ? void 0 : _j.finish_reason) === "stop") && isFunctionStreamingIn) {
+      isFunctionStreamingIn = false;
       return '"}}';
     }
     const text = trimStartOfStream(
-      (_n = (_m = (_k = (_j = json.choices[0]) == null ? void 0 : _j.delta) == null ? void 0 : _k.content) != null ? _m : (_l = json.choices[0]) == null ? void 0 : _l.text) != null ? _n : ""
+      (_o = (_n = (_l = (_k = json.choices[0]) == null ? void 0 : _k.delta) == null ? void 0 : _l.content) != null ? _n : (_m = json.choices[0]) == null ? void 0 : _m.text) != null ? _o : ""
     );
     return text;
   };
@@ -232,6 +235,9 @@ function createFunctionCallTransformer(callbacks) {
           if (!functionResponse) {
             controller.enqueue(textEncoder.encode(aggregatedResponse));
             return;
+          } else if (typeof functionResponse === "string") {
+            controller.enqueue(textEncoder.encode(functionResponse));
+            return;
           }
           const openAIStream = OpenAIStream(functionResponse, __spreadProps(__spreadValues({}, callbacks), {
             [__internal__OpenAIFnMessagesSymbol]: newFunctionCallMessages

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "2.1.19",
+  "version": "2.1.21",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",