From 7053f2f67dc9b20bffaa95a31909a16550a94f70 Mon Sep 17 00:00:00 2001
From: Zohaib Rauf <zabirauf@gmail.com>
Date: Mon, 12 Feb 2024 23:35:31 -0800
Subject: [PATCH 1/5] Added Keep alive setting

---
 src/lib/apis/ollama/index.ts                   |  5 +++--
 .../components/chat/MessageInput/Models.svelte |  4 ++--
 .../components/chat/Settings/Advanced.svelte   | 18 +++++++++++++++++-
 src/routes/(app)/+page.svelte                  |  3 ++-
 src/routes/(app)/c/[id]/+page.svelte           |  3 ++-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/lib/apis/ollama/index.ts b/src/lib/apis/ollama/index.ts
index 62501966..df538311 100644
--- a/src/lib/apis/ollama/index.ts
+++ b/src/lib/apis/ollama/index.ts
@@ -167,7 +167,7 @@ export const generateTitle = async (token: string = '', model: string, prompt: s
 	return res?.response ?? 'New Chat';
 };
 
-export const generatePrompt = async (token: string = '', model: string, conversation: string) => {
+export const generatePrompt = async (token: string = '', model: string, conversation: string, body: object = {}) => {
 	let error = null;
 
 	if (conversation === '') {
@@ -188,7 +188,8 @@ export const generatePrompt = async (token: string = '', model: string, conversa
 			As USER in the conversation above, your task is to continue the conversation. Remember, Your responses should be crafted as if you're a human conversing in a natural, realistic manner, keeping in mind the context and flow of the dialogue. Please generate a fitting response to the last message in the conversation, or if there is no existing conversation, initiate one as a normal person would.
 			
 			Response:
-			`
+			`,
+			...body
 		})
 	}).catch((err) => {
 		console.log(err);
diff --git a/src/lib/components/chat/MessageInput/Models.svelte b/src/lib/components/chat/MessageInput/Models.svelte
index 0dbb71c8..84ec6f8d 100644
--- a/src/lib/components/chat/MessageInput/Models.svelte
+++ b/src/lib/components/chat/MessageInput/Models.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { generatePrompt } from '$lib/apis/ollama';
-	import { models } from '$lib/stores';
+	import { models, settings } from '$lib/stores';
 	import { splitStream } from '$lib/utils';
 	import { tick } from 'svelte';
 	import toast from 'svelte-french-toast';
@@ -53,7 +53,7 @@
 			return `${a}### ${message.role.toUpperCase()}\n${message.content}\n\n`;
 		}, '');
 
-		const res = await generatePrompt(localStorage.token, model.name, convoText);
+		const res = await generatePrompt(localStorage.token, model.name, convoText, { keep_alive: $settings.keepAlive ?? undefined });
 
 		if (res && res.ok) {
 			const reader = res.body
diff --git a/src/lib/components/chat/Settings/Advanced.svelte b/src/lib/components/chat/Settings/Advanced.svelte
index 5396947b..58897bcd 100644
--- a/src/lib/components/chat/Settings/Advanced.svelte
+++ b/src/lib/components/chat/Settings/Advanced.svelte
@@ -7,6 +7,7 @@
 
 	// Advanced
 	let requestFormat = '';
+	let keepAlive = '';
 	let options = {
 		// Advanced
 		seed: 0,
@@ -38,6 +39,7 @@
 		let settings = JSON.parse(localStorage.getItem('settings') ?? '{}');
 
 		requestFormat = settings.requestFormat ?? '';
+		keepAlive = settings.keepAlive ?? '';
 
 		options.seed = settings.seed ?? 0;
 		options.temperature = settings.temperature ?? '';
@@ -85,6 +87,19 @@
 				</button>
 			</div>
 		</div>
+		<div class=" py-1 flex w-full justify-between">
+			<div class=" w-20 text-xs font-medium self-center">Keep Alive</div>
+			<div class=" flex-1 self-center">
+				<input
+					class="w-full rounded py-1.5 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none border border-gray-100 dark:border-gray-600"
+					type="number"
+					placeholder="Default"
+					bind:value={keepAlive}
+					autocomplete="off"
+					min="-1"
+				/>
+			</div>
+		</div>
 	</div>
 
 	<div class="flex justify-end pt-3 text-sm font-medium">
@@ -106,7 +121,8 @@
 						tfs_z: options.tfs_z !== '' ? options.tfs_z : undefined,
 						num_ctx: options.num_ctx !== '' ? options.num_ctx : undefined,
 						num_predict: options.num_predict !== '' ? options.num_predict : undefined
-					}
+					},
+					keepAlive: keepAlive !== '' ? keepAlive : undefined
 				});
 
 				dispatch('save');
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index a01e4d36..6b7ccb2e 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -358,7 +358,8 @@
 			options: {
 				...($settings.options ?? {})
 			},
