ai 2.2.25 → 2.2.27

package/svelte/dist/index.js

@@ -525,12 +525,6 @@ var F2 = (t, e) => c.useSWR(t, e);
 // svelte/use-chat.ts
 var import_store = require("svelte/store");
 
-// shared/call-api.ts
-var import_nanoid = require("nanoid");
-
-// shared/utils.ts
-var import_non_secure = require("nanoid/non-secure");
-
 // shared/stream-parts.ts
 var textStreamPart = {
   code: "0",
@@ -652,7 +646,51 @@ var parseStreamPart = (line) => {
   return streamPartsByCode[code].parse(jsonValue);
 };
 
+// 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) {
+    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;
+    }
+    const concatenatedChunks = concatChunks(chunks, totalLength);
+    totalLength = 0;
+    const streamParts2 = decoder.decode(concatenatedChunks, { stream: true }).split("\n").filter((line) => line !== "").map(parseStreamPart);
+    for (const streamPart of streamParts2) {
+      yield streamPart;
+    }
+    if (isAborted == null ? void 0 : isAborted()) {
+      reader.cancel();
+      break;
+    }
+  }
+}
+
 // shared/utils.ts
+var import_non_secure = require("nanoid/non-secure");
 var nanoid = (0, import_non_secure.customAlphabet)(
   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
   7
@@ -683,80 +721,47 @@ async function parseComplexResponse({
   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"] = {
+  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 {
@@ -779,7 +784,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -788,7 +794,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) => {
@@ -822,13 +831,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,
@@ -913,7 +923,7 @@ async function processChatStream({
 }
 
 // svelte/use-chat.ts
-var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadata, previousMessages, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
+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 }) => ({
@@ -954,7 +964,8 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
       mutate([...chatRequest.messages, ...merged]);
       mutateStreamData([...existingData || [], ...data || []]);
     },
-    onFinish
+    onFinish,
+    generateId
   });
 };
 var uniqueId = 0;
@@ -971,7 +982,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
@@ -1015,6 +1027,7 @@ function useChat({
           extraMetadata,
           (0, import_store.get)(messages),
           abortController,
+          generateId,
           onFinish,
           onResponse,
           sendExtraMessageFields
@@ -1042,7 +1055,7 @@ function useChat({
   }
   const append = async (message, { options, functions, function_call } = {}) => {
     if (!message.id) {
-      message.id = nanoid();
+      message.id = generateId();
     }
     const chatRequest = {
       messages: (0, import_store.get)(messages).concat(message),
@@ -1149,6 +1162,7 @@ function useCompletion({
     fetcher: () => store2[key] || initialCompletion,
     fallbackData: initialCompletion
   });
+  const streamData = (0, import_store2.writable)(void 0);
   const loading = (0, import_store2.writable)(false);
   data.set(initialCompletion);
   const mutate = (data2) => {
@@ -1197,17 +1211,37 @@ function useCompletion({
       }
       let result = "";
       const reader = res.body.getReader();
-      const decoder = createChunkDecoder();
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          break;
+      const existingData = (0, import_store2.get)(streamData);
+      const isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
+      if (isComplexMode) {
+        for await (const { type, value } of readDataStream(reader, {
+          isAborted: () => abortController === null
+        })) {
+          switch (type) {
+            case "text": {
+              result += value;
+              mutate(result);
+              break;
+            }
+            case "data": {
+              streamData.set([...existingData || [], ...value || []]);
+              break;
+            }
+          }
         }
-        result += decoder(value);
-        mutate(result);
-        if (abortController === null) {
-          reader.cancel();
-          break;
+      } else {
+        const decoder = createChunkDecoder();
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            break;
+          }
+          result += decoder(value);
+          mutate(result);
+          if (abortController === null) {
+            reader.cancel();
+            break;
+          }
         }
       }
       if (onFinish) {
@@ -1262,7 +1296,8 @@ function useCompletion({
     setCompletion,
     input,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/svelte/dist/index.mjs

@@ -498,12 +498,6 @@ var F2 = (t, e) => c.useSWR(t, e);
 // svelte/use-chat.ts
 import { derived, get, writable } from "svelte/store";
 
-// shared/call-api.ts
-import { nanoid as nanoid2 } from "nanoid";
-
-// shared/utils.ts
-import { customAlphabet } from "nanoid/non-secure";
-
 // shared/stream-parts.ts
 var textStreamPart = {
   code: "0",
@@ -625,7 +619,51 @@ var parseStreamPart = (line) => {
   return streamPartsByCode[code].parse(jsonValue);
 };
 
+// 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) {
+    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;
+    }
+    const concatenatedChunks = concatChunks(chunks, totalLength);
+    totalLength = 0;
+    const streamParts2 = decoder.decode(concatenatedChunks, { stream: true }).split("\n").filter((line) => line !== "").map(parseStreamPart);
+    for (const streamPart of streamParts2) {
+      yield streamPart;
+    }
+    if (isAborted == null ? void 0 : isAborted()) {
+      reader.cancel();
+      break;
+    }
+  }
+}
+
 // shared/utils.ts
+import { customAlphabet } from "nanoid/non-secure";
 var nanoid = customAlphabet(
   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
   7
@@ -656,80 +694,47 @@ async function parseComplexResponse({
   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"] = {
+  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 {
@@ -752,7 +757,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -761,7 +767,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) => {
@@ -795,13 +804,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,
@@ -886,7 +896,7 @@ async function processChatStream({
 }
 
 // svelte/use-chat.ts
-var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadata, previousMessages, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
+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 }) => ({
@@ -927,7 +937,8 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
       mutate([...chatRequest.messages, ...merged]);
       mutateStreamData([...existingData || [], ...data || []]);
     },
-    onFinish
+    onFinish,
+    generateId
   });
 };
 var uniqueId = 0;
@@ -944,7 +955,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
@@ -988,6 +1000,7 @@ function useChat({
           extraMetadata,
           get(messages),
           abortController,
+          generateId,
           onFinish,
           onResponse,
           sendExtraMessageFields
@@ -1015,7 +1028,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),
@@ -1122,6 +1135,7 @@ function useCompletion({
     fetcher: () => store2[key] || initialCompletion,
     fallbackData: initialCompletion
   });
+  const streamData = writable2(void 0);
   const loading = writable2(false);
   data.set(initialCompletion);
   const mutate = (data2) => {
@@ -1170,17 +1184,37 @@ function useCompletion({
       }
       let result = "";
       const reader = res.body.getReader();
-      const decoder = createChunkDecoder();
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          break;
+      const existingData = get2(streamData);
+      const isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
+      if (isComplexMode) {
+        for await (const { type, value } of readDataStream(reader, {
+          isAborted: () => abortController === null
+        })) {
+          switch (type) {
+            case "text": {
+              result += value;
+              mutate(result);
+              break;
+            }
+            case "data": {
+              streamData.set([...existingData || [], ...value || []]);
+              break;
+            }
+          }
         }
-        result += decoder(value);
-        mutate(result);
-        if (abortController === null) {
-          reader.cancel();
-          break;
+      } else {
+        const decoder = createChunkDecoder();
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            break;
+          }
+          result += decoder(value);
+          mutate(result);
+          if (abortController === null) {
+            reader.cancel();
+            break;
+          }
         }
       }
       if (onFinish) {
@@ -1235,7 +1269,8 @@ function useCompletion({
     setCompletion,
     input,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 export {

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 */
@@ -262,6 +273,8 @@ type UseCompletionHelpers = {
     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 useCompletion({ api, id, initialCompletion, initialInput, credentials, headers, body, onResponse, onFinish, onError, }?: UseCompletionOptions): UseCompletionHelpers;