ai 2.2.25 → 2.2.27

package/react/dist/index.mjs

@@ -149,24 +149,22 @@ function createChunkDecoder(complex) {
 }
 var COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
-// shared/call-api.ts
-import { nanoid as nanoid2 } from "nanoid";
-
-// shared/parse-complex-response.ts
-async function parseComplexResponse({
-  reader,
-  abortControllerRef,
-  update,
-  onFinish,
-  generateId = nanoid,
-  getCurrentDate = () => /* @__PURE__ */ new Date()
-}) {
-  const createdAt = getCurrentDate();
-  const decode = createChunkDecoder(true);
-  const prefixMap = {
-    data: []
-  };
-  const NEWLINE = "\n".charCodeAt(0);
+// shared/read-data-stream.ts
+var NEWLINE = "\n".charCodeAt(0);
+function concatChunks(chunks, totalLength) {
+  const concatenatedChunks = new Uint8Array(totalLength);
+  let offset = 0;
+  for (const chunk of chunks) {
+    concatenatedChunks.set(chunk, offset);
+    offset += chunk.length;
+  }
+  chunks.length = 0;
+  return concatenatedChunks;
+}
+async function* readDataStream(reader, {
+  isAborted
+} = {}) {
+  const decoder = new TextDecoder();
   const chunks = [];
   let totalLength = 0;
   while (true) {
@@ -181,61 +179,70 @@ async function parseComplexResponse({
     if (chunks.length === 0) {
       break;
     }
-    let concatenatedChunks = new Uint8Array(totalLength);
-    let offset = 0;
-    for (const chunk of chunks) {
-      concatenatedChunks.set(chunk, offset);
-      offset += chunk.length;
-    }
-    chunks.length = 0;
+    const concatenatedChunks = concatChunks(chunks, totalLength);
     totalLength = 0;
-    const lines = decode(concatenatedChunks);
-    if (typeof lines === "string") {
-      throw new Error(
-        "Invalid response format. Complex mode was set but the response is a string. This should never happen."
-      );
+    const streamParts2 = decoder.decode(concatenatedChunks, { stream: true }).split("\n").filter((line) => line !== "").map(parseStreamPart);
+    for (const streamPart of streamParts2) {
+      yield streamPart;
     }
-    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: generateId(),
-            role: "assistant",
-            content: value2,
-            createdAt
-          };
-        }
-      }
-      let functionCallMessage = null;
-      if (type === "function_call") {
-        prefixMap["function_call"] = {
+    if (isAborted == null ? void 0 : isAborted()) {
+      reader.cancel();
+      break;
+    }
+  }
+}
+
+// shared/parse-complex-response.ts
+async function parseComplexResponse({
+  reader,
+  abortControllerRef,
+  update,
+  onFinish,
+  generateId = nanoid,
+  getCurrentDate = () => /* @__PURE__ */ new Date()
+}) {
+  const createdAt = getCurrentDate();
+  const prefixMap = {
+    data: []
+  };
+  for await (const { type, value } of readDataStream(reader, {
+    isAborted: () => (abortControllerRef == null ? void 0 : abortControllerRef.current) === null
+  })) {
+    if (type === "text") {
+      if (prefixMap["text"]) {
+        prefixMap["text"] = {
+          ...prefixMap["text"],
+          content: (prefixMap["text"].content || "") + value
+        };
+      } else {
+        prefixMap["text"] = {
           id: generateId(),
           role: "assistant",
-          content: "",
-          function_call: value2.function_call,
-          name: value2.function_call.name,
+          content: value,
           createdAt
         };
-        functionCallMessage = prefixMap["function_call"];
-      }
-      if (type === "data") {
-        prefixMap["data"].push(...value2);
-      }
-      const responseMessage = prefixMap["text"];
-      const merged = [functionCallMessage, responseMessage].filter(
-        Boolean
-      );
-      update(merged, [...prefixMap["data"]]);
-      if ((abortControllerRef == null ? void 0 : abortControllerRef.current) === null) {
-        reader.cancel();
-        break;
       }
     }
+    let functionCallMessage = null;
+    if (type === "function_call") {
+      prefixMap["function_call"] = {
+        id: generateId(),
+        role: "assistant",
+        content: "",
+        function_call: value.function_call,
+        name: value.function_call.name,
+        createdAt
+      };
+      functionCallMessage = prefixMap["function_call"];
+    }
+    if (type === "data") {
+      prefixMap["data"].push(...value);
+    }
+    const responseMessage = prefixMap["text"];
+    const merged = [functionCallMessage, responseMessage].filter(
+      Boolean
+    );
+    update(merged, [...prefixMap["data"]]);
   }
   onFinish == null ? void 0 : onFinish(prefixMap);
   return {
@@ -258,7 +265,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -267,7 +275,10 @@ async function callApi({
       messages,
       ...body
     }),
-    headers,
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
     signal: (_a = abortController == null ? void 0 : abortController()) == null ? void 0 : _a.signal,
     credentials
   }).catch((err) => {
@@ -301,13 +312,14 @@ async function callApi({
         if (onFinish && prefixMap.text != null) {
           onFinish(prefixMap.text);
         }
-      }
+      },
+      generateId
     });
   } else {
     const createdAt = /* @__PURE__ */ new Date();
     const decode = createChunkDecoder(false);
     let streamedResponse = "";
-    const replyId = nanoid2();
+    const replyId = generateId();
     let responseMessage = {
       id: replyId,
       createdAt,
@@ -392,7 +404,7 @@ async function processChatStream({
 }
 
 // react/use-chat.ts
-var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadataRef, messagesRef, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
+var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadataRef, messagesRef, abortControllerRef, generateId, onFinish, onResponse, sendExtraMessageFields) => {
   var _a, _b;
   const previousMessages = messagesRef.current;
   mutate(chatRequest.messages, false);
@@ -405,7 +417,7 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
     }
   }));
   if (typeof api !== "string") {
-    const replyId = nanoid();
+    const replyId = generateId();
     const createdAt = /* @__PURE__ */ new Date();
     let responseMessage = {
       id: replyId,
@@ -468,7 +480,8 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
       mutate([...chatRequest.messages, ...merged], false);
       mutateStreamData([...existingData || [], ...data || []], false);
     },
-    onFinish
+    onFinish,
+    generateId
   });
 };
 function useChat({
@@ -483,7 +496,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const hookId = useId();
   const chatId = id || hookId;
@@ -531,6 +545,7 @@ function useChat({
             extraMetadataRef,
             messagesRef,
             abortControllerRef,
+            generateId,
             onFinish,
             onResponse,
             sendExtraMessageFields
@@ -569,13 +584,14 @@ function useChat({
       sendExtraMessageFields,
       experimental_onFunctionCall,
       messagesRef.current,
-      abortControllerRef.current
+      abortControllerRef.current,
+      generateId
     ]
   );
   const append = useCallback(
     async (message, { options, functions, function_call, data } = {}) => {
       if (!message.id) {
-        message.id = nanoid();
+        message.id = generateId();
       }
       const chatRequest = {
         messages: messagesRef.current.concat(message),
@@ -586,7 +602,7 @@ function useChat({
       };
       return triggerRequest(chatRequest);
     },
-    [triggerRequest]
+    [triggerRequest, generateId]
   );
   const reload = useCallback(
     async ({ options, functions, function_call } = {}) => {
@@ -692,6 +708,7 @@ function useCompletion({
     [completionId, "loading"],
     null
   );
+  const { data: streamData, mutate: mutateStreamData } = useSWR2([completionId, "streamData"], null);
   const [error, setError] = useState2(void 0);
   const completion = data;
   const [abortController, setAbortController] = useState2(null);
@@ -748,17 +765,39 @@ function useCompletion({
         }
         let result = "";
         const reader = res.body.getReader();
-        const decoder = createChunkDecoder();
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) {
-            break;
+        const isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
+        if (isComplexMode) {
+          for await (const { type, value } of readDataStream(reader, {
+            isAborted: () => abortController2 === null
+          })) {
+            switch (type) {
+              case "text": {
+                result += value;
+                mutate(result, false);
+                break;
+              }
+              case "data": {
+                mutateStreamData(
+                  [...streamData || [], ...value || []],
+                  false
+                );
+                break;
+              }
+            }
           }
-          result += decoder(value);
-          mutate(result, false);
-          if (abortController2 === null) {
-            reader.cancel();
-            break;
+        } else {
+          const decoder = createChunkDecoder();
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) {
+              break;
+            }
+            result += decoder(value);
+            mutate(result, false);
+            if (abortController2 === null) {
+              reader.cancel();
+              break;
+            }
           }
         }
         if (onFinish) {
@@ -834,50 +873,31 @@ function useCompletion({
     setInput,
     handleInputChange,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 
 // react/use-assistant.ts
 import { useState as useState3 } from "react";
-
-// shared/process-message-stream.ts
-async function processMessageStream(reader, processMessage) {
-  const decoder = new TextDecoder();
-  let buffer = "";
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      if (buffer.length > 0) {
-        processMessage(buffer);
-      }
-      break;
-    }
-    buffer += decoder.decode(value, { stream: true });
-    let endIndex;
-    while ((endIndex = buffer.indexOf("\n")) !== -1) {
-      processMessage(buffer.substring(0, endIndex).trim());
-      buffer = buffer.substring(endIndex + 1);
-    }
-  }
-}
-
-// react/use-assistant.ts
 function experimental_useAssistant({
   api,
-  threadId: threadIdParam
+  threadId: threadIdParam,
+  credentials,
+  headers,
+  body
 }) {
   const [messages, setMessages] = useState3([]);
   const [input, setInput] = useState3("");
   const [threadId, setThreadId] = useState3(void 0);
   const [status, setStatus] = useState3("awaiting_message");
   const [error, setError] = useState3(void 0);
-  const handleInputChange = (e) => {
-    setInput(e.target.value);
+  const handleInputChange = (event) => {
+    setInput(event.target.value);
   };
-  const submitMessage = async (e) => {
-    var _a;
-    e.preventDefault();
+  const submitMessage = async (event, requestOptions) => {
+    var _a, _b;
+    (_a = event == null ? void 0 : event.preventDefault) == null ? void 0 : _a.call(event);
     if (input === "") {
       return;
     }
@@ -889,19 +909,24 @@ function experimental_useAssistant({
     setInput("");
     const result = await fetch(api, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
+      credentials,
+      headers: { "Content-Type": "application/json", ...headers },
       body: JSON.stringify({
+        ...body,
         // always use user-provided threadId when available:
-        threadId: (_a = threadIdParam != null ? threadIdParam : threadId) != null ? _a : null,
-        message: input
+        threadId: (_b = threadIdParam != null ? threadIdParam : threadId) != null ? _b : null,
+        message: input,
+        // optional request data:
+        data: requestOptions == null ? void 0 : requestOptions.data
       })
     });
     if (result.body == null) {
       throw new Error("The response body is empty.");
     }
-    await processMessageStream(result.body.getReader(), (message) => {
-      try {
-        const { type, value } = parseStreamPart(message);
+    try {
+      for await (const { type, value } of readDataStream(
+        result.body.getReader()
+      )) {
         switch (type) {
           case "assistant_message": {
             setMessages((messages2) => [
@@ -928,10 +953,10 @@ function experimental_useAssistant({
             break;
           }
         }
-      } catch (error2) {
-        setError(error2);
       }
-    });
+    } catch (error2) {
+      setError(error2);
+    }
     setStatus("awaiting_message");
   };
   return {

package/solid/dist/index.d.ts

@@ -35,6 +35,7 @@ interface Function {
      */
     description?: string;
 }
+type IdGenerator = () => string;
 /**
  * Shared types between the API and UI packages.
  */
@@ -109,6 +110,11 @@ type UseChatOptions = {
      * Callback function to be called when an error is encountered.
      */
     onError?: (error: Error) => void;
+    /**
+     * A way to provide a function that is going to be used for ids for messages.
+     * If not provided nanoid is used by default.
+     */
+    generateId?: IdGenerator;
     /**
      * The credentials mode to be used for the fetch request.
      * Possible values are: 'omit', 'same-origin', 'include'.
@@ -238,7 +244,7 @@ type UseChatHelpers = {
     /** Additional data added on the server via StreamData */
     data: Accessor<JSONValue[] | undefined>;
 };
-declare function useChat({ api, id, initialMessages, initialInput, sendExtraMessageFields, experimental_onFunctionCall, onResponse, onFinish, onError, credentials, headers, body, }?: UseChatOptions): UseChatHelpers;
+declare function useChat({ api, id, initialMessages, initialInput, sendExtraMessageFields, experimental_onFunctionCall, onResponse, onFinish, onError, credentials, headers, body, generateId, }?: UseChatOptions): UseChatHelpers;
 
 type UseCompletionHelpers = {
     /** The current completion result */
@@ -273,6 +279,8 @@ type UseCompletionHelpers = {
     handleSubmit: (e: any) => void;
     /** Whether the API request is in progress */
     isLoading: Accessor<boolean>;
+    /** Additional data added on the server via StreamData */
+    data: Accessor<JSONValue[] | undefined>;
 };
 declare function useCompletion({ api, id, initialCompletion, initialInput, credentials, headers, body, onResponse, onFinish, onError, }?: UseCompletionOptions): UseCompletionHelpers;