ai 2.2.26 → 2.2.27

package/dist/index.js

@@ -863,21 +863,22 @@ async function ReplicateStream(res, cb, options) {
   );
 }
 
-// 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) {
@@ -892,61 +893,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 {

package/dist/index.mjs

@@ -815,21 +815,22 @@ async function ReplicateStream(res, cb, options) {
   );
 }
 
-// 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) {
@@ -844,61 +845,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 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "2.2.26",
+  "version": "2.2.27",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -76,14 +76,14 @@
     "@types/node": "^17.0.12",
     "@types/react": "^18.2.8",
     "@types/react-dom": "^18.2.0",
-    "@vue/vue3-jest": "28",
+    "@vitejs/plugin-react": "4.2.0",
+    "@vitejs/plugin-vue": "4.5.0",
     "eslint": "^7.32.0",
-    "jest": "29.2.1",
-    "jest-environment-jsdom": "^29.7.0",
-    "jsdom": "^22.1.0",
-    "langchain": "0.0.172",
+    "jsdom": "^23.0.0",
+    "langchain": "0.0.196",
+    "msw": "2.0.9",
     "openai": "4.16.1",
-    "ts-jest": "29.0.3",
+    "react-dom": "^18.2.0",
     "tsup": "^6.7.0",
     "typescript": "5.1.3",
     "@vercel/ai-tsconfig": "0.0.0",
@@ -138,8 +138,8 @@
     "type-check": "tsc --noEmit",
     "prettier-check": "prettier --check \"./**/*.ts*\"",
     "test": "pnpm test:node && pnpm test:edge && pnpm test:ui",
-    "test:edge": "jest --forceExit --config jest.node.config.js --env @edge-runtime/jest-environment .test.ts ",
-    "test:node": "jest --forceExit --config jest.node.config.js --env node .test.ts",
-    "test:ui": "jest --forceExit --config jest.ui.config.js .ui.test.ts"
+    "test:edge": "vitest --config vitest.edge.config.js --run",
+    "test:node": "vitest --config vitest.node.config.js --run",
+    "test:ui": "vitest --config vitest.ui.config.js --run"
   }
 }

package/react/dist/index.d.ts

@@ -341,6 +341,8 @@ type UseCompletionHelpers = {
     handleSubmit: (e: React.FormEvent<HTMLFormElement>) => void;
     /** Whether the API request is in progress */
     isLoading: boolean;
+    /** Additional data added on the server via StreamData */
+    data?: JSONValue[] | undefined;
 };
 declare function useCompletion({ api, id, initialCompletion, initialInput, credentials, headers, body, onResponse, onFinish, onError, }?: UseCompletionOptions): UseCompletionHelpers;
 
@@ -363,12 +365,16 @@ type UseAssistantHelpers = {
     /** Current error, if any */
     error: undefined | unknown;
 };
-declare function experimental_useAssistant({ api, threadId: threadIdParam, }: {
+type UseAssistantOptions = {
     api: string;
     threadId?: string | undefined;
-}): UseAssistantHelpers;
+    credentials?: RequestCredentials;
+    headers?: Record<string, string> | Headers;
+    body?: object;
+};
+declare function experimental_useAssistant({ api, threadId: threadIdParam, credentials, headers, body, }: UseAssistantOptions): UseAssistantHelpers;
 
-export { AssistantStatus, CreateMessage, Message, UseAssistantHelpers, UseChatHelpers, UseChatOptions, UseCompletionHelpers, experimental_useAssistant, useChat, useCompletion };
+export { AssistantStatus, CreateMessage, Message, UseAssistantHelpers, UseAssistantOptions, UseChatHelpers, UseChatOptions, UseCompletionHelpers, experimental_useAssistant, useChat, useCompletion };
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
 type Props = {

package/react/dist/index.js

@@ -186,21 +186,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) {
@@ -215,61 +216,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 {
@@ -714,29 +724,6 @@ function useChat({
 // react/use-completion.ts
 var import_react2 = require("react");
 var import_swr2 = __toESM(require("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,
@@ -758,6 +745,7 @@ function useCompletion({
     [completionId, "loading"],
     null
   );
+  const { data: streamData, mutate: mutateStreamData } = (0, import_swr2.default)([completionId, "streamData"], null);
   const [error, setError] = (0, import_react2.useState)(void 0);
   const completion = data;
   const [abortController, setAbortController] = (0, import_react2.useState)(null);
@@ -816,13 +804,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) {
@@ -911,7 +910,8 @@ function useCompletion({
     setInput,
     handleInputChange,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 
@@ -919,7 +919,10 @@ function useCompletion({
 var import_react3 = require("react");
 function experimental_useAssistant({
   api,
-  threadId: threadIdParam
+  threadId: threadIdParam,
+  credentials,
+  headers,
+  body
 }) {
   const [messages, setMessages] = (0, import_react3.useState)([]);
   const [input, setInput] = (0, import_react3.useState)("");
@@ -943,8 +946,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,
@@ -955,9 +960,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) => [
@@ -984,10 +990,10 @@ function experimental_useAssistant({
             break;
           }
         }
-      } catch (error2) {
-        setError(error2);
       }
-    });
+    } catch (error2) {
+      setError(error2);
+    }
     setStatus("awaiting_message");
   };
   return {