@ai-sdk/react 2.0.0-canary.2 → 2.0.0-canary.21

package/dist/index.js

@@ -37,7 +37,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/use-chat.ts
-var import_ui_utils2 = require("@ai-sdk/ui-utils");
+var import_ai2 = require("ai");
 var import_react2 = require("react");
 var import_swr = __toESM(require("swr"));
 
@@ -48,12 +48,12 @@ function throttle(fn, waitMs) {
 }
 
 // src/util/use-stable-value.ts
-var import_ui_utils = require("@ai-sdk/ui-utils");
+var import_ai = require("ai");
 var import_react = require("react");
 function useStableValue(latestValue) {
   const [value, setValue] = (0, import_react.useState)(latestValue);
   (0, import_react.useEffect)(() => {
-    if (!(0, import_ui_utils.isDeepEqualData)(latestValue, value)) {
+    if (!(0, import_ai.isDeepEqualData)(latestValue, value)) {
       setValue(latestValue);
     }
   }, [latestValue, value]);
@@ -66,28 +66,26 @@ function useChat({
   id,
   initialMessages,
   initialInput = "",
-  sendExtraMessageFields,
   onToolCall,
   experimental_prepareRequestBody,
   maxSteps = 1,
-  streamProtocol = "data",
-  onResponse,
+  streamProtocol = "ui-message",
   onFinish,
   onError,
   credentials,
   headers,
   body,
-  generateId = import_ui_utils2.generateId,
+  generateId = import_ai2.generateId,
   fetch: fetch2,
-  keepLastMessageOnError = true,
-  experimental_throttle: throttleWaitMs
+  experimental_throttle: throttleWaitMs,
+  messageMetadataSchema
 } = {}) {
   const [hookId] = (0, import_react2.useState)(generateId);
   const chatId = id != null ? id : hookId;
   const chatKey = typeof api === "string" ? [api, chatId] : chatId;
   const stableInitialMessages = useStableValue(initialMessages != null ? initialMessages : []);
   const processedInitialMessages = (0, import_react2.useMemo)(
-    () => (0, import_ui_utils2.fillMessageParts)(stableInitialMessages),
+    () => stableInitialMessages,
     [stableInitialMessages]
   );
   const { data: messages, mutate } = (0, import_swr.default)(
@@ -99,11 +97,6 @@ function useChat({
   (0, import_react2.useEffect)(() => {
     messagesRef.current = messages || [];
   }, [messages]);
-  const { data: streamData, mutate: mutateStreamData } = (0, import_swr.default)([chatKey, "streamData"], null);
-  const streamDataRef = (0, import_react2.useRef)(streamData);
-  (0, import_react2.useEffect)(() => {
-    streamDataRef.current = streamData;
-  }, [streamData]);
   const { data: status = "ready", mutate: mutateStatus } = (0, import_swr.default)([chatKey, "status"], null);
   const { data: error = void 0, mutate: setError } = (0, import_swr.default)([chatKey, "error"], null);
   const abortControllerRef = (0, import_react2.useRef)(null);
@@ -120,58 +113,29 @@ function useChat({
     };
   }, [credentials, headers, body]);
   const triggerRequest = (0, import_react2.useCallback)(
-    async (chatRequest) => {
-      var _a, _b;
+    async (chatRequest, requestType = "generate") => {
+      var _a;
       mutateStatus("submitted");
       setError(void 0);
-      const chatMessages = (0, import_ui_utils2.fillMessageParts)(chatRequest.messages);
+      const chatMessages = chatRequest.messages;
       const messageCount = chatMessages.length;
-      const maxStep = (0, import_ui_utils2.extractMaxToolInvocationStep)(
-        (_a = chatMessages[chatMessages.length - 1]) == null ? void 0 : _a.toolInvocations
+      const maxStep = (0, import_ai2.extractMaxToolInvocationStep)(
+        (0, import_ai2.getToolInvocations)(chatMessages[chatMessages.length - 1])
       );
       try {
         const abortController = new AbortController();
         abortControllerRef.current = abortController;
         const throttledMutate = throttle(mutate, throttleWaitMs);
-        const throttledMutateStreamData = throttle(
-          mutateStreamData,
-          throttleWaitMs
-        );
-        const previousMessages = messagesRef.current;
         throttledMutate(chatMessages, false);
-        const constructedMessagesPayload = sendExtraMessageFields ? chatMessages : chatMessages.map(
-          ({
-            role,
-            content,
-            experimental_attachments,
-            data,
-            annotations,
-            toolInvocations,
-            parts
-          }) => ({
-            role,
-            content,
-            ...experimental_attachments !== void 0 && {
-              experimental_attachments
-            },
-            ...data !== void 0 && { data },
-            ...annotations !== void 0 && { annotations },
-            ...toolInvocations !== void 0 && { toolInvocations },
-            ...parts !== void 0 && { parts }
-          })
-        );
-        const existingData = streamDataRef.current;
-        await (0, import_ui_utils2.callChatApi)({
+        await (0, import_ai2.callChatApi)({
           api,
-          body: (_b = experimental_prepareRequestBody == null ? void 0 : experimental_prepareRequestBody({
+          body: (_a = experimental_prepareRequestBody == null ? void 0 : experimental_prepareRequestBody({
             id: chatId,
             messages: chatMessages,
-            requestData: chatRequest.data,
             requestBody: chatRequest.body
-          })) != null ? _b : {
+          })) != null ? _a : {
             id: chatId,
-            messages: constructedMessagesPayload,
-            data: chatRequest.data,
+            messages: chatMessages,
             ...extraMetadataRef.current.body,
             ...chatRequest.body
           },
@@ -182,14 +146,9 @@ function useChat({
             ...chatRequest.headers
           },
           abortController: () => abortControllerRef.current,
-          restoreMessagesOnFailure() {
-            if (!keepLastMessageOnError) {
-              throttledMutate(previousMessages, false);
-            }
-          },
-          onResponse,
-          onUpdate({ message, data, replaceLastMessage }) {
+          onUpdate({ message }) {
             mutateStatus("streaming");
+            const replaceLastMessage = message.id === chatMessages[chatMessages.length - 1].id;
             throttledMutate(
               [
                 ...replaceLastMessage ? chatMessages.slice(0, chatMessages.length - 1) : chatMessages,
@@ -197,18 +156,14 @@ function useChat({
               ],
               false
             );
-            if (data == null ? void 0 : data.length) {
-              throttledMutateStreamData(
-                [...existingData != null ? existingData : [], ...data],
-                false
-              );
-            }
           },
           onToolCall,
           onFinish,
           generateId,
           fetch: fetch2,
-          lastMessage: chatMessages[chatMessages.length - 1]
+          lastMessage: chatMessages[chatMessages.length - 1],
+          requestType,
+          messageMetadataSchema
         });
         abortControllerRef.current = null;
         mutateStatus("ready");
@@ -225,7 +180,7 @@ function useChat({
         mutateStatus("error");
       }
       const messages2 = messagesRef.current;
-      if ((0, import_ui_utils2.shouldResubmitMessages)({
+      if ((0, import_ai2.shouldResubmitMessages)({
         originalMaxToolInvocationStep: maxStep,
         originalMessageCount: messageCount,
         maxSteps,
@@ -239,14 +194,10 @@ function useChat({
       mutateStatus,
       api,
       extraMetadataRef,
-      onResponse,
       onFinish,
       onError,
       setError,
-      mutateStreamData,
-      streamDataRef,
       streamProtocol,
-      sendExtraMessageFields,
       experimental_prepareRequestBody,
       onToolCall,
       maxSteps,
@@ -254,35 +205,27 @@ function useChat({
       abortControllerRef,
       generateId,
       fetch2,
-      keepLastMessageOnError,
       throttleWaitMs,
-      chatId
+      chatId,
+      messageMetadataSchema
     ]
   );
   const append = (0, import_react2.useCallback)(
-    async (message, {
-      data,
-      headers: headers2,
-      body: body2,
-      experimental_attachments
-    } = {}) => {
-      var _a, _b;
-      const attachmentsForRequest = await (0, import_ui_utils2.prepareAttachmentsForRequest)(
-        experimental_attachments
-      );
-      const messages2 = messagesRef.current.concat({
-        ...message,
-        id: (_a = message.id) != null ? _a : generateId(),
-        createdAt: (_b = message.createdAt) != null ? _b : /* @__PURE__ */ new Date(),
-        experimental_attachments: attachmentsForRequest.length > 0 ? attachmentsForRequest : void 0,
-        parts: (0, import_ui_utils2.getMessageParts)(message)
+    async (message, { headers: headers2, body: body2 } = {}) => {
+      var _a;
+      await triggerRequest({
+        messages: messagesRef.current.concat({
+          ...message,
+          id: (_a = message.id) != null ? _a : generateId()
+        }),
+        headers: headers2,
+        body: body2
       });
-      return triggerRequest({ messages: messages2, headers: headers2, body: body2, data });
     },
     [triggerRequest, generateId]
   );
   const reload = (0, import_react2.useCallback)(
-    async ({ data, headers: headers2, body: body2 } = {}) => {
+    async ({ headers: headers2, body: body2 } = {}) => {
       const messages2 = messagesRef.current;
       if (messages2.length === 0) {
         return null;
@@ -291,8 +234,7 @@ function useChat({
       return triggerRequest({
         messages: lastMessage.role === "assistant" ? messages2.slice(0, -1) : messages2,
         headers: headers2,
-        body: body2,
-        data
+        body: body2
       });
     },
     [triggerRequest]
@@ -303,33 +245,27 @@ function useChat({
       abortControllerRef.current = null;
     }
   }, []);
+  const experimental_resume = (0, import_react2.useCallback)(async () => {
+    const messages2 = messagesRef.current;
+    triggerRequest({ messages: messages2 }, "resume");
+  }, [triggerRequest]);
   const setMessages = (0, import_react2.useCallback)(
     (messages2) => {
       if (typeof messages2 === "function") {
         messages2 = messages2(messagesRef.current);
       }
-      const messagesWithParts = (0, import_ui_utils2.fillMessageParts)(messages2);
-      mutate(messagesWithParts, false);
-      messagesRef.current = messagesWithParts;
+      mutate(messages2, false);
+      messagesRef.current = messages2;
     },
     [mutate]
   );
-  const setData = (0, import_react2.useCallback)(
-    (data) => {
-      if (typeof data === "function") {
-        data = data(streamDataRef.current);
-      }
-      mutateStreamData(data, false);
-      streamDataRef.current = data;
-    },
-    [mutateStreamData]
-  );
   const [input, setInput] = (0, import_react2.useState)(initialInput);
   const handleSubmit = (0, import_react2.useCallback)(
     async (event, options = {}, metadata) => {
       var _a;
       (_a = event == null ? void 0 : event.preventDefault) == null ? void 0 : _a.call(event);
-      if (!input && !options.allowEmptySubmit)
+      const fileParts = Array.isArray(options == null ? void 0 : options.files) ? options.files : await (0, import_ai2.convertFileListToFileUIParts)(options == null ? void 0 : options.files);
+      if (!input && fileParts.length === 0)
         return;
       if (metadata) {
         extraMetadataRef.current = {
@@ -337,24 +273,16 @@ function useChat({
           ...metadata
         };
       }
-      const attachmentsForRequest = await (0, import_ui_utils2.prepareAttachmentsForRequest)(
-        options.experimental_attachments
-      );
-      const messages2 = messagesRef.current.concat({
-        id: generateId(),
-        createdAt: /* @__PURE__ */ new Date(),
-        role: "user",
-        content: input,
-        experimental_attachments: attachmentsForRequest.length > 0 ? attachmentsForRequest : void 0,
-        parts: [{ type: "text", text: input }]
-      });
-      const chatRequest = {
-        messages: messages2,
+      triggerRequest({
+        messages: messagesRef.current.concat({
+          id: generateId(),
+          role: "user",
+          metadata: void 0,
+          parts: [...fileParts, { type: "text", text: input }]
+        }),
         headers: options.headers,
-        body: options.body,
-        data: options.data
-      };
-      triggerRequest(chatRequest);
+        body: options.body
+      });
       setInput("");
     },
     [input, generateId, triggerRequest]
@@ -365,7 +293,7 @@ function useChat({
   const addToolResult = (0, import_react2.useCallback)(
     ({ toolCallId, result }) => {
       const currentMessages = messagesRef.current;
-      (0, import_ui_utils2.updateToolCallResult)({
+      (0, import_ai2.updateToolCallResult)({
         messages: currentMessages,
         toolCallId,
         toolResult: result
@@ -373,7 +301,12 @@ function useChat({
       mutate(
         [
           ...currentMessages.slice(0, currentMessages.length - 1),
-          { ...currentMessages[currentMessages.length - 1] }
+          {
+            ...currentMessages[currentMessages.length - 1],
+            // @ts-ignore
+            // update the revisionId to trigger a re-render
+            revisionId: generateId()
+          }
         ],
         false
       );
@@ -381,34 +314,32 @@ function useChat({
         return;
       }
       const lastMessage = currentMessages[currentMessages.length - 1];
-      if ((0, import_ui_utils2.isAssistantMessageWithCompletedToolCalls)(lastMessage)) {
+      if ((0, import_ai2.isAssistantMessageWithCompletedToolCalls)(lastMessage)) {
         triggerRequest({ messages: currentMessages });
       }
     },
-    [mutate, status, triggerRequest]
+    [mutate, status, triggerRequest, generateId]
   );
   return {
     messages: messages != null ? messages : [],
     id: chatId,
     setMessages,
-    data: streamData,
-    setData,
     error,
     append,
     reload,
     stop,
+    experimental_resume,
     input,
     setInput,
     handleInputChange,
     handleSubmit,
-    isLoading: status === "submitted" || status === "streaming",
     status,
     addToolResult
   };
 }
 
 // src/use-completion.ts
-var import_ui_utils3 = require("@ai-sdk/ui-utils");
+var import_ai3 = require("ai");
 var import_react3 = require("react");
 var import_swr2 = __toESM(require("swr"));
 function useCompletion({
@@ -421,7 +352,6 @@ function useCompletion({
   body,
   streamProtocol = "data",
   fetch: fetch2,
-  onResponse,
   onFinish,
   onError,
   experimental_throttle: throttleWaitMs
@@ -435,7 +365,6 @@ function useCompletion({
     [completionId, "loading"],
     null
   );
-  const { data: streamData, mutate: mutateStreamData } = (0, import_swr2.default)([completionId, "streamData"], null);
   const [error, setError] = (0, import_react3.useState)(void 0);
   const completion = data;
   const [abortController, setAbortController] = (0, import_react3.useState)(null);
@@ -452,7 +381,7 @@ function useCompletion({
     };
   }, [credentials, headers, body]);
   const triggerRequest = (0, import_react3.useCallback)(
-    async (prompt, options) => (0, import_ui_utils3.callCompletionApi)({
+    async (prompt, options) => (0, import_ai3.callCompletionApi)({
       api,
       prompt,
       credentials: extraMetadataRef.current.credentials,
@@ -468,14 +397,9 @@ function useCompletion({
         (completion2) => mutate(completion2, false),
         throttleWaitMs
       ),
-      onData: throttle(
-        (data2) => mutateStreamData([...streamData != null ? streamData : [], ...data2 != null ? data2 : []], false),
-        throttleWaitMs
-      ),
       setLoading: mutateLoading,
       setError,
       setAbortController,
-      onResponse,
       onFinish,
       onError
     }),
@@ -485,14 +409,11 @@ function useCompletion({
       api,
       extraMetadataRef,
       setAbortController,
-      onResponse,
       onFinish,
       onError,
       setError,
-      streamData,
       streamProtocol,
       fetch2,
-      mutateStreamData,
       throttleWaitMs
     ]
   );
@@ -539,14 +460,13 @@ function useCompletion({
     setInput,
     handleInputChange,
     handleSubmit,
-    isLoading,
-    data: streamData
+    isLoading
   };
 }
 
 // src/use-object.ts
 var import_provider_utils = require("@ai-sdk/provider-utils");
-var import_ui_utils4 = require("@ai-sdk/ui-utils");
+var import_ai4 = require("ai");
 var import_react4 = require("react");
 var import_swr3 = __toESM(require("swr"));
 var getOriginalFetch = () => fetch;
@@ -613,22 +533,22 @@ function useObject({
       let latestObject = void 0;
       await response.body.pipeThrough(new TextDecoderStream()).pipeTo(
         new WritableStream({
-          write(chunk) {
+          async write(chunk) {
             accumulatedText += chunk;
-            const { value } = (0, import_ui_utils4.parsePartialJson)(accumulatedText);
+            const { value } = await (0, import_ai4.parsePartialJson)(accumulatedText);
             const currentObject = value;
-            if (!(0, import_ui_utils4.isDeepEqualData)(latestObject, currentObject)) {
+            if (!(0, import_ai4.isDeepEqualData)(latestObject, currentObject)) {
               latestObject = currentObject;
               mutate(currentObject);
             }
           },
-          close() {
+          async close() {
             setIsLoading(false);
             abortControllerRef.current = null;
             if (onFinish != null) {
-              const validationResult = (0, import_provider_utils.safeValidateTypes)({
+              const validationResult = await (0, import_provider_utils.safeValidateTypes)({
                 value: latestObject,
-                schema: (0, import_ui_utils4.asSchema)(schema)
+                schema: (0, import_ai4.asSchema)(schema)
               });
               onFinish(
                 validationResult.success ? { object: validationResult.value, error: void 0 } : { object: void 0, error: validationResult.error }