qyyfw/qihuaiflow
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(chat): image send 500 + table/newline formatting (v2026.07.20.1708)

Browse Source
This commit is contained in:
QihuAI Design committed 2026-07-20 17:08:20 +08:00
1 parent 612ce37518
commit 9aad8b5a22
4 files changed
+64 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

backend/python/app/api/chat_media.py
+1 -1
View File
@@ -1430,7 +1430,7 @@ async def _generate_media_task(ai_msg_id: str, ai_model_id: str, prompt: str, us
logger.info(f"[_generate_media_task] 启动 media 生成 msg={ai_msg_id} model={ai_model_id} prompt={prompt[:60]!r}")
caps = [c.lower() for c in (ai_model.capabilities or [])]
is_video = "video" in caps
timeout_seconds = 300 if is_video else 90
timeout_seconds = 300 if is_video else 180
try:
result = await asyncio.wait_for(
_generate_media(db, ai_model, prompt, user_id),
backend/python/app/api/chat_service.py
+10
View File
@@ -1657,6 +1657,16 @@ async def _send_message_core(
# 媒体分支直接返回，不会进入 LLM 工具调用；提前初始化避免未绑定
called_skill_names = []
called_mcp_names = []
if effective_skill_ids:
frontend/src/pages/front/ChatPage.css
+6 -1
View File
@@ -471,10 +471,15 @@
}
.md-table td {
padding: 10px 14px;
padding: 8px 12px;
border-bottom: 1px solid #EEF0F4;
color: var(--color-text-primary);
vertical-align: top;
line-height: 1.5;
}
.md-table td br {
line-height: 0.8;
}
.md-table tbody tr:last-child td {
frontend/src/pages/front/ChatPage.tsx
+47 -37
View File
@@ -189,41 +189,8 @@ const MarkdownContent: React.FC<{ content: string }> = ({ content }) => {
return '\x00MEDIA' + (mediaBlocks.length - 1) + '\x00';
});
// 2.7 Extract Markdown tables: | h1 | h2 |\n|---|---| ... |
// 把整段表格替换为占位符，表格内容(已转义)放入 tableBlocks 数组
const tableBlocks: string[] = [];
text = text.replace(
/((?:^\|.+\|\r?\n)+^\|[\s\-:|]+\|\r?\n(?:^\|.+\|\r?\n?)+)/gm,
(_m: string, block: string) => {
const lines = block.trim().split(/\r?\n/).filter((l: string) => l.trim());
if (lines.length < 2) return block;
const headerCells = lines[0].split('|').slice(1, -1).map((c: string) => c.trim());
const alignCells = lines[1].split('|').slice(1, -1).map((c: string) => {
const t = c.trim();
const left = t.startsWith(':');
const right = t.endsWith(':');
if (left && right) return 'center';
if (right) return 'right';
if (left) return 'left';
return 'left';
});
const bodyRows = lines.slice(2).map((row: string) =>
row.split('|').slice(1, -1).map((c: string) => c.trim())
);
const thead = headerCells.map((c: string, i: number) =>
`<th style="text-align:${alignCells[i] || 'left'}">${c}</th>`
).join('');
const tbody = bodyRows.map((r: string[]) =>
'<tr>' + r.map((c: string, i: number) =>
`<td style="text-align:${alignCells[i] || 'left'}">${c}</td>`
).join('') + '</tr>'
).join('');
const html = `<table class="md-table"><thead><tr>${thead}</tr></thead><tbody>${tbody}</tbody></table>`;
const idx = tableBlocks.length;
tableBlocks.push(html);
return '\x00TABLE' + idx + '\x00';
}
);
// 2.6 Normalize excessive blank lines in prose (code blocks already extracted)
text = text.replace(/\n{3,}/g, '\n\n').trim();
// 2.8 LaTeX 数学公式：$$...$$（块级）和 $...$（行内）
// 提取为占位符，渲染后用 KaTeX 处理
@@ -273,15 +240,58 @@ const MarkdownContent: React.FC<{ content: string }> = ({ content }) => {
text = text.replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>');
text = text.replace(/(?<!\w)\*(?!\*)(.+?)(?<!\*)\*(?!\w)/g, '<em>$1</em>');
// 7.5 Extract Markdown tables after inline formatting so cells support bold/italic/links.
// 表格提取放在加粗/链接之后，避免单元格内 **xxx** 原样显示；同时压缩单元格内多余 <br>。
const tableBlocks: string[] = [];
text = text.replace(
/((?:^\|.+\|\r?\n)+^\|[\s\-:|]+\|\r?\n(?:^\|.+\|\r?\n?)+)/gm,
(_m: string, block: string) => {
const lines = block.trim().split(/\r?\n/).filter((l: string) => l.trim());
if (lines.length < 2) return block;
const headerCells = lines[0].split('|').slice(1, -1).map((c: string) => c.trim());
const alignCells = lines[1].split('|').slice(1, -1).map((c: string) => {
const t = c.trim();
const left = t.startsWith(':');
const right = t.endsWith(':');
if (left && right) return 'center';
if (right) return 'right';
if (left) return 'left';
return 'left';
});
const normalizeCell = (cell: string) => {
return cell
.replace(/<br\s*\/?>\s*/gi, '<br/>')
.replace(/\n/g, '<br/>')
.replace(/(<br\/>){2,}/g, '<br/>')
.replace(/^(<br\/>)+|(<br\/>)+$/g, '');
};
const bodyRows = lines.slice(2).map((row: string) =>
row.split('|').slice(1, -1).map((c: string) => normalizeCell(c.trim()))
);
const thead = headerCells.map((c: string, i: number) =>
`<th style="text-align:${alignCells[i] || 'left'}">${normalizeCell(c)}</th>`
).join('');
const tbody = bodyRows.map((r: string[]) =>
'<tr>' + r.map((c: string, i: number) =>
`<td style="text-align:${alignCells[i] || 'left'}">${c}</td>`
).join('') + '</tr>'
).join('');
const html = `<table class="md-table"><thead><tr>${thead}</tr></thead><tbody>${tbody}</tbody></table>`;
const idx = tableBlocks.length;
tableBlocks.push(html);
return '\x00TABLE' + idx + '\x00';
}
);
// 8. Lists
text = text.replace(/^\s*[-*] (.+)$/gm, '<li class="md-li">$1</li>');
text = text.replace(/^\s*\d+\. (.+)$/gm, '<li class="md-li">$1</li>');
// Wrap consecutive <li> in <ul>
text = text.replace(/((?:<li class="md-li">[\s\S]*?<\/li>\n?)+)/g, '<ul class="md-ul">$1</ul>');
// 9. Convert double newlines to paragraph breaks, single to <br/>
// 9. Convert double newlines to paragraph breaks, single newlines to spaces
text = text.replace(/\n\n/g, '</p><p class="md-p">');
text = text.replace(/\n/g, '<br/>');
text = text.replace(/\n/g, ' ');
// 10. Restore code blocks and inline codes
text = text.replace(/\x00CODEBLOCK(\d+)\x00/g, (_m: string, idx: string) => codeBlocks[parseInt(idx)] || '');