UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-04-08 14:49:46 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: merged response should be used in messages payload

Browse Source
This commit is contained in:
Timothy J. Baek 2024-10-26 12:41:54 -07:00
parent badbe4ea06
commit f03629de61
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/components/chat/Chat.svelte
View File

@ -1070,7 +1070,7 @@
// Prepare the base message object // Prepare the base message object
const baseMessage = { const baseMessage = {
role: message.role, role: message.role,
content: message.content content: message?.merged?.content ?? message.content
}; };
// Extract and format image URLs if any exist // Extract and format image URLs if any exist
@ -1535,10 +1535,7 @@
content: [ content: [
{ {
type: 'text', type: 'text',
text: text: message?.merged?.content ?? message.content
arr.length - 1 !== idx
? message.content
: (message?.raContent ?? message.content)
}, },
...message.files ...message.files
.filter((file) => file.type === 'image') .filter((file) => file.type === 'image')
@ -1551,10 +1548,7 @@
] ]
} }
: { : {
content: content: message?.merged?.content ?? message.content
arr.length - 1 !== idx
? message.content
: (message?.raContent ?? message.content)
}) })
})), })),
seed: params?.seed ?? $settings?.params?.seed ?? undefined, seed: params?.seed ?? $settings?.params?.seed ?? undefined,

38
src/lib/components/chat/Messages/MultiResponseMessages.svelte
View File

@ -16,7 +16,6 @@
import Markdown from './Markdown.svelte'; import Markdown from './Markdown.svelte';
import Name from './Name.svelte'; import Name from './Name.svelte';
import Skeleton from './Skeleton.svelte'; import Skeleton from './Skeleton.svelte';
const i18n = getContext('i18n'); const i18n = getContext('i18n');
export let chatId; export let chatId;
@ -155,7 +154,6 @@
await tick(); await tick();
const messageElement = document.getElementById(`message-${messageId}`); const messageElement = document.getElementById(`message-${messageId}`);
console.log(messageElement);
if (messageElement) { if (messageElement) {
messageElement.scrollIntoView({ block: 'start' }); messageElement.scrollIntoView({ block: 'start' });
} }
@ -237,7 +235,7 @@
{/each} {/each}
</div> </div>
{#if !readOnly && isLastMessage} {#if !readOnly}
{#if !Object.keys(groupedMessageIds).find((modelIdx) => { {#if !Object.keys(groupedMessageIds).find((modelIdx) => {
const { messageIds } = groupedMessageIds[modelIdx]; const { messageIds } = groupedMessageIds[modelIdx];
const _messageId = messageIds[groupedMessageIdsIdx[modelIdx]]; const _messageId = messageIds[groupedMessageIdsIdx[modelIdx]];
@ -272,22 +270,24 @@
{/if} {/if}
</div> </div>
<div class=" flex-shrink-0 text-gray-600 dark:text-gray-500 mt-1"> {#if isLastMessage}
<Tooltip content={$i18n.t('Merge Responses')} placement="bottom"> <div class=" flex-shrink-0 text-gray-600 dark:text-gray-500 mt-1">
<button <Tooltip content={$i18n.t('Merge Responses')} placement="bottom">
type="button" <button
id="merge-response-button" type="button"
class="{true id="merge-response-button"
? 'visible' class="{true
: '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" ? 'visible'
on:click={() => { : '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"
mergeResponsesHandler(); on:click={() => {
}} mergeResponsesHandler();
> }}
<Merge className=" size-5 " /> >
</button> <Merge className=" size-5 " />
</Tooltip> </button>
</div> </Tooltip>
</div>
{/if}
</div> </div>
{/if} {/if}
{/if} {/if}