mirror of
https://github.com/open-webui/open-webui
synced 2025-04-05 13:15:36 +00:00
fix: cloned many model chat freezing issue
This commit is contained in:
parent
079f37a2d6
commit
a1b4df1b85
@ -5,15 +5,12 @@
|
|||||||
|
|
||||||
import { toast } from 'svelte-sonner';
|
import { toast } from 'svelte-sonner';
|
||||||
import { getChatList, updateChatById } from '$lib/apis/chats';
|
import { getChatList, updateChatById } from '$lib/apis/chats';
|
||||||
|
import { copyToClipboard, findWordIndices } from '$lib/utils';
|
||||||
|
|
||||||
import UserMessage from './Messages/UserMessage.svelte';
|
import UserMessage from './Messages/UserMessage.svelte';
|
||||||
import ResponseMessage from './Messages/ResponseMessage.svelte';
|
import ResponseMessage from './Messages/ResponseMessage.svelte';
|
||||||
import Placeholder from './Messages/Placeholder.svelte';
|
import Placeholder from './Messages/Placeholder.svelte';
|
||||||
import Spinner from '../common/Spinner.svelte';
|
import MultiResponseMessages from './Messages/MultiResponseMessages.svelte';
|
||||||
import { imageGenerations } from '$lib/apis/images';
|
|
||||||
import { copyToClipboard, findWordIndices } from '$lib/utils';
|
|
||||||
import CompareMessages from './Messages/CompareMessages.svelte';
|
|
||||||
import { stringify } from 'postcss';
|
|
||||||
|
|
||||||
const i18n = getContext('i18n');
|
const i18n = getContext('i18n');
|
||||||
|
|
||||||
@ -364,7 +361,7 @@
|
|||||||
{/key}
|
{/key}
|
||||||
{:else}
|
{:else}
|
||||||
{#key message.parentId}
|
{#key message.parentId}
|
||||||
<CompareMessages
|
<MultiResponseMessages
|
||||||
bind:history
|
bind:history
|
||||||
{messages}
|
{messages}
|
||||||
{readOnly}
|
{readOnly}
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { onMount, tick } from 'svelte';
|
import { onMount, tick } from 'svelte';
|
||||||
import { createEventDispatcher } from 'svelte';
|
import { createEventDispatcher } from 'svelte';
|
||||||
|
|
||||||
import { updateChatById } from '$lib/apis/chats';
|
import { updateChatById } from '$lib/apis/chats';
|
||||||
|
|
||||||
import ResponseMessage from './ResponseMessage.svelte';
|
import ResponseMessage from './ResponseMessage.svelte';
|
||||||
|
|
||||||
export let chatId;
|
export let chatId;
|
||||||
@ -30,17 +28,9 @@
|
|||||||
let groupedMessages = {};
|
let groupedMessages = {};
|
||||||
let groupedMessagesIdx = {};
|
let groupedMessagesIdx = {};
|
||||||
|
|
||||||
$: groupedMessages = parentMessage?.models.reduce((a, model, modelIdx) => {
|
$: if (parentMessage) {
|
||||||
// Find all messages that are children of the parent message and have the same model
|
initHandler();
|
||||||
const modelMessages = parentMessage?.childrenIds
|
}
|
||||||
.map((id) => history.messages[id])
|
|
||||||
.filter((m) => m.modelIdx === modelIdx);
|
|
||||||
|
|
||||||
return {
|
|
||||||
...a,
|
|
||||||
[modelIdx]: { messages: modelMessages }
|
|
||||||
};
|
|
||||||
}, {});
|
|
||||||
|
|
||||||
const showPreviousMessage = (modelIdx) => {
|
const showPreviousMessage = (modelIdx) => {
|
||||||
groupedMessagesIdx[modelIdx] = Math.max(0, groupedMessagesIdx[modelIdx] - 1);
|
groupedMessagesIdx[modelIdx] = Math.max(0, groupedMessagesIdx[modelIdx] - 1);
|
||||||
@ -78,25 +68,47 @@
|
|||||||
dispatch('change');
|
dispatch('change');
|
||||||
};
|
};
|
||||||
|
|
||||||
onMount(async () => {
|
const initHandler = async () => {
|
||||||
await tick();
|
await tick();
|
||||||
currentMessageId = messages[messageIdx].id;
|
currentMessageId = messages[messageIdx].id;
|
||||||
|
|
||||||
for (const [modelIdx, model] of parentMessage?.models.entries()) {
|
groupedMessages = parentMessage?.models.reduce((a, model, modelIdx) => {
|
||||||
|
// Find all messages that are children of the parent message and have the same model
|
||||||
|
const modelMessages = parentMessage?.childrenIds
|
||||||
|
.map((id) => history.messages[id])
|
||||||
|
.filter((m) => m.modelIdx === modelIdx);
|
||||||
|
|
||||||
|
return {
|
||||||
|
...a,
|
||||||
|
[modelIdx]: { messages: modelMessages }
|
||||||
|
};
|
||||||
|
}, {});
|
||||||
|
|
||||||
|
groupedMessagesIdx = parentMessage?.models.reduce((a, model, modelIdx) => {
|
||||||
const idx = groupedMessages[modelIdx].messages.findIndex((m) => m.id === currentMessageId);
|
const idx = groupedMessages[modelIdx].messages.findIndex((m) => m.id === currentMessageId);
|
||||||
if (idx !== -1) {
|
if (idx !== -1) {
|
||||||
groupedMessagesIdx[modelIdx] = idx;
|
return {
|
||||||
|
...a,
|
||||||
|
[modelIdx]: idx
|
||||||
|
};
|
||||||
} else {
|
} else {
|
||||||
groupedMessagesIdx[modelIdx] = 0;
|
return {
|
||||||
|
...a,
|
||||||
|
[modelIdx]: 0
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}, {});
|
||||||
|
};
|
||||||
|
|
||||||
|
onMount(async () => {
|
||||||
|
initHandler();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="flex snap-x snap-mandatory overflow-x-auto scrollbar-hidden"
|
class="flex snap-x snap-mandatory overflow-x-auto scrollbar-hidden"
|
||||||
id="responses-container-{parentMessage.id}"
|
id="responses-container-{chatId}-{parentMessage.id}"
|
||||||
>
|
>
|
||||||
{#key currentMessageId}
|
{#key currentMessageId}
|
||||||
{#each Object.keys(groupedMessages) as modelIdx}
|
{#each Object.keys(groupedMessages) as modelIdx}
|
||||||
@ -128,34 +140,36 @@
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{#key history.currentId}
|
{#key history.currentId}
|
||||||
<ResponseMessage
|
{#if message}
|
||||||
message={groupedMessages[modelIdx].messages[groupedMessagesIdx[modelIdx]]}
|
<ResponseMessage
|
||||||
siblings={groupedMessages[modelIdx].messages.map((m) => m.id)}
|
{message}
|
||||||
isLastMessage={true}
|
siblings={groupedMessages[modelIdx].messages.map((m) => m.id)}
|
||||||
{updateChatMessages}
|
isLastMessage={true}
|
||||||
{confirmEditResponseMessage}
|
{updateChatMessages}
|
||||||
showPreviousMessage={() => showPreviousMessage(modelIdx)}
|
{confirmEditResponseMessage}
|
||||||
showNextMessage={() => showNextMessage(modelIdx)}
|
showPreviousMessage={() => showPreviousMessage(modelIdx)}
|
||||||
{readOnly}
|
showNextMessage={() => showNextMessage(modelIdx)}
|
||||||
{rateMessage}
|
{readOnly}
|
||||||
{copyToClipboard}
|
{rateMessage}
|
||||||
{continueGeneration}
|
{copyToClipboard}
|
||||||
regenerateResponse={async (message) => {
|
{continueGeneration}
|
||||||
regenerateResponse(message);
|
regenerateResponse={async (message) => {
|
||||||
await tick();
|
regenerateResponse(message);
|
||||||
groupedMessagesIdx[modelIdx] = groupedMessages[modelIdx].messages.length - 1;
|
await tick();
|
||||||
}}
|
groupedMessagesIdx[modelIdx] = groupedMessages[modelIdx].messages.length - 1;
|
||||||
on:save={async (e) => {
|
}}
|
||||||
console.log('save', e);
|
on:save={async (e) => {
|
||||||
|
console.log('save', e);
|
||||||
|
|
||||||
const message = e.detail;
|
const message = e.detail;
|
||||||
history.messages[message.id] = message;
|
history.messages[message.id] = message;
|
||||||
await updateChatById(localStorage.token, chatId, {
|
await updateChatById(localStorage.token, chatId, {
|
||||||
messages: messages,
|
messages: messages,
|
||||||
history: history
|
history: history
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
{/if}
|
||||||
{/key}
|
{/key}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
Loading…
Reference in New Issue
Block a user