ai 2.2.26 → 2.2.27

package/svelte/dist/index.mjs

@@ -498,9 +498,6 @@ 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";
-
 // shared/stream-parts.ts
 var textStreamPart = {
   code: "0",
@@ -622,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
@@ -653,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 {
@@ -1127,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) => {
@@ -1175,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) {
@@ -1240,7 +1269,8 @@ function useCompletion({
     setCompletion,
     input,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 export {

package/vue/dist/index.d.ts

@@ -273,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;
 

package/vue/dist/index.js

@@ -39,9 +39,6 @@ module.exports = __toCommonJS(vue_exports);
 var import_swrv = __toESM(require("swrv"));
 var import_vue = require("vue");
 
-// shared/utils.ts
-var import_non_secure = require("nanoid/non-secure");
-
 // shared/stream-parts.ts
 var textStreamPart = {
   code: "0",
@@ -163,7 +160,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
@@ -194,80 +235,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 {
@@ -625,6 +633,7 @@ function useCompletion({
     null
   );
   (_a = isLoading.value) != null ? _a : isLoading.value = false;
+  const { data: streamData, mutate: mutateStreamData } = useSWRV2(`${completionId}-data`, null);
   data.value || (data.value = initialCompletion);
   const mutate = (data2) => {
     store2[key] = data2;
@@ -634,6 +643,7 @@ function useCompletion({
   const error = (0, import_vue2.ref)(void 0);
   let abortController = null;
   async function triggerRequest(prompt, options) {
+    var _a2;
     try {
       error.value = void 0;
       mutateLoading(() => true);
@@ -647,6 +657,7 @@ function useCompletion({
           ...options == null ? void 0 : options.body
         }),
         headers: {
+          "Content-Type": "application/json",
           ...headers,
           ...options == null ? void 0 : options.headers
         },
@@ -672,17 +683,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 = (_a2 = streamData.value) != null ? _a2 : [];
+      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.value = [...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) {
@@ -731,7 +762,8 @@ function useCompletion({
     setCompletion,
     input,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 // Annotate the CommonJS export names for ESM import in node: