ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-11 20:05:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

transform tool calls into proper messages

Browse source
This commit is contained in:
Oleg Yermolenko 2025-11-28 18:19:23 +02:00
parent 453ea9b9a1
commit fc68071e1d
2 changed files with 128 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
src/lib/components/chat/Chat.svelte
View file

@ -51,7 +51,7 @@
getMessageContentParts,
createMessagesList,
getPromptVariables,
processDetails,
processDetailsAndExtractToolCalls,
removeAllDetails,
getCodeBlockContents
} from '$lib/utils';
@ -1865,46 +1865,73 @@
$settings?.params?.stream_response ??
params?.stream_response ??
true;
let messages = [
params?.system || $settings.system
? {
let messages = [];
if (params?.system || $settings.system) {
messages.push({
role: 'system',
content: `${params?.system ?? $settings?.system ?? ''}`
}
: undefined,
..._messages.map((message) => ({
...message,
content: processDetails(message.content)
}))
].filter((message) => message);
});
}
messages = messages
.map((message, idx, arr) => ({
role: message.role,
...((message.files?.filter((file) => file.type === 'image').length > 0 ?? false) &&
message.role === 'user'
? {
content: [
{
type: 'text',
text: message?.merged?.content ?? message.content
},
...message.files
.filter((file) => file.type === 'image')
.map((file) => ({
type: 'image_url',
image_url: {
url: file.url
}
}))
]
for (const message of _messages) {
let content = message?.merged?.content ?? message?.content;
let processedMessages = processDetailsAndExtractToolCalls(content ?? '');
let nonToolMesssage = null;
let toolCallIndex = 0;
for (const processedMessage of processedMessages) {
if (typeof processedMessage == "string") {
nonToolMesssage = {
role: message?.role,
content: message?.role === 'user' ? processedMessage : processedMessage.trim()
};
if (message?.role === 'user' && (message.files?.filter((file) => file.type === 'image').length > 0 ?? false)) {
nonToolMesssage = {
...nonToolMesssage,
...message.files
.filter((file) => file.type === 'image')
.map((file) => ({
type: 'image_url',
image_url: {
url: file.url
}
}))
}
: {
content: message?.merged?.content ?? message.content
})
}))
.filter((message) => message?.role === 'user' || message?.content?.trim());
}
messages.push(nonToolMesssage);
continue;
}
if (!nonToolMesssage) {
nonToolMesssage = {
role: message?.role,
content: ''
};
messages.push(nonToolMesssage);
}
nonToolMesssage.tool_calls ??= [];
nonToolMesssage.tool_calls.push({
index: toolCallIndex++,
id: processedMessage.id,
type: 'function',
function: {
name: processedMessage.name,
arguments: processedMessage.arguments
}
});
messages.push({
role: 'tool',
tool_call_id: processedMessage.id,
content: processedMessage.result
});
}
}
const toolIds = [];
const toolServerIds = [];

78
src/lib/utils/index.ts
View file

@ -856,28 +856,78 @@ export const removeAllDetails = (content) => {
return content;
};
export const processDetails = (content) => {
content = removeDetails(content, ['reasoning', 'code_interpreter']);
// This regex matches <details> tags with type="tool_calls" and captures their attributes
const toolCallsDetailsRegex = /<details\s+type="tool_calls"([^>]*)>([\s\S]*?)<\/details>/gis;
const detailsAttributesRegex = /(\w+)="([^"]*)"/g;
// This regex matches <details> tags with type="tool_calls" and captures their attributes to convert them to a string
const detailsRegex = /<details\s+type="tool_calls"([^>]*)>([\s\S]*?)<\/details>/gis;
const matches = content.match(detailsRegex);
if (matches) {
export const processDetailsAndExtractToolCalls = (content) => {
content = removeDetails(content, ['reasoning', 'code_interpreter']);
// Split text and tool calls into messages array
let messages = [];
const matches = content.match(toolCallsDetailsRegex);
if (matches && matches.length > 0) {
let previousDetailsEndIndex = 0;
for (const match of matches) {
const attributesRegex = /(\w+)="([^"]*)"/g;
const attributes = {};
let attributeMatch;
while ((attributeMatch = attributesRegex.exec(match)) !== null) {
attributes[attributeMatch[1]] = attributeMatch[2];
let detailsStartIndex = content.indexOf(match, previousDetailsEndIndex);
let assistantMessage = content.substr(previousDetailsEndIndex, detailsStartIndex - previousDetailsEndIndex);
previousDetailsEndIndex = detailsStartIndex + match.length;
assistantMessage = assistantMessage.trim('\n');
if (assistantMessage.length > 0) {
messages.push(assistantMessage);
}
content = content.replace(match, `"${attributes.result}"`);
const attributes = {};
let attributeMatch;
while ((attributeMatch = detailsAttributesRegex.exec(match)) !== null) {
attributes[attributeMatch[1]] = attributeMatch[2];
}
if (!attributes.id) {
continue;
}
let toolCall = {
id: attributes.id,
name: attributes.name,
arguments: unescapeHtml(attributes.arguments ?? ''),
result: unescapeHtml(attributes.result ?? '')
}
toolCall.arguments = parseDoubleEncodedString(toolCall.arguments);
toolCall.result = parseDoubleEncodedString(toolCall.result);
messages.push(toolCall);
}
let finalAssistantMessage = content.substr(previousDetailsEndIndex);
finalAssistantMessage = finalAssistantMessage.trim('\n');
if (finalAssistantMessage.length > 0) {
messages.push(finalAssistantMessage);
}
}
return content;
else if (content.length > 0) {
messages.push(content);
}
return messages;
};
function parseDoubleEncodedString(value) {
try
{
let parsedValue = JSON.parse(value);
if (typeof value == "string") {
return parsedValue;
}
}
catch {}
return value;
}
// This regular expression matches code blocks marked by triple backticks
const codeBlockRegex = /```[\s\S]*?```/g;