ai 2.2.22 → 2.2.24

package/solid/dist/index.d.ts

@@ -64,6 +64,7 @@ type ChatRequest = {
     options?: RequestOptions;
     functions?: Array<Function>;
     function_call?: FunctionCall;
+    data?: Record<string, string>;
 };
 type FunctionCallHandler = (chatMessages: Message[], functionCall: FunctionCall) => Promise<ChatRequest | void>;
 type RequestOptions = {
@@ -194,6 +195,9 @@ type UseCompletionOptions = {
      */
     body?: object;
 };
+type JSONValue = null | string | number | boolean | {
+    [x: string]: JSONValue;
+} | Array<JSONValue>;
 
 type UseChatHelpers = {
     /** Current messages in the chat */
@@ -231,8 +235,10 @@ type UseChatHelpers = {
     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 useChat({ api, id, initialMessages, initialInput, sendExtraMessageFields, onResponse, onFinish, onError, credentials, headers, body, }?: UseChatOptions): UseChatHelpers;
+declare function useChat({ api, id, initialMessages, initialInput, sendExtraMessageFields, experimental_onFunctionCall, onResponse, onFinish, onError, credentials, headers, body, }?: UseChatOptions): UseChatHelpers;
 
 type UseCompletionHelpers = {
     /** The current completion result */

package/solid/dist/index.js

@@ -30,8 +30,134 @@ var import_solid_js = require("solid-js");
 var import_solid_swr_store = require("solid-swr-store");
 var import_swr_store = require("swr-store");
 
+// shared/call-api.ts
+var import_nanoid = require("nanoid");
+
 // shared/utils.ts
 var import_non_secure = require("nanoid/non-secure");
+
+// shared/stream-parts.ts
+var textStreamPart = {
+  code: "0",
+  name: "text",
+  parse: (value) => {
+    if (typeof value !== "string") {
+      throw new Error('"text" parts expect a string value.');
+    }
+    return { type: "text", value };
+  }
+};
+var functionCallStreamPart = {
+  code: "1",
+  name: "function_call",
+  parse: (value) => {
+    if (value == null || typeof value !== "object" || !("function_call" in value) || typeof value.function_call !== "object" || value.function_call == null || !("name" in value.function_call) || !("arguments" in value.function_call) || typeof value.function_call.name !== "string" || typeof value.function_call.arguments !== "string") {
+      throw new Error(
+        '"function_call" parts expect an object with a "function_call" property.'
+      );
+    }
+    return {
+      type: "function_call",
+      value
+    };
+  }
+};
+var dataStreamPart = {
+  code: "2",
+  name: "data",
+  parse: (value) => {
+    if (!Array.isArray(value)) {
+      throw new Error('"data" parts expect an array value.');
+    }
+    return { type: "data", value };
+  }
+};
+var errorStreamPart = {
+  code: "3",
+  name: "error",
+  parse: (value) => {
+    if (typeof value !== "string") {
+      throw new Error('"error" parts expect a string value.');
+    }
+    return { type: "error", value };
+  }
+};
+var assistantMessage = {
+  code: "4",
+  name: "assistant_message",
+  parse: (value) => {
+    if (value == null || typeof value !== "object" || !("id" in value) || !("role" in value) || !("content" in value) || typeof value.id !== "string" || typeof value.role !== "string" || value.role !== "assistant" || !Array.isArray(value.content) || !value.content.every(
+      (item) => item != null && typeof item === "object" && "type" in item && item.type === "text" && "text" in item && item.text != null && typeof item.text === "object" && "value" in item.text && typeof item.text.value === "string"
+    )) {
+      throw new Error(
+        '"assistant_message" parts expect an object with an "id", "role", and "content" property.'
+      );
+    }
+    return {
+      type: "assistant_message",
+      value
+    };
+  }
+};
+var assistantControlData = {
+  code: "5",
+  name: "assistant_control_data",
+  parse: (value) => {
+    if (value == null || typeof value !== "object" || !("threadId" in value) || !("messageId" in value) || typeof value.threadId !== "string" || typeof value.messageId !== "string") {
+      throw new Error(
+        '"assistant_control_data" parts expect an object with a "threadId" and "messageId" property.'
+      );
+    }
+    return {
+      type: "assistant_control_data",
+      value: {
+        threadId: value.threadId,
+        messageId: value.messageId
+      }
+    };
+  }
+};
+var streamParts = [
+  textStreamPart,
+  functionCallStreamPart,
+  dataStreamPart,
+  errorStreamPart,
+  assistantMessage,
+  assistantControlData
+];
+var streamPartsByCode = {
+  [textStreamPart.code]: textStreamPart,
+  [functionCallStreamPart.code]: functionCallStreamPart,
+  [dataStreamPart.code]: dataStreamPart,
+  [errorStreamPart.code]: errorStreamPart,
+  [assistantMessage.code]: assistantMessage,
+  [assistantControlData.code]: assistantControlData
+};
+var StreamStringPrefixes = {
+  [textStreamPart.name]: textStreamPart.code,
+  [functionCallStreamPart.name]: functionCallStreamPart.code,
+  [dataStreamPart.name]: dataStreamPart.code,
+  [errorStreamPart.name]: errorStreamPart.code,
+  [assistantMessage.name]: assistantMessage.code,
+  [assistantControlData.name]: assistantControlData.code
+};
+var validCodes = streamParts.map((part) => part.code);
+var parseStreamPart = (line) => {
+  const firstSeparatorIndex = line.indexOf(":");
+  if (firstSeparatorIndex === -1) {
+    throw new Error("Failed to parse stream string. No separator found.");
+  }
+  const prefix = line.slice(0, firstSeparatorIndex);
+  if (!validCodes.includes(prefix)) {
+    throw new Error(`Failed to parse stream string. Invalid code ${prefix}.`);
+  }
+  const code = prefix;
+  const textValue = line.slice(firstSeparatorIndex + 1);
+  const jsonValue = JSON.parse(textValue);
+  return streamPartsByCode[code].parse(jsonValue);
+};
+
+// shared/utils.ts
 var nanoid = (0, import_non_secure.customAlphabet)(
   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
   7
@@ -47,33 +173,249 @@ function createChunkDecoder(complex) {
   }
   return function(chunk) {
     const decoded = decoder.decode(chunk, { stream: true }).split("\n").filter((line) => line !== "");
-    return decoded.map(getStreamStringTypeAndValue).filter(Boolean);
+    return decoded.map(parseStreamPart).filter(Boolean);
   };
 }
-var StreamStringPrefixes = {
-  text: 0,
-  function_call: 1,
-  data: 2
-  // user_err: 3?
-};
-var getStreamStringTypeAndValue = (line) => {
-  const firstSeperatorIndex = line.indexOf(":");
-  const prefix = line.slice(0, firstSeperatorIndex);
-  const type = Object.keys(StreamStringPrefixes).find(
-    (key) => StreamStringPrefixes[key] === Number(prefix)
-  );
-  const val = line.slice(firstSeperatorIndex + 1);
-  let parsedVal = val;
-  if (!val) {
-    return { type, value: "" };
+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);
+  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;
+      }
+    }
   }
-  try {
-    parsedVal = JSON.parse(val);
-  } catch (e) {
-    console.error("Failed to parse JSON value:", val);
+  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,
+      ...body
+    }),
+    headers,
+    signal: (_a = abortController == null ? void 0 : abortController()) == null ? void 0 : _a.signal,
+    credentials
+  }).catch((err) => {
+    restoreMessagesOnFailure();
+    throw err;
+  });
+  if (onResponse) {
+    try {
+      await onResponse(response);
+    } catch (err) {
+      throw err;
+    }
   }