-			format: $settings.requestFormat ?? undefined
+			format: $settings.requestFormat ?? undefined,
+			keep_alive: $settings.keepAlive ?? undefined
 		});
 
 		if (res && res.ok) {
diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte
index 4ff1f3bd..c1e05087 100644
--- a/src/routes/(app)/c/[id]/+page.svelte
+++ b/src/routes/(app)/c/[id]/+page.svelte
@@ -372,7 +372,8 @@
 			options: {
 				...($settings.options ?? {})
 			},
-			format: $settings.requestFormat ?? undefined
+			format: $settings.requestFormat ?? undefined,
+			keep_alive: $settings.keepAlive ?? undefined
 		});
 
 		if (res && res.ok) {

From 56966c411b010125f41e8b3730dd0b7dbd9a4f33 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Tue, 13 Feb 2024 01:46:58 -0800
Subject: [PATCH 2/5] fix: keep alive value should be string

---
 .../components/chat/Settings/Advanced.svelte  | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/lib/components/chat/Settings/Advanced.svelte b/src/lib/components/chat/Settings/Advanced.svelte
index 58897bcd..baa3165a 100644
--- a/src/lib/components/chat/Settings/Advanced.svelte
+++ b/src/lib/components/chat/Settings/Advanced.svelte
@@ -7,7 +7,8 @@
 
 	// Advanced
 	let requestFormat = '';
-	let keepAlive = '';
+	let keepAlive = null;
+
 	let options = {
 		// Advanced
 		seed: 0,
@@ -59,6 +60,37 @@
 		<AdvancedParams bind:options />
 		<hr class=" dark:border-gray-700" />
 
+		<div class=" py-1 w-full justify-between">
+			<div class="flex w-full justify-between">
+				<div class=" self-center text-xs font-medium">Keep Alive</div>
+
+				<button
+					class="p-1 px-3 text-xs flex rounded transition"
+					type="button"
+					on:click={() => {
+						keepAlive = keepAlive === null ? '5m' : null;
+					}}
+				>
+					{#if keepAlive === null}
+						<span class="ml-2 self-center"> Default </span>
+					{:else}
+						<span class="ml-2 self-center"> Custom </span>
+					{/if}
+				</button>
+			</div>
+
+			{#if keepAlive !== null}
+				<div class="flex mt-1 space-x-2">
+					<input
+						class="w-full rounded py-1.5 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none border border-gray-100 dark:border-gray-600"
+						type="text"
+						placeholder={`e.g.) "30s","10m". Valid time units are "s", "m", "h".`}
+						bind:value={keepAlive}
+					/>
+				</div>
+			{/if}
+		</div>
+
 		<div>
 			<div class=" py-1 flex w-full justify-between">
 				<div class=" self-center text-sm font-medium">Request Mode</div>
@@ -87,19 +119,6 @@
 				</button>
 			</div>
 		</div>
-		<div class=" py-1 flex w-full justify-between">
-			<div class=" w-20 text-xs font-medium self-center">Keep Alive</div>
-			<div class=" flex-1 self-center">
-				<input
-					class="w-full rounded py-1.5 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none border border-gray-100 dark:border-gray-600"
-					type="number"
-					placeholder="Default"
-					bind:value={keepAlive}
-					autocomplete="off"
-					min="-1"
-				/>
-			</div>
-		</div>
 	</div>
 
 	<div class="flex justify-end pt-3 text-sm font-medium">

From 3057bfe5a02a0e88a10aa1655d26253413f85af0 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Tue, 13 Feb 2024 01:48:31 -0800
Subject: [PATCH 3/5] chore: revert

---
 src/lib/apis/ollama/index.ts                       | 5 ++---
 src/lib/components/chat/MessageInput/Models.svelte | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lib/apis/ollama/index.ts b/src/lib/apis/ollama/index.ts
index df538311..62501966 100644
--- a/src/lib/apis/ollama/index.ts
+++ b/src/lib/apis/ollama/index.ts
@@ -167,7 +167,7 @@ export const generateTitle = async (token: string = '', model: string, prompt: s
 	return res?.response ?? 'New Chat';
 };
 
-export const generatePrompt = async (token: string = '', model: string, conversation: string, body: object = {}) => {
+export const generatePrompt = async (token: string = '', model: string, conversation: string) => {
 	let error = null;
 
 	if (conversation === '') {
@@ -188,8 +188,7 @@ export const generatePrompt = async (token: string = '', model: string, conversa
 			As USER in the conversation above, your task is to continue the conversation. Remember, Your responses should be crafted as if you're a human conversing in a natural, realistic manner, keeping in mind the context and flow of the dialogue. Please generate a fitting response to the last message in the conversation, or if there is no existing conversation, initiate one as a normal person would.
 			
 			Response:
-			`,
-			...body
+			`
 		})
 	}).catch((err) => {
 		console.log(err);
diff --git a/src/lib/components/chat/MessageInput/Models.svelte b/src/lib/components/chat/MessageInput/Models.svelte
index 84ec6f8d..054142ea 100644
--- a/src/lib/components/chat/MessageInput/Models.svelte
+++ b/src/lib/components/chat/MessageInput/Models.svelte
@@ -53,7 +53,7 @@
 			return `${a}### ${message.role.toUpperCase()}\n${message.content}\n\n`;
 		}, '');
 
-		const res = await generatePrompt(localStorage.token, model.name, convoText, { keep_alive: $settings.keepAlive ?? undefined });
+		const res = await generatePrompt(localStorage.token, model.name, convoText);
 
 		if (res && res.ok) {
 			const reader = res.body

From 42b24cbb684a38c8f8f1da64132eaf06e8eb18b3 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Tue, 13 Feb 2024 01:50:46 -0800
Subject: [PATCH 4/5] fix: keep alive default value

---
 src/lib/components/chat/Settings/Advanced.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/chat/Settings/Advanced.svelte b/src/lib/components/chat/Settings/Advanced.svelte
index baa3165a..48c12269 100644
--- a/src/lib/components/chat/Settings/Advanced.svelte
+++ b/src/lib/components/chat/Settings/Advanced.svelte
@@ -40,7 +40,7 @@
 		let settings = JSON.parse(localStorage.getItem('settings') ?? '{}');
 
 		requestFormat = settings.requestFormat ?? '';
-		keepAlive = settings.keepAlive ?? '';
+		keepAlive = settings.keepAlive ?? null;
 
 		options.seed = settings.seed ?? 0;
 		options.temperature = settings.temperature ?? '';
@@ -141,7 +141,7 @@
 						num_ctx: options.num_ctx !== '' ? options.num_ctx : undefined,
 						num_predict: options.num_predict !== '' ? options.num_predict : undefined
 					},
-					keepAlive: keepAlive !== '' ? keepAlive : undefined
+					keepAlive: keepAlive ? keepAlive : undefined
 				});
 
 				dispatch('save');

From bae30f2756c2b61ee8007ece89764a8a8651f524 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Tue, 13 Feb 2024 01:52:28 -0800
Subject: [PATCH 5/5] chore: remove unused variable

---
 src/lib/components/chat/MessageInput/Models.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/chat/MessageInput/Models.svelte b/src/lib/components/chat/MessageInput/Models.svelte
index 054142ea..0dbb71c8 100644
--- a/src/lib/components/chat/MessageInput/Models.svelte
+++ b/src/lib/components/chat/MessageInput/Models.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { generatePrompt } from '$lib/apis/ollama';
-	import { models, settings } from '$lib/stores';
+	import { models } from '$lib/stores';
 	import { splitStream } from '$lib/utils';
 	import { tick } from 'svelte';
 	import toast from 'svelte-french-toast';