ai 2.2.2 → 2.2.3

package/dist/index.d.ts

@@ -197,7 +197,7 @@ type OpenAIStreamCallbacks = AIStreamCallbacksAndOptions & {
      * })
      * ```
      */
-    experimental_onFunctionCall?: (functionCallPayload: FunctionCallPayload, createFunctionCallMessages: (functionCallResult: JSONValue) => CreateMessage[]) => Promise<Response | undefined | void | string | AsyncIterable<ChatCompletionChunk>>;
+    experimental_onFunctionCall?: (functionCallPayload: FunctionCallPayload, createFunctionCallMessages: (functionCallResult: JSONValue) => CreateMessage[]) => Promise<Response | undefined | void | string | AsyncIterableOpenAIStreamReturnTypes>;
 };
 interface ChatCompletionChunk {
     id: string;
@@ -239,7 +239,45 @@ interface FunctionCall {
      */
     name?: string;
 }
-declare function OpenAIStream(res: Response | AsyncIterable<ChatCompletionChunk>, callbacks?: OpenAIStreamCallbacks): ReadableStream;
+/**
+ * https://github.com/openai/openai-node/blob/3ec43ee790a2eb6a0ccdd5f25faa23251b0f9b8e/src/resources/completions.ts#L28C1-L64C1
+ * Completions API. Streamed and non-streamed responses are the same.
+ */
+interface Completion {
+    /**
+     * A unique identifier for the completion.
+     */
+    id: string;
+    /**
+     * The list of completion choices the model generated for the input prompt.
+     */
+    choices: Array<CompletionChoice>;
+    /**
+     * The Unix timestamp of when the completion was created.
+     */
+    created: number;
+    /**
+     * The model used for completion.
+     */
+    model: string;
+    /**
+     * The object type, which is always "text_completion"
+     */
+    object: string;
+}
+interface CompletionChoice {
+    /**
+     * The reason the model stopped generating tokens. This will be `stop` if the model
+     * hit a natural stop point or a provided stop sequence, or `length` if the maximum
+     * number of tokens specified in the request was reached.
+     */
+    finish_reason: 'stop' | 'length';
+    index: number;
+    logprobs: any | null;
+    text: string;
+}
+type AsyncIterableOpenAIStreamReturnTypes = AsyncIterable<ChatCompletionChunk> | AsyncIterable<Completion>;
+declare function OpenAIStream(res: Response | AsyncIterableOpenAIStreamReturnTypes, callbacks?: OpenAIStreamCallbacks): ReadableStream;
 
 interface FunctionCallPayload {
     name: string;

package/dist/index.js

@@ -315,11 +315,11 @@ function chunkToText() {
   const trimStartOfStream = trimStartOfStreamHelper();
   let isFunctionStreamingIn;
   return (json) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
-    if ((_c = (_b = (_a = json.choices[0]) == null ? void 0 : _a.delta) == null ? void 0 : _b.function_call) == null ? void 0 : _c.name) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    if (isChatCompletionChunk(json) && ((_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) {
+    } else if (isChatCompletionChunk(json) && ((_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}`;
@@ -328,12 +328,18 @@ function chunkToText() {
       return '"}}';
     }
     const text = trimStartOfStream(
-      (_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 : ""
+      isChatCompletionChunk(json) && json.choices[0].delta.content ? json.choices[0].delta.content : isCompletion(json) ? json.choices[0].text : ""
     );
     return text;
   };
 }
 var __internal__OpenAIFnMessagesSymbol = Symbol("internal_openai_fn_messages");
