happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: ID generation improvements

This commit is contained in:
Aleksander Grygier 2025-12-16 10:24:00 +01:00
parent 0e7e5db661
commit 3a9bce2b1e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/server/webui/src/lib/components/app/misc/MarkdownContent.svelte
View File

@ -7,8 +7,8 @@
import remarkRehype from 'remark-rehype'; import remarkRehype from 'remark-rehype';
import rehypeKatex from 'rehype-katex'; import rehypeKatex from 'rehype-katex';
import rehypeStringify from 'rehype-stringify'; import rehypeStringify from 'rehype-stringify';
import type { Root as HastRoot } from 'hast'; import type { Root as HastRoot, RootContent as HastRootContent } from 'hast';
import type { Root as MdastRoot, RootContent } from 'mdast'; import type { Root as MdastRoot } from 'mdast';
import { browser } from '$app/environment'; import { browser } from '$app/environment';
import { onDestroy } from 'svelte'; import { onDestroy } from 'svelte';
import { rehypeRestoreTableHtml } from '$lib/markdown/table-html-restorer'; import { rehypeRestoreTableHtml } from '$lib/markdown/table-html-restorer';
@ -302,11 +302,11 @@
} }
} }
function getNodeId(node: RootContent, indexFallback: number): string { function getHastNodeId(node: HastRootContent, indexFallback: number): string {
const position = node.position; const position = node.position;
if (position?.start?.offset != null && position?.end?.offset != null) { if (position?.start?.offset != null && position?.end?.offset != null) {
return `${position.start.offset}-${position.end.offset}`; return `hast-${position.start.offset}-${position.end.offset}`;
} }
return `${node.type}-${indexFallback}`; return `${node.type}-${indexFallback}`;
@ -337,16 +337,14 @@
const normalized = preprocessLaTeX(markdown); const normalized = preprocessLaTeX(markdown);
const processorInstance = processor(); const processorInstance = processor();
const ast = processorInstance.parse(normalized) as MdastRoot; const ast = processorInstance.parse(normalized) as MdastRoot;
const children = ast.children ?? [];
const nodeIds = children.map((node, index) => getNodeId(node as RootContent, index));
const processedRoot = (await processorInstance.run(ast)) as HastRoot; const processedRoot = (await processorInstance.run(ast)) as HastRoot;
const processedChildren = processedRoot.children ?? []; const processedChildren = processedRoot.children ?? [];
const stableCount = Math.max(processedChildren.length - 1, 0); const stableCount = Math.max(processedChildren.length - 1, 0);
const nextBlocks: MarkdownBlock[] = []; const nextBlocks: MarkdownBlock[] = [];
for (let index = 0; index < stableCount; index++) { for (let index = 0; index < stableCount; index++) {
const id = nodeIds[index] ?? `processed-${index}`; const hastChild = processedChildren[index];
const id = getHastNodeId(hastChild, index);
const existing = renderedBlocks[index]; const existing = renderedBlocks[index];
if (existing && existing.id === id) { if (existing && existing.id === id) {