ai 2.2.24 → 2.2.26

package/svelte/dist/index.mjs

@@ -1,6 +1,3 @@
-// svelte/use-chat.ts
-import { get, writable, derived } from "svelte/store";
-
 // ../../node_modules/.pnpm/swrev@4.0.0/node_modules/swrev/dist/swrev.mjs
 var P = Object.defineProperty;
 var F = (r, e, t) => e in r ? P(r, e, { enumerable: true, configurable: true, writable: true, value: t }) : r[e] = t;
@@ -498,6 +495,9 @@ var W = (t) => new O2(t);
 var c = W();
 var F2 = (t, e) => c.useSWR(t, e);
 
+// svelte/use-chat.ts
+import { derived, get, writable } from "svelte/store";
+
 // shared/utils.ts
 import { customAlphabet } from "nanoid/non-secure";
 
@@ -641,103 +641,297 @@ function createChunkDecoder(complex) {
     return decoded.map(parseStreamPart).filter(Boolean);
   };
 }
+var COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
-// svelte/use-chat.ts
-var getStreamedResponse = async (api, chatRequest, mutate, extraMetadata, previousMessages, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
-  var _a, _b, _c, _d;
-  mutate(chatRequest.messages);
-  const res = await fetch(api, {
+// 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);
+  const chunks = [];
+  let totalLength = 0;
+  while (true) {
+    const { value } = await reader.read();
+    if (value) {
+      chunks.push(value);
+      totalLength += value.length;
+      if (value[value.length - 1] !== NEWLINE) {
+        continue;
+      }
+    }
+    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;
+    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."
+      );
+    }
+    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"] = {
+          id: generateId(),
+          role: "assistant",
+          content: "",
+          function_call: value2.function_call,
+          name: value2.function_call.name,
+          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;
+      }
+    }
+  }
+  onFinish == null ? void 0 : onFinish(prefixMap);
+  return {
+    messages: [prefixMap.text, prefixMap.function_call].filter(
+      Boolean
+    ),
+    data: prefixMap.data
+  };
+}
+
+// shared/call-api.ts
+async function callApi({
+  api,
+  messages,
+  body,
+  credentials,
+  headers,
+  abortController,
+  appendMessage,
+  restoreMessagesOnFailure,
+  onResponse,
+  onUpdate,
+  onFinish,
+  generateId
+}) {
+  var _a;
+  const response = await fetch(api, {
     method: "POST",
     body: JSON.stringify({
-      messages: sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(
-        ({ role, content, name, function_call }) => ({
-          role,
-          content,
-          ...name !== void 0 && { name },
-          ...function_call !== void 0 && {
-            function_call
-          }
-        })
-      ),
-      ...extraMetadata.body,
-      ...(_a = chatRequest.options) == null ? void 0 : _a.body,
-      ...chatRequest.functions !== void 0 && {
-        functions: chatRequest.functions
-      },
-      ...chatRequest.function_call !== void 0 && {
-        function_call: chatRequest.function_call
-      }
+      messages,
+      ...body
     }),
-    credentials: extraMetadata.credentials,
     headers: {
-      ...extraMetadata.headers,
-      ...(_b = chatRequest.options) == null ? void 0 : _b.headers
+      "Content-Type": "application/json",
+      ...headers
     },
-    ...abortControllerRef !== null && {
-      signal: abortControllerRef.signal
-    }
+    signal: (_a = abortController == null ? void 0 : abortController()) == null ? void 0 : _a.signal,
+    credentials
   }).catch((err) => {
-    mutate(previousMessages);
+    restoreMessagesOnFailure();
     throw err;
   });
   if (onResponse) {
     try {
-      await onResponse(res);
+      await onResponse(response);
     } catch (err) {
       throw err;
     }
   }
-  if (!res.ok) {
-    mutate(previousMessages);
-    throw new Error(await res.text() || "Failed to fetch the chat response.");
+  if (!response.ok) {
+    restoreMessagesOnFailure();
+    throw new Error(
+      await response.text() || "Failed to fetch the chat response."
+    );
   }
-  if (!res.body) {
+  if (!response.body) {
     throw new Error("The response body is empty.");
   }
-  let streamedResponse = "";
-  const createdAt = /* @__PURE__ */ new Date();
-  const replyId = nanoid();
-  const reader = res.body.getReader();
-  const decode = createChunkDecoder();
-  let responseMessage = {
-    id: replyId,
-    createdAt,
-    content: "",
-    role: "assistant"
-  };
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
+  const reader = response.body.getReader();
+  const isComplexMode = response.headers.get(COMPLEX_HEADER) === "true";
+  if (isComplexMode) {
+    return await parseComplexResponse({
+      reader,
+      abortControllerRef: abortController != null ? { current: abortController() } : void 0,
+      update: onUpdate,
+      onFinish(prefixMap) {
+        if (onFinish && prefixMap.text != null) {
+          onFinish(prefixMap.text);
+        }
+      },
+      generateId
+    });
+  } else {
+    const createdAt = /* @__PURE__ */ new Date();
+    const decode = createChunkDecoder(false);
+    let streamedResponse = "";
+    const replyId = generateId();
+    let responseMessage = {
+      id: replyId,
+      createdAt,
+      content: "",
+      role: "assistant"
+    };
+    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;
+      }
+      appendMessage({ ...responseMessage });
+      if ((abortController == null ? void 0 : abortController()) === null) {
+        reader.cancel();
+        break;
+      }
     }
-    streamedResponse += decode(value);
-    const functionStart = streamedResponse.indexOf("{");
-    if (functionStart !== -1) {
-      const matches = /(.*?)(?:({"function_call".*?}})(.*))?$/gs.exec(
-        streamedResponse
-      );
-      responseMessage.content = `${(_c = matches == null ? void 0 : matches[1]) != null ? _c : ""}${(_d = matches == null ? void 0 : matches[3]) != null ? _d : ""}`;
-      responseMessage.function_call = matches == null ? void 0 : matches[2];
-    } else {
-      responseMessage.content = streamedResponse;
+    if (streamedResponse.startsWith('{"function_call":')) {
+      const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
+      responseMessage["function_call"] = parsedFunctionCall;
+      appendMessage({ ...responseMessage });
     }
-    mutate([...chatRequest.messages, { ...responseMessage }]);
-    if (abortControllerRef === null) {
-      reader.cancel();
-      break;
+    if (onFinish) {
+      onFinish(responseMessage);
     }
+    return responseMessage;
   }
-  if (typeof responseMessage.function_call === "string") {
-    const parsedFunctionCall = JSON.parse(
-      responseMessage.function_call
-    ).function_call;
-    responseMessage.function_call = parsedFunctionCall;
-    mutate([...chatRequest.messages, { ...responseMessage }]);
-  }
-  if (onFinish) {
-    onFinish(responseMessage);
+}
+
+// shared/process-chat-stream.ts
+async function processChatStream({
+  getStreamedResponse: getStreamedResponse2,
+  experimental_onFunctionCall,
+  updateChatRequest,
+  getCurrentMessages
+}) {
+  while (true) {
+    const messagesAndDataOrJustMessage = await getStreamedResponse2();
+    if ("messages" in messagesAndDataOrJustMessage) {
+      let hasFollowingResponse = false;
+      for (const message of messagesAndDataOrJustMessage.messages) {
+        if (message.function_call === void 0 || typeof message.function_call === "string") {
+          continue;
+        }
+        hasFollowingResponse = true;
+        if (experimental_onFunctionCall) {
+          const functionCall = message.function_call;
+          const functionCallResponse = await experimental_onFunctionCall(
+            getCurrentMessages(),
+            functionCall
+          );
+          if (functionCallResponse === void 0) {
+            hasFollowingResponse = false;
+            break;
+          }
+          updateChatRequest(functionCallResponse);
+        }
+      }
+      if (!hasFollowingResponse) {
+        break;
+      }
+    } else {
+      const streamedResponseMessage = messagesAndDataOrJustMessage;
+      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(getCurrentMessages(), functionCall);
+        if (functionCallResponse === void 0)
+          break;
+        updateChatRequest(functionCallResponse);
+      }
+    }
   }
-  return responseMessage;
+}
+
+// svelte/use-chat.ts
+var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadata, previousMessages, abortControllerRef, generateId, onFinish, onResponse, sendExtraMessageFields) => {
+  var _a, _b;
+  mutate(chatRequest.messages);
+  const constructedMessagesPayload = sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(({ role, content, name, function_call }) => ({
+    role,
+    content,
+    ...name !== void 0 && { name },
+    ...function_call !== void 0 && {
+      function_call
+    }
+  }));
+  return await callApi({
+    api,
+    messages: constructedMessagesPayload,
+    body: {
+      ...extraMetadata.body,
+      ...(_a = chatRequest.options) == null ? void 0 : _a.body,
+      ...chatRequest.functions !== void 0 && {
+        functions: chatRequest.functions
+      },
+      ...chatRequest.function_call !== void 0 && {
+        function_call: chatRequest.function_call
+      }
+    },
+    credentials: extraMetadata.credentials,
+    headers: {
+      ...extraMetadata.headers,
+      ...(_b = chatRequest.options) == null ? void 0 : _b.headers
+    },
+    abortController: () => abortControllerRef,
+    appendMessage(message) {
+      mutate([...chatRequest.messages, message]);
+    },
+    restoreMessagesOnFailure() {
+      mutate(previousMessages);
+    },
+    onResponse,
+    onUpdate(merged, data) {
+      mutate([...chatRequest.messages, ...merged]);
+      mutateStreamData([...existingData || [], ...data || []]);
+    },
+    onFinish,
+    generateId
+  });
 };
 var uniqueId = 0;
 var store = {};
