ai 3.1.0-canary.4 → 3.1.1

package/solid/dist/index.mjs

@@ -103,9 +103,9 @@ var toolCallStreamPart = {
   code: "7",
   name: "tool_calls",
   parse: (value) => {
-    if (value == null || typeof value !== "object" || !("tool_calls" in value) || typeof value.tool_calls !== "object" || value.tool_calls == null || !Array.isArray(value.tool_calls) || value.tool_calls.some((tc) => {
-      tc == null || typeof tc !== "object" || !("id" in tc) || typeof tc.id !== "string" || !("type" in tc) || typeof tc.type !== "string" || !("function" in tc) || tc.function == null || typeof tc.function !== "object" || !("arguments" in tc.function) || typeof tc.function.name !== "string" || typeof tc.function.arguments !== "string";
-    })) {
+    if (value == null || typeof value !== "object" || !("tool_calls" in value) || typeof value.tool_calls !== "object" || value.tool_calls == null || !Array.isArray(value.tool_calls) || value.tool_calls.some(
+      (tc) => tc == null || typeof tc !== "object" || !("id" in tc) || typeof tc.id !== "string" || !("type" in tc) || typeof tc.type !== "string" || !("function" in tc) || tc.function == null || typeof tc.function !== "object" || !("arguments" in tc.function) || typeof tc.function.name !== "string" || typeof tc.function.arguments !== "string"
+    )) {
       throw new Error(
         '"tool_calls" parts expect an object with a ToolCallPayload.'
       );
@@ -218,27 +218,12 @@ async function* readDataStream(reader, {
   }
 }
 
-// shared/utils.ts
+// shared/generate-id.ts
 import { customAlphabet } from "nanoid/non-secure";
-var nanoid = customAlphabet(
+var generateId = 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 COMPLEX_HEADER = "X-Experimental-Stream-Data";
 
 // shared/parse-complex-response.ts
 function assignAnnotationsToMessage(message, annotations) {
@@ -251,7 +236,7 @@ async function parseComplexResponse({
   abortControllerRef,
   update,
   onFinish,
-  generateId = nanoid,
+  generateId: generateId2 = generateId,
   getCurrentDate = () => /* @__PURE__ */ new Date()
 }) {
   const createdAt = getCurrentDate();
@@ -270,7 +255,7 @@ async function parseComplexResponse({
         };
       } else {
         prefixMap["text"] = {
-          id: generateId(),
+          id: generateId2(),
           role: "assistant",
           content: value,
           createdAt
@@ -280,7 +265,7 @@ async function parseComplexResponse({
     let functionCallMessage = null;
     if (type === "function_call") {
       prefixMap["function_call"] = {
-        id: generateId(),
+        id: generateId2(),
         role: "assistant",
         content: "",
         function_call: value.function_call,
@@ -292,7 +277,7 @@ async function parseComplexResponse({
     let toolCallMessage = null;
     if (type === "tool_calls") {
       prefixMap["tool_calls"] = {
-        id: generateId(),
+        id: generateId2(),
         role: "assistant",
         content: "",
         tool_calls: value.tool_calls,
@@ -351,20 +336,36 @@ async function parseComplexResponse({
   };
 }
 
+// shared/utils.ts
+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);
+  };
+}
+
 // shared/call-chat-api.ts
 async function callChatApi({
   api,
   messages,
   body,
+  streamMode = "stream-data",
   credentials,
   headers,
   abortController,
-  appendMessage,
   restoreMessagesOnFailure,
   onResponse,
   onUpdate,
   onFinish,
-  generateId
+  generateId: generateId2
 }) {
   var _a;
   const response = await fetch(api, {
@@ -400,63 +401,51 @@ async function callChatApi({
     throw new Error("The response body is empty.");
   }
   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);
+  switch (streamMode) {
+    case "text": {
+      const decoder = createChunkDecoder();
+      const resultMessage = {
+        id: generateId2(),
+        createdAt: /* @__PURE__ */ new Date(),
+        role: "assistant",
+        content: ""
+      };
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) {
+          break;
+        }
+        resultMessage.content += decoder(value);
+        resultMessage.id = generateId2();
+        onUpdate([{ ...resultMessage }], []);
+        if ((abortController == null ? void 0 : abortController()) === null) {
+          reader.cancel();
+          break;
         }
-      },
-      generateId
-    });
-  } else {
-    const createdAt = /* @__PURE__ */ new Date();
-    const decode = createChunkDecoder(false);
-    let streamedResponse = "";
-    const replyId = generateId();
-    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 if (streamedResponse.startsWith('{"tool_calls":')) {
-        responseMessage["tool_calls"] = streamedResponse;
-      } else {
-        responseMessage["content"] = streamedResponse;
-      }
-      appendMessage({ ...responseMessage });
-      if ((abortController == null ? void 0 : abortController()) === null) {
-        reader.cancel();
-        break;
       }
+      onFinish == null ? void 0 : onFinish(resultMessage);
+      return {
+        messages: [resultMessage],
+        data: []
+      };
     }
-    if (streamedResponse.startsWith('{"function_call":')) {
-      const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
-      responseMessage["function_call"] = parsedFunctionCall;
-      appendMessage({ ...responseMessage });
-    }
-    if (streamedResponse.startsWith('{"tool_calls":')) {
-      const parsedToolCalls = JSON.parse(streamedResponse).tool_calls;
-      responseMessage["tool_calls"] = parsedToolCalls;
-      appendMessage({ ...responseMessage });
+    case "stream-data": {
+      return await parseComplexResponse({
+        reader,
+        abortControllerRef: abortController != null ? { current: abortController() } : void 0,
+        update: onUpdate,
+        onFinish(prefixMap) {
+          if (onFinish && prefixMap.text != null) {
+            onFinish(prefixMap.text);
+          }
+        },
+        generateId: generateId2
+      });
     }
-    if (onFinish) {
-      onFinish(responseMessage);
+    default: {
+      const exhaustiveCheck = streamMode;
+      throw new Error(`Unknown stream mode: ${exhaustiveCheck}`);
     }
-    return responseMessage;
   }
 }
 
@@ -598,7 +587,8 @@ function useChat({
   credentials,
   headers,
   body,
-  generateId = nanoid
+  streamMode,
+  generateId: generateId2 = generateId
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
@@ -654,6 +644,7 @@ function useChat({
               ...body,
               ...options == null ? void 0 : options.body
             },
+            streamMode,
             headers: {
               ...headers,
               ...options == null ? void 0 : options.headers
@@ -666,15 +657,12 @@ function useChat({
               setStreamData([...existingData, ...data2 != null ? data2 : []]);
             },
             onFinish,
-            appendMessage(message) {
-              mutate([...chatRequest.messages, message]);
-            },
             restoreMessagesOnFailure() {
               if (previousMessages.status === "success") {
                 mutate(previousMessages.data);
               }
             },
-            generateId
+            generateId: generateId2
           });
         },
         experimental_onFunctionCall,
@@ -700,7 +688,7 @@ function useChat({
   const append = async (message, options) => {
     var _a;
     if (!message.id) {
-      message.id = generateId();
+      message.id = generateId2();
     }
     return triggerRequest(
       ((_a = messages()) != null ? _a : []).concat(message),
@@ -769,6 +757,7 @@ async function callCompletionApi({
   credentials,
   headers,
   body,
+  streamMode = "stream-data",
   setCompletion,
   setLoading,
   setError,
@@ -816,36 +805,44 @@ async function callCompletionApi({
     }
     let result = "";
     const reader = res.body.getReader();
-    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;
-            setCompletion(result);
+    switch (streamMode) {
+      case "text": {
+        const decoder = createChunkDecoder();
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
             break;
           }
-          case "data": {
-            onData == null ? void 0 : onData(value);
+          result += decoder(value);
+          setCompletion(result);
+          if (abortController === null) {
+            reader.cancel();
             break;
           }
         }
+        break;
       }
-    } else {
-      const decoder = createChunkDecoder();
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          break;
-        }
-        result += decoder(value);
-        setCompletion(result);
-        if (abortController === null) {
-          reader.cancel();
-          break;
+      case "stream-data": {
+        for await (const { type, value } of readDataStream(reader, {
+          isAborted: () => abortController === null
+        })) {
+          switch (type) {
+            case "text": {
+              result += value;
+              setCompletion(result);
+              break;
+            }
+            case "data": {
+              onData == null ? void 0 : onData(value);
+              break;
+            }
+          }
         }
+        break;
+      }
+      default: {
+        const exhaustiveCheck = streamMode;
+        throw new Error(`Unknown stream mode: ${exhaustiveCheck}`);
       }
     }
     if (onFinish) {
@@ -886,6 +883,7 @@ function useCompletion({
   credentials,
   headers,
   body,
+  streamMode,
   onResponse,
   onFinish,
   onError
@@ -924,6 +922,7 @@ function useCompletion({
         ...body,
         ...options == null ? void 0 : options.body
       },
+      streamMode,
       setCompletion: mutate,
       setLoading: setIsLoading,
       setError,