From 2e59d2661b031b5ea8eac340010cb947245c9c45 Mon Sep 17 00:00:00 2001
From: Lars Grammel <lars.grammel@gmail.com>
Date: Fri, 12 Jul 2024 17:56:14 +0200
Subject: [PATCH 1/3] feat (provider/google): add cachedContent optional
 setting (#2261)

---
 .changeset/cool-donkeys-build.md                           | 5 +++++
 .../01-ai-sdk-providers/10-google-generative-ai.mdx        | 5 +++++
 packages/google/src/google-generative-ai-language-model.ts | 3 +++
 packages/google/src/google-generative-ai-settings.ts       | 7 +++++++
 4 files changed, 20 insertions(+)
 create mode 100644 .changeset/cool-donkeys-build.md

diff --git a/.changeset/cool-donkeys-build.md b/.changeset/cool-donkeys-build.md
new file mode 100644
index 000000000000..19adc4ad9e48
--- /dev/null
+++ b/.changeset/cool-donkeys-build.md
@@ -0,0 +1,5 @@
+---
+'@ai-sdk/google': patch
+---
+
+feat (provider/google): add cachedContent optional setting
diff --git a/content/providers/01-ai-sdk-providers/10-google-generative-ai.mdx b/content/providers/01-ai-sdk-providers/10-google-generative-ai.mdx
index 012d64efcf34..c294c6ee333a 100644
--- a/content/providers/01-ai-sdk-providers/10-google-generative-ai.mdx
+++ b/content/providers/01-ai-sdk-providers/10-google-generative-ai.mdx
@@ -93,6 +93,11 @@ The following optional settings are available for Google Generative AI models:
   Top-k sampling considers the set of topK most probable tokens.
   Models running with nucleus sampling don't allow topK setting.
 
+- **cachedContent** _string_
+
+  Optional. The name of the cached content used as context to serve the prediction.
+  Format: cachedContents/{cachedContent}
+
 - **safetySettings** _Array\<\{ category: string; threshold: string \}\>_
 
   Optional. Safety settings for the model.
diff --git a/packages/google/src/google-generative-ai-language-model.ts b/packages/google/src/google-generative-ai-language-model.ts
index da4417aed78f..37f405edd626 100644
--- a/packages/google/src/google-generative-ai-language-model.ts
+++ b/packages/google/src/google-generative-ai-language-model.ts
@@ -110,6 +110,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV1 {
             systemInstruction,
             safetySettings: this.settings.safetySettings,
             ...prepareToolsAndToolConfig(mode),
+            cachedContent: this.settings.cachedContent,
           },
           warnings,
         };
@@ -125,6 +126,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV1 {
             contents,
             systemInstruction,
             safetySettings: this.settings.safetySettings,
+            cachedContent: this.settings.cachedContent,
           },
           warnings,
         };
@@ -146,6 +148,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV1 {
             },
             toolConfig: { functionCallingConfig: { mode: 'ANY' } },
             safetySettings: this.settings.safetySettings,
+            cachedContent: this.settings.cachedContent,
           },
           warnings,
         };
diff --git a/packages/google/src/google-generative-ai-settings.ts b/packages/google/src/google-generative-ai-settings.ts
index 36aa32c18e04..d43193bfd0ab 100644
--- a/packages/google/src/google-generative-ai-settings.ts
+++ b/packages/google/src/google-generative-ai-settings.ts
@@ -16,6 +16,13 @@ Models running with nucleus sampling don't allow topK setting.
    */
   topK?: number;
 
+  /**
+Optional.
+The name of the cached content used as context to serve the prediction.
+Format: cachedContents/{cachedContent}
+   */
+  cachedContent?: string;
+
   /**
 Optional. A list of unique safety settings for blocking unsafe content.
    */

