ai 2.2.1 → 2.2.2

package/react/dist/index.js

@@ -46,17 +46,48 @@ var nanoid = (0, import_non_secure.customAlphabet)(
   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
   7
 );
-function createChunkDecoder() {
+function createChunkDecoder(complex) {
   const decoder = new TextDecoder();
+  if (!complex) {
+    return function(chunk) {
+      if (!chunk)
+        return "";
+      return decoder.decode(chunk, { stream: true });
+    };
+  }
   return function(chunk) {
-    if (!chunk)
-      return "";
-    return decoder.decode(chunk, { stream: true });
+    const decoded = decoder.decode(chunk, { stream: true }).split("\n");
+    return decoded.map(getStreamStringTypeAndValue).filter(Boolean);
   };
 }
+var StreamStringPrefixes = {
+  text: 0,
+  function_call: 1,
+  data: 2
+  // user_err: 3?
+};
+var getStreamStringTypeAndValue = (line) => {
+  const firstSeperatorIndex = line.indexOf(":");
+  const prefix = line.slice(0, firstSeperatorIndex);
+  const type = Object.keys(StreamStringPrefixes).find(
+    (key) => StreamStringPrefixes[key] === Number(prefix)
+  );
+  const val = line.slice(firstSeperatorIndex + 1);
+  let parsedVal = val;
+  if (!val) {
+    return { type, value: "" };
+  }
+  try {
+    parsedVal = JSON.parse(val);
+  } catch (e) {
+    console.error("Failed to parse JSON value:", val);
+  }
+  return { type, value: parsedVal };
+};
+var COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
 // react/use-chat.ts
-var getStreamedResponse = async (api, chatRequest, mutate, extraMetadataRef, messagesRef, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
+var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadataRef, messagesRef, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
   var _a, _b;
   const previousMessages = messagesRef.current;
   mutate(chatRequest.messages, false);
@@ -108,43 +139,124 @@ var getStreamedResponse = async (api, chatRequest, mutate, extraMetadataRef, mes
   if (!res.body) {
     throw new Error("The response body is empty.");
   }
-  let streamedResponse = "";
+  const isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
   const createdAt = /* @__PURE__ */ new Date();
-  const replyId = nanoid();
   const reader = res.body.getReader();
-  const decode = createChunkDecoder();
+  const decode = createChunkDecoder(isComplexMode);
+  let responseMessages = [];
+  let streamedResponse = "";
+  const replyId = nanoid();
   let responseMessage = {
     id: replyId,
     createdAt,
     content: "",
     role: "assistant"
   };
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
+  let responseData = [];
+  const prefixMap = {};
+  if (isComplexMode) {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        break;
+      }
+      const lines = decode(value);
+      if (typeof lines === "string") {
+        throw new Error(
+          "Invalid response format. Complex mode was set but the response is a string. This should never happen."
+        );
+      }
+      for (const { type, value: value2 } of lines) {
+        if (type === "text") {
+          if (prefixMap["text"]) {
+            prefixMap["text"] = {
+              ...prefixMap["text"],
+              content: (prefixMap["text"].content || "") + value2
+            };
+          } else {
+            prefixMap["text"] = {
+              id: nanoid(),
+              role: "assistant",
+              content: value2,
+              createdAt
+            };
+          }
+        }
+        if (type === "function_call") {
+          prefixMap["function_call"] = value2;
+        }
+        if (type === "data") {
+          const parsedValue = JSON.parse(value2);
+          if (prefixMap["data"]) {
+            prefixMap["data"] = [...prefixMap["data"], ...parsedValue];
+          } else {
+            prefixMap["data"] = parsedValue;
+          }
+        }
+        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(
+          Boolean
+        );
+        mutate([...chatRequest.messages, ...merged], false);
+        mutateStreamData([...existingData || [], ...data || []]);
+        if (abortControllerRef.current === null) {
+          reader.cancel();
+          break;
+        }
+      }
+    }
+    for (const [type, item] of Object.entries(prefixMap)) {
+      if (onFinish && type === "text") {
+        onFinish(item);
+      }
+      if (type === "data") {
+        responseData.push(item);
+      } else {
+        responseMessages.push(item);
+      }
+    }
+    return { messages: responseMessages, data: responseData };
+  } else {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        break;
+      }
+      streamedResponse += decode(value);
+      if (streamedResponse.startsWith('{"function_call":')) {
+        responseMessage["function_call"] = streamedResponse;
+      } else {
+        responseMessage["content"] = streamedResponse;
+      }
+      mutate([...chatRequest.messages, { ...responseMessage }], false);
+      if (abortControllerRef.current === null) {
+        reader.cancel();
+        break;
+      }
     }
