Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
676a4dff
Commit
676a4dff
authored
May 19, 2024
by
Timothy J. Baek
Browse files
feat: many model interaction ui
parent
0ede1d14
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
280 additions
and
85 deletions
+280
-85
src/lib/components/chat/Messages.svelte
src/lib/components/chat/Messages.svelte
+34
-5
src/lib/components/chat/Messages/CompareMessages.svelte
src/lib/components/chat/Messages/CompareMessages.svelte
+156
-0
src/lib/components/chat/Messages/ResponseMessage.svelte
src/lib/components/chat/Messages/ResponseMessage.svelte
+6
-4
src/routes/(app)/+page.svelte
src/routes/(app)/+page.svelte
+41
-38
src/routes/(app)/c/[id]/+page.svelte
src/routes/(app)/c/[id]/+page.svelte
+43
-38
No files found.
src/lib/components/chat/Messages.svelte
View file @
676a4dff
<script lang="ts">
<script lang="ts">
import { v4 as uuidv4 } from 'uuid';
import { v4 as uuidv4 } from 'uuid';
import { chats, config, modelfiles, settings, user as _user } from '$lib/stores';
import { chats, config, modelfiles, settings, user as _user
, mobile
} from '$lib/stores';
import { tick, getContext } from 'svelte';
import { tick, getContext } from 'svelte';
import { toast } from 'svelte-sonner';
import { toast } from 'svelte-sonner';
...
@@ -13,6 +13,8 @@
...
@@ -13,6 +13,8 @@
import Spinner from '../common/Spinner.svelte';
import Spinner from '../common/Spinner.svelte';
import { imageGenerations } from '$lib/apis/images';
import { imageGenerations } from '$lib/apis/images';
import { copyToClipboard, findWordIndices } from '$lib/utils';
import { copyToClipboard, findWordIndices } from '$lib/utils';
import CompareMessages from './Messages/CompareMessages.svelte';
import { stringify } from 'postcss';
const i18n = getContext('i18n');
const i18n = getContext('i18n');
...
@@ -28,10 +30,10 @@
...
@@ -28,10 +30,10 @@
export let processing = '';
export let processing = '';
export let bottomPadding = false;
export let bottomPadding = false;
export let autoScroll;
export let autoScroll;
export let selectedModels;
export let history = {};
export let history = {};
export let messages = [];
export let messages = [];
export let selectedModels;
export let selectedModelfiles = [];
export let selectedModelfiles = [];
$: if (autoScroll && bottomPadding) {
$: if (autoScroll && bottomPadding) {
...
@@ -63,7 +65,8 @@
...
@@ -63,7 +65,8 @@
childrenIds: [],
childrenIds: [],
role: 'user',
role: 'user',
content: userPrompt,
content: userPrompt,
...(history.messages[messageId].files && { files: history.messages[messageId].files })
...(history.messages[messageId].files && { files: history.messages[messageId].files }),
models: selectedModels.filter((m, mIdx) => selectedModels.indexOf(m) === mIdx)
};
};
let messageParentId = history.messages[messageId].parentId;
let messageParentId = history.messages[messageId].parentId;
...
@@ -79,7 +82,7 @@
...
@@ -79,7 +82,7 @@
history.currentId = userMessageId;
history.currentId = userMessageId;
await tick();
await tick();
await sendPrompt(userPrompt, userMessageId
, chatId
);
await sendPrompt(userPrompt, userMessageId);
};
};
const updateChatMessages = async () => {
const updateChatMessages = async () => {
...
@@ -309,7 +312,7 @@
...
@@ -309,7 +312,7 @@
{showNextMessage}
{showNextMessage}
copyToClipboard={copyToClipboardWithToast}
copyToClipboard={copyToClipboardWithToast}
/>
/>
{:else}
{:else
if $mobile || (history.messages[message.parentId]?.models?.length ?? 1) === 1
}
{#key message.id}
{#key message.id}
<ResponseMessage
<ResponseMessage
{message}
{message}
...
@@ -337,6 +340,32 @@
...
@@ -337,6 +340,32 @@
}}
}}
/>
/>
{/key}
{/key}
{:else}
{#key message.parentId}
<CompareMessages
bind:history
{messages}
{chatId}
parentMessage={history.messages[message.parentId]}
{messageIdx}
{selectedModelfiles}
{updateChatMessages}
{confirmEditResponseMessage}
{rateMessage}
copyToClipboard={copyToClipboardWithToast}
{continueGeneration}
{regenerateResponse}
on:change={() => {
const element = document.getElementById('messages-container');
autoScroll =
element.scrollHeight - element.scrollTop <= element.clientHeight + 50;
setTimeout(() => {
scrollToBottom();
}, 100);
}}
/>
{/key}
{/if}
{/if}
</div>
</div>
</div>
</div>
...
...
src/lib/components/chat/Messages/CompareMessages.svelte
0 → 100644
View file @
676a4dff
<script lang="ts">
import { createEventDispatcher } from 'svelte';
import { updateChatById } from '$lib/apis/chats';
import { onMount, tick } from 'svelte';
import ResponseMessage from './ResponseMessage.svelte';
export let chatId;
export let history;
export let messages = [];
export let messageIdx;
export let parentMessage;
export let selectedModelfiles;
export let updateChatMessages: Function;
export let confirmEditResponseMessage: Function;
export let rateMessage: Function;
export let copyToClipboard: Function;
export let continueGeneration: Function;
export let regenerateResponse: Function;
const dispatch = createEventDispatcher();
let currentMessageId;
let groupedMessagesIdx = {};
let groupedMessages = {};
$: groupedMessages = parentMessage?.models.reduce((a, model) => {
const modelMessages = parentMessage?.childrenIds
.map((id) => history.messages[id])
.filter((m) => m.model === model);
return {
...a,
[model]: { messages: modelMessages }
};
}, {});
onMount(async () => {
await tick();
currentMessageId = messages[messageIdx].id;
for (const model of parentMessage?.models) {
const idx = groupedMessages[model].messages.findIndex((m) => m.id === currentMessageId);
if (idx !== -1) {
groupedMessagesIdx[model] = idx;
} else {
groupedMessagesIdx[model] = 0;
}
}
});
</script>
<div>
<div class="flex snap-x snap-mandatory overflow-x-auto scrollbar-none">
{#each Object.keys(groupedMessages) as model}
{#if groupedMessagesIdx[model] !== undefined && groupedMessages[model].messages.length > 0}
<!-- svelte-ignore a11y-no-static-element-interactions -->
<!-- svelte-ignore a11y-click-events-have-key-events -->
<div
class=" snap-center min-w-96 w-full max-w-full m-1 outline outline-1 {history.messages[
currentMessageId
].model === model
? 'outline-gray-200 dark:outline-gray-700 outline-2'
: 'outline-gray-100 dark:outline-gray-850 '} transition p-6 rounded-3xl"
on:click={() => {
currentMessageId = groupedMessages[model].messages[groupedMessagesIdx[model]].id;
let messageId = groupedMessages[model].messages[groupedMessagesIdx[model]].id;
console.log(messageId);
let messageChildrenIds = history.messages[messageId].childrenIds;
while (messageChildrenIds.length !== 0) {
messageId = messageChildrenIds.at(-1);
messageChildrenIds = history.messages[messageId].childrenIds;
}
history.currentId = messageId;
dispatch('change');
}}
>
<ResponseMessage
message={groupedMessages[model].messages[groupedMessagesIdx[model]]}
modelfiles={selectedModelfiles}
siblings={groupedMessages[model].messages.map((m) => m.id)}
isLastMessage={true}
{updateChatMessages}
{confirmEditResponseMessage}
showPreviousMessage={() => {
groupedMessagesIdx[model] = Math.max(0, groupedMessagesIdx[model] - 1);
let messageId = groupedMessages[model].messages[groupedMessagesIdx[model]].id;
console.log(messageId);
let messageChildrenIds = history.messages[messageId].childrenIds;
while (messageChildrenIds.length !== 0) {
messageId = messageChildrenIds.at(-1);
messageChildrenIds = history.messages[messageId].childrenIds;
}
history.currentId = messageId;
dispatch('change');
}}
showNextMessage={() => {
groupedMessagesIdx[model] = Math.min(
groupedMessages[model].messages.length - 1,
groupedMessagesIdx[model] + 1
);
let messageId = groupedMessages[model].messages[groupedMessagesIdx[model]].id;
console.log(messageId);
let messageChildrenIds = history.messages[messageId].childrenIds;
while (messageChildrenIds.length !== 0) {
messageId = messageChildrenIds.at(-1);
messageChildrenIds = history.messages[messageId].childrenIds;
}
history.currentId = messageId;
dispatch('change');
}}
{rateMessage}
{copyToClipboard}
{continueGeneration}
regenerateResponse={async (model) => {
regenerateResponse(model);
await tick();
groupedMessagesIdx[model] = groupedMessages[model].messages.length - 1;
}}
on:save={async (e) => {
console.log('save', e);
const message = e.detail;
history.messages[message.id] = message;
await updateChatById(localStorage.token, chatId, {
messages: messages,
history: history
});
}}
/>
</div>
{/if}
{/each}
</div>
</div>
src/lib/components/chat/Messages/ResponseMessage.svelte
View file @
676a4dff
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
let selectedCitation = null;
let selectedCitation = null;
$: tokens = marked.lexer(sanitizeResponseContent(message.content));
$: tokens = marked.lexer(sanitizeResponseContent(message
?
.content));
const renderer = new marked.Renderer();
const renderer = new marked.Renderer();
...
@@ -499,7 +499,7 @@
...
@@ -499,7 +499,7 @@
class=" flex justify-start overflow-x-auto buttons text-gray-600 dark:text-gray-500"
class=" flex justify-start overflow-x-auto buttons text-gray-600 dark:text-gray-500"
>
>
{#if siblings.length > 1}
{#if siblings.length > 1}
<div class="flex self-center" dir="ltr">
<div class="flex self-center
min-w-fit
" dir="ltr">
<button
<button
class="self-center p-1 hover:bg-black/5 dark:hover:bg-white/5 dark:hover:text-white hover:text-black rounded-md transition"
class="self-center p-1 hover:bg-black/5 dark:hover:bg-white/5 dark:hover:text-white hover:text-black rounded-md transition"
on:click={() => {
on:click={() => {
...
@@ -523,7 +523,7 @@
...
@@ -523,7 +523,7 @@
</button>
</button>
<div
<div
class="text-sm tracking-widest font-semibold self-center dark:text-gray-100"
class="text-sm tracking-widest font-semibold self-center dark:text-gray-100
min-w-fit
"
>
>
{siblings.indexOf(message.id) + 1}/{siblings.length}
{siblings.indexOf(message.id) + 1}/{siblings.length}
</div>
</div>
...
@@ -894,7 +894,9 @@
...
@@ -894,7 +894,9 @@
class="{isLastMessage
class="{isLastMessage
? 'visible'
? 'visible'
: 'invisible group-hover:visible'} p-1.5 hover:bg-black/5 dark:hover:bg-white/5 rounded-lg dark:hover:text-white hover:text-black transition regenerate-response-button"
: 'invisible group-hover:visible'} p-1.5 hover:bg-black/5 dark:hover:bg-white/5 rounded-lg dark:hover:text-white hover:text-black transition regenerate-response-button"
on:click={regenerateResponse}
on:click={() => {
regenerateResponse(message.model);
}}
>
>
<svg
<svg
xmlns="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
...
...
src/routes/(app)/+page.svelte
View file @
676a4dff
...
@@ -202,6 +202,7 @@
...
@@ -202,6 +202,7 @@
user
:
_user
??
undefined
,
user
:
_user
??
undefined
,
content
:
userPrompt
,
content
:
userPrompt
,
files
:
files
.
length
>
0
?
files
:
undefined
,
files
:
files
.
length
>
0
?
files
:
undefined
,
models
:
selectedModels
.
filter
((
m
,
mIdx
)
=>
selectedModels
.
indexOf
(
m
)
===
mIdx
),
timestamp
:
Math
.
floor
(
Date
.
now
()
/
1000
)
//
Unix
epoch
timestamp
:
Math
.
floor
(
Date
.
now
()
/
1000
)
//
Unix
epoch
};
};
...
@@ -250,48 +251,50 @@
...
@@ -250,48 +251,50 @@
}
}
};
};
const
sendPrompt
=
async
(
prompt
,
parentId
)
=>
{
const
sendPrompt
=
async
(
prompt
,
parentId
,
modelId
=
null
)
=>
{
const
_chatId
=
JSON
.
parse
(
JSON
.
stringify
($
chatId
));
const
_chatId
=
JSON
.
parse
(
JSON
.
stringify
($
chatId
));
await
Promise
.
all
(
await
Promise
.
all
(
(
atSelectedModel
!== '' ? [atSelectedModel.id] : selectedModels).map(async (modelId) => {
(
modelId
?
[
modelId
]
:
atSelectedModel
!== '' ? [atSelectedModel.id] : selectedModels).map(
console
.
log
(
'modelId'
,
modelId
);
async
(
modelId
)
=>
{
const
model
=
$
models
.
filter
((
m
)
=>
m
.
id
===
modelId
).
at
(
0
);
console
.
log
(
'modelId'
,
modelId
);
const
model
=
$
models
.
filter
((
m
)
=>
m
.
id
===
modelId
).
at
(
0
);
if
(
model
)
{
//
Create
response
message
if
(
model
)
{
let
responseMessageId
=
uuidv4
();
//
Create
response
message
let
responseMessage
=
{
let
responseMessageId
=
uuidv4
();
parentId
:
parentId
,
let
responseMessage
=
{
id
:
responseMessageId
,
parentId
:
parentId
,
childrenIds
:
[],
id
:
responseMessageId
,
role
:
'assistant'
,
childrenIds
:
[],
content
:
''
,
role
:
'assistant'
,
model
:
model
.
id
,
content
:
''
,
timestamp
:
Math
.
floor
(
Date
.
now
()
/
1000
)
//
Unix
epoch
model
:
model
.
id
,
};
timestamp
:
Math
.
floor
(
Date
.
now
()
/
1000
)
//
Unix
epoch
};
//
Add
message
to
history
and
Set
currentId
to
messageId
history
.
messages
[
responseMessageId
]
=
responseMessage
;
//
Add
message
to
history
and
Set
currentId
to
messageId
history
.
currentId
=
responseMessageId
;
history
.
messages
[
responseMessageId
]
=
responseMessage
;
history
.
currentId
=
responseMessageId
;
//
Append
messageId
to
childrenIds
of
parent
message
if
(
parentId
!== null) {
//
Append
messageId
to
childrenIds
of
parent
message
history
.
messages
[
parentId
].
childrenIds
=
[
if
(
parentId
!== null) {
...
history
.
messages
[
parentId
].
childrenIds
,
history
.
messages
[
parentId
].
childrenIds
=
[
responseMessageId
...
history
.
messages
[
parentId
].
childrenIds
,
];
responseMessageId
}
];
}
if
(
model
?.
external
)
{
if
(
model
?.
external
)
{
await
sendPromptOpenAI
(
model
,
prompt
,
responseMessageId
,
_chatId
);
await
sendPromptOpenAI
(
model
,
prompt
,
responseMessageId
,
_chatId
);
}
else
if
(
model
)
{
}
else
if
(
model
)
{
await
sendPromptOllama
(
model
,
prompt
,
responseMessageId
,
_chatId
);
await
sendPromptOllama
(
model
,
prompt
,
responseMessageId
,
_chatId
);
}
}
else
{
toast
.
error
($
i18n
.
t
(`
Model
{{
modelId
}}
not
found
`,
{
modelId
}));
}
}
}
else
{
toast
.
error
($
i18n
.
t
(`
Model
{{
modelId
}}
not
found
`,
{
modelId
}));
}
}
}
)
)
);
);
await
chats
.
set
(
await
getChatList
(
localStorage
.
token
));
await
chats
.
set
(
await
getChatList
(
localStorage
.
token
));
...
@@ -756,7 +759,7 @@
...
@@ -756,7 +759,7 @@
console.log('
stopResponse
');
console.log('
stopResponse
');
};
};
const regenerateResponse = async () => {
const regenerateResponse = async (
modelId
) => {
console.log('
regenerateResponse
');
console.log('
regenerateResponse
');
if (messages.length != 0 && messages.at(-1).done == true) {
if (messages.length != 0 && messages.at(-1).done == true) {
messages.splice(messages.length - 1, 1);
messages.splice(messages.length - 1, 1);
...
@@ -765,7 +768,7 @@
...
@@ -765,7 +768,7 @@
let userMessage = messages.at(-1);
let userMessage = messages.at(-1);
let userPrompt = userMessage.content;
let userPrompt = userMessage.content;
await sendPrompt(userPrompt, userMessage.id);
await sendPrompt(userPrompt, userMessage.id
, modelId
);
}
}
};
};
...
...
src/routes/(app)/c/[id]/+page.svelte
View file @
676a4dff
...
@@ -210,7 +210,8 @@
...
@@ -210,7 +210,8 @@
user
:
_user
??
undefined
,
user
:
_user
??
undefined
,
content
:
userPrompt
,
content
:
userPrompt
,
files
:
files
.
length
>
0
?
files
:
undefined
,
files
:
files
.
length
>
0
?
files
:
undefined
,
timestamp
:
Math
.
floor
(
Date
.
now
()
/
1000
)
//
Unix
epoch
timestamp
:
Math
.
floor
(
Date
.
now
()
/
1000
),
//
Unix
epoch
models
:
selectedModels
};
};
//
Add
message
to
history
and
Set
currentId
to
messageId
//
Add
message
to
history
and
Set
currentId
to
messageId
...
@@ -255,47 +256,51 @@
...
@@ -255,47 +256,51 @@
await
sendPrompt
(
userPrompt
,
userMessageId
);
await
sendPrompt
(
userPrompt
,
userMessageId
);
}
}
};
};
const
sendPrompt
=
async
(
prompt
,
parentId
)
=>
{
const
sendPrompt
=
async
(
prompt
,
parentId
,
modelId
=
null
)
=>
{
const
_chatId
=
JSON
.
parse
(
JSON
.
stringify
($
chatId
));
const
_chatId
=
JSON
.
parse
(
JSON
.
stringify
($
chatId
));
await
Promise
.
all
(
await
Promise
.
all
(
(
atSelectedModel
!== '' ? [atSelectedModel.id] : selectedModels).map(async (modelId) => {
(
modelId
?
[
modelId
]
:
atSelectedModel
!== '' ? [atSelectedModel.id] : selectedModels).map(
const
model
=
$
models
.
filter
((
m
)
=>
m
.
id
===
modelId
).
at
(
0
);
async
(
modelId
)
=>
{
console
.
log
(
'modelId'
,
modelId
);
if
(
model
)
{
const
model
=
$
models
.
filter
((
m
)
=>
m
.
id
===
modelId
).
at
(
0
);
//
Create
response
message
let
responseMessageId
=
uuidv4
();
if
(
model
)
{
let
responseMessage
=
{
//
Create
response
message
parentId
:
parentId
,
let
responseMessageId
=
uuidv4
();
id
:
responseMessageId
,
let
responseMessage
=
{
childrenIds
:
[],
parentId
:
parentId
,
role
:
'assistant'
,
id
:
responseMessageId
,
content
:
''
,
childrenIds
:
[],
model
:
model
.
id
,
role
:
'assistant'
,
timestamp
:
Math
.
floor
(
Date
.
now
()
/
1000
)
//
Unix
epoch
content
:
''
,
};
model
:
model
.
id
,
timestamp
:
Math
.
floor
(
Date
.
now
()
/
1000
)
//
Unix
epoch
//
Add
message
to
history
and
Set
currentId
to
messageId
};
history
.
messages
[
responseMessageId
]
=
responseMessage
;
history
.
currentId
=
responseMessageId
;
//
Add
message
to
history
and
Set
currentId
to
messageId
history
.
messages
[
responseMessageId
]
=
responseMessage
;
//
Append
messageId
to
childrenIds
of
parent
message
history
.
currentId
=
responseMessageId
;
if
(
parentId
!== null) {
history
.
messages
[
parentId
].
childrenIds
=
[
//
Append
messageId
to
childrenIds
of
parent
message
...
history
.
messages
[
parentId
].
childrenIds
,
if
(
parentId
!== null) {
responseMessageId
history
.
messages
[
parentId
].
childrenIds
=
[
];
...
history
.
messages
[
parentId
].
childrenIds
,
}
responseMessageId
];
}
if
(
model
?.
external
)
{
if
(
model
?.
external
)
{
await
sendPromptOpenAI
(
model
,
prompt
,
responseMessageId
,
_chatId
);
await
sendPromptOpenAI
(
model
,
prompt
,
responseMessageId
,
_chatId
);
}
else
if
(
model
)
{
}
else
if
(
model
)
{
await
sendPromptOllama
(
model
,
prompt
,
responseMessageId
,
_chatId
);
await
sendPromptOllama
(
model
,
prompt
,
responseMessageId
,
_chatId
);
}
}
else
{
toast
.
error
($
i18n
.
t
(`
Model
{{
modelId
}}
not
found
`,
{
modelId
}));
}
}
}
else
{
toast
.
error
($
i18n
.
t
(`
Model
{{
modelId
}}
not
found
`,
{
modelId
}));
}
}
}
)
)
);
);
await
chats
.
set
(
await
getChatList
(
localStorage
.
token
));
await
chats
.
set
(
await
getChatList
(
localStorage
.
token
));
...
@@ -759,7 +764,7 @@
...
@@ -759,7 +764,7 @@
console.log('
stopResponse
');
console.log('
stopResponse
');
};
};
const regenerateResponse = async () => {
const regenerateResponse = async (
modelId = null
) => {
console.log('
regenerateResponse
');
console.log('
regenerateResponse
');
if (messages.length != 0 && messages.at(-1).done == true) {
if (messages.length != 0 && messages.at(-1).done == true) {
messages.splice(messages.length - 1, 1);
messages.splice(messages.length - 1, 1);
...
@@ -768,7 +773,7 @@
...
@@ -768,7 +773,7 @@
let userMessage = messages.at(-1);
let userMessage = messages.at(-1);
let userPrompt = userMessage.content;
let userPrompt = userMessage.content;
await sendPrompt(userPrompt, userMessage.id);
await sendPrompt(userPrompt, userMessage.id
, modelId
);
}
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment