From b916f1b07d89b9779e3dffd59d5560617fe98c52 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Fri, 29 Dec 2023 23:25:40 -0800
Subject: [PATCH] feat: messages refac

---
 src/lib/components/chat/Messages.svelte             | 11 +++++++++++
 .../components/chat/Messages/ResponseMessage.svelte | 13 +++----------
 src/routes/(app)/c/[id]/+page.svelte                | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/lib/components/chat/Messages.svelte b/src/lib/components/chat/Messages.svelte
index 08589420..3920a40d 100644
--- a/src/lib/components/chat/Messages.svelte
+++ b/src/lib/components/chat/Messages.svelte
@@ -96,7 +96,17 @@
 	};
 
 	const confirmEditResponseMessage = async (messageId, content) => {
+		history.messages[messageId].originalContent = history.messages[messageId].content;
 		history.messages[messageId].content = content;
+
+		await tick();
+
+		await updateChatById(localStorage.token, chatId, {
+			messages: messages,
+			history: history
+		});
+
+		await chats.set(await getChatList(localStorage.token));
 	};
 
 	const rateMessage = async (messageId, rating) => {
@@ -225,6 +235,7 @@
 				{:else}
 					<ResponseMessage
 						{message}
+						modelfiles={selectedModelfiles}
 						siblings={history.messages[message.parentId]?.childrenIds ?? []}
 						isLastMessage={messageIdx + 1 === messages.length}
 						{confirmEditResponseMessage}
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index abdd5da2..bb81b2c9 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -26,8 +26,6 @@
 	export let copyToClipboard: Function;
 	export let regenerateResponse: Function;
 
-	let selectedModelfile = '';
-
 	let edit = false;
 	let editedContent = '';
 
@@ -42,19 +40,14 @@
 		await tick();
 
 		if (tooltipInstance) {
-			console.log(tooltipInstance);
 			tooltipInstance[0].destroy();
 		}
 
-		console.log('rendering message');
-
 		renderLatex();
 		hljs.highlightAll();
 		createCopyCodeBlockButton();
 
 		if (message.info) {
-			console.log(message);
-
 			tooltipInstance = tippy(`#info-${message.id}`, {
 				content: `<span class="text-xs" id="tooltip-${message.id}">token/s: ${
 					`${
@@ -214,12 +207,12 @@
 </script>
 
 <div class=" flex w-full message-{message.id}">
-	<ProfileImage src={selectedModelfile?.imageUrl ?? '/favicon.png'} />
+	<ProfileImage src={modelfiles[message.model]?.imageUrl ?? '/favicon.png'} />
 
 	<div class="w-full overflow-hidden">
 		<Name>
-			{#if selectedModelfile}
-				{selectedModelfile.title}
+			{#if message.model in modelfiles}
+				{modelfiles[message.model]?.title}
 			{:else}
 				Ollama <span class=" text-gray-500 text-sm font-medium"
 					>{message.model ? ` ${message.model}` : ''}</span
diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte
index 9600f298..db027502 100644
--- a/src/routes/(app)/c/[id]/+page.svelte
+++ b/src/routes/(app)/c/[id]/+page.svelte
@@ -31,6 +31,17 @@
 			? $modelfiles.filter((modelfile) => modelfile.tagName === selectedModels[0])[0]
 			: null;
 
+	let selectedModelfiles = {};
+	$: selectedModelfiles = selectedModels.reduce((a, tagName, i, arr) => {
+		const modelfile =
+			$modelfiles.filter((modelfile) => modelfile.tagName === tagName)?.at(0) ?? undefined;
+
+		return {
+			...a,
+			...(modelfile && { [tagName]: modelfile })
+		};
+	}, {});
+
 	let chat = null;
 
 	let title = '';
@@ -643,7 +654,7 @@
 				<Messages
 					chatId={$chatId}
 					{selectedModels}
-					{selectedModelfile}
+					{selectedModelfiles}
 					bind:history
 					bind:messages
 					bind:autoScroll