+function isChatCompletionChunk(data) {
+  return "choices" in data && "delta" in data.choices[0];
+}
+function isCompletion(data) {
+  return "choices" in data && "text" in data.choices[0];
+}
 function OpenAIStream(res, callbacks) {
   const cb = callbacks;
   let stream;

package/dist/index.mjs

@@ -270,11 +270,11 @@ function chunkToText() {
   const trimStartOfStream = trimStartOfStreamHelper();
   let isFunctionStreamingIn;
   return (json) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
-    if ((_c = (_b = (_a = json.choices[0]) == null ? void 0 : _a.delta) == null ? void 0 : _b.function_call) == null ? void 0 : _c.name) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    if (isChatCompletionChunk(json) && ((_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) {
+    } else if (isChatCompletionChunk(json) && ((_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}`;
@@ -283,12 +283,18 @@ function chunkToText() {
       return '"}}';
     }
     const text = trimStartOfStream(
-      (_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 : ""
+      isChatCompletionChunk(json) && json.choices[0].delta.content ? json.choices[0].delta.content : isCompletion(json) ? json.choices[0].text : ""
     );
     return text;
   };
 }
 var __internal__OpenAIFnMessagesSymbol = Symbol("internal_openai_fn_messages");
+function isChatCompletionChunk(data) {
+  return "choices" in data && "delta" in data.choices[0];
+}
+function isCompletion(data) {
+  return "choices" in data && "text" in data.choices[0];
+}
 function OpenAIStream(res, callbacks) {
   const cb = callbacks;
   let stream;

package/package.json

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

package/react/dist/index.js

@@ -144,14 +144,6 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
   const reader = res.body.getReader();
   const decode = createChunkDecoder(isComplexMode);
   let responseMessages = [];
-  let streamedResponse = "";
-  const replyId = nanoid();
-  let responseMessage = {
-    id: replyId,
-    createdAt,
-    content: "",
-    role: "assistant"
-  };
   let responseData = [];
   const prefixMap = {};
   if (isComplexMode) {
@@ -182,8 +174,22 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
             };
           }
         }
+        let functionCallMessage = null;
         if (type === "function_call") {
           prefixMap["function_call"] = value2;
+          let functionCall = prefixMap["function_call"];
+          if (functionCall && typeof functionCall === "string") {
+            const parsedFunctionCall = JSON.parse(functionCall).function_call;
+            functionCallMessage = {
+              id: nanoid(),
+              role: "assistant",
+              content: "",
+              function_call: parsedFunctionCall,
+              name: parsedFunctionCall.name,
+              createdAt
+            };
+            prefixMap["function_call"] = functionCallMessage;
+          }
         }
         if (type === "data") {
           const parsedValue = JSON.parse(value2);
@@ -194,24 +200,12 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
           }
         }
         const data = prefixMap["data"];
-        const responseMessage2 = prefixMap["text"];
-        let functionCall = prefixMap["function_call"];
-        let functionCallMessage = null;
-        if (functionCall) {
-          const parsedFunctionCall = JSON.parse(functionCall).function_call;
-          functionCallMessage = {
-            id: nanoid(),
-            role: "function",
-            content: "",
-            name: parsedFunctionCall.name,
-            createdAt
-          };
-        }
-        const merged = [functionCallMessage, responseMessage2].filter(
+        const responseMessage = prefixMap["text"];
+        const merged = [functionCallMessage, responseMessage].filter(
           Boolean
         );
         mutate([...chatRequest.messages, ...merged], false);
-        mutateStreamData([...existingData || [], ...data || []]);
+        mutateStreamData([...existingData || [], ...data || []], false);
         if (abortControllerRef.current === null) {
           reader.cancel();
           break;
@@ -230,6 +224,14 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
     }
     return { messages: responseMessages, data: responseData };
   } else {
+    let streamedResponse = "";
+    const replyId = nanoid();
+    let responseMessage = {
+      id: replyId,
+      createdAt,
+      content: "",
+      role: "assistant"
+    };
     while (true) {
       const { done, value } = await reader.read();
       if (done) {

package/react/dist/index.mjs

@@ -108,14 +108,6 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
   const reader = res.body.getReader();
   const decode = createChunkDecoder(isComplexMode);
   let responseMessages = [];
-  let streamedResponse = "";
-  const replyId = nanoid();
-  let responseMessage = {
-    id: replyId,
-    createdAt,
-    content: "",
-    role: "assistant"
-  };
   let responseData = [];
   const prefixMap = {};
   if (isComplexMode) {
@@ -146,8 +138,22 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
             };
           }
         }
+        let functionCallMessage = null;
         if (type === "function_call") {
           prefixMap["function_call"] = value2;
+          let functionCall = prefixMap["function_call"];
+          if (functionCall && typeof functionCall === "string") {
+            const parsedFunctionCall = JSON.parse(functionCall).function_call;
+            functionCallMessage = {
+              id: nanoid(),
+              role: "assistant",
+              content: "",
+              function_call: parsedFunctionCall,
+              name: parsedFunctionCall.name,
+              createdAt
+            };
+            prefixMap["function_call"] = functionCallMessage;
+          }
         }
         if (type === "data") {
           const parsedValue = JSON.parse(value2);
@@ -158,24 +164,12 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
           }
         }
         const data = prefixMap["data"];
-        const responseMessage2 = prefixMap["text"];
-        let functionCall = prefixMap["function_call"];
-        let functionCallMessage = null;
-        if (functionCall) {
-          const parsedFunctionCall = JSON.parse(functionCall).function_call;
-          functionCallMessage = {
-            id: nanoid(),
-            role: "function",
-            content: "",
-            name: parsedFunctionCall.name,
-            createdAt
-          };
-        }
-        const merged = [functionCallMessage, responseMessage2].filter(
+        const responseMessage = prefixMap["text"];
+        const merged = [functionCallMessage, responseMessage].filter(
           Boolean
         );
         mutate([...chatRequest.messages, ...merged], false);
-        mutateStreamData([...existingData || [], ...data || []]);
+        mutateStreamData([...existingData || [], ...data || []], false);
         if (abortControllerRef.current === null) {
           reader.cancel();
           break;
@@ -194,6 +188,14 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
     }
     return { messages: responseMessages, data: responseData };
   } else {
+    let streamedResponse = "";
+    const replyId = nanoid();
+    let responseMessage = {
+      id: replyId,
+      createdAt,
+      content: "",
+      role: "assistant"
+    };
     while (true) {
       const { done, value } = await reader.read();
       if (done) {