ai 2.2.6 → 2.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",

package/react/dist/index.js

@@ -305,32 +305,54 @@ function useChat({
     };
   }, [credentials, headers, body]);
   const [error, setError] = (0, import_react.useState)();
-  async function triggerRequest(chatRequest) {
-    try {
-      mutateLoading(true);
-      const abortController = new AbortController();
-      abortControllerRef.current = abortController;
-      while (true) {
-        const messagesAndDataOrJustMessage = await getStreamedResponse(
-          api,
-          chatRequest,
-          mutate,
-          mutateStreamData,
-          streamData,
-          extraMetadataRef,
-          messagesRef,
-          abortControllerRef,
-          onFinish,
-          onResponse,
-          sendExtraMessageFields
-        );
-        if ("messages" in messagesAndDataOrJustMessage) {
-          for (const message of messagesAndDataOrJustMessage.messages) {
-            if (message.function_call === void 0 || typeof message.function_call === "string") {
+  const triggerRequest = (0, import_react.useCallback)(
+    async (chatRequest) => {
+      try {
+        mutateLoading(true);
+        const abortController = new AbortController();
+        abortControllerRef.current = abortController;
+        while (true) {
+          const messagesAndDataOrJustMessage = await getStreamedResponse(
+            api,
+            chatRequest,
+            mutate,
+            mutateStreamData,
+            streamData,
+            extraMetadataRef,
+            messagesRef,
+            abortControllerRef,
+            onFinish,
+            onResponse,
+            sendExtraMessageFields
+          );
+          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(
+                  messagesRef.current,
+                  functionCall
+                );
+                if (functionCallResponse === void 0)
+                  break;
+                chatRequest = 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 = message.function_call;
+              const functionCall = streamedResponseMessage.function_call;
               const functionCallResponse = await experimental_onFunctionCall(
                 messagesRef.current,
                 functionCall
@@ -340,37 +362,38 @@ function useChat({
               chatRequest = functionCallResponse;
             }
           }
-        } 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(
-              messagesRef.current,
-              functionCall
-            );
-            if (functionCallResponse === void 0)
-              break;
-            chatRequest = functionCallResponse;
-          }
         }
         abortControllerRef.current = null;
+      } catch (err) {
+        if (err.name === "AbortError") {
+          abortControllerRef.current = null;
+          return null;
+        }
+        if (onError && err instanceof Error) {
+          onError(err);
+        }
+        setError(err);
+      } finally {
+        mutateLoading(false);
       }
-    } catch (err) {
-      if (err.name === "AbortError") {
-        abortControllerRef.current = null;
-        return null;
-      }
-      if (onError && err instanceof Error) {
-        onError(err);
-      }
-      setError(err);
-    } finally {
-      mutateLoading(false);
-    }
-  }
+    },
+    [
+      mutate,
+      mutateLoading,
+      api,
+      extraMetadataRef,
+      onResponse,
+      onFinish,
+      onError,
+      setError,
+      mutateStreamData,
+      streamData,
+      sendExtraMessageFields,
+      experimental_onFunctionCall,
+      messagesRef.current,
+      abortControllerRef.current
+    ]
+  );
   const append = (0, import_react.useCallback)(
     async (message, { options, functions, function_call } = {}) => {
       if (!message.id) {
@@ -505,78 +528,91 @@ function useCompletion({
       body
     };
   }, [credentials, headers, body]);
-  async function triggerRequest(prompt, options) {
-    try {
-      mutateLoading(true);
-      const abortController2 = new AbortController();
-      setAbortController(abortController2);
-      mutate("", false);
-      const res = await fetch(api, {
-        method: "POST",
-        body: JSON.stringify({
-          prompt,
-          ...extraMetadataRef.current.body,
-          ...options == null ? void 0 : options.body
-        }),
-        credentials: extraMetadataRef.current.credentials,
-        headers: {
-          ...extraMetadataRef.current.headers,
-          ...options == null ? void 0 : options.headers
-        },
-        signal: abortController2.signal
-      }).catch((err) => {
-        throw err;
-      });
-      if (onResponse) {
-        try {
-          await onResponse(res);
-        } catch (err) {
+  const triggerRequest = (0, import_react2.useCallback)(
+    async (prompt, options) => {
+      try {
+        mutateLoading(true);
+        const abortController2 = new AbortController();
+        setAbortController(abortController2);
+        mutate("", false);
+        const res = await fetch(api, {
+          method: "POST",
+          body: JSON.stringify({
+            prompt,
+            ...extraMetadataRef.current.body,
+            ...options == null ? void 0 : options.body
+          }),
+          credentials: extraMetadataRef.current.credentials,
+          headers: {
+            ...extraMetadataRef.current.headers,
+            ...options == null ? void 0 : options.headers
+          },
+          signal: abortController2.signal
+        }).catch((err) => {
           throw err;
+        });
+        if (onResponse) {
+          try {
+            await onResponse(res);
+          } catch (err) {
+            throw err;
+          }
         }
-      }
-      if (!res.ok) {
-        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 reader = res.body.getReader();
-      const decoder = createChunkDecoder();
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          break;
+        if (!res.ok) {
+          throw new Error(
+            await res.text() || "Failed to fetch the chat response."
+          );
         }
-        result += decoder(value);
-        mutate(result, false);
-        if (abortController2 === null) {
-          reader.cancel();
-          break;
+        if (!res.body) {
+          throw new Error("The response body is empty.");
+        }
+        let result = "";
+        const reader = res.body.getReader();
+        const decoder = createChunkDecoder();
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            break;
+          }
+          result += decoder(value);
+          mutate(result, false);
+          if (abortController2 === null) {
+            reader.cancel();
+            break;
+          }
+        }
+        if (onFinish) {
+          onFinish(prompt, result);
         }
-      }
-      if (onFinish) {
-        onFinish(prompt, result);
-      }
-      setAbortController(null);
-      return result;
-    } catch (err) {
-      if (err.name === "AbortError") {
         setAbortController(null);
-        return null;
-      }
-      if (err instanceof Error) {
-        if (onError) {
-          onError(err);
+        return result;
+      } catch (err) {
+        if (err.name === "AbortError") {
+          setAbortController(null);
+          return null;
         }
+        if (err instanceof Error) {
+          if (onError) {
+            onError(err);
+          }
+        }
+        setError(err);
+      } finally {
+        mutateLoading(false);
       }
-      setError(err);
-    } finally {
-      mutateLoading(false);
-    }
-  }
+    },
+    [
+      mutate,
+      mutateLoading,
+      api,
+      extraMetadataRef,
+      setAbortController,
+      onResponse,
+      onFinish,
+      onError,
+      setError
+    ]
+  );
   const stop = (0, import_react2.useCallback)(() => {
     if (abortController) {
       abortController.abort();

package/react/dist/index.mjs

@@ -269,32 +269,54 @@ function useChat({
     };
   }, [credentials, headers, body]);
   const [error, setError] = useState();
-  async function triggerRequest(chatRequest) {
-    try {
-      mutateLoading(true);
-      const abortController = new AbortController();
-      abortControllerRef.current = abortController;
-      while (true) {
-        const messagesAndDataOrJustMessage = await getStreamedResponse(
-          api,
-          chatRequest,
-          mutate,
-          mutateStreamData,
-          streamData,
-          extraMetadataRef,
-          messagesRef,
-          abortControllerRef,
-          onFinish,
-          onResponse,
-          sendExtraMessageFields
-        );
-        if ("messages" in messagesAndDataOrJustMessage) {
-          for (const message of messagesAndDataOrJustMessage.messages) {
-            if (message.function_call === void 0 || typeof message.function_call === "string") {
+  const triggerRequest = useCallback(
+    async (chatRequest) => {
+      try {
+        mutateLoading(true);
+        const abortController = new AbortController();
+        abortControllerRef.current = abortController;
+        while (true) {
+          const messagesAndDataOrJustMessage = await getStreamedResponse(
+            api,
+            chatRequest,
+            mutate,
+            mutateStreamData,
+            streamData,
+            extraMetadataRef,
+            messagesRef,
+            abortControllerRef,
+            onFinish,
+            onResponse,
+            sendExtraMessageFields
+          );
+          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(
+                  messagesRef.current,
+                  functionCall
+                );
+                if (functionCallResponse === void 0)
+                  break;
+                chatRequest = 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 = message.function_call;
+              const functionCall = streamedResponseMessage.function_call;
               const functionCallResponse = await experimental_onFunctionCall(
                 messagesRef.current,
                 functionCall
@@ -304,37 +326,38 @@ function useChat({
               chatRequest = functionCallResponse;
             }
           }
-        } 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(
-              messagesRef.current,
-              functionCall
-            );
-            if (functionCallResponse === void 0)
-              break;
-            chatRequest = functionCallResponse;
-          }
         }
         abortControllerRef.current = null;
+      } catch (err) {
+        if (err.name === "AbortError") {
+          abortControllerRef.current = null;
+          return null;
+        }
+        if (onError && err instanceof Error) {
+          onError(err);
+        }
+        setError(err);
+      } finally {
+        mutateLoading(false);
       }
-    } catch (err) {
-      if (err.name === "AbortError") {
-        abortControllerRef.current = null;
-        return null;
-      }
-      if (onError && err instanceof Error) {
-        onError(err);
-      }
-      setError(err);
-    } finally {
-      mutateLoading(false);
-    }
-  }
+    },
+    [
+      mutate,
+      mutateLoading,
+      api,
+      extraMetadataRef,
+      onResponse,
+      onFinish,
+      onError,
+      setError,
+      mutateStreamData,
+      streamData,
+      sendExtraMessageFields,
+      experimental_onFunctionCall,
+      messagesRef.current,
+      abortControllerRef.current
+    ]
+  );
   const append = useCallback(
     async (message, { options, functions, function_call } = {}) => {
       if (!message.id) {
@@ -469,78 +492,91 @@ function useCompletion({
       body
     };
   }, [credentials, headers, body]);
-  async function triggerRequest(prompt, options) {
-    try {
-      mutateLoading(true);
-      const abortController2 = new AbortController();
-      setAbortController(abortController2);
-      mutate("", false);
-      const res = await fetch(api, {
-        method: "POST",
-        body: JSON.stringify({
-          prompt,
-          ...extraMetadataRef.current.body,
-          ...options == null ? void 0 : options.body
-        }),
-        credentials: extraMetadataRef.current.credentials,
-        headers: {
-          ...extraMetadataRef.current.headers,
-          ...options == null ? void 0 : options.headers
-        },
-        signal: abortController2.signal
-      }).catch((err) => {
-        throw err;
-      });
-      if (onResponse) {
-        try {
-          await onResponse(res);
-        } catch (err) {
+  const triggerRequest = useCallback2(
+    async (prompt, options) => {
+      try {
+        mutateLoading(true);
+        const abortController2 = new AbortController();
+        setAbortController(abortController2);
+        mutate("", false);
+        const res = await fetch(api, {
+          method: "POST",
+          body: JSON.stringify({
+            prompt,
+            ...extraMetadataRef.current.body,
+            ...options == null ? void 0 : options.body
+          }),
+          credentials: extraMetadataRef.current.credentials,
+          headers: {
+            ...extraMetadataRef.current.headers,
+            ...options == null ? void 0 : options.headers
+          },
+          signal: abortController2.signal
+        }).catch((err) => {
           throw err;
+        });
+        if (onResponse) {
+          try {
+            await onResponse(res);
+          } catch (err) {
+            throw err;
+          }
         }
-      }
-      if (!res.ok) {
-        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 reader = res.body.getReader();
-      const decoder = createChunkDecoder();
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          break;
+        if (!res.ok) {
+          throw new Error(
+            await res.text() || "Failed to fetch the chat response."
+          );
         }
-        result += decoder(value);
-        mutate(result, false);
-        if (abortController2 === null) {
-          reader.cancel();
-          break;
+        if (!res.body) {
+          throw new Error("The response body is empty.");
+        }
+        let result = "";
+        const reader = res.body.getReader();
+        const decoder = createChunkDecoder();
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            break;
+          }
+          result += decoder(value);
+          mutate(result, false);
+          if (abortController2 === null) {
+            reader.cancel();
+            break;
+          }
+        }
+        if (onFinish) {
+          onFinish(prompt, result);
         }
-      }
-      if (onFinish) {
-        onFinish(prompt, result);
-      }
-      setAbortController(null);
-      return result;
-    } catch (err) {
-      if (err.name === "AbortError") {
         setAbortController(null);
-        return null;
-      }
-      if (err instanceof Error) {
-        if (onError) {
-          onError(err);
+        return result;
+      } catch (err) {
+        if (err.name === "AbortError") {
+          setAbortController(null);
+          return null;
         }
+        if (err instanceof Error) {
+          if (onError) {
+            onError(err);
+          }
+        }
+        setError(err);
+      } finally {
+        mutateLoading(false);
       }
-      setError(err);
-    } finally {
-      mutateLoading(false);
-    }
-  }
+    },
+    [
+      mutate,
+      mutateLoading,
+      api,
+      extraMetadataRef,
+      setAbortController,
+      onResponse,
+      onFinish,
+      onError,
+      setError
+    ]
+  );
   const stop = useCallback2(() => {
     if (abortController) {
       abortController.abort();