ai 2.2.24 → 2.2.26

package/react/dist/index.js

@@ -186,9 +186,6 @@ function createChunkDecoder(complex) {
 }
 var COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
-// shared/call-api.ts
-var import_nanoid = require("nanoid");
-
 // shared/parse-complex-response.ts
 async function parseComplexResponse({
   reader,
@@ -295,7 +292,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -304,7 +302,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) => {
@@ -338,13 +339,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 = (0, import_nanoid.nanoid)();
+    const replyId = generateId();
     let responseMessage = {
       id: replyId,
       createdAt,
@@ -429,7 +431,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);
@@ -442,7 +444,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,
@@ -505,7 +507,8 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
       mutate([...chatRequest.messages, ...merged], false);
       mutateStreamData([...existingData || [], ...data || []], false);
     },
-    onFinish
+    onFinish,
+    generateId
   });
 };
 function useChat({
@@ -520,7 +523,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const hookId = (0, import_react.useId)();
   const chatId = id || hookId;
@@ -568,6 +572,7 @@ function useChat({
             extraMetadataRef,
             messagesRef,
             abortControllerRef,
+            generateId,
             onFinish,
             onResponse,
             sendExtraMessageFields
@@ -606,13 +611,14 @@ function useChat({
       sendExtraMessageFields,
       experimental_onFunctionCall,
       messagesRef.current,
-      abortControllerRef.current
+      abortControllerRef.current,
+      generateId
     ]
   );
   const append = (0, import_react.useCallback)(
     async (message, { options, functions, function_call, data } = {}) => {
       if (!message.id) {
-        message.id = nanoid();
+        message.id = generateId();
       }
       const chatRequest = {
         messages: messagesRef.current.concat(message),
@@ -623,7 +629,7 @@ function useChat({
       };
       return triggerRequest(chatRequest);
     },
-    [triggerRequest]
+    [triggerRequest, generateId]
   );
   const reload = (0, import_react.useCallback)(
     async ({ options, functions, function_call } = {}) => {
@@ -708,6 +714,29 @@ function useChat({
 // react/use-completion.ts
 var import_react2 = require("react");
 var import_swr2 = __toESM(require("swr"));
+
+// 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-completion.ts
 function useCompletion({
   api = "/api/completion",
   id,
@@ -785,17 +814,28 @@ function useCompletion({
         }
         let result = "";
         const reader = res.body.getReader();
-        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;
+        const isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
+        if (isComplexMode) {
+          await processMessageStream(reader, (message) => {
+            const { type, value } = parseStreamPart(message);
+            if (type === "text") {
+              result += value;
+              mutate(result, false);
+            }
+          });
+        } 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) {
@@ -877,29 +917,6 @@ function useCompletion({
 
 // react/use-assistant.ts
 var import_react3 = require("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
@@ -909,12 +926,12 @@ function experimental_useAssistant({
   const [threadId, setThreadId] = (0, import_react3.useState)(void 0);
   const [status, setStatus] = (0, import_react3.useState)("awaiting_message");
   const [error, setError] = (0, import_react3.useState)(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;
     }
@@ -929,8 +946,10 @@ function experimental_useAssistant({
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
         // 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) {
@@ -973,6 +992,7 @@ function experimental_useAssistant({
   };
   return {
     messages,
+    threadId,
     input,
     handleInputChange,
     submitMessage,

package/react/dist/index.mjs

@@ -149,9 +149,6 @@ 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,
@@ -258,7 +255,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -267,7 +265,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 +302,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 +394,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 +407,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 +470,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 +486,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const hookId = useId();
   const chatId = id || hookId;
@@ -531,6 +535,7 @@ function useChat({
             extraMetadataRef,
             messagesRef,
             abortControllerRef,
+            generateId,
             onFinish,
             onResponse,
             sendExtraMessageFields
@@ -569,13 +574,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 +592,7 @@ function useChat({
       };
       return triggerRequest(chatRequest);
     },
-    [triggerRequest]
+    [triggerRequest, generateId]
   );
   const reload = useCallback(
     async ({ options, functions, function_call } = {}) => {
@@ -671,6 +677,29 @@ function useChat({
 // react/use-completion.ts
 import { useCallback as useCallback2, useEffect as useEffect2, useId as useId2, useRef as useRef2, useState as useState2 } from "react";
 import useSWR2 from "swr";
+
+// 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-completion.ts
 function useCompletion({
   api = "/api/completion",
   id,
@@ -748,17 +777,28 @@ function useCompletion({
         }
         let result = "";
         const reader = res.body.getReader();
-        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;
+        const isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
+        if (isComplexMode) {
+          await processMessageStream(reader, (message) => {
+            const { type, value } = parseStreamPart(message);
+            if (type === "text") {
+              result += value;
+              mutate(result, false);
+            }
+          });
+        } 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) {
@@ -840,29 +880,6 @@ function useCompletion({
 
 // 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
@@ -872,12 +889,12 @@ function experimental_useAssistant({
   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;
     }
@@ -892,8 +909,10 @@ function experimental_useAssistant({
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
         // 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) {
@@ -936,6 +955,7 @@ function experimental_useAssistant({
   };
   return {
     messages,
+    threadId,
     input,
     handleInputChange,
     submitMessage,

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 */

package/solid/dist/index.js

@@ -30,9 +30,6 @@ var import_solid_js = require("solid-js");
 var import_solid_swr_store = require("solid-swr-store");
 var import_swr_store = require("swr-store");
 
-// shared/call-api.ts
-var import_nanoid = require("nanoid");
-
 // shared/utils.ts
 var import_non_secure = require("nanoid/non-secure");
 
@@ -284,7 +281,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -293,7 +291,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) => {
@@ -327,13 +328,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 = (0, import_nanoid.nanoid)();
+    const replyId = generateId();
     let responseMessage = {
       id: replyId,
       createdAt,
@@ -438,7 +440,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
@@ -511,7 +514,8 @@ function useChat({
               if (previousMessages.status === "success") {
                 mutate(previousMessages.data);
               }
-            }
+            },
+            generateId
           });
         },
         experimental_onFunctionCall,
@@ -537,7 +541,7 @@ function useChat({
   const append = async (message, options) => {
     var _a;
     if (!message.id) {
-      message.id = nanoid();
+      message.id = generateId();
     }
     return triggerRequest(
       ((_a = messages()) != null ? _a : []).concat(message),

package/solid/dist/index.mjs

@@ -3,9 +3,6 @@ import { createSignal } from "solid-js";
 import { useSWRStore } from "solid-swr-store";
 import { createSWRStore } from "swr-store";
 
-// shared/call-api.ts
-import { nanoid as nanoid2 } from "nanoid";
-
 // shared/utils.ts
 import { customAlphabet } from "nanoid/non-secure";
 
@@ -257,7 +254,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -266,7 +264,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) => {
@@ -300,13 +301,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,
@@ -411,7 +413,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
@@ -484,7 +487,8 @@ function useChat({
               if (previousMessages.status === "success") {
                 mutate(previousMessages.data);
               }
-            }
+            },
+            generateId
           });
         },
         experimental_onFunctionCall,
@@ -510,7 +514,7 @@ function useChat({
   const append = async (message, options) => {
     var _a;
     if (!message.id) {
-      message.id = nanoid();
+      message.id = generateId();
     }
     return triggerRequest(
       ((_a = messages()) != null ? _a : []).concat(message),