From 2ef069b17fceafb6a22fe4216513ee86b1aca80d Mon Sep 17 00:00:00 2001
From: KartikGS <starkartik9@gmail.com>
Date: Mon, 19 Feb 2024 16:15:53 +0530
Subject: [PATCH 1/4] Custom instruction anchor in settings

---
 src/routes/settings/+layout.svelte | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/routes/settings/+layout.svelte b/src/routes/settings/+layout.svelte
index dbc2bd1f420..8906e47b26d 100644
--- a/src/routes/settings/+layout.svelte
+++ b/src/routes/settings/+layout.svelte
@@ -10,6 +10,7 @@
 	import CarbonCheckmark from "~icons/carbon/checkmark";
 	import CarbonAdd from "~icons/carbon/add";
 
+	import LicenseIcon from '~icons/carbon/license'
 	import UserIcon from "~icons/carbon/user";
 	import { fade, fly } from "svelte/transition";
 	export let data;
@@ -76,6 +77,14 @@
 					{/if}
 				</a>
 			{/each}
+			<a
+				href="{base}/settings/custom"
+				class="group flex h-10 flex-none items-center gap-2 pl-3 pr-2 text-sm text-gray-500 hover:bg-gray-100 md:rounded-xl
+			{$page.url.pathname === `${base}/settings/custom` ? '!bg-gray-100 !text-gray-800' : ''}"
+			>
+				<LicenseIcon />
+				<div class="truncate">Custom Instructions</div>
+			</a>
 			<!-- if its huggingchat, the number of assistants owned by the user must be non-zero to show the UI -->
 			{#if data.enableAssistants}
 				<h3 bind:this={assistantsSection} class="pb-3 pl-3 pt-5 text-[.8rem] text-gray-800 sm:pl-1">

From e76995d66bd33eeeda13ba18d5cf5921982a5c95 Mon Sep 17 00:00:00 2001
From: KartikGS <starkartik9@gmail.com>
Date: Fri, 23 Feb 2024 12:20:26 +0530
Subject: [PATCH 2/4] persistant custom instruction

---
 src/lib/stores/settings.ts              |  1 +
 src/lib/types/Settings.ts               |  3 +++
 src/routes/+layout.server.ts            |  1 +
 src/routes/settings/+server.ts          |  1 +
 src/routes/settings/custom/+page.svelte | 34 +++++++++++++++++++++++++
 src/routes/settings/custom/+page.ts     |  8 ++++++
 6 files changed, 48 insertions(+)
 create mode 100644 src/routes/settings/custom/+page.svelte
 create mode 100644 src/routes/settings/custom/+page.ts

diff --git a/src/lib/stores/settings.ts b/src/lib/stores/settings.ts
index 4839c4fa8e7..a29087f30c8 100644
--- a/src/lib/stores/settings.ts
+++ b/src/lib/stores/settings.ts
@@ -15,6 +15,7 @@ type SettingsStore = {
 	customPrompts: Record<string, string>;
 	recentlySaved: boolean;
 	assistants: Array<ObjectId | string>;
+	customInstruction: string;
 };
 
 export function useSettingsStore() {
diff --git a/src/lib/types/Settings.ts b/src/lib/types/Settings.ts
index 5a6804e05a8..0d179e95ed9 100644
--- a/src/lib/types/Settings.ts
+++ b/src/lib/types/Settings.ts
@@ -21,6 +21,8 @@ export interface Settings extends Timestamps {
 	customPrompts?: Record<string, string>;
 
 	assistants?: Assistant["_id"][];
+
+	customInstruction?: string;
 }
 
 // TODO: move this to a constant file along with other constants
@@ -30,4 +32,5 @@ export const DEFAULT_SETTINGS = {
 	hideEmojiOnSidebar: false,
 	customPrompts: {},
 	assistants: [],
+	customInstruction: "",
 };
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index ba55c921f26..05a14d0fe66 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -139,6 +139,7 @@ export const load: LayoutServerLoad = async ({ locals, depends }) => {
 				DEFAULT_SETTINGS.shareConversationsWithModelAuthors,
 			customPrompts: settings?.customPrompts ?? {},
 			assistants: settings?.assistants?.map((el) => el.toString()) ?? [],
+			customInstruction: settings?.customInstruction ?? "",
 		},
 		models: models.map((model) => ({
 			id: model.id,
diff --git a/src/routes/settings/+server.ts b/src/routes/settings/+server.ts
index 81289bacba2..2b9545adfd7 100644
--- a/src/routes/settings/+server.ts
+++ b/src/routes/settings/+server.ts
@@ -15,6 +15,7 @@ export async function POST({ request, locals }) {
 			ethicsModalAccepted: z.boolean().optional(),
 			activeModel: z.string().default(DEFAULT_SETTINGS.activeModel),
 			customPrompts: z.record(z.string()).default({}),
+			customInstruction: z.string().default(""),
 		})
 		.parse(body);
 
diff --git a/src/routes/settings/custom/+page.svelte b/src/routes/settings/custom/+page.svelte
new file mode 100644
index 00000000000..6f05a5808f5
--- /dev/null
+++ b/src/routes/settings/custom/+page.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+	import { useSettingsStore } from "$lib/stores/settings";
+
+	const settings = useSettingsStore();
+
+	$: if ($settings.customInstruction === undefined) {
+		$settings.customInstruction = "";
+	}
+
+	$: hasCustomInstruction =
+		$settings.customInstruction !== "";
+</script>
+
+<div class="flex flex-col items-start">
+	<div class="flex w-full flex-col gap-2">
+		<div class="flex w-full flex-row content-between">
+			<h3 class="mb-1.5 text-lg font-semibold text-gray-800">Custom Instructions</h3>
+			{#if hasCustomInstruction}
+				<button
+					class="ml-auto underline decoration-gray-300 hover:decoration-gray-700"
+					on:click|stopPropagation={() =>
+						($settings.customInstruction = "")}
+				>
+					Reset
+				</button>
+			{/if}
+		</div>
+		<textarea
+			rows="10"
+			class="w-full resize-none rounded-md border-2 bg-gray-100 p-2"
+			bind:value={$settings.customInstruction}
+		/>
+	</div>
+</div>
diff --git a/src/routes/settings/custom/+page.ts b/src/routes/settings/custom/+page.ts
new file mode 100644
index 00000000000..0dd5de6971a
--- /dev/null
+++ b/src/routes/settings/custom/+page.ts
@@ -0,0 +1,8 @@
+import { base } from "$app/paths";
+import { redirect } from "@sveltejs/kit";
+
+export async function load({ parent, params }) {
+	const data = await parent();
+
+	return data;
+}

From c49f804554a16fef3cedf7221e76b5b1590f828e Mon Sep 17 00:00:00 2001
From: KartikGS <starkartik9@gmail.com>
Date: Tue, 5 Mar 2024 20:35:05 +0530
Subject: [PATCH 3/4] Appending custom instruction to the preprompt

---
 src/routes/+page.svelte                 | 5 ++++-
 src/routes/settings/+layout.svelte      | 2 +-
 src/routes/settings/custom/+page.svelte | 6 ++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 78d93c4a3f3..68526f7b0dd 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -34,6 +34,9 @@
 					model = data.models[0].id;
 				}
 			}
+			let customPreprompt = $settings.customPrompts[$settings.activeModel]
+				? $settings.customInstruction + "\n" + $settings.customPrompts[$settings.activeModel]
+				: undefined;
 			const res = await fetch(`${base}/conversation`, {
 				method: "POST",
 				headers: {
@@ -41,7 +44,7 @@
 				},
 				body: JSON.stringify({
 					model,
-					preprompt: $settings.customPrompts[$settings.activeModel],
+					preprompt: customPreprompt,
 					assistantId: data.assistant?._id,
 				}),
 			});
diff --git a/src/routes/settings/+layout.svelte b/src/routes/settings/+layout.svelte
index 8906e47b26d..05b5c87fac1 100644
--- a/src/routes/settings/+layout.svelte
+++ b/src/routes/settings/+layout.svelte
@@ -10,7 +10,7 @@
 	import CarbonCheckmark from "~icons/carbon/checkmark";
 	import CarbonAdd from "~icons/carbon/add";
 
-	import LicenseIcon from '~icons/carbon/license'
+	import LicenseIcon from "~icons/carbon/license";
 	import UserIcon from "~icons/carbon/user";
 	import { fade, fly } from "svelte/transition";
 	export let data;
diff --git a/src/routes/settings/custom/+page.svelte b/src/routes/settings/custom/+page.svelte
index 6f05a5808f5..52d44e25a29 100644
--- a/src/routes/settings/custom/+page.svelte
+++ b/src/routes/settings/custom/+page.svelte
@@ -7,8 +7,7 @@
 		$settings.customInstruction = "";
 	}
 
-	$: hasCustomInstruction =
-		$settings.customInstruction !== "";
+	$: hasCustomInstruction = $settings.customInstruction !== "";
 </script>
 
 <div class="flex flex-col items-start">
@@ -18,8 +17,7 @@
 			{#if hasCustomInstruction}
 				<button
 					class="ml-auto underline decoration-gray-300 hover:decoration-gray-700"
-					on:click|stopPropagation={() =>
-						($settings.customInstruction = "")}
+					on:click|stopPropagation={() => ($settings.customInstruction = "")}
 				>
 					Reset
 				</button>

From ed48a75971dea7d412feeacd9d9fda951c6e2d26 Mon Sep 17 00:00:00 2001
From: KartikGS <starkartik9@gmail.com>
Date: Wed, 6 Mar 2024 17:34:50 +0530
Subject: [PATCH 4/4] lint error correction

---
 src/routes/settings/custom/+page.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/routes/settings/custom/+page.ts b/src/routes/settings/custom/+page.ts
index 0dd5de6971a..f6eb3cd4bde 100644
--- a/src/routes/settings/custom/+page.ts
+++ b/src/routes/settings/custom/+page.ts
@@ -1,7 +1,4 @@
-import { base } from "$app/paths";
-import { redirect } from "@sveltejs/kit";
-
-export async function load({ parent, params }) {
+export async function load({ parent }) {
 	const data = await parent();
 
 	return data;