jhzhang/rag
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(server-release): 从 main 同步表格图片修复

Browse Source 
纯逻辑同步，不涉及 API 格式变更：

1. chat_routes.py:
   - 新增 _replace_table_image_placeholders(): 将答案中 [图片]
     和 [N张图片] 占位符替换为 ![id](url) markdown 图片语法
   - _filter_images_by_answer: 补充 [图片]/![ 图片意图检测
   - import re 提升到模块级

2. manager.py:
   - 跨页表格 HTML 合并修复: BS 解析后追加 <tr> 行（原来直接
     拼接两个 <table> 导致第二表行被 html_table_to_markdown 丢弃）
   - 表头跳过逻辑改为对比第一行
   - 新增 text_level/bbox/table_type/table_nest_level/sub_type 元数据
This commit is contained in:
lacerate551
2026-06-21 00:52:33 +08:00
parent b5bcb3c941
commit 184511f4ec
2 changed files with 95 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
knowledge/manager.py
View File

@@ -39,6 +39,7 @@ from pathlib import Path
import logging
import chromadb
from bs4 import BeautifulSoup
# 从 base.py 导入基础类和常量
from .base import (
@@ -550,8 +551,39 @@ class KnowledgeBaseManager(
curr_html = getattr(current, 'table_html', '') or ''
next_html = getattr(next_chunk, 'table_html', '') or ''
if curr_html and next_html:
# 合并两个表格的 HTML
current.table_html = curr_html + '\n' + next_html
# 正确合并两个表格的 HTML：
# 将第二个表格的 <tr> 行追加到第一个表格中
# （而非简单拼接两个 <table>，否则 html_table_to_markdown
# 的 soup.find('table') 只能找到第一个表格）
try:
soup1 = BeautifulSoup(curr_html, 'html.parser')
soup2 = BeautifulSoup(next_html, 'html.parser')
table1 = soup1.find('table')
table2 = soup2.find('table')
if table1 and table2:
# 从第二个表格提取数据行
next_rows = table2.find_all('tr')
# 跳过与第一个表格表头重复的行
# 对比第一行而非所有 th（find_all('th') 会匹配
# 整个表格的 th，无法与单行做列表比较）
first_row_t1 = table1.find('tr')
if first_row_t1 and next_rows:
row1_texts = [c.get_text(strip=True) for c in first_row_t1.find_all(['th', 'td'])]
row2_texts = [c.get_text(strip=True) for c in next_rows[0].find_all(['th', 'td'])]
if row1_texts and row2_texts and row1_texts == row2_texts:
next_rows = next_rows[1:]
logger.debug("跨页表格合并: 跳过了重复的表头行")
for row in next_rows:
table1.append(row)
current.table_html = str(soup1)
logger.debug(f"跨页表格 HTML 合并成功: 追加了 {len(next_rows)} 行")
else:
current.table_html = curr_html + '\n' + next_html
except Exception as e:
logger.warning(f"跨页表格 HTML 合并异常: {e}，回退到简单拼接")
current.table_html = curr_html + '\n' + next_html
elif not curr_html and next_html:
current.table_html = next_html
# 合并 image_path 和嵌入图片到 images
curr_img = getattr(current, 'image_path', None)