-    streamedResponse += decode(value);
     if (streamedResponse.startsWith('{"function_call":')) {
-      responseMessage["function_call"] = streamedResponse;
-    } else {
-      responseMessage["content"] = streamedResponse;
+      const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
+      responseMessage["function_call"] = parsedFunctionCall;
+      mutate([...chatRequest.messages, { ...responseMessage }]);
     }
-    mutate([...chatRequest.messages, { ...responseMessage }], false);
-    if (abortControllerRef.current === null) {
-      reader.cancel();
-      break;
+    if (onFinish) {
+      onFinish(responseMessage);
     }
+    return responseMessage;
   }
-  if (streamedResponse.startsWith('{"function_call":')) {
-    const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
-    responseMessage["function_call"] = parsedFunctionCall;
-    mutate([...chatRequest.messages, { ...responseMessage }]);
-  }
-  if (onFinish) {
-    onFinish(responseMessage);
-  }
-  return responseMessage;
 };
 function useChat({
   api = "/api/chat",
@@ -162,17 +274,20 @@ function useChat({
 } = {}) {
   const hookId = (0, import_react.useId)();
   const chatId = id || hookId;
-  const { data, mutate } = (0, import_swr.default)([api, chatId], null, {
+  const { data: messages, mutate } = (0, import_swr.default)([api, chatId], null, {
     fallbackData: initialMessages
   });
   const { data: isLoading = false, mutate: mutateLoading } = (0, import_swr.default)(
     [chatId, "loading"],
     null
   );
-  const messages = data;
-  const messagesRef = (0, import_react.useRef)(messages);
+  const { data: streamData, mutate: mutateStreamData } = (0, import_swr.default)(
+    [chatId, "streamData"],
+    null
+  );
+  const messagesRef = (0, import_react.useRef)(messages || []);
   (0, import_react.useEffect)(() => {
-    messagesRef.current = messages;
+    messagesRef.current = messages || [];
   }, [messages]);
   const abortControllerRef = (0, import_react.useRef)(null);
   const extraMetadataRef = (0, import_react.useRef)({
@@ -194,10 +309,12 @@ function useChat({
       const abortController = new AbortController();
       abortControllerRef.current = abortController;
       while (true) {
-        const streamedResponseMessage = await getStreamedResponse(
+        const messagesAndDataOrJustMessage = await getStreamedResponse(
           api,
           chatRequest,
           mutate,
+          mutateStreamData,
+          streamData,
           extraMetadataRef,
           messagesRef,
           abortControllerRef,
@@ -205,19 +322,41 @@ function useChat({
           onResponse,
           sendExtraMessageFields
         );
-        if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
-          break;
-        }
-        if (experimental_onFunctionCall) {
-          const functionCall = streamedResponseMessage.function_call;
-          const functionCallResponse = await experimental_onFunctionCall(messagesRef.current, functionCall);
-          if (functionCallResponse === void 0)
+        if ("messages" in messagesAndDataOrJustMessage) {
+          for (const message of messagesAndDataOrJustMessage.messages) {
+            if (message.function_call === void 0 || typeof message.function_call === "string") {
+              break;
+            }
+            if (experimental_onFunctionCall) {
+              const functionCall = message.function_call;
+              const functionCallResponse = await experimental_onFunctionCall(
+                messagesRef.current,
+                functionCall
+              );
+              if (functionCallResponse === void 0)
+                break;
+              chatRequest = functionCallResponse;
+            }
+          }
+        } else {
+          const streamedResponseMessage = messagesAndDataOrJustMessage;
+          if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
             break;
-          chatRequest = functionCallResponse;
+          }
+          if (experimental_onFunctionCall) {
+            const functionCall = streamedResponseMessage.function_call;
+            const functionCallResponse = await experimental_onFunctionCall(
+              messagesRef.current,
+              functionCall
+            );
+            if (functionCallResponse === void 0)
+              break;
+            chatRequest = functionCallResponse;
+          }
         }
+        abortControllerRef.current = null;
+        return null;
       }
-      abortControllerRef.current = null;
-      return null;
     } catch (err) {
       if (err.name === "AbortError") {
         abortControllerRef.current = null;
@@ -311,7 +450,7 @@ function useChat({
     setInput(e.target.value);
   };
   return {
-    messages,
+    messages: messages || [],
     error,
     append,
     reload,
@@ -321,7 +460,8 @@ function useChat({
     setInput,
     handleInputChange,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 

package/react/dist/index.mjs

@@ -10,17 +10,48 @@ var nanoid = customAlphabet(
   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
   7
 );
-function createChunkDecoder() {
+function createChunkDecoder(complex) {
   const decoder = new TextDecoder();
+  if (!complex) {
+    return function(chunk) {
+      if (!chunk)
+        return "";
+      return decoder.decode(chunk, { stream: true });
+    };
+  }
   return function(chunk) {
-    if (!chunk)
-      return "";
-    return decoder.decode(chunk, { stream: true });
+    const decoded = decoder.decode(chunk, { stream: true }).split("\n");
+    return decoded.map(getStreamStringTypeAndValue).filter(Boolean);
   };
 }
+var StreamStringPrefixes = {
+  text: 0,
+  function_call: 1,
+  data: 2
+  // user_err: 3?
+};
+var getStreamStringTypeAndValue = (line) => {
+  const firstSeperatorIndex = line.indexOf(":");
+  const prefix = line.slice(0, firstSeperatorIndex);
+  const type = Object.keys(StreamStringPrefixes).find(
+    (key) => StreamStringPrefixes[key] === Number(prefix)
+  );
+  const val = line.slice(firstSeperatorIndex + 1);
+  let parsedVal = val;
+  if (!val) {
+    return { type, value: "" };
+  }
+  try {
+    parsedVal = JSON.parse(val);
+  } catch (e) {
+    console.error("Failed to parse JSON value:", val);
+  }
+  return { type, value: parsedVal };
+};
+var COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
 // react/use-chat.ts
-var getStreamedResponse = async (api, chatRequest, mutate, extraMetadataRef, messagesRef, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
+var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadataRef, messagesRef, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
   var _a, _b;
   const previousMessages = messagesRef.current;
   mutate(chatRequest.messages, false);
@@ -72,43 +103,124 @@ var getStreamedResponse = async (api, chatRequest, mutate, extraMetadataRef, mes
   if (!res.body) {
     throw new Error("The response body is empty.");
   }
-  let streamedResponse = "";
+  const isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
   const createdAt = /* @__PURE__ */ new Date();
-  const replyId = nanoid();
   const reader = res.body.getReader();
-  const decode = createChunkDecoder();
+  const decode = createChunkDecoder(isComplexMode);
+  let responseMessages = [];
+  let streamedResponse = "";
+  const replyId = nanoid();
   let responseMessage = {
     id: replyId,
     createdAt,
     content: "",
     role: "assistant"
   };
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
+  let responseData = [];
+  const prefixMap = {};
+  if (isComplexMode) {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        break;
+      }
+      const lines = decode(value);
+      if (typeof lines === "string") {
+        throw new Error(
+          "Invalid response format. Complex mode was set but the response is a string. This should never happen."
+        );
+      }
+      for (const { type, value: value2 } of lines) {
+        if (type === "text") {
+          if (prefixMap["text"]) {
+            prefixMap["text"] = {
+              ...prefixMap["text"],
+              content: (prefixMap["text"].content || "") + value2
+            };
+          } else {
+            prefixMap["text"] = {
+              id: nanoid(),
+              role: "assistant",
+              content: value2,
+              createdAt
+            };
+          }
+        }
+        if (type === "function_call") {
+          prefixMap["function_call"] = value2;
+        }
+        if (type === "data") {
+          const parsedValue = JSON.parse(value2);
+          if (prefixMap["data"]) {
+            prefixMap["data"] = [...prefixMap["data"], ...parsedValue];
+          } else {
+            prefixMap["data"] = parsedValue;
+          }
+        }
+        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(
+          Boolean
+        );
+        mutate([...chatRequest.messages, ...merged], false);
+        mutateStreamData([...existingData || [], ...data || []]);
+        if (abortControllerRef.current === null) {
+          reader.cancel();
+          break;
+        }
+      }
+    }
+    for (const [type, item] of Object.entries(prefixMap)) {
+      if (onFinish && type === "text") {
+        onFinish(item);
+      }
+      if (type === "data") {
+        responseData.push(item);
+      } else {
+        responseMessages.push(item);
+      }
+    }
+    return { messages: responseMessages, data: responseData };
+  } else {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        break;
+      }
+      streamedResponse += decode(value);
+      if (streamedResponse.startsWith('{"function_call":')) {
+        responseMessage["function_call"] = streamedResponse;
+      } else {
+        responseMessage["content"] = streamedResponse;
+      }
+      mutate([...chatRequest.messages, { ...responseMessage }], false);
+      if (abortControllerRef.current === null) {
+        reader.cancel();
+        break;
+      }
     }
-    streamedResponse += decode(value);
     if (streamedResponse.startsWith('{"function_call":')) {
-      responseMessage["function_call"] = streamedResponse;
-    } else {
-      responseMessage["content"] = streamedResponse;
+      const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
+      responseMessage["function_call"] = parsedFunctionCall;
+      mutate([...chatRequest.messages, { ...responseMessage }]);
     }
-    mutate([...chatRequest.messages, { ...responseMessage }], false);
-    if (abortControllerRef.current === null) {
-      reader.cancel();
-      break;
+    if (onFinish) {
+      onFinish(responseMessage);
     }
+    return responseMessage;
   }
-  if (streamedResponse.startsWith('{"function_call":')) {
-    const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
-    responseMessage["function_call"] = parsedFunctionCall;
-    mutate([...chatRequest.messages, { ...responseMessage }]);
-  }
-  if (onFinish) {
-    onFinish(responseMessage);
-  }
-  return responseMessage;
 };
 function useChat({
   api = "/api/chat",
@@ -126,17 +238,20 @@ function useChat({
 } = {}) {
   const hookId = useId();
   const chatId = id || hookId;
-  const { data, mutate } = useSWR([api, chatId], null, {
+  const { data: messages, mutate } = useSWR([api, chatId], null, {
     fallbackData: initialMessages
   });
   const { data: isLoading = false, mutate: mutateLoading } = useSWR(
     [chatId, "loading"],
     null
   );
-  const messages = data;
-  const messagesRef = useRef(messages);
+  const { data: streamData, mutate: mutateStreamData } = useSWR(
+    [chatId, "streamData"],
+    null
+  );
+  const messagesRef = useRef(messages || []);
   useEffect(() => {
-    messagesRef.current = messages;
+    messagesRef.current = messages || [];
   }, [messages]);
   const abortControllerRef = useRef(null);
   const extraMetadataRef = useRef({
@@ -158,10 +273,12 @@ function useChat({
       const abortController = new AbortController();
       abortControllerRef.current = abortController;
       while (true) {
-        const streamedResponseMessage = await getStreamedResponse(
+        const messagesAndDataOrJustMessage = await getStreamedResponse(
           api,
           chatRequest,
           mutate,
+          mutateStreamData,
+          streamData,
           extraMetadataRef,
           messagesRef,
           abortControllerRef,
@@ -169,19 +286,41 @@ function useChat({
           onResponse,
           sendExtraMessageFields
         );
-        if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
-          break;
-        }
-        if (experimental_onFunctionCall) {
-          const functionCall = streamedResponseMessage.function_call;
-          const functionCallResponse = await experimental_onFunctionCall(messagesRef.current, functionCall);
-          if (functionCallResponse === void 0)
+        if ("messages" in messagesAndDataOrJustMessage) {
+          for (const message of messagesAndDataOrJustMessage.messages) {
+            if (message.function_call === void 0 || typeof message.function_call === "string") {
+              break;
+            }
+            if (experimental_onFunctionCall) {
+              const functionCall = message.function_call;
+              const functionCallResponse = await experimental_onFunctionCall(
+                messagesRef.current,
+                functionCall
+              );
+              if (functionCallResponse === void 0)
+                break;
+              chatRequest = functionCallResponse;
+            }
+          }
+        } else {
+          const streamedResponseMessage = messagesAndDataOrJustMessage;
+          if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
             break;
-          chatRequest = functionCallResponse;
+          }
+          if (experimental_onFunctionCall) {
+            const functionCall = streamedResponseMessage.function_call;
+            const functionCallResponse = await experimental_onFunctionCall(
+              messagesRef.current,
+              functionCall
+            );
+            if (functionCallResponse === void 0)
+              break;
+            chatRequest = functionCallResponse;
+          }
         }
+        abortControllerRef.current = null;
+        return null;
       }
-      abortControllerRef.current = null;
-      return null;
     } catch (err) {
       if (err.name === "AbortError") {
         abortControllerRef.current = null;
@@ -275,7 +414,7 @@ function useChat({
     setInput(e.target.value);
   };
   return {
-    messages,
+    messages: messages || [],
     error,
     append,
     reload,
@@ -285,7 +424,8 @@ function useChat({
     setInput,
     handleInputChange,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 

package/solid/dist/index.js

@@ -36,14 +36,44 @@ var nanoid = (0, import_non_secure.customAlphabet)(
   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
   7
 );
-function createChunkDecoder() {
+function createChunkDecoder(complex) {
   const decoder = new TextDecoder();
+  if (!complex) {
+    return function(chunk) {
+      if (!chunk)
+        return "";
+      return decoder.decode(chunk, { stream: true });
+    };
+  }
   return function(chunk) {
-    if (!chunk)
-      return "";
-    return decoder.decode(chunk, { stream: true });
+    const decoded = decoder.decode(chunk, { stream: true }).split("\n");
+    return decoded.map(getStreamStringTypeAndValue).filter(Boolean);
   };
 }
+var StreamStringPrefixes = {
+  text: 0,
+  function_call: 1,
+  data: 2
+  // user_err: 3?
+};
+var getStreamStringTypeAndValue = (line) => {
+  const firstSeperatorIndex = line.indexOf(":");
+  const prefix = line.slice(0, firstSeperatorIndex);
+  const type = Object.keys(StreamStringPrefixes).find(
+    (key) => StreamStringPrefixes[key] === Number(prefix)
+  );
+  const val = line.slice(firstSeperatorIndex + 1);
+  let parsedVal = val;
+  if (!val) {
+    return { type, value: "" };
+  }
+  try {
+    parsedVal = JSON.parse(val);
+  } catch (e) {
+    console.error("Failed to parse JSON value:", val);
+  }
+  return { type, value: parsedVal };
+};
 
 // solid/use-chat.ts
 var uniqueId = 0;