Appending custom instruction to the preprompt

Author: KartikGS

src/routes/+page.svelte

@@ -34,14 +34,17 @@
 					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: {
 					"Content-Type": "application/json",
 				},
 				body: JSON.stringify({
 					model,
-					preprompt: $settings.customPrompts[$settings.activeModel],
+					preprompt: customPreprompt,
 					assistantId: data.assistant?._id,
 				}),
 			});

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;

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>