ai 2.2.24 → 2.2.25

package/dist/index.d.ts

@@ -461,6 +461,18 @@ declare function AIStream(response: Response, customParser?: AIStreamParser, cal
  */
 declare function readableFromAsyncIterable<T>(iterable: AsyncIterable<T>): ReadableStream<T>;
 
+interface AWSBedrockResponse {
+    body?: AsyncIterable<{
+        chunk?: {
+            bytes?: Uint8Array;
+        };
+    }>;
+}
+declare function AWSBedrockAnthropicStream(response: AWSBedrockResponse, callbacks?: AIStreamCallbacksAndOptions): ReadableStream;
+declare function AWSBedrockCohereStream(response: AWSBedrockResponse, callbacks?: AIStreamCallbacksAndOptions): ReadableStream;
+declare function AWSBedrockLlama2Stream(response: AWSBedrockResponse, callbacks?: AIStreamCallbacksAndOptions): ReadableStream;
+declare function AWSBedrockStream(response: AWSBedrockResponse, callbacks: AIStreamCallbacksAndOptions | undefined, extractTextDeltaFromChunk: (chunk: any) => string): ReadableStream<any>;
+
 /**
  * A stream wrapper to send custom JSON-encoded data back to the client.
  */
@@ -692,4 +704,4 @@ declare function experimental_AssistantResponse({ threadId, messageId }: {
     sendMessage: (message: AssistantMessage) => void;
 }) => Promise<void>): Response;
 
-export { AIStream, AIStreamCallbacksAndOptions, AIStreamParser, AnthropicStream, AssistantMessage, COMPLEX_HEADER, ChatRequest, ChatRequestOptions, CohereStream, CompletionUsage, CreateMessage, FunctionCall, FunctionCallHandler, FunctionCallPayload, HuggingFaceStream, JSONValue, LangChainStream, Message, OpenAIStream, OpenAIStreamCallbacks, ReactResponseRow, ReplicateStream, RequestOptions, StreamString, StreamingTextResponse, UseChatOptions, UseCompletionOptions, createCallbacksTransformer, createChunkDecoder, createEventStreamTransformer, createStreamDataTransformer, experimental_AssistantResponse, experimental_StreamData, experimental_StreamingReactResponse, isStreamStringEqualToType, nanoid, readableFromAsyncIterable, streamToResponse, trimStartOfStreamHelper };
+export { AIStream, AIStreamCallbacksAndOptions, AIStreamParser, AWSBedrockAnthropicStream, AWSBedrockCohereStream, AWSBedrockLlama2Stream, AWSBedrockStream, AnthropicStream, AssistantMessage, COMPLEX_HEADER, ChatRequest, ChatRequestOptions, CohereStream, CompletionUsage, CreateMessage, FunctionCall, FunctionCallHandler, FunctionCallPayload, HuggingFaceStream, JSONValue, LangChainStream, Message, OpenAIStream, OpenAIStreamCallbacks, ReactResponseRow, ReplicateStream, RequestOptions, StreamString, StreamingTextResponse, UseChatOptions, UseCompletionOptions, createCallbacksTransformer, createChunkDecoder, createEventStreamTransformer, createStreamDataTransformer, experimental_AssistantResponse, experimental_StreamData, experimental_StreamingReactResponse, isStreamStringEqualToType, nanoid, readableFromAsyncIterable, streamToResponse, trimStartOfStreamHelper };

package/dist/index.js

