scriptoriumadmin/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-10-11 03:38:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

refac

Browse source 
Co-Authored-By: Algorithm5838 <108630393+Algorithm5838@users.noreply.github.com>
This commit is contained in:
Timothy Jaeryang Baek 2026-10-10 22:25:11 +04:00
parent 88ff2c65cf
commit 46a2a830ab
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
View file

@ -6,7 +6,7 @@
import fileSaver from 'file-saver';
const { saveAs } = fileSaver;
import { marked, type Token } from 'marked';
import { type Token } from 'marked';
import { copyToClipboard, unescapeHtml } from '$lib/utils';
import { resolveChatMessageToolCall } from '$lib/apis/chats';
@ -470,7 +470,7 @@
id={`${id}-${tokenIdx}-${detailIdx}-d`}
{chatId}
{messageId}
tokens={marked.lexer(decode(detailToken.text))}
tokens={detailToken.tokens ?? []}
attributes={detailToken?.attributes}
{done}
{allowEmbeds}
@ -531,7 +531,7 @@
id={`${id}-${tokenIdx}-d`}
{chatId}
{messageId}
tokens={marked.lexer(decode(token.text))}
tokens={token.tokens ?? []}
attributes={token?.attributes}
{done}
{allowEmbeds}

11
src/lib/utils/marked/extension.ts
View file

@ -1,3 +1,6 @@
import { decode } from 'html-entities';
import { type Token, type TokenizerThis } from 'marked';
// Helper function to find matching closing tag
function findMatchingClosingTag(src: string, openTag: string, closeTag: string): number {
let depth = 1;
@ -26,7 +29,7 @@ function parseAttributes(tag: string): { [key: string]: string } {
return attributes;
}
function detailsTokenizer(src: string) {
function detailsTokenizer(this: TokenizerThis, src: string) {
// Updated regex to capture attributes inside <details>
const detailsRegex = /^<details(\s+[^>]*)?>\n/;
const summaryRegex = /^<summary>(.*?)<\/summary>\n/;
@ -49,11 +52,17 @@ function detailsTokenizer(src: string) {
content = content.slice(summaryMatch[0].length).trim();
}
const tokens: Token[] = [];
if (attributes.type !== 'tool_calls') {
this.lexer.blockTokens(decode(content), tokens);
}
return {
type: 'details',
raw: fullMatch,
summary: summary,
text: content,
tokens,
attributes: attributes // Include extracted attributes from <details>
};
}