From bede7bf45908a385a59439423777c39dfff1b0f6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 17:58:23 +0200
Subject: [PATCH 2/3] Version Packages (#2258)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/cool-donkeys-build.md       | 5 -----
 .changeset/ninety-beers-do.md          | 5 -----
 .changeset/odd-avocados-search.md      | 5 -----
 .changeset/pretty-elephants-deliver.md | 5 -----
 packages/google-vertex/CHANGELOG.md    | 6 ++++++
 packages/google-vertex/package.json    | 2 +-
 packages/google/CHANGELOG.md           | 8 ++++++++
 packages/google/package.json           | 2 +-
 8 files changed, 16 insertions(+), 22 deletions(-)
 delete mode 100644 .changeset/cool-donkeys-build.md
 delete mode 100644 .changeset/ninety-beers-do.md
 delete mode 100644 .changeset/odd-avocados-search.md
 delete mode 100644 .changeset/pretty-elephants-deliver.md

diff --git a/.changeset/cool-donkeys-build.md b/.changeset/cool-donkeys-build.md
deleted file mode 100644
index 19adc4ad9e48..000000000000
--- a/.changeset/cool-donkeys-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@ai-sdk/google': patch
----
-
-feat (provider/google): add cachedContent optional setting
diff --git a/.changeset/ninety-beers-do.md b/.changeset/ninety-beers-do.md
deleted file mode 100644
index 090b96fa1dfa..000000000000
--- a/.changeset/ninety-beers-do.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@ai-sdk/google': patch
----
-
-feat (provider/google): support system instructions
diff --git a/.changeset/odd-avocados-search.md b/.changeset/odd-avocados-search.md
deleted file mode 100644
index b51b7c346618..000000000000
--- a/.changeset/odd-avocados-search.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@ai-sdk/google-vertex': patch
----
-
-feat (provider/google-vertex): use systemInstruction content parts
diff --git a/.changeset/pretty-elephants-deliver.md b/.changeset/pretty-elephants-deliver.md
deleted file mode 100644
index 26a1e084aa32..000000000000
--- a/.changeset/pretty-elephants-deliver.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@ai-sdk/google': patch
----
-
-feat (provider/google): add tool support for object generation (new default mode)
diff --git a/packages/google-vertex/CHANGELOG.md b/packages/google-vertex/CHANGELOG.md
index 2a184c7f1b86..8d5ac6b7a647 100644
--- a/packages/google-vertex/CHANGELOG.md
+++ b/packages/google-vertex/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ai-sdk/google-vertex
 
+## 0.0.15
+
+### Patch Changes
+
+- bb584330: feat (provider/google-vertex): use systemInstruction content parts
+
 ## 0.0.14
 
 ### Patch Changes
diff --git a/packages/google-vertex/package.json b/packages/google-vertex/package.json
index 35646b31771d..ea80323437cd 100644
--- a/packages/google-vertex/package.json
+++ b/packages/google-vertex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/google-vertex",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",
diff --git a/packages/google/CHANGELOG.md b/packages/google/CHANGELOG.md
index 48a040582e28..8c023a43c694 100644
--- a/packages/google/CHANGELOG.md
+++ b/packages/google/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @ai-sdk/google
 
+## 0.0.27
+
+### Patch Changes
+
+- 2e59d266: feat (provider/google): add cachedContent optional setting
+- d2b9723d: feat (provider/google): support system instructions
+- 4dfe0b00: feat (provider/google): add tool support for object generation (new default mode)
+
 ## 0.0.26
 
 ### Patch Changes
diff --git a/packages/google/package.json b/packages/google/package.json
index 98ef96d89a55..98e0a8a22acb 100644
--- a/packages/google/package.json
+++ b/packages/google/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/google",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",

From 8d306c637bccc5c9a2fcbd378b19e47b3175d16d Mon Sep 17 00:00:00 2001
From: AntzyMo <mozbano@163.com>
Date: Sat, 13 Jul 2024 18:27:26 +0800
Subject: [PATCH 3/3] fix(vue/solid/svelte) keepLastMessageOnError

---
 examples/nuxt-openai/pages/index.vue          | 34 ++++++--
 .../solidstart-openai/src/routes/index.tsx    | 39 ++++++++-
 .../sveltekit-openai/src/routes/+page.svelte  | 79 +++++++++++++------
 packages/solid/src/use-chat.ts                | 15 +++-
 packages/svelte/src/use-chat.ts               | 17 +++-
 packages/vue/src/use-chat.ts                  | 15 +++-
 6 files changed, 162 insertions(+), 37 deletions(-)

diff --git a/examples/nuxt-openai/pages/index.vue b/examples/nuxt-openai/pages/index.vue
index 665c277302b5..58639294f0a1 100644
--- a/examples/nuxt-openai/pages/index.vue
+++ b/examples/nuxt-openai/pages/index.vue
@@ -1,7 +1,18 @@
 <script setup lang="ts">
 import { useChat } from '@ai-sdk/vue';
+import { computed } from 'vue';
 
-const { messages, input, handleSubmit } = useChat();
+const {
+  messages,
+  input,
+  handleSubmit,
+  isLoading,
+  error,
+  stop,
+} = useChat({
+  keepLastMessageOnError: true,
+});
+const disabled = computed(() => isLoading.value || error.value != null)
 </script>
 
 <template>
@@ -11,11 +22,24 @@ const { messages, input, handleSubmit } = useChat();
       {{ m.content }}
     </div>
 
+    <div v-if="isLoading" class="mt-4 text-gray-500">
+      <div>Loading...</div>
+      <button type="button" class="px-4 py-2 mt-4 text-blue-500 border border-blue-500 rounded-md" @click="stop">
+        Stop
+      </button>
+    </div>
+
+    <div v-if="error" class="mt-4">
+      <div class="text-red-500">An error occurred.</div>
+      <button type="button" class="px-4 py-2 mt-4 text-blue-500 border border-blue-500 rounded-md"
+        @click="handleSubmit">
+        Retry
+      </button>
+    </div>
+
     <form @submit="handleSubmit">
-      <input
-        class="fixed bottom-0 w-full max-w-md p-2 mb-8 border border-gray-300 rounded shadow-xl"
-        v-model="input"
-        placeholder="Say something..."
+      <input class="fixed bottom-0 w-full max-w-md p-2 mb-8 border border-gray-300 rounded shadow-xl" v-model="input"
+        placeholder="Say something..." :disabled="disabled" />
       />
     </form>
   </div>
diff --git a/examples/solidstart-openai/src/routes/index.tsx b/examples/solidstart-openai/src/routes/index.tsx
index d07ba2bbb35f..ec2e71d1f6c4 100644
--- a/examples/solidstart-openai/src/routes/index.tsx
+++ b/examples/solidstart-openai/src/routes/index.tsx
@@ -2,7 +2,17 @@ import { For } from 'solid-js';
 import { useChat } from '@ai-sdk/solid';
 
 export default function Chat() {
-  const { messages, input, handleInputChange, handleSubmit } = useChat();
+  const {
+    messages,
+    input,
+    handleInputChange,
+    handleSubmit,
+    isLoading,
+    error,
+    stop,
+  } = useChat({
+    keepLastMessageOnError: true,
+  });
 
   return (
     <div class="flex flex-col w-full max-w-md py-24 mx-auto stretch">
@@ -15,12 +25,39 @@ export default function Chat() {
         )}
       </For>
 
+      {isLoading() && (
+        <div class="mt-4 text-gray-500">
+          <div>Loading...</div>
+          <button
+            type="button"
+            class="px-4 py-2 mt-4 text-blue-500 border border-blue-500 rounded-md"
+            onClick={stop}
+          >
+            Stop
+          </button>
+        </div>
+      )}
+
+      {error() && (
+        <div class="mt-4">
+          <div class="text-red-500">An error occurred.</div>
+          <button
+            type="button"
+            class="px-4 py-2 mt-4 text-blue-500 border border-blue-500 rounded-md"
+            onClick={handleSubmit}
+          >
+            Retry
+          </button>
+        </div>
+      )}
+
       <form onSubmit={handleSubmit}>
         <input
           class="fixed bottom-0 w-full max-w-md p-2 mb-8 border border-gray-300 rounded shadow-xl"
           value={input()}
           placeholder="Say something..."
           onInput={handleInputChange}
+          disabled={isLoading() || error() != null}
         />
       </form>
     </div>
diff --git a/examples/sveltekit-openai/src/routes/+page.svelte b/examples/sveltekit-openai/src/routes/+page.svelte
index 7f91cb275eca..6646450d1e06 100644
--- a/examples/sveltekit-openai/src/routes/+page.svelte
+++ b/examples/sveltekit-openai/src/routes/+page.svelte
@@ -1,37 +1,66 @@
 <script lang="ts">
-	import { useChat } from '@ai-sdk/svelte'
+  import { useChat } from '@ai-sdk/svelte';
 
-	const { input, handleSubmit, messages } = useChat()
+  const { input, handleSubmit, messages, isLoading, error, stop } = useChat({
+    keepLastMessageOnError: true,
+  });
 </script>
 
 <svelte:head>
-	<title>Home</title>
-	<meta name="description" content="Svelte demo app" />
+  <title>Home</title>
+  <meta name="description" content="Svelte demo app" />
 </svelte:head>
 
 <section>
-	<h1>useChat</h1>
-	<ul>
-		{#each $messages as message}
-			<li>{message.role}: {message.content}</li>
-		{/each}
-	</ul>
-	<form on:submit={handleSubmit}>
-		<input bind:value={$input} />
-		<button type="submit">Send</button>
-	</form>
+  <h1>useChat</h1>
+  <ul>
+    {#each $messages as message}
+      <li>{message.role}: {message.content}</li>
+    {/each}
+  </ul>
+
+  {#if $isLoading}
+    <div class="mt-4 text-gray-500">
+      <div>Loading...</div>
+      <button
+        type="button"
+        class="px-4 py-2 mt-4 text-blue-500 border border-blue-500 rounded-md"
+        on:click={stop}
+      >
+        Stop
+      </button>
+    </div>
+  {/if}
+
+  {#if $error}
+    <div class="mt-4">
+      <div class="text-red-500">An error occurred.</div>
+      <button
+        type="button"
+        class="px-4 py-2 mt-4 text-blue-500 border border-blue-500 rounded-md"
+        on:click={handleSubmit}
+      >
+        Retry
+      </button>
+    </div>
+  {/if}
+
+  <form on:submit={handleSubmit}>
+    <input bind:value={$input} disabled={$isLoading || $error != null} />
+    <button type="submit">Send</button>
+  </form>
 </section>
 
 <style>
-	section {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		flex: 0.6;
-	}
-
-	h1 {
-		width: 100%;
-	}
+  section {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    flex: 0.6;
+  }
+
+  h1 {
+    width: 100%;
+  }
 </style>
diff --git a/packages/solid/src/use-chat.ts b/packages/solid/src/use-chat.ts
index faaa667ed255..bb1b039c7ab3 100644
--- a/packages/solid/src/use-chat.ts
+++ b/packages/solid/src/use-chat.ts
@@ -101,6 +101,7 @@ const getStreamedResponse = async (
   onToolCall: UseChatOptions['onToolCall'] | undefined,
   sendExtraMessageFields: boolean | undefined,
   fetch: FetchFunction | undefined,
+  keepLastMessageOnError: boolean | undefined,
 ) => {
   // Do an optimistic update to the chat state to show the updated messages
   // immediately.
@@ -139,7 +140,9 @@ const getStreamedResponse = async (
     },
     abortController: () => abortController,
     restoreMessagesOnFailure() {
-      mutate(previousMessages);
+      if (!keepLastMessageOnError) {
+        mutate(previousMessages);
+      }
     },
     onResponse,
     onUpdate(merged, data) {
@@ -170,6 +173,13 @@ case of misconfigured tools.
 By default, it's set to 0, which will disable the feature.
  */
   maxToolRoundtrips?: number;
+  /**
+Keeps the last message when an error happens. This will be the default behavior
+starting with the next major release.
+The flag was introduced for backwards compatibility.
+Please enable it and update your error handling/resubmit behavior.
+   */
+  keepLastMessageOnError?: boolean;
 };
 
 export function useChat(
@@ -258,6 +268,7 @@ export function useChat(
             useChatOptions().onToolCall?.(),
             useChatOptions().sendExtraMessageFields?.(),
             useChatOptions().fetch?.(),
+            useChatOptions().keepLastMessageOnError?.(),
           ),
         experimental_onFunctionCall:
           useChatOptions().experimental_onFunctionCall?.(),
@@ -269,7 +280,7 @@ export function useChat(
 
       abortController = null;
     } catch (err) {
-      // Ignore abort errors as they are expected.
+      // Ignore abort errors as they are expected.∏
       if ((err as any).name === 'AbortError') {
         abortController = null;
         return null;
diff --git a/packages/svelte/src/use-chat.ts b/packages/svelte/src/use-chat.ts
index 6e295f9ee432..de77943f8c66 100644
--- a/packages/svelte/src/use-chat.ts
+++ b/packages/svelte/src/use-chat.ts
@@ -83,6 +83,7 @@ const getStreamedResponse = async (
   onResponse: ((response: Response) => void | Promise<void>) | undefined,
   sendExtraMessageFields: boolean | undefined,
   fetch: FetchFunction | undefined,
+  keepLastMessageOnError: boolean | undefined,
 ) => {
   // Do an optimistic update to the chat state to show the updated messages
   // immediately.
@@ -141,7 +142,9 @@ const getStreamedResponse = async (
     },
     abortController: () => abortControllerRef,
     restoreMessagesOnFailure() {
-      mutate(previousMessages);
+      if (!keepLastMessageOnError) {
+        mutate(previousMessages);
+      }
     },
     onResponse,
     onUpdate(merged, data) {
@@ -176,7 +179,16 @@ export function useChat({
   body,
   generateId = generateIdFunc,
   fetch,
-}: UseChatOptions = {}): UseChatHelpers {
+  keepLastMessageOnError = false,
+}: UseChatOptions & {
+  /**
+Keeps the last message when an error happens. This will be the default behavior
+starting with the next major release.
+The flag was introduced for backwards compatibility.
+Please enable it and update your error handling/resubmit behavior.
+   */
+  keepLastMessageOnError?: boolean;
+} = {}): UseChatHelpers {
   // Generate a unique id for the chat if not provided.
   const chatId = id || `chat-${uniqueId++}`;
 
@@ -243,6 +255,7 @@ export function useChat({
             onResponse,
             sendExtraMessageFields,
             fetch,
+            keepLastMessageOnError,
           ),
         experimental_onFunctionCall,
         experimental_onToolCall,
diff --git a/packages/vue/src/use-chat.ts b/packages/vue/src/use-chat.ts
index c76e3a683612..26baaa8fa093 100644
--- a/packages/vue/src/use-chat.ts
+++ b/packages/vue/src/use-chat.ts
@@ -84,7 +84,16 @@ export function useChat({
   body,
   generateId = generateIdFunc,
   fetch,
-}: UseChatOptions = {}): UseChatHelpers {
+  keepLastMessageOnError = false,
+}: UseChatOptions & {
+  /**
+Keeps the last message when an error happens. This will be the default behavior
+starting with the next major release.
+The flag was introduced for backwards compatibility.
+Please enable it and update your error handling/resubmit behavior.
+   */
+  keepLastMessageOnError?: boolean;
+} = {}): UseChatHelpers {
   // Generate a unique ID for the chat if not provided.
   const chatId = id || `chat-${uniqueId++}`;
 
@@ -198,7 +207,9 @@ export function useChat({
             },
             restoreMessagesOnFailure() {
               // Restore the previous messages if the request fails.
-              mutate(previousMessages);
+              if (!keepLastMessageOnError) {
+                mutate(previousMessages);
+              }
             },
             generateId,
             onToolCall: undefined, // not implemented yet