@@ -21,6 +21,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var streams_exports = {};
 __export(streams_exports, {
   AIStream: () => AIStream,
+  AWSBedrockAnthropicStream: () => AWSBedrockAnthropicStream,
+  AWSBedrockCohereStream: () => AWSBedrockCohereStream,
+  AWSBedrockLlama2Stream: () => AWSBedrockLlama2Stream,
+  AWSBedrockStream: () => AWSBedrockStream,
   AnthropicStream: () => AnthropicStream,
   COMPLEX_HEADER: () => COMPLEX_HEADER,
   CohereStream: () => CohereStream,
@@ -289,29 +293,6 @@ function formatStreamPart(type, value) {
 `;
 }
 
-// shared/utils.ts
-var import_non_secure = require("nanoid/non-secure");
-var nanoid = (0, import_non_secure.customAlphabet)(
-  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-  7
-);
-function createChunkDecoder(complex) {
-  const decoder = new TextDecoder();
-  if (!complex) {
-    return function(chunk) {
-      if (!chunk)
-        return "";
-      return decoder.decode(chunk, { stream: true });
-    };
-  }
-  return function(chunk) {
-    const decoded = decoder.decode(chunk, { stream: true }).split("\n").filter((line) => line !== "");
-    return decoded.map(parseStreamPart).filter(Boolean);
-  };
-}
-var isStreamStringEqualToType = (type, value) => value.startsWith(`${StreamStringPrefixes[type]}:`) && value.endsWith("\n");
-var COMPLEX_HEADER = "X-Experimental-Stream-Data";
-
 // streams/stream-data.ts
 var experimental_StreamData = class {
   constructor() {
@@ -397,6 +378,71 @@ function createStreamDataTransformer(experimental_streamData) {
   });
 }
 
+// streams/aws-bedrock-stream.ts
+async function* asDeltaIterable(response, extractTextDeltaFromChunk) {
+  var _a, _b;
+  const decoder = new TextDecoder();
+  for await (const chunk of (_a = response.body) != null ? _a : []) {
+    const bytes = (_b = chunk.chunk) == null ? void 0 : _b.bytes;
+    if (bytes != null) {
+      const chunkText = decoder.decode(bytes);
+      const chunkJSON = JSON.parse(chunkText);
+      const delta = extractTextDeltaFromChunk(chunkJSON);
+      if (delta != null) {
+        yield delta;
+      }
+    }
+  }
+}
+function AWSBedrockAnthropicStream(response, callbacks) {
+  return AWSBedrockStream(response, callbacks, (chunk) => chunk.completion);
+}
+function AWSBedrockCohereStream(response, callbacks) {
+  return AWSBedrockStream(
+    response,
+    callbacks,
+    // As of 2023-11-17, Bedrock does not support streaming for Cohere,
+    // so we take the full generation:
+    (chunk) => {
+      var _a, _b;
+      return (_b = (_a = chunk.generations) == null ? void 0 : _a[0]) == null ? void 0 : _b.text;
+    }
+  );
+}
+function AWSBedrockLlama2Stream(response, callbacks) {
+  return AWSBedrockStream(response, callbacks, (chunk) => chunk.generation);
+}
+function AWSBedrockStream(response, callbacks, extractTextDeltaFromChunk) {
+  return readableFromAsyncIterable(
+    asDeltaIterable(response, extractTextDeltaFromChunk)
+  ).pipeThrough(createCallbacksTransformer(callbacks)).pipeThrough(
+    createStreamDataTransformer(callbacks == null ? void 0 : callbacks.experimental_streamData)
+  );
+}
+
+// shared/utils.ts
+var import_non_secure = require("nanoid/non-secure");
+var nanoid = (0, import_non_secure.customAlphabet)(
+  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
+  7
+);
+function createChunkDecoder(complex) {
+  const decoder = new TextDecoder();
+  if (!complex) {
+    return function(chunk) {
+      if (!chunk)
+        return "";
+      return decoder.decode(chunk, { stream: true });
+    };
+  }
+  return function(chunk) {
+    const decoded = decoder.decode(chunk, { stream: true }).split("\n").filter((line) => line !== "");
+    return decoded.map(parseStreamPart).filter(Boolean);
+  };
+}
+var isStreamStringEqualToType = (type, value) => value.startsWith(`${StreamStringPrefixes[type]}:`) && value.endsWith("\n");
+var COMPLEX_HEADER = "X-Experimental-Stream-Data";
+
 // streams/openai-stream.ts
 function parseOpenAIStream() {
   const extract = chunkToText();
@@ -1035,6 +1081,10 @@ function experimental_AssistantResponse({ threadId, messageId }, process2) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AIStream,
+  AWSBedrockAnthropicStream,
+  AWSBedrockCohereStream,
+  AWSBedrockLlama2Stream,
+  AWSBedrockStream,
   AnthropicStream,
   COMPLEX_HEADER,
   CohereStream,

package/dist/index.mjs

@@ -245,29 +245,6 @@ function formatStreamPart(type, value) {
 `;
 }
 
-// shared/utils.ts
-import { customAlphabet } from "nanoid/non-secure";
-var nanoid = customAlphabet(
-  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-  7
-);
-function createChunkDecoder(complex) {
-  const decoder = new TextDecoder();
-  if (!complex) {
-    return function(chunk) {
-      if (!chunk)
-        return "";
-      return decoder.decode(chunk, { stream: true });
-    };
-  }
-  return function(chunk) {
-    const decoded = decoder.decode(chunk, { stream: true }).split("\n").filter((line) => line !== "");
-    return decoded.map(parseStreamPart).filter(Boolean);
-  };
-}
-var isStreamStringEqualToType = (type, value) => value.startsWith(`${StreamStringPrefixes[type]}:`) && value.endsWith("\n");
-var COMPLEX_HEADER = "X-Experimental-Stream-Data";
-
 // streams/stream-data.ts
 var experimental_StreamData = class {
   constructor() {
@@ -353,6 +330,71 @@ function createStreamDataTransformer(experimental_streamData) {
   });
 }
 
+// streams/aws-bedrock-stream.ts
+async function* asDeltaIterable(response, extractTextDeltaFromChunk) {
+  var _a, _b;
+  const decoder = new TextDecoder();
+  for await (const chunk of (_a = response.body) != null ? _a : []) {
+    const bytes = (_b = chunk.chunk) == null ? void 0 : _b.bytes;
+    if (bytes != null) {
+      const chunkText = decoder.decode(bytes);
+      const chunkJSON = JSON.parse(chunkText);
+      const delta = extractTextDeltaFromChunk(chunkJSON);
+      if (delta != null) {
+        yield delta;
+      }
+    }
+  }
+}
+function AWSBedrockAnthropicStream(response, callbacks) {
+  return AWSBedrockStream(response, callbacks, (chunk) => chunk.completion);
+}
+function AWSBedrockCohereStream(response, callbacks) {
+  return AWSBedrockStream(
+    response,
+    callbacks,
+    // As of 2023-11-17, Bedrock does not support streaming for Cohere,
+    // so we take the full generation:
+    (chunk) => {
+      var _a, _b;
+      return (_b = (_a = chunk.generations) == null ? void 0 : _a[0]) == null ? void 0 : _b.text;
+    }
+  );
+}
+function AWSBedrockLlama2Stream(response, callbacks) {
+  return AWSBedrockStream(response, callbacks, (chunk) => chunk.generation);
+}
+function AWSBedrockStream(response, callbacks, extractTextDeltaFromChunk) {
+  return readableFromAsyncIterable(
+    asDeltaIterable(response, extractTextDeltaFromChunk)
+  ).pipeThrough(createCallbacksTransformer(callbacks)).pipeThrough(
+    createStreamDataTransformer(callbacks == null ? void 0 : callbacks.experimental_streamData)
+  );
+}
+
+// shared/utils.ts
+import { customAlphabet } from "nanoid/non-secure";
+var nanoid = customAlphabet(
+  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
+  7
+);
+function createChunkDecoder(complex) {
+  const decoder = new TextDecoder();
+  if (!complex) {
+    return function(chunk) {
+      if (!chunk)
+        return "";
+      return decoder.decode(chunk, { stream: true });
+    };
+  }
+  return function(chunk) {
+    const decoded = decoder.decode(chunk, { stream: true }).split("\n").filter((line) => line !== "");
+    return decoded.map(parseStreamPart).filter(Boolean);
+  };
+}
+var isStreamStringEqualToType = (type, value) => value.startsWith(`${StreamStringPrefixes[type]}:`) && value.endsWith("\n");
+var COMPLEX_HEADER = "X-Experimental-Stream-Data";
+
 // streams/openai-stream.ts
 function parseOpenAIStream() {
   const extract = chunkToText();
@@ -990,6 +1032,10 @@ function experimental_AssistantResponse({ threadId, messageId }, process2) {
 }
 export {
   AIStream,
+  AWSBedrockAnthropicStream,
+  AWSBedrockCohereStream,
+  AWSBedrockLlama2Stream,
+  AWSBedrockStream,
   AnthropicStream,
   COMPLEX_HEADER,
   CohereStream,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "2.2.24",
+  "version": "2.2.25",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -64,6 +64,7 @@
     "swrv": "1.0.4"
   },
   "devDependencies": {
+    "@aws-sdk/client-bedrock-runtime": "3.451.0",
     "@edge-runtime/jest-environment": "1.1.0-beta.31",
     "@huggingface/inference": "2.6.4",
     "@testing-library/jest-dom": "^6.1.4",
@@ -82,8 +83,8 @@
     "ts-jest": "29.0.3",
     "tsup": "^6.7.0",
     "typescript": "5.1.3",
-    "@vercel/ai-tsconfig": "0.0.0",
-    "eslint-config-vercel-ai": "0.0.0"
+    "eslint-config-vercel-ai": "0.0.0",
+    "@vercel/ai-tsconfig": "0.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",

package/prompts/dist/index.d.ts

@@ -33,6 +33,13 @@ interface Message {
     function_call?: string | FunctionCall;
 }
 
+/**
+ * A prompt constructor for Anthropic models.
+ * Does not support `function` messages.
+ * @see https://docs.anthropic.com/claude/reference/getting-started-with-the-api
+ */
+declare function experimental_buildAnthropicPrompt(messages: Pick<Message, 'content' | 'role'>[]): string;
+
 /**
  * A prompt constructor for the HuggingFace StarChat Beta model.
  * Does not support `function` messages.
@@ -52,4 +59,4 @@ declare function experimental_buildOpenAssistantPrompt(messages: Pick<Message, '
  */
 declare function experimental_buildLlama2Prompt(messages: Pick<Message, 'content' | 'role'>[]): string;
 
-export { experimental_buildLlama2Prompt, experimental_buildOpenAssistantPrompt, experimental_buildStarChatBetaPrompt };
+export { experimental_buildAnthropicPrompt, experimental_buildLlama2Prompt, experimental_buildOpenAssistantPrompt, experimental_buildStarChatBetaPrompt };

package/prompts/dist/index.js

@@ -20,12 +20,28 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // prompts/index.ts
 var prompts_exports = {};
 __export(prompts_exports, {
+  experimental_buildAnthropicPrompt: () => experimental_buildAnthropicPrompt,
   experimental_buildLlama2Prompt: () => experimental_buildLlama2Prompt,
   experimental_buildOpenAssistantPrompt: () => experimental_buildOpenAssistantPrompt,
   experimental_buildStarChatBetaPrompt: () => experimental_buildStarChatBetaPrompt
 });
 module.exports = __toCommonJS(prompts_exports);
 
+// prompts/anthropic.ts
+function experimental_buildAnthropicPrompt(messages) {
+  return messages.map(({ content, role }) => {
+    if (role === "user") {
+      return `
+
+Human: ${content}`;
+    } else {
+      return `
+
+Assistant: ${content}`;
+    }
+  }) + "\n\nAssistant:";
+}
+
 // prompts/huggingface.ts
 function experimental_buildStarChatBetaPrompt(messages) {
   return messages.map(({ content, role }) => {
@@ -83,6 +99,7 @@ ${content}
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  experimental_buildAnthropicPrompt,
   experimental_buildLlama2Prompt,
   experimental_buildOpenAssistantPrompt,
   experimental_buildStarChatBetaPrompt

package/prompts/dist/index.mjs

@@ -1,3 +1,18 @@
+// prompts/anthropic.ts
+function experimental_buildAnthropicPrompt(messages) {
+  return messages.map(({ content, role }) => {
+    if (role === "user") {
+      return `
+
+Human: ${content}`;
+    } else {
+      return `
+
+Assistant: ${content}`;
+    }
+  }) + "\n\nAssistant:";
+}
+
 // prompts/huggingface.ts
 function experimental_buildStarChatBetaPrompt(messages) {
   return messages.map(({ content, role }) => {
@@ -54,6 +69,7 @@ ${content}
   return startPrompt + conversation.join("") + endPrompt;
 }
 export {
+  experimental_buildAnthropicPrompt,
   experimental_buildLlama2Prompt,
   experimental_buildOpenAssistantPrompt,
   experimental_buildStarChatBetaPrompt

package/react/dist/index.d.ts

@@ -343,6 +343,7 @@ declare function experimental_useAssistant({ api, threadId: threadIdParam, }: {
     threadId?: string | undefined;
 }): {
     messages: Message[];
+    threadId: string | undefined;
     input: string;
     handleInputChange: (e: any) => void;
     submitMessage: (e: any) => Promise<void>;

package/react/dist/index.js

@@ -973,6 +973,7 @@ function experimental_useAssistant({
   };
   return {
     messages,
+    threadId,
     input,
     handleInputChange,
     submitMessage,

package/react/dist/index.mjs

@@ -936,6 +936,7 @@ function experimental_useAssistant({
   };
   return {
     messages,
+    threadId,
     input,
     handleInputChange,
     submitMessage,

package/svelte/dist/index.d.ts

@@ -201,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 */
@@ -237,6 +240,8 @@ type UseChatHelpers = {
     metadata?: Object;
     /** 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 useChat({ api, id, initialMessages, initialInput, sendExtraMessageFields, experimental_onFunctionCall, onResponse, onFinish, onError, credentials, headers, body, }?: UseChatOptions): UseChatHelpers;
 

package/svelte/dist/index.js

@@ -25,9 +25,6 @@ __export(svelte_exports, {
 });
 module.exports = __toCommonJS(svelte_exports);
 
-// svelte/use-chat.ts
-var import_store = require("svelte/store");
-
 // ../../node_modules/.pnpm/swrev@4.0.0/node_modules/swrev/dist/swrev.mjs
 var P = Object.defineProperty;
 var F = (r, e, t) => e in r ? P(r, e, { enumerable: true, configurable: true, writable: true, value: t }) : r[e] = t;
@@ -525,6 +522,12 @@ var W = (t) => new O2(t);
 var c = W();
 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");
 
@@ -668,103 +671,291 @@ function createChunkDecoder(complex) {
     return decoded.map(parseStreamPart).filter(Boolean);
   };
 }
+var COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
-// svelte/use-chat.ts
-var getStreamedResponse = async (api, chatRequest, mutate, extraMetadata, previousMessages, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
-  var _a, _b, _c, _d;
-  mutate(chatRequest.messages);
-  const res = await fetch(api, {
+// 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);
+  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"] = {
+          id: generateId(),
+          role: "assistant",
+          content: "",
+          function_call: value2.function_call,
+          name: value2.function_call.name,
+          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;
+      }
+    }
+  }
+  onFinish == null ? void 0 : onFinish(prefixMap);
+  return {
+    messages: [prefixMap.text, prefixMap.function_call].filter(
+      Boolean
+    ),
+    data: prefixMap.data
+  };
+}
+
+// shared/call-api.ts
+async function callApi({
+  api,
+  messages,
+  body,
+  credentials,
+  headers,
+  abortController,
+  appendMessage,
+  restoreMessagesOnFailure,
+  onResponse,
+  onUpdate,
+  onFinish
+}) {
+  var _a;
+  const response = await fetch(api, {
     method: "POST",
     body: JSON.stringify({
-      messages: sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(
-        ({ role, content, name, function_call }) => ({
-          role,
-          content,
-          ...name !== void 0 && { name },
-          ...function_call !== void 0 && {
-            function_call
-          }
-        })
-      ),
-      ...extraMetadata.body,
-      ...(_a = chatRequest.options) == null ? void 0 : _a.body,
-      ...chatRequest.functions !== void 0 && {
-        functions: chatRequest.functions
-      },
-      ...chatRequest.function_call !== void 0 && {
-        function_call: chatRequest.function_call
-      }
+      messages,
+      ...body
     }),
-    credentials: extraMetadata.credentials,
-    headers: {
-      ...extraMetadata.headers,
-      ...(_b = chatRequest.options) == null ? void 0 : _b.headers
-    },
-    ...abortControllerRef !== null && {
-      signal: abortControllerRef.signal
-    }
+    headers,
+    signal: (_a = abortController == null ? void 0 : abortController()) == null ? void 0 : _a.signal,
+    credentials
   }).catch((err) => {
-    mutate(previousMessages);
+    restoreMessagesOnFailure();
     throw err;
   });
   if (onResponse) {
     try {
-      await onResponse(res);
+      await onResponse(response);
     } catch (err) {
       throw err;
     }
   }
-  if (!res.ok) {
-    mutate(previousMessages);
-    throw new Error(await res.text() || "Failed to fetch the chat response.");
+  if (!response.ok) {
+    restoreMessagesOnFailure();
+    throw new Error(
+      await response.text() || "Failed to fetch the chat response."
+    );
   }
-  if (!res.body) {
+  if (!response.body) {
     throw new Error("The response body is empty.");
   }
-  let streamedResponse = "";
-  const createdAt = /* @__PURE__ */ new Date();
-  const replyId = nanoid();
-  const reader = res.body.getReader();
-  const decode = createChunkDecoder();
-  let responseMessage = {
-    id: replyId,
-    createdAt,
-    content: "",
-    role: "assistant"
-  };
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
+  const reader = response.body.getReader();
+  const isComplexMode = response.headers.get(COMPLEX_HEADER) === "true";
+  if (isComplexMode) {
+    return await parseComplexResponse({
+      reader,
+      abortControllerRef: abortController != null ? { current: abortController() } : void 0,
+      update: onUpdate,
+      onFinish(prefixMap) {
+        if (onFinish && prefixMap.text != null) {
+          onFinish(prefixMap.text);
+        }
+      }
+    });
+  } else {
+    const createdAt = /* @__PURE__ */ new Date();
+    const decode = createChunkDecoder(false);
+    let streamedResponse = "";
+    const replyId = (0, import_nanoid.nanoid)();
+    let responseMessage = {
+      id: replyId,
+      createdAt,
+      content: "",
+      role: "assistant"
+    };
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        break;
+      }
+      streamedResponse += decode(value);
+      if (streamedResponse.startsWith('{"function_call":')) {
+        responseMessage["function_call"] = streamedResponse;
+      } else {
+        responseMessage["content"] = streamedResponse;
+      }
+      appendMessage({ ...responseMessage });
+      if ((abortController == null ? void 0 : abortController()) === null) {
+        reader.cancel();
+        break;
+      }
     }
-    streamedResponse += decode(value);
-    const functionStart = streamedResponse.indexOf("{");
-    if (functionStart !== -1) {
-      const matches = /(.*?)(?:({"function_call".*?}})(.*))?$/gs.exec(
-        streamedResponse
-      );
-      responseMessage.content = `${(_c = matches == null ? void 0 : matches[1]) != null ? _c : ""}${(_d = matches == null ? void 0 : matches[3]) != null ? _d : ""}`;
-      responseMessage.function_call = matches == null ? void 0 : matches[2];
-    } else {
-      responseMessage.content = streamedResponse;
+    if (streamedResponse.startsWith('{"function_call":')) {
+      const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
+      responseMessage["function_call"] = parsedFunctionCall;
+      appendMessage({ ...responseMessage });
     }
-    mutate([...chatRequest.messages, { ...responseMessage }]);
-    if (abortControllerRef === null) {
-      reader.cancel();
-      break;
+    if (onFinish) {
+      onFinish(responseMessage);
     }
+    return responseMessage;
   }
-  if (typeof responseMessage.function_call === "string") {
-    const parsedFunctionCall = JSON.parse(
-      responseMessage.function_call
-    ).function_call;
-    responseMessage.function_call = parsedFunctionCall;
-    mutate([...chatRequest.messages, { ...responseMessage }]);
-  }
-  if (onFinish) {
-    onFinish(responseMessage);
+}
+
+// shared/process-chat-stream.ts
+async function processChatStream({
+  getStreamedResponse: getStreamedResponse2,
+  experimental_onFunctionCall,
+  updateChatRequest,
+  getCurrentMessages
+}) {
+  while (true) {
+    const messagesAndDataOrJustMessage = await getStreamedResponse2();
+    if ("messages" in messagesAndDataOrJustMessage) {
+      let hasFollowingResponse = false;
+      for (const message of messagesAndDataOrJustMessage.messages) {
+        if (message.function_call === void 0 || typeof message.function_call === "string") {
+          continue;
+        }
+        hasFollowingResponse = true;
+        if (experimental_onFunctionCall) {
+          const functionCall = message.function_call;
+          const functionCallResponse = await experimental_onFunctionCall(
+            getCurrentMessages(),
+            functionCall
+          );
+          if (functionCallResponse === void 0) {
+            hasFollowingResponse = false;
+            break;
+          }
+          updateChatRequest(functionCallResponse);
+        }
+      }
+      if (!hasFollowingResponse) {
+        break;
+      }
+    } else {
+      const streamedResponseMessage = messagesAndDataOrJustMessage;
+      if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
+        break;
+      }
+      if (experimental_onFunctionCall) {
+        const functionCall = streamedResponseMessage.function_call;
+        const functionCallResponse = await experimental_onFunctionCall(getCurrentMessages(), functionCall);
+        if (functionCallResponse === void 0)
+          break;
+        updateChatRequest(functionCallResponse);
+      }
+    }
   }
-  return responseMessage;
+}
+
+// svelte/use-chat.ts
+var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadata, previousMessages, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
+  var _a, _b;
+  mutate(chatRequest.messages);
+  const constructedMessagesPayload = sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(({ role, content, name, function_call }) => ({
+    role,
+    content,
+    ...name !== void 0 && { name },
+    ...function_call !== void 0 && {
+      function_call
+    }
+  }));
+  return await callApi({
+    api,
+    messages: constructedMessagesPayload,
+    body: {
+      ...extraMetadata.body,
+      ...(_a = chatRequest.options) == null ? void 0 : _a.body,
+      ...chatRequest.functions !== void 0 && {
+        functions: chatRequest.functions
+      },
+      ...chatRequest.function_call !== void 0 && {
+        function_call: chatRequest.function_call
+      }
+    },
+    credentials: extraMetadata.credentials,
+    headers: {
+      ...extraMetadata.headers,
+      ...(_b = chatRequest.options) == null ? void 0 : _b.headers
+    },
+    abortController: () => abortControllerRef,
+    appendMessage(message) {
+      mutate([...chatRequest.messages, message]);
+    },
+    restoreMessagesOnFailure() {
+      mutate(previousMessages);
+    },
+    onResponse,
+    onUpdate(merged, data) {
+      mutate([...chatRequest.messages, ...merged]);
+      mutateStreamData([...existingData || [], ...data || []]);
+    },
+    onFinish
+  });
 };
 var uniqueId = 0;
 var store = {};
@@ -792,6 +983,7 @@ function useChat({
     fetcher: () => store[key] || initialMessages,
     fallbackData: initialMessages
   });
+  const streamData = (0, import_store.writable)(void 0);
   const loading = (0, import_store.writable)(false);
   data.set(initialMessages);
   const mutate = (data2) => {
@@ -811,29 +1003,28 @@ function useChat({
       error.set(void 0);
       loading.set(true);
       abortController = new AbortController();
-      while (true) {
-        const streamedResponseMessage = await getStreamedResponse(
+      await processChatStream({
+        getStreamedResponse: () => getStreamedResponse(
           api,
           chatRequest,
           mutate,
+          (data2) => {
+            streamData.set(data2);
+          },
+          (0, import_store.get)(streamData),
           extraMetadata,
           (0, import_store.get)(messages),
           abortController,
           onFinish,
           onResponse,
           sendExtraMessageFields
-        );
-        if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
-          break;
-        }
-        if (experimental_onFunctionCall) {
-          const functionCall = streamedResponseMessage.function_call;
-          const functionCallResponse = await experimental_onFunctionCall((0, import_store.get)(messages), functionCall);
-          if (functionCallResponse === void 0)
-            break;
-          chatRequest = functionCallResponse;
-        }
-      }
+        ),
+        experimental_onFunctionCall,
+        updateChatRequest: (chatRequestParam) => {
+          chatRequest = chatRequestParam;
+        },
+        getCurrentMessages: () => (0, import_store.get)(messages)
+      });
       abortController = null;
       return null;
     } catch (err) {
@@ -927,7 +1118,8 @@ function useChat({
     setMessages,
     input,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }
 

package/svelte/dist/index.mjs

@@ -1,6 +1,3 @@
-// svelte/use-chat.ts
-import { get, writable, derived } from "svelte/store";
-
 // ../../node_modules/.pnpm/swrev@4.0.0/node_modules/swrev/dist/swrev.mjs
 var P = Object.defineProperty;
 var F = (r, e, t) => e in r ? P(r, e, { enumerable: true, configurable: true, writable: true, value: t }) : r[e] = t;
@@ -498,6 +495,12 @@ var W = (t) => new O2(t);
 var c = W();
 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";
 
@@ -641,103 +644,291 @@ function createChunkDecoder(complex) {
     return decoded.map(parseStreamPart).filter(Boolean);
   };
 }
+var COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
-// svelte/use-chat.ts
-var getStreamedResponse = async (api, chatRequest, mutate, extraMetadata, previousMessages, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
-  var _a, _b, _c, _d;
-  mutate(chatRequest.messages);
-  const res = await fetch(api, {
+// 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);
+  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"] = {
+          id: generateId(),
+          role: "assistant",
+          content: "",
+          function_call: value2.function_call,
+          name: value2.function_call.name,
+          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;
+      }
+    }
+  }
+  onFinish == null ? void 0 : onFinish(prefixMap);
+  return {
+    messages: [prefixMap.text, prefixMap.function_call].filter(
+      Boolean
+    ),
+    data: prefixMap.data
+  };
+}
+
+// shared/call-api.ts
+async function callApi({
+  api,
+  messages,
+  body,
+  credentials,
+  headers,
+  abortController,
+  appendMessage,
+  restoreMessagesOnFailure,
+  onResponse,
+  onUpdate,
+  onFinish
+}) {
+  var _a;
+  const response = await fetch(api, {
     method: "POST",
     body: JSON.stringify({
-      messages: sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(
-        ({ role, content, name, function_call }) => ({
-          role,
-          content,
-          ...name !== void 0 && { name },
-          ...function_call !== void 0 && {
-            function_call
-          }
-        })
-      ),
-      ...extraMetadata.body,
-      ...(_a = chatRequest.options) == null ? void 0 : _a.body,
-      ...chatRequest.functions !== void 0 && {
-        functions: chatRequest.functions
-      },
-      ...chatRequest.function_call !== void 0 && {
-        function_call: chatRequest.function_call
-      }
+      messages,
+      ...body
     }),
-    credentials: extraMetadata.credentials,
-    headers: {
-      ...extraMetadata.headers,
-      ...(_b = chatRequest.options) == null ? void 0 : _b.headers
-    },
-    ...abortControllerRef !== null && {
-      signal: abortControllerRef.signal
-    }
+    headers,
+    signal: (_a = abortController == null ? void 0 : abortController()) == null ? void 0 : _a.signal,
+    credentials
   }).catch((err) => {
-    mutate(previousMessages);
+    restoreMessagesOnFailure();
     throw err;
   });
   if (onResponse) {
     try {
-      await onResponse(res);
+      await onResponse(response);
     } catch (err) {
       throw err;
     }
   }
-  if (!res.ok) {
-    mutate(previousMessages);
-    throw new Error(await res.text() || "Failed to fetch the chat response.");
+  if (!response.ok) {
+    restoreMessagesOnFailure();
+    throw new Error(
+      await response.text() || "Failed to fetch the chat response."
+    );
   }
-  if (!res.body) {
+  if (!response.body) {
     throw new Error("The response body is empty.");
   }
-  let streamedResponse = "";
-  const createdAt = /* @__PURE__ */ new Date();
-  const replyId = nanoid();
-  const reader = res.body.getReader();
-  const decode = createChunkDecoder();
-  let responseMessage = {
-    id: replyId,
-    createdAt,
-    content: "",
-    role: "assistant"
-  };
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
+  const reader = response.body.getReader();
+  const isComplexMode = response.headers.get(COMPLEX_HEADER) === "true";
+  if (isComplexMode) {
+    return await parseComplexResponse({
+      reader,
+      abortControllerRef: abortController != null ? { current: abortController() } : void 0,
+      update: onUpdate,
+      onFinish(prefixMap) {
+        if (onFinish && prefixMap.text != null) {
+          onFinish(prefixMap.text);
+        }
+      }
+    });
+  } else {
+    const createdAt = /* @__PURE__ */ new Date();
+    const decode = createChunkDecoder(false);
+    let streamedResponse = "";
+    const replyId = nanoid2();
+    let responseMessage = {
+      id: replyId,
+      createdAt,
+      content: "",
+      role: "assistant"
+    };
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        break;
+      }
+      streamedResponse += decode(value);
+      if (streamedResponse.startsWith('{"function_call":')) {
+        responseMessage["function_call"] = streamedResponse;
+      } else {
+        responseMessage["content"] = streamedResponse;
+      }
+      appendMessage({ ...responseMessage });
+      if ((abortController == null ? void 0 : abortController()) === null) {
+        reader.cancel();
+        break;
+      }
     }
-    streamedResponse += decode(value);
-    const functionStart = streamedResponse.indexOf("{");
-    if (functionStart !== -1) {
-      const matches = /(.*?)(?:({"function_call".*?}})(.*))?$/gs.exec(
-        streamedResponse
-      );
-      responseMessage.content = `${(_c = matches == null ? void 0 : matches[1]) != null ? _c : ""}${(_d = matches == null ? void 0 : matches[3]) != null ? _d : ""}`;
-      responseMessage.function_call = matches == null ? void 0 : matches[2];
-    } else {
-      responseMessage.content = streamedResponse;
+    if (streamedResponse.startsWith('{"function_call":')) {
+      const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
+      responseMessage["function_call"] = parsedFunctionCall;
+      appendMessage({ ...responseMessage });
     }
-    mutate([...chatRequest.messages, { ...responseMessage }]);
-    if (abortControllerRef === null) {
-      reader.cancel();
-      break;
+    if (onFinish) {
+      onFinish(responseMessage);
     }
+    return responseMessage;
   }
-  if (typeof responseMessage.function_call === "string") {
-    const parsedFunctionCall = JSON.parse(
-      responseMessage.function_call
-    ).function_call;
-    responseMessage.function_call = parsedFunctionCall;
-    mutate([...chatRequest.messages, { ...responseMessage }]);
-  }
-  if (onFinish) {
-    onFinish(responseMessage);
+}
+
+// shared/process-chat-stream.ts
+async function processChatStream({
+  getStreamedResponse: getStreamedResponse2,
+  experimental_onFunctionCall,
+  updateChatRequest,
+  getCurrentMessages
+}) {
+  while (true) {
+    const messagesAndDataOrJustMessage = await getStreamedResponse2();
+    if ("messages" in messagesAndDataOrJustMessage) {
+      let hasFollowingResponse = false;
+      for (const message of messagesAndDataOrJustMessage.messages) {
+        if (message.function_call === void 0 || typeof message.function_call === "string") {
+          continue;
+        }
+        hasFollowingResponse = true;
+        if (experimental_onFunctionCall) {
+          const functionCall = message.function_call;
+          const functionCallResponse = await experimental_onFunctionCall(
+            getCurrentMessages(),
+            functionCall
+          );
+          if (functionCallResponse === void 0) {
+            hasFollowingResponse = false;
+            break;
+          }
+          updateChatRequest(functionCallResponse);
+        }
+      }
+      if (!hasFollowingResponse) {
+        break;
+      }
+    } else {
+      const streamedResponseMessage = messagesAndDataOrJustMessage;
+      if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
+        break;
+      }
+      if (experimental_onFunctionCall) {
+        const functionCall = streamedResponseMessage.function_call;
+        const functionCallResponse = await experimental_onFunctionCall(getCurrentMessages(), functionCall);
+        if (functionCallResponse === void 0)
+          break;
+        updateChatRequest(functionCallResponse);
+      }
+    }
   }
-  return responseMessage;
+}
+
+// svelte/use-chat.ts
+var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadata, previousMessages, abortControllerRef, onFinish, onResponse, sendExtraMessageFields) => {
+  var _a, _b;
+  mutate(chatRequest.messages);
+  const constructedMessagesPayload = sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(({ role, content, name, function_call }) => ({
+    role,
+    content,
+    ...name !== void 0 && { name },
+    ...function_call !== void 0 && {
+      function_call
+    }
+  }));
+  return await callApi({
+    api,
+    messages: constructedMessagesPayload,
+    body: {
+      ...extraMetadata.body,
+      ...(_a = chatRequest.options) == null ? void 0 : _a.body,
+      ...chatRequest.functions !== void 0 && {
+        functions: chatRequest.functions
+      },
+      ...chatRequest.function_call !== void 0 && {
+        function_call: chatRequest.function_call
+      }
+    },
+    credentials: extraMetadata.credentials,
+    headers: {
+      ...extraMetadata.headers,
+      ...(_b = chatRequest.options) == null ? void 0 : _b.headers
+    },
+    abortController: () => abortControllerRef,
+    appendMessage(message) {
+      mutate([...chatRequest.messages, message]);
+    },
+    restoreMessagesOnFailure() {
+      mutate(previousMessages);
+    },
+    onResponse,
+    onUpdate(merged, data) {
+      mutate([...chatRequest.messages, ...merged]);
+      mutateStreamData([...existingData || [], ...data || []]);
+    },
+    onFinish
+  });
 };
 var uniqueId = 0;
 var store = {};
@@ -765,6 +956,7 @@ function useChat({
     fetcher: () => store[key] || initialMessages,
     fallbackData: initialMessages
   });
+  const streamData = writable(void 0);
   const loading = writable(false);
   data.set(initialMessages);
   const mutate = (data2) => {
@@ -784,29 +976,28 @@ function useChat({
       error.set(void 0);
       loading.set(true);
       abortController = new AbortController();
-      while (true) {
-        const streamedResponseMessage = await getStreamedResponse(
+      await processChatStream({
+        getStreamedResponse: () => getStreamedResponse(
           api,
           chatRequest,
           mutate,
+          (data2) => {
+            streamData.set(data2);
+          },
+          get(streamData),
           extraMetadata,
           get(messages),
           abortController,
           onFinish,
           onResponse,
           sendExtraMessageFields
-        );
-        if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
-          break;
-        }
-        if (experimental_onFunctionCall) {
-          const functionCall = streamedResponseMessage.function_call;
-          const functionCallResponse = await experimental_onFunctionCall(get(messages), functionCall);
-          if (functionCallResponse === void 0)
-            break;
-          chatRequest = functionCallResponse;
-        }
-      }
+        ),
+        experimental_onFunctionCall,
+        updateChatRequest: (chatRequestParam) => {
+          chatRequest = chatRequestParam;
+        },
+        getCurrentMessages: () => get(messages)
+      });
       abortController = null;
       return null;
     } catch (err) {
@@ -900,7 +1091,8 @@ function useChat({
     setMessages,
     input,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }