From f03629de618e4d2a73a64bc99ef41eb1a05174bf Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sat, 26 Oct 2024 12:41:54 -0700
Subject: [PATCH] fix: merged response should be used in messages payload

---
 src/lib/components/chat/Chat.svelte           | 12 ++----
 .../Messages/MultiResponseMessages.svelte     | 38 +++++++++----------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 051ae306b..a0feda057 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -1070,7 +1070,7 @@
 				// Prepare the base message object
 				const baseMessage = {
 					role: message.role,
-					content: message.content
+					content: message?.merged?.content ?? message.content
 				};
 
 				// Extract and format image URLs if any exist
@@ -1535,10 +1535,7 @@
 										content: [
 											{
 												type: 'text',
-												text:
-													arr.length - 1 !== idx
-														? message.content
-														: (message?.raContent ?? message.content)
+												text: message?.merged?.content ?? message.content
 											},
 											...message.files
 												.filter((file) => file.type === 'image')
@@ -1551,10 +1548,7 @@
 										]
 									}
 								: {
-										content:
-											arr.length - 1 !== idx
-												? message.content
-												: (message?.raContent ?? message.content)
+										content: message?.merged?.content ?? message.content
 									})
 						})),
 					seed: params?.seed ?? $settings?.params?.seed ?? undefined,
diff --git a/src/lib/components/chat/Messages/MultiResponseMessages.svelte b/src/lib/components/chat/Messages/MultiResponseMessages.svelte
index 4eee6d568..438bf1b34 100644
--- a/src/lib/components/chat/Messages/MultiResponseMessages.svelte
+++ b/src/lib/components/chat/Messages/MultiResponseMessages.svelte
@@ -16,7 +16,6 @@
 	import Markdown from './Markdown.svelte';
 	import Name from './Name.svelte';
 	import Skeleton from './Skeleton.svelte';
-
 	const i18n = getContext('i18n');
 
 	export let chatId;
@@ -155,7 +154,6 @@
 		await tick();
 
 		const messageElement = document.getElementById(`message-${messageId}`);
-		console.log(messageElement);
 		if (messageElement) {
 			messageElement.scrollIntoView({ block: 'start' });
 		}
@@ -237,7 +235,7 @@
 			{/each}
 		</div>
 
-		{#if !readOnly && isLastMessage}
+		{#if !readOnly}
 			{#if !Object.keys(groupedMessageIds).find((modelIdx) => {
 				const { messageIds } = groupedMessageIds[modelIdx];
 				const _messageId = messageIds[groupedMessageIdsIdx[modelIdx]];
@@ -272,22 +270,24 @@
 						{/if}
 					</div>
 
-					<div class=" flex-shrink-0 text-gray-600 dark:text-gray-500 mt-1">
-						<Tooltip content={$i18n.t('Merge Responses')} placement="bottom">
-							<button
-								type="button"
-								id="merge-response-button"
-								class="{true
-									? 'visible'
-									: 'invisible group-hover:visible'} p-1 hover:bg-black/5 dark:hover:bg-white/5 rounded-lg dark:hover:text-white hover:text-black transition regenerate-response-button"
-								on:click={() => {
-									mergeResponsesHandler();
-								}}
-							>
-								<Merge className=" size-5 " />
-							</button>
-						</Tooltip>
-					</div>
+					{#if isLastMessage}
+						<div class=" flex-shrink-0 text-gray-600 dark:text-gray-500 mt-1">
+							<Tooltip content={$i18n.t('Merge Responses')} placement="bottom">
+								<button
+									type="button"
+									id="merge-response-button"
+									class="{true
+										? 'visible'
+										: 'invisible group-hover:visible'} p-1 hover:bg-black/5 dark:hover:bg-white/5 rounded-lg dark:hover:text-white hover:text-black transition regenerate-response-button"
+									on:click={() => {
+										mergeResponsesHandler();
+									}}
+								>
+									<Merge className=" size-5 " />
+								</button>
+							</Tooltip>
+						</div>
+					{/if}
 				</div>
 			{/if}
 		{/if}