-  return { type, value: parsedVal };
-};
+  if (!response.ok) {
+    restoreMessagesOnFailure();
+    throw new Error(
+      await response.text() || "Failed to fetch the chat response."
+    );
+  }
+  if (!response.body) {
+    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);
+        }
+      }
+    });
+  } 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;
+      }
+    }
+    if (streamedResponse.startsWith('{"function_call":')) {
+      const parsedFunctionCall = JSON.parse(streamedResponse).function_call;
+      responseMessage["function_call"] = parsedFunctionCall;
+      appendMessage({ ...responseMessage });
+    }
+    if (onFinish) {
+      onFinish(responseMessage);
+    }
+    return responseMessage;
+  }
+}
+
+// shared/process-chat-stream.ts
+async function processChatStream({
+  getStreamedResponse,
+  experimental_onFunctionCall,
+  updateChatRequest,
+  getCurrentMessages
+}) {
+  while (true) {
+    const messagesAndDataOrJustMessage = await getStreamedResponse();
+    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);
+      }
+    }
+  }
+}
 
 // solid/use-chat.ts
 var uniqueId = 0;
@@ -90,6 +432,7 @@ function useChat({
   initialMessages = [],
   initialInput = "",
   sendExtraMessageFields,
+  experimental_onFunctionCall,
   onResponse,
   onFinish,
   onError,
@@ -99,18 +442,20 @@ function useChat({
 } = {}) {
   const chatId = id || `chat-${uniqueId++}`;
   const key = `${api}|${chatId}`;
-  const data = (0, import_solid_swr_store.useSWRStore)(chatApiStore, () => [key], {
+  const messages = (0, import_solid_swr_store.useSWRStore)(chatApiStore, () => [key], {
     initialData: initialMessages
   });
-  const mutate = (data2) => {
-    store[key] = data2;
+  const mutate = (data) => {
+    store[key] = data;
     return chatApiStore.mutate([key], {
       status: "success",
-      data: data2
+      data
     });
   };
-  const messages = data;
   const [error, setError] = (0, import_solid_js.createSignal)(void 0);
+  const [streamData, setStreamData] = (0, import_solid_js.createSignal)(
+    void 0
+  );
   const [isLoading, setIsLoading] = (0, import_solid_js.createSignal)(false);
   let abortController = null;
   async function triggerRequest(messagesSnapshot, options) {
@@ -118,91 +463,64 @@ function useChat({
       setError(void 0);
       setIsLoading(true);
       abortController = new AbortController();
-      const previousMessages = chatApiStore.get([key], {
+      const getCurrentMessages = () => chatApiStore.get([key], {
         shouldRevalidate: false
       });
+      const previousMessages = getCurrentMessages();
       mutate(messagesSnapshot);
-      const res = await fetch(api, {
-        method: "POST",
-        body: JSON.stringify({
-          messages: sendExtraMessageFields ? messagesSnapshot : messagesSnapshot.map(
-            ({ role, content, name, function_call }) => ({
-              role,
-              content,
-              ...name !== void 0 && { name },
-              ...function_call !== void 0 && {
-                function_call
+      let chatRequest = {
+        messages: messagesSnapshot,
+        options
+      };
+      await processChatStream({
+        getStreamedResponse: async () => {
+          var _a;
+          const existingData = (_a = streamData()) != null ? _a : [];
+          return await callApi({
+            api,
+            messages: sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(
+              ({ role, content, name, function_call }) => ({
+                role,
+                content,
+                ...name !== void 0 && { name },
+                ...function_call !== void 0 && {
+                  function_call
+                }
+              })
+            ),
+            body: {
+              ...body,
+              ...options == null ? void 0 : options.body
+            },
+            headers: {
+              ...headers,
+              ...options == null ? void 0 : options.headers
+            },
+            abortController: () => abortController,
+            credentials,
+            onResponse,
+            onUpdate(merged, data) {
+              mutate([...chatRequest.messages, ...merged]);
+              setStreamData([...existingData, ...data != null ? data : []]);
+            },
+            onFinish,
+            appendMessage(message) {
+              mutate([...chatRequest.messages, message]);
+            },
+            restoreMessagesOnFailure() {
+              if (previousMessages.status === "success") {
+                mutate(previousMessages.data);
               }
-            })
-          ),
-          ...body,
-          ...options == null ? void 0 : options.body
-        }),
-        headers: {
-          ...headers,
-          ...options == null ? void 0 : options.headers
+            }
+          });
         },
-        signal: abortController.signal,
-        credentials
-      }).catch((err) => {
-        if (previousMessages.status === "success") {
-          mutate(previousMessages.data);
-        }
-        throw err;
+        experimental_onFunctionCall,
+        updateChatRequest(newChatRequest) {
+          chatRequest = newChatRequest;
+        },
+        getCurrentMessages: () => getCurrentMessages().data
       });
-      if (onResponse) {
-        try {
-          await onResponse(res);
-        } catch (err) {
-          throw err;
-        }
-      }
-      if (!res.ok) {
-        if (previousMessages.status === "success") {
-          mutate(previousMessages.data);
-        }
-        throw new Error(
-          await res.text() || "Failed to fetch the chat response."
-        );
-      }
-      if (!res.body) {
-        throw new Error("The response body is empty.");
-      }
-      let result = "";
-      const createdAt = /* @__PURE__ */ new Date();
-      const replyId = nanoid();
-      const reader = res.body.getReader();
-      const decoder = createChunkDecoder();
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          break;
-        }
-        result += decoder(value);
-        mutate([
-          ...messagesSnapshot,
-          {
-            id: replyId,
-            createdAt,
-            content: result,
-            role: "assistant"
-          }
-        ]);
-        if (abortController === null) {
-          reader.cancel();
-          break;
-        }
-      }
-      if (onFinish) {
-        onFinish({
-          id: replyId,
-          createdAt,
-          content: result,
-          role: "assistant"
-        });
-      }
       abortController = null;
-      return result;
     } catch (err) {
       if (err.name === "AbortError") {
         abortController = null;
@@ -268,7 +586,8 @@ function useChat({
     input,
     setInput,
     handleSubmit,
-    isLoading
+    isLoading,
+    data: streamData
   };
 }