@@ -753,7 +947,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
@@ -765,6 +960,7 @@ function useChat({
     fetcher: () => store[key] || initialMessages,
     fallbackData: initialMessages
   });
+  const streamData = writable(void 0);
   const loading = writable(false);
   data.set(initialMessages);
   const mutate = (data2) => {
@@ -784,29 +980,29 @@ function useChat({
       error.set(void 0);
       loading.set(true);
       abortController = new AbortController();
-      while (true) {
-        const streamedResponseMessage = await getStreamedResponse(
+      await processChatStream({
+        getStreamedResponse: () => getStreamedResponse(
           api,
           chatRequest,
           mutate,
+          (data2) => {
+            streamData.set(data2);
+          },
+          get(streamData),
           extraMetadata,
           get(messages),
           abortController,
+          generateId,
           onFinish,
           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(get(messages), functionCall);
-          if (functionCallResponse === void 0)
-            break;
-          chatRequest = functionCallResponse;
-        }
-      }
+        ),
+        experimental_onFunctionCall,
+        updateChatRequest: (chatRequestParam) => {
+          chatRequest = chatRequestParam;
+        },
+        getCurrentMessages: () => get(messages)
+      });
       abortController = null;
       return null;
     } catch (err) {
@@ -824,7 +1020,7 @@ function useChat({
   }
   const append = async (message, { options, functions, function_call } = {}) => {
     if (!message.id) {
-      message.id = nanoid();
+      message.id = generateId();
     }
     const chatRequest = {
       messages: get(messages).concat(message),
@@ -900,7 +1096,8 @@ function useChat({
     setMessages,
     input,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 

package/vue/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'.
@@ -195,6 +201,9 @@ type UseCompletionOptions = {
      */
     body?: object;
 };
+type JSONValue = null | string | number | boolean | {
+    [x: string]: JSONValue;
+} | Array<JSONValue>;
 
 type UseChatHelpers = {
     /** Current messages in the chat */
@@ -228,8 +237,10 @@ type UseChatHelpers = {
     handleSubmit: (e: any) => void;
     /** Whether the API request is in progress */
     isLoading: Ref<boolean | undefined>;
+    /** Additional data added on the server via StreamData */
+    data: Ref<JSONValue[] | undefined>;
 };
-declare function useChat({ api, id, initialMessages, initialInput, sendExtraMessageFields, 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 */