ai 2.2.25 → 2.2.27

package/solid/dist/index.js

@@ -30,12 +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");
-
 // shared/stream-parts.ts
 var textStreamPart = {
   code: "0",
@@ -157,7 +151,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
@@ -188,80 +226,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 {
@@ -284,7 +289,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -293,7 +299,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 +336,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 +448,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
@@ -511,7 +522,8 @@ function useChat({
               if (previousMessages.status === "success") {
                 mutate(previousMessages.data);
               }
-            }
+            },
+            generateId
           });
         },
         experimental_onFunctionCall,
@@ -537,7 +549,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),
@@ -593,8 +605,8 @@ function useChat({
 
 // solid/use-completion.ts
 var import_solid_js2 = require("solid-js");
-var import_swr_store2 = require("swr-store");
 var import_solid_swr_store2 = require("solid-swr-store");
+var import_swr_store2 = require("swr-store");
 var uniqueId2 = 0;
 var store2 = {};
 var completionApiStore = (0, import_swr_store2.createSWRStore)({
@@ -629,9 +641,13 @@ function useCompletion({
   };
   const completion = data;
   const [error, setError] = (0, import_solid_js2.createSignal)(void 0);
+  const [streamData, setStreamData] = (0, import_solid_js2.createSignal)(
+    void 0
+  );
   const [isLoading, setIsLoading] = (0, import_solid_js2.createSignal)(false);
   let abortController = null;
   async function triggerRequest(prompt, options) {
+    var _a;
     try {
       setError(void 0);
       setIsLoading(true);
@@ -670,17 +686,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 isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
+      if (isComplexMode) {
+        const existingData = (_a = streamData()) != null ? _a : [];
+        for await (const { type, value } of readDataStream(reader, {
+          isAborted: () => abortController === null
+        })) {
+          switch (type) {
+            case "text": {
+              result += value;
+              mutate(result);
+              break;
+            }
+            case "data": {
+              setStreamData([...existingData, ...value != null ? 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) {
@@ -730,7 +766,8 @@ function useCompletion({
     input,
     setInput,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/solid/dist/index.mjs

@@ -3,12 +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";
-
 // shared/stream-parts.ts
 var textStreamPart = {
   code: "0",
@@ -130,7 +124,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
@@ -161,80 +199,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 {
@@ -257,7 +262,8 @@ async function callApi({
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
-  onFinish
+  onFinish,
+  generateId
 }) {
   var _a;
   const response = await fetch(api, {
@@ -266,7 +272,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 +309,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 +421,8 @@ function useChat({
   onError,
   credentials,
   headers,
-  body
+  body,
+  generateId = nanoid
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
@@ -484,7 +495,8 @@ function useChat({
               if (previousMessages.status === "success") {
                 mutate(previousMessages.data);
               }
-            }
+            },
+            generateId
           });
         },
         experimental_onFunctionCall,
@@ -510,7 +522,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),
@@ -566,8 +578,8 @@ function useChat({
 
 // solid/use-completion.ts
 import { createSignal as createSignal2 } from "solid-js";
-import { createSWRStore as createSWRStore2 } from "swr-store";
 import { useSWRStore as useSWRStore2 } from "solid-swr-store";
+import { createSWRStore as createSWRStore2 } from "swr-store";
 var uniqueId2 = 0;
 var store2 = {};
 var completionApiStore = createSWRStore2({
@@ -602,9 +614,13 @@ function useCompletion({
   };
   const completion = data;
   const [error, setError] = createSignal2(void 0);
+  const [streamData, setStreamData] = createSignal2(
+    void 0
+  );
   const [isLoading, setIsLoading] = createSignal2(false);
   let abortController = null;
   async function triggerRequest(prompt, options) {
+    var _a;
     try {
       setError(void 0);
       setIsLoading(true);
@@ -643,17 +659,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 isComplexMode = res.headers.get(COMPLEX_HEADER) === "true";
+      if (isComplexMode) {
+        const existingData = (_a = streamData()) != null ? _a : [];
+        for await (const { type, value } of readDataStream(reader, {
+          isAborted: () => abortController === null
+        })) {
+          switch (type) {
+            case "text": {
+              result += value;
+              mutate(result);
+              break;
+            }
+            case "data": {
+              setStreamData([...existingData, ...value != null ? 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) {
@@ -703,7 +739,8 @@ function useCompletion({
     input,
     setInput,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 export {

package/svelte/dist/index.d.ts

@@ -35,6 +35,7 @@ interface Function {
      */
     description?: string;
 }
+type IdGenerator = () => string;
 /**
  * Shared types between the API and UI packages.
  */
@@ -115,6 +116,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'.
@@ -243,7 +249,7 @@ type UseChatHelpers = {
     /** Additional data added on the server via StreamData */
     data: Readable<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 */
@@ -276,6 +282,8 @@ type UseCompletionHelpers = {
     handleSubmit: (e: any) => void;
     /** Whether the API request is in progress */
     isLoading: Readable<boolean | undefined>;
+    /** Additional data added on the server via StreamData */
+    data: Readable<JSONValue[] | undefined>;
 };
 declare function useCompletion({ api, id, initialCompletion, initialInput, credentials, headers, body, onResponse, onFinish, onError, }?: UseCompletionOptions): UseCompletionHelpers;