mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-12 04:15:25 +00:00
update append files logic
This commit is contained in:
parent
00b61ee25c
commit
fda3b287d4
1 changed files with 8 additions and 4 deletions
|
|
@ -1876,6 +1876,7 @@
|
||||||
|
|
||||||
for (const message of _messages) {
|
for (const message of _messages) {
|
||||||
let content = message?.merged?.content ?? message?.content;
|
let content = message?.merged?.content ?? message?.content;
|
||||||
|
content = message?.role !== 'user' ? content?.trim() : content;
|
||||||
let processedMessages = processDetailsAndExtractToolCalls(content ?? '');
|
let processedMessages = processDetailsAndExtractToolCalls(content ?? '');
|
||||||
|
|
||||||
let nonToolMesssage = null;
|
let nonToolMesssage = null;
|
||||||
|
|
@ -1885,15 +1886,18 @@
|
||||||
if (typeof processedMessage == 'string') {
|
if (typeof processedMessage == 'string') {
|
||||||
nonToolMesssage = {
|
nonToolMesssage = {
|
||||||
role: message?.role,
|
role: message?.role,
|
||||||
content: message?.role === 'user' ? processedMessage : processedMessage.trim()
|
content: processedMessage
|
||||||
};
|
};
|
||||||
|
|
||||||
if (
|
if (
|
||||||
message?.role === 'user' &&
|
message?.role === 'user' &&
|
||||||
(message.files?.filter((file) => file.type === 'image').length > 0 ?? false)
|
(message.files?.filter((file) => file.type === 'image').length > 0 ?? false)
|
||||||
) {
|
) {
|
||||||
nonToolMesssage = {
|
nonToolMesssage.content = [
|
||||||
...nonToolMesssage,
|
{
|
||||||
|
type: 'text',
|
||||||
|
text: nonToolMesssage.content
|
||||||
|
},
|
||||||
...message.files
|
...message.files
|
||||||
.filter((file) => file.type === 'image')
|
.filter((file) => file.type === 'image')
|
||||||
.map((file) => ({
|
.map((file) => ({
|
||||||
|
|
@ -1902,7 +1906,7 @@
|
||||||
url: file.url
|
url: file.url
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
};
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
messages.push(nonToolMesssage);
|
messages.push(nonToolMesssage);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue