ai 2.2.26 → 2.2.27

package/react/dist/index.mjs

@@ -149,21 +149,22 @@ function createChunkDecoder(complex) {
 }
 var COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
-// 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);
+// 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) {
@@ -178,61 +179,70 @@ async function parseComplexResponse({
     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;
+    const concatenatedChunks = concatChunks(chunks, totalLength);
     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."
-      );
+    const streamParts2 = decoder.decode(concatenatedChunks, { stream: true }).split("\n").filter((line) => line !== "").map(parseStreamPart);
+    for (const streamPart of streamParts2) {
+      yield streamPart;
     }
-    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"] = {
+    if (isAborted == null ? void 0 : isAborted()) {
+      reader.cancel();
+      break;
+    }
+  }
+}
+
+// shared/parse-complex-response.ts
+async function parseComplexResponse({
+  reader,
+  abortControllerRef,
+  update,
+  onFinish,
+  generateId = nanoid,
+  getCurrentDate = () => /* @__PURE__ */ new Date()
+}) {
+  const createdAt = getCurrentDate();
+  const prefixMap = {
+    data: []
+  };
+  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 {
@@ -677,29 +687,6 @@ 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,
@@ -721,6 +708,7 @@ function useCompletion({
     [completionId, "loading"],
     null
   );
+  const { data: streamData, mutate: mutateStreamData } = useSWR2([completionId, "streamData"], null);
   const [error, setError] = useState2(void 0);
   const completion = data;
   const [abortController, setAbortController] = useState2(null);
@@ -779,13 +767,24 @@ function useCompletion({
         const reader = res.body.getReader();
         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);
+          for await (const { type, value } of readDataStream(reader, {
+            isAborted: () => abortController2 === null
+          })) {
+            switch (type) {
+              case "text": {
+                result += value;
+                mutate(result, false);
+                break;
+              }
+              case "data": {
+                mutateStreamData(
+                  [...streamData || [], ...value || []],
+                  false
+                );
+                break;
+              }
             }
-          });
+          }
         } else {
           const decoder = createChunkDecoder();
           while (true) {
@@ -874,7 +873,8 @@ function useCompletion({
     setInput,
     handleInputChange,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 
@@ -882,7 +882,10 @@ function useCompletion({
 import { useState as useState3 } from "react";
 function experimental_useAssistant({
   api,
-  threadId: threadIdParam
+  threadId: threadIdParam,
+  credentials,
+  headers,
+  body
 }) {
   const [messages, setMessages] = useState3([]);
   const [input, setInput] = useState3("");
@@ -906,8 +909,10 @@ function experimental_useAssistant({
     setInput("");
     const result = await fetch(api, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
+      credentials,
+      headers: { "Content-Type": "application/json", ...headers },
       body: JSON.stringify({
+        ...body,
         // always use user-provided threadId when available:
         threadId: (_b = threadIdParam != null ? threadIdParam : threadId) != null ? _b : null,
         message: input,
@@ -918,9 +923,10 @@ function experimental_useAssistant({
     if (result.body == null) {
       throw new Error("The response body is empty.");
     }
-    await processMessageStream(result.body.getReader(), (message) => {
-      try {
-        const { type, value } = parseStreamPart(message);
+    try {
+      for await (const { type, value } of readDataStream(
+        result.body.getReader()
+      )) {
         switch (type) {
           case "assistant_message": {
             setMessages((messages2) => [
@@ -947,10 +953,10 @@ function experimental_useAssistant({
             break;
           }
         }
-      } catch (error2) {
-        setError(error2);
       }
-    });
+    } catch (error2) {
+      setError(error2);
+    }
     setStatus("awaiting_message");
   };
   return {

package/solid/dist/index.d.ts

@@ -279,6 +279,8 @@ type UseCompletionHelpers = {
     handleSubmit: (e: any) => void;
     /** Whether the API request is in progress */
     isLoading: Accessor<boolean>;
+    /** Additional data added on the server via StreamData */
+    data: Accessor<JSONValue[] | undefined>;
 };
 declare function useCompletion({ api, id, initialCompletion, initialInput, credentials, headers, body, onResponse, onFinish, onError, }?: UseCompletionOptions): UseCompletionHelpers;
 

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/utils.ts
-var import_non_secure = require("nanoid/non-secure");
-
 // shared/stream-parts.ts
 var textStreamPart = {
   code: "0",
@@ -154,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
@@ -185,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 {
@@ -597,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)({
@@ -633,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);
@@ -674,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) {
@@ -734,7 +766,8 @@ function useCompletion({
     input,
     setInput,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 // Annotate the CommonJS export names for ESM import in node: