Skip to content

Transforms complex documents like PDFs and Office docs into LLM-ready markdown/JSON for your Agentic workflows.

refactor(webui): remove output-stage LLM controls

myhloli6cdaae681bd4
diff --git a/mineru/kit/gradio/app.py b/mineru/kit/gradio/app.py
index 0e3bb631..d018c525 100644
--- a/mineru/kit/gradio/app.py
+++ b/mineru/kit/gradio/app.py
@@ -13,7 +13,6 @@ from pathlib import Path
from typing import Any
from urllib.parse import quote
-from ...config import LLMAidedConfig
from ...filetypes import (
FLASH_ONLY_PARSE_EXTENSIONS,
HTML_EXTENSIONS,
@@ -354,7 +353,6 @@ def build_gradio_app(
enable_api: bool = True,
max_pages: int | None = None,
document_io: GradioDocumentIO | None = None,
- llm_aided_config: LLMAidedConfig | None = None,
) -> Any:
"""构建不启动监听端口的 Gradio Blocks 应用,便于单元测试和外部托管。"""
import gradio as gr
@@ -381,7 +379,6 @@ def build_gradio_app(
"__MINERU_STATUS_TIMER__",
_resource_text("gradio_status_timer.js"),
)
- .replace("__MINERU_ADVANCED_OPTIONS__", _resource_text("gradio_advanced_options.js"))
)
# 等待限制放在生成器内部,使其他会话也能立即显示本地排队状态。
conversions = SessionConversions()
@@ -392,7 +389,6 @@ def build_gradio_app(
max_pages=max_pages,
slot=conversions.slot,
document_io=document_io,
- llm_aided_config=llm_aided_config,
)
with gr.Blocks() as demo:
@@ -474,8 +470,6 @@ def build_gradio_app(
elem_classes=["mineru-page-handle-b"],
)
page_notice = gr.HTML(value="", visible=False, elem_classes=["mineru-page-notice"])
- if llm_aided_config is not None:
- gr.Button(i18n("mineru.advanced_options"), size="sm", elem_classes=["mineru-advanced-open"])
with gr.Row(elem_classes=["mineru-actions"]):
convert_button = gr.Button(
i18n("mineru.convert"),
@@ -573,27 +567,6 @@ def build_gradio_app(
)
download_notice = gr.HTML(value="", elem_classes=["mineru-kit-download-notice"])
- llm_inputs = []
- if llm_aided_config is not None:
- llm_available = bool(llm_aided_config.api_key.strip())
- with gr.Column(elem_id="mineru-advanced-popover", elem_classes=["mineru-advanced-popover"], min_width=0):
- gr.HTML(f'<h3 id="mineru-llm-enhancement-heading">{localized_text("llm_enhancement")}</h3>')
- title_leveling = gr.Checkbox(
- value=llm_aided_config.features.title_leveling,
- label=i18n("mineru.title_leveling"),
- interactive=llm_available,
- elem_classes=["mineru-title-leveling"],
- )
- cross_page_table_cell_merge = gr.Checkbox(
- value=llm_aided_config.features.cross_page_table_cell_merge,
- label=i18n("mineru.cell_merge"),
- interactive=llm_available,
- elem_classes=["mineru-cell-merge"],
- )
- if not llm_available:
- gr.HTML(localized_text("llm_unavailable"), elem_classes=["mineru-enhancement-warning"])
- llm_inputs = [title_leveling, cross_page_table_cell_merge]
-
artifact_state = gr.State(value=None)
active_run_id = gr.Textbox(value="", visible=False)
conversion_ticket = gr.Textbox(value="", visible=False)
@@ -775,24 +748,6 @@ def build_gradio_app(
# 显式注册幂等加载事件,初始化前端状态和自定义文案。
demo.load(fn=None, js=app_js, **private_event_kwargs)
- if llm_aided_config is not None:
- input_file.change(
- fn=None,
- inputs=input_file,
- outputs=[],
- js=(
- "(file) => { window.__mineruAdvancedOptions?.setFile(file, "
- f"{json.dumps(sorted(PDF_EXTENSIONS | IMAGE_EXTENSIONS))}); }}"
- ),
- **private_event_kwargs,
- )
- clear_button.click(
- fn=None,
- inputs=[],
- outputs=[],
- js="() => { window.__mineruAdvancedOptions?.setFile(null, []); }",
- **private_event_kwargs,
- )
preview_outputs = [
pdf_preview,
image_preview,
@@ -854,19 +809,15 @@ def build_gradio_app(
raw_page_range: str,
force_ocr: bool = False,
request: object | None = None,
- title_leveling: bool | None = None,
- cross_page_table_cell_merge: bool | None = None,
) -> tuple[object, ...]:
- """保留原四个输入顺序,尾部可选增强参数默认采用应用配置。"""
+ """保留公开转换 API 的四个输入和原生组件输出,普通响应一次返回结果。"""
session = getattr(request, "session_hash", None) or uuid.uuid4().hex
run = conversions.start(session, uuid.uuid4().hex)
assert run is not None
try:
outcome = await conversion_service.execute(
run,
- ConversionInput(
- file_path, tier_position, raw_page_range, force_ocr, title_leveling, cross_page_table_cell_merge
- ),
+ ConversionInput(file_path, tier_position, raw_page_range, force_ocr),
public_base_url=_gradio_public_base_url(request),
)
return conversion_updates(outcome, status_html=run.state.render(), download_formats=_DOWNLOAD_FORMATS)
@@ -896,7 +847,7 @@ def build_gradio_app(
# 公开 API 仍由 Gradio 原生组件序列化,浏览器通过私有回执校验后才应用结果。
convert_event = api_conversion_button.click(
fn=convert_handler,
- inputs=[input_file, tier, page_range, force_ocr, *llm_inputs],
+ inputs=[input_file, tier, page_range, force_ocr],
outputs=convert_outputs,
**event_kwargs,
)
@@ -953,10 +904,6 @@ def build_gradio_app(
revision = identity["revision"]
if type(revision) is not int or revision <= 0:
return ""
- title_enabled = identity.get("title_leveling")
- cells_enabled = identity.get("cross_page_table_cell_merge")
- if any(value is not None and type(value) is not bool for value in (title_enabled, cells_enabled)):
- return ""
except (ValueError, TypeError, KeyError, AttributeError):
return ""
session = getattr(request, "session_hash", "") or ""
@@ -966,7 +913,7 @@ def build_gradio_app(
public_base_url = _gradio_public_base_url(request)
outcome = await conversion_service.execute(
run,
- ConversionInput(file_path, tier_position, raw_page_range, force_ocr, title_enabled, cells_enabled),
+ ConversionInput(file_path, tier_position, raw_page_range, force_ocr),
public_base_url=public_base_url,
)
if conversions.current(session, run_id) is not run:
@@ -986,11 +933,11 @@ def build_gradio_app(
# 前端先建立任务身份并重置界面,再串联后端提交。
begin_conversion = convert_button.click(
fn=None,
- inputs=llm_inputs,
+ inputs=[],
outputs=[*begin_conversion_outputs, conversion_ticket, status_poll, html_output, json_output],
js=(
- f"(...options) => {{ ({pdf_preview_js('begin')})(); "
- f"const ticket = ({conversion_js('begin')})(...options); "
+ f"() => {{ ({pdf_preview_js('begin')})(); "
+ f"const ticket = ({conversion_js('begin')})(); "
f"return [{json.dumps(_status_html(STATUS_PREPARING_REQUEST))}, "
f"...({download_js('reset')})(), ...ticket, '', '']; }}"
),
@@ -1179,7 +1126,6 @@ def launch_gradio(
api_server_disable_image_analysis: bool,
api_server_preload_models: bool,
max_pages: int | None = None,
- llm_aided_config: LLMAidedConfig | None = None,
) -> None:
"""连接外部服务或托管一个本地服务,原生文档始终由同一服务解析。"""
configure_standard_streams()
@@ -1210,7 +1156,6 @@ def launch_gradio(
enable_example=enable_example,
enable_api=enable_api,
max_pages=max_pages,
- llm_aided_config=llm_aided_config,
)
_launch_gradio_app(
demo,
diff --git a/mineru/kit/gradio/conversion.py b/mineru/kit/gradio/conversion.py
index 6a365902..371e1880 100644
--- a/mineru/kit/gradio/conversion.py
+++ b/mineru/kit/gradio/conversion.py
@@ -26,8 +26,6 @@ class ConversionInput:
tier_position: int | float
page_range: str
force_ocr: bool = False
- title_leveling: bool | None = None
- cross_page_table_cell_merge: bool | None = None
@dataclass(frozen=True)
diff --git a/mineru/kit/gradio/conversion_service.py b/mineru/kit/gradio/conversion_service.py
index 51f6f83e..57c5af13 100644
--- a/mineru/kit/gradio/conversion_service.py
+++ b/mineru/kit/gradio/conversion_service.py
@@ -13,7 +13,6 @@ from typing import Literal, Protocol
from loguru import logger
from ...errors import MineruError
-from ...config import LLMAidedConfig
from ...filetypes import (
FLASH_ONLY_PARSE_EXTENSIONS,
HTML_EXTENSIONS,
@@ -39,7 +38,6 @@ from .conversion import (
run_sync_output,
)
from .document_io import GradioDocumentIO, LocalGradioDocumentIO
-from .llm_enhancement import enhance_outputs
from .page_range import validate_max_pages
from .status import (
STATUS_COMPLETED,
@@ -87,7 +85,6 @@ class ConversionService:
max_pages: int | None,
slot: asyncio.Semaphore,
document_io: GradioDocumentIO | None = None,
- llm_aided_config: LLMAidedConfig | None = None,
) -> None:
"""显式接收解析能力、产物目录、页数限制和共享执行槽。"""
validate_max_pages(max_pages)
@@ -97,7 +94,6 @@ class ConversionService:
self.max_pages = max_pages
self.slot = slot
self.document_io = document_io if document_io is not None else LocalGradioDocumentIO()
- self.llm_aided_config = llm_aided_config.model_copy(deep=True) if llm_aided_config is not None else None
async def execute(
self,
@@ -186,13 +182,6 @@ class ConversionService:
await asyncio.sleep(0)
run.publish(STATUS_PROCESSING_OUTPUT)
output_started = time.monotonic()
- if self.llm_aided_config is not None and validated.suffix in PDF_EXTENSIONS | IMAGE_EXTENSIONS:
- run.state.warning_keys = await enhance_outputs(
- result.middle_json,
- self.llm_aided_config,
- title_leveling=inputs.title_leveling,
- cross_page_table_cell_merge=inputs.cross_page_table_cell_merge,
- )
artifacts = await run_sync_output(
self.document_io.persist_parse_result,
result,
diff --git a/mineru/kit/gradio/i18n.py b/mineru/kit/gradio/i18n.py
index e1ad435c..cc2a5b22 100644
--- a/mineru/kit/gradio/i18n.py
+++ b/mineru/kit/gradio/i18n.py
@@ -55,24 +55,6 @@ MESSAGES: dict[str, tuple[str, str]] = {
),
"convert": ("Convert", "转换"),
"clear": ("Clear", "清除"),
- "advanced_options": ("Advanced options", "高级选项"),
- "llm_enhancement": ("LLM enhancement", "LLM增强"),
- "title_leveling": ("Heading levels", "标题分级"),
- "cell_merge": ("Cell merging", "单元格合并"),
- "llm_unavailable": (
- "LLM enhancement is unavailable. Standard parsing is still available.",
- "LLM增强暂不可用,仍可正常解析。",
- ),
- "llm_timeout": ("LLM enhancement timed out. Available results have been kept.", "LLM增强超时,已保留可用结果。"),
- "llm_failed": ("LLM enhancement could not finish. Available results have been kept.", "LLM增强未完成,已保留可用结果。"),
- "llm_title_incomplete": (
- "Some heading levels could not be enhanced; original levels were kept.",
- "部分标题分级未完成,已保留原层级。",
- ),
- "llm_cells_incomplete": (
- "Some cross-page cells could not be enhanced; original content was kept.",
- "部分跨页单元格增强未完成,已保留原内容。",
- ),
"preview": ("Document preview", "文档预览"),
"pdf_loading": ("Loading PDF…", "正在加载 PDF…"),
"pdf_previous": ("Previous page", "上一页"),
diff --git a/mineru/kit/gradio/llm_enhancement.py b/mineru/kit/gradio/llm_enhancement.py
deleted file mode 100644
index 456ba3c6..00000000
--- a/mineru/kit/gradio/llm_enhancement.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""WebUI 输出阶段的有界 LLM 增强,不改变解析服务和文档协议。"""
-
-from __future__ import annotations
-
-import asyncio
-import time
-
-from loguru import logger
-
-from ...config import LLMAidedConfig, LLMAidedFeaturesConfig
-from ...types import MiddleJson
-from ...utils.async_utils import drain_future
-
-ENHANCEMENT_TIMEOUT_SECONDS = 60.0
-
-
-async def enhance_outputs(
- middle_json: MiddleJson,
- config: LLMAidedConfig,
- *,
- title_leveling: bool | None,
- cross_page_table_cell_merge: bool | None,
-) -> tuple[str, ...]:
- """按本次选择执行增强,失败返回本地化提示键,用户取消仍向上传播。"""
- title_enabled = config.features.title_leveling if title_leveling is None else title_leveling
- table_enabled = (
- config.features.cross_page_table_cell_merge if cross_page_table_cell_merge is None else cross_page_table_cell_merge
- )
- if not title_enabled and not table_enabled:
- return ()
- if not config.api_key.strip():
- return ("llm_unavailable",)
-
- from ...backend.postprocess.llm_aided import aio_apply_llm_aided_postprocess
- from ...backend.postprocess.llm_client import LLMAidedClient
- from ...backend.postprocess.llm_report import LLMAidedReport
-
- request_config = config.model_copy(
- update={
- "features": LLMAidedFeaturesConfig(
- title_leveling=title_enabled,
- cross_page_table_cell_merge=table_enabled,
- )
- }
- )
- report = LLMAidedReport()
- client: LLMAidedClient | None = None
- warnings: list[str] = []
- started = time.monotonic()
- try:
- async with asyncio.timeout(ENHANCEMENT_TIMEOUT_SECONDS):
- client = LLMAidedClient(request_config, request_timeout=20.0, transport_retries=0)
- await aio_apply_llm_aided_postprocess(
- middle_json,
- request_config,
- client=client,
- allow_partial_title_leveling=True,
- report=report,
- )
- except TimeoutError:
- warnings.append("llm_timeout")
- except Exception as exc:
- logger.warning("WebUI LLM enhancement failed: {}", type(exc).__name__)
- warnings.append("llm_failed")
- finally:
- if client is not None:
- closing = asyncio.create_task(client.close())
- try:
- await asyncio.shield(closing)
- except asyncio.CancelledError:
- await drain_future(closing)
- raise
- except Exception as exc:
- logger.warning("WebUI LLM client cleanup failed: {}", type(exc).__name__)
- logger.debug("WebUI LLM outputs elapsed={:.3f}s report={}", time.monotonic() - started, report)
- for feature, key in (
- (report.title_leveling, "llm_title_incomplete"),
- (report.cross_page_table_cell_merge, "llm_cells_incomplete"),
- ):
- if feature.failed or feature.pending:
- warnings.append(key)
- return tuple(warnings)
-
-
-__all__ = ["enhance_outputs"]
diff --git a/mineru/kit/gradio/status.py b/mineru/kit/gradio/status.py
index 533a54e3..b82ec1b8 100644
--- a/mineru/kit/gradio/status.py
+++ b/mineru/kit/gradio/status.py
@@ -58,7 +58,6 @@ class StatusPanelState:
run_id: str = field(default_factory=lambda: uuid.uuid4().hex)
phase_id: int = 0
sequence: int = 0
- warning_keys: tuple[str, ...] = ()
def append(self, message: str | ParseStatusUpdate, *, at: float | None = None) -> bool:
"""阶段通知维持本地计时;服务端耗时只更新完成数值,不重启同阶段动画。"""
@@ -132,16 +131,13 @@ class StatusPanelState:
else:
title = _localized_text("status_latest")
latest_html = localized_message(latest)
- warnings_html = "".join(
- f'<div class="mineru-enhancement-warning" role="status">{_localized_text(key)}</div>' for key in self.warning_keys
- )
return (
'<div class="status-steps-panel">'
f'<div class="status-panel-title">{title}</div>'
f'<div class="status-steps-list">{"".join(items)}</div>'
f'<div class="status-latest" data-mineru-run-id="{self.run_id}" '
f'data-mineru-phase-id="{self.phase_id}" data-mineru-status-seq="{self.sequence}"'
- f"{timer_attributes}>{latest_html}</div>{warnings_html}</div>"
+ f"{timer_attributes}>{latest_html}</div></div>"
)
diff --git a/mineru/resources/gradio_advanced_options.js b/mineru/resources/gradio_advanced_options.js
deleted file mode 100644
index 50f79ecf..00000000
--- a/mineru/resources/gradio_advanced_options.js
+++ /dev/null
@@ -1,97 +0,0 @@
-() => {
- let available = false;
- let opened = false;
- let openTimer;
- let closeTimer;
- // 所有查找都使用自有类名,兼容 Gradio 重绘及按钮外层结构。
- const root = () => document.querySelector(".mineru-advanced-open");
- const button = () => {
- const element = root();
- return element?.matches("button") ? element : element?.querySelector("button");
- };
- const panel = () => document.querySelector(".mineru-advanced-popover");
- // 浮窗优先位于按钮右侧,窄屏改为按钮下方,并限制在当前 iframe 视口内。
- const position = () => {
- const trigger = button();
- const popup = panel();
- if (!trigger || !popup || !opened) return;
- const bounds = trigger.getBoundingClientRect();
- const width = Math.min(300, window.innerWidth - 24);
- popup.style.width = `${width}px`;
- const height = popup.getBoundingClientRect().height;
- const fitsRight = bounds.right + 12 + width <= window.innerWidth - 12;
- const left = fitsRight ? bounds.right + 12 : Math.max(12, Math.min(bounds.left, window.innerWidth - width - 12));
- const preferredTop = fitsRight ? bounds.top : bounds.bottom + 8;
- const top = Math.max(12, Math.min(preferredTop, window.innerHeight - height - 12));
- popup.style.left = `${left}px`;
- popup.style.top = `${top}px`;
- };
- // 幂等同步可见性和无障碍属性,隐藏浮窗不重置原生 checkbox 的值。
- const sync = () => {
- const triggerRoot = root();
- const trigger = button();
- const popup = panel();
- if (!triggerRoot || !trigger || !popup) return;
- const visible = available && opened;
- // 属性只在变化时写入,避免与界面 MutationObserver 形成循环。
- if (triggerRoot.dataset.available !== String(available)) triggerRoot.dataset.available = String(available);
- if (popup.dataset.open !== String(visible)) popup.dataset.open = String(visible);
- if (popup.inert !== !visible) popup.inert = !visible;
- for (const [name, value] of Object.entries({
- "aria-expanded": String(visible), "aria-haspopup": "dialog", "aria-controls": "mineru-advanced-popover",
- })) {
- if (trigger.getAttribute(name) !== value) trigger.setAttribute(name, value);
- }
- if (popup.getAttribute("role") !== "dialog") popup.setAttribute("role", "dialog");
- if (popup.getAttribute("aria-labelledby") !== "mineru-llm-enhancement-heading") {
- popup.setAttribute("aria-labelledby", "mineru-llm-enhancement-heading");
- }
- };
- // 统一取消悬停定时器,避免清除文件后又被延迟打开。
- const stopTimers = () => { clearTimeout(openTimer); clearTimeout(closeTimer); };
- // 关闭只影响浮窗,不改变增强选择。
- const close = () => { stopTimers(); opened = false; sync(); };
- // 展开时重新计算位置,兼容滚动、窗口缩放和语言切换。
- const open = () => { stopTimers(); opened = available; sync(); position(); };
- // 文件组件提供真实路径,前端仅负责显隐;后端仍独立校验格式。
- const setFile = (file, extensions) => {
- const path = (typeof file === "string" ? file : file?.path) || "";
- available = extensions.some((extension) => path.toLowerCase().endsWith(`.${extension}`));
- close();
- };
- // 判断事件是否仍处于按钮或浮窗内部,穿过两者间距时延迟关闭。
- const inside = (target) => target instanceof Element
- && Boolean(target.closest(".mineru-advanced-open, .mineru-advanced-popover"));
- document.addEventListener("pointerover", (event) => {
- if (!inside(event.target)) return;
- clearTimeout(closeTimer);
- if (!opened && !inside(event.relatedTarget) && event.pointerType !== "touch") {
- openTimer = setTimeout(open, 120);
- }
- });
- document.addEventListener("pointerout", (event) => {
- if (inside(event.target) && !inside(event.relatedTarget)) {
- clearTimeout(openTimer);
- closeTimer = setTimeout(() => {
- if (!inside(document.activeElement)) close();
- }, 280);
- }
- });
- document.addEventListener("click", (event) => {
- if (!(event.target instanceof Element)) return;
- if (event.target.closest(".mineru-advanced-open")) {
- if (opened) close();
- else open();
- if (opened && event.detail === 0) panel()?.querySelector("input")?.focus();
- } else if (!event.target.closest(".mineru-advanced-popover")) close();
- });
- document.addEventListener("keydown", (event) => {
- if (event.key === "Escape" && opened) { close(); button()?.focus(); }
- });
- document.addEventListener("focusout", (event) => {
- if (inside(event.target) && !inside(event.relatedTarget)) close();
- });
- window.addEventListener("resize", position);
- window.addEventListener("scroll", position, true);
- return { setFile, sync, close };
-}
diff --git a/mineru/resources/gradio_app.css b/mineru/resources/gradio_app.css
index 5487d2be..e01e90d9 100644
--- a/mineru/resources/gradio_app.css
+++ b/mineru/resources/gradio_app.css
@@ -46,33 +46,6 @@ body.dark .gradio-container {
top: 12px;
align-self: flex-start;
}
-/* 高级选项保留原生表单值,只按当前源文件切换按钮与浮窗显隐。 */
-.mineru-advanced-open { display: none !important; }
-.mineru-advanced-open[data-available="true"] { display: block !important; width: 100% !important; }
-.mineru-advanced-open button { width: 100%; }
-.mineru-advanced-popover {
- position: fixed !important;
- z-index: 1000 !important;
- width: min(300px, calc(100vw - 24px));
- max-width: calc(100vw - 24px) !important;
- max-height: calc(100vh - 24px);
- overflow: auto !important;
- padding: 16px !important;
- gap: 10px !important;
- border: 1px solid var(--mineru-panel-border) !important;
- border-radius: 12px !important;
- background: var(--block-background-fill, #fff) !important;
- box-shadow: 0 16px 40px rgba(0, 0, 0, .22);
- visibility: hidden !important;
- opacity: 0;
- pointer-events: none;
- transition: opacity 140ms ease;
-}
-.mineru-advanced-popover[data-open="true"] { visibility: visible !important; opacity: 1; pointer-events: auto; }
-.mineru-advanced-popover h3 { margin: 0 !important; font-size: 16px; }
-.mineru-advanced-popover .block { border: 0 !important; padding: 0 !important; }
-.mineru-enhancement-warning { font-size: 12px; line-height: 1.5; color: var(--body-text-color-subdued); margin-top: 6px; }
-body.dark .mineru-advanced-popover { background: #24252a !important; }
/* 有示例时控制列拉伸到与预览面板等高,由示例块吸收底部空白。 */
.mineru-control-column:has(#mineru-kit-examples) {
align-self: stretch !important;
diff --git a/mineru/resources/gradio_app.js b/mineru/resources/gradio_app.js
index 437889ca..2f64b3d7 100644
--- a/mineru/resources/gradio_app.js
+++ b/mineru/resources/gradio_app.js
@@ -1,5 +1,5 @@
() => {
- const APP_SCRIPT_VERSION = "v7-llm-advanced-options";
+ const APP_SCRIPT_VERSION = "v6-local-status-clock";
if (window.__mineruGradioAppInstalled === APP_SCRIPT_VERSION) {
return;
}
@@ -21,7 +21,6 @@
const i18n = window.__mineruI18n = __MINERU_I18N__;
const statusTimer = (__MINERU_STATUS_TIMER__)(i18n);
window.__mineruStatusPanel = statusTimer;
- const advancedOptions = window.__mineruAdvancedOptions = (__MINERU_ADVANCED_OPTIONS__)();
// HTML 回调和前端事件使用同一份词典与首选语言规则。
const localizeMineruCustomText = () => i18n.localize();
@@ -78,7 +77,6 @@
localizeMineruCustomText();
applyOfficePreviewNoticePreference();
refreshPageRangeTrack();
- advancedOptions.sync();
};
const findUploadFileInput = () => {
diff --git a/mineru/resources/gradio_conversion.js b/mineru/resources/gradio_conversion.js
index 5b31b65c..6bb4157e 100644
--- a/mineru/resources/gradio_conversion.js
+++ b/mineru/resources/gradio_conversion.js
@@ -31,11 +31,7 @@
state.terminal = false;
state.applied = false;
window.__mineruStatusPanel?.showPreparing();
- // 在点击时固定本次增强选项,排队期间的勾选变化只影响下一次提交。
- return [JSON.stringify({
- run_id: state.runId, revision: state.revision,
- title_leveling: args[0], cross_page_table_cell_merge: args[1],
- }), timer(true)];
+ return [JSON.stringify({ run_id: state.runId, revision: state.revision }), timer(true)];
}
if (action === "cancel") {
stopPreviewLog();
diff --git a/tests/unittest/test_gradio_llm_enhancement.py b/tests/unittest/test_gradio_llm_enhancement.py
deleted file mode 100644
index 1370d529..00000000
--- a/tests/unittest/test_gradio_llm_enhancement.py
+++ /dev/null
@@ -1,355 +0,0 @@
-"""验证输出增强的语义结果、计时、超时、取消和公开界面参数。"""
-
-from __future__ import annotations
-
-import asyncio
-import json
-import shutil
-import subprocess
-from pathlib import Path
-from types import SimpleNamespace
-from typing import Any
-
-import pytest
-
-from mineru.backend.postprocess import llm_client
-from mineru.config import LLMAidedConfig
-from mineru.kit.gradio import app as gradio_app
-from mineru.kit.gradio import conversion_service, llm_enhancement
-from mineru.kit.gradio.client import V1ServerCapabilities
-from mineru.kit.gradio.conversion import ConversionInput, ConversionRun, ConversionSuccess
-from mineru.kit.gradio.conversion import ConversionFailure
-from mineru.kit.gradio.conversion_service import ConversionService
-from mineru.kit.gradio.llm_enhancement import enhance_outputs
-from mineru.kit.gradio.status import STATUS_PROCESSING_ON_SERVER, STATUS_PROCESSING_OUTPUT, ParseStatusUpdate
-from mineru.parser.base import ParseResult
-from mineru.types import BlockType, DocTitleBlock, MiddleJson, PageInfo, ParagraphTitleBlock
-from _span_test_utils import inline
-from test_kit_gradio import _middle_json as simple_middle_json
-from test_kit_gradio_conversion_service import _ParseClient
-from test_llm_aided_postprocess import _cross_page_table_pages, _llm_config, _merged_row_texts, _middle_json
-
-
-def test_advanced_options_hover_keyboard_and_file_switches() -> None:
- """运行真实前端控制器,验证悬停延迟、键盘、触摸和清除后的显隐。"""
- node = shutil.which("node")
- if node is None:
- pytest.skip("Node.js is required for frontend state tests")
- result = subprocess.run(
- [node, str(Path(__file__).with_name("test_kit_gradio_advanced_options.cjs"))],
- capture_output=True,
- text=True,
- check=False,
- )
- assert result.returncode == 0, result.stdout + result.stderr
-
-
-class _SDK:
- """模拟真实 SDK 请求边界,保留请求参数、取消和关闭证据。"""
-
- def __init__(self) -> None:
- """默认返回合法结果,可按标题内容阻塞某一个请求。"""
- self.chat = SimpleNamespace(completions=self)
- self.requests: list[dict[str, Any]] = []
- self.options: dict[str, Any] = {}
- self.block_title = ""
- self.invalid = False
- self.started = asyncio.Event()
- self.cancelled = False
- self.closed = False
-
- async def create(self, **kwargs: Any) -> SimpleNamespace:
- """模拟标题、表格合法响应和可取消的慢请求。"""
- self.requests.append(kwargs)
- prompt = kwargs["messages"][0]["content"]
- if self.block_title and self.block_title in prompt:
- self.started.set()
- try:
- await asyncio.Event().wait()
- except asyncio.CancelledError:
- self.cancelled = True
- raise
- content = "invalid" if self.invalid else "[1, 0]" if "JSON 整数数组" in prompt else '{"0": 3}'
- return SimpleNamespace(choices=[SimpleNamespace(message=SimpleNamespace(content=content))])
-
- async def close(self) -> None:
- """记录客户端关闭,不启动任何网络连接。"""
- self.closed = True
-
-
-def sdk(monkeypatch: pytest.MonkeyPatch) -> _SDK:
- """替换底层 SDK,仍执行真实的重试、校验、共享并发和写回。"""
- instance = _SDK()
-
- def create_sdk(**kwargs: Any) -> _SDK:
- """记录 SDK 级超时和重试配置。"""
- instance.options = kwargs
- return instance
-
- monkeypatch.setattr(llm_client, "AsyncOpenAI", create_sdk)
- return instance
-
-
-def _title_pages(indices: tuple[int, ...]) -> MiddleJson:
- """用两个独立标题组覆盖选页、部分成功和超时场景。"""
- pages = [
- PageInfo(
- page_idx=page_idx,
- blocks=[
- DocTitleBlock(type=BlockType.DOC_TITLE, index=0, content=inline(f"Document {i}"), level=1),
- ParagraphTitleBlock(type=BlockType.PARAGRAPH_TITLE, index=1, content=inline(f"Section {i}"), level=2),
- ],
- )
- for i, page_idx in enumerate(indices)
- ]
- return _middle_json(pages, is_full_document=False)
-
-
[email protected]("indices", [(0,), (0, 19), (4, 19), (0, 4, 19)])
-def test_output_enhancement_levels_partial_documents_without_changing_identity(sdk: _SDK, indices: tuple[int, ...]) -> None:
- """所有选页均可分级,但不伪造整本标识和原页号。"""
- middle = _title_pages(indices)
- warnings = asyncio.run(
- enhance_outputs(middle, _llm_config(title=True), title_leveling=None, cross_page_table_cell_merge=None)
- )
- assert warnings == ()
- assert not middle.is_full_document
- assert tuple(page.page_idx for page in middle.pages) == indices
- assert [page.blocks[1].level for page in middle.pages] == [3] * len(indices)
- assert sdk.options["timeout"] == 20 and sdk.options["max_retries"] == 0
- assert sdk.closed
-
-
[email protected]("title,cells", [(False, False), (True, False), (False, True), (True, True)])
-def test_independent_switches_change_real_semantics(sdk: _SDK, title: bool, cells: bool) -> None:
- """检查标题层级和真实渲染行,不只断言函数被调用。"""
- pages = _cross_page_table_pages()
- pages.append(_title_pages((2,)).pages[0])
- middle = _middle_json(pages)
- warnings = asyncio.run(
- enhance_outputs(middle, _llm_config(title=True, table=True), title_leveling=title, cross_page_table_cell_merge=cells)
- )
- assert warnings == ()
- assert middle.pages[2].blocks[1].level == (3 if title else 2)
- assert middle.pages[1].blocks[0].cell_merge == ([1, 0] if cells else None)
- if cells:
- assert _merged_row_texts(middle) == [["H1", "H2"], ["A B", "X"], ["Y"]]
- assert len(sdk.requests) == int(title) + int(cells)
- assert sdk.closed is (title or cells)
-
-
-def test_timeout_keeps_completed_title_groups_and_closes_client(sdk: _SDK, monkeypatch: pytest.MonkeyPatch) -> None:
- """同一功能的一个候选超时,不丢弃先完成的候选,也不遗留后台请求。"""
- sdk.block_title = "Section 1"
- monkeypatch.setattr(llm_enhancement, "ENHANCEMENT_TIMEOUT_SECONDS", 0.05)
- middle = _title_pages((0, 1))
- warnings = asyncio.run(
- enhance_outputs(middle, _llm_config(title=True), title_leveling=True, cross_page_table_cell_merge=False)
- )
- assert warnings == ("llm_timeout", "llm_title_incomplete")
- assert [page.blocks[1].level for page in middle.pages] == [3, 2]
- assert sdk.cancelled and sdk.closed
-
-
-def test_user_cancellation_propagates_and_drains_requests(sdk: _SDK) -> None:
- """用户取消不会被当成普通增强失败,未完成请求和客户端均回收。"""
- sdk.block_title = "Section 0"
-
- async def scenario() -> None:
- """在请求进入后取消,检查取消真正完成才返回。"""
- task = asyncio.create_task(
- enhance_outputs(_title_pages((0,)), _llm_config(title=True), title_leveling=True, cross_page_table_cell_merge=False)
- )
- await sdk.started.wait()
- task.cancel()
- with pytest.raises(asyncio.CancelledError):
- await task
- assert sdk.cancelled and sdk.closed
-
- asyncio.run(scenario())
-
-
-def test_invalid_response_retries_three_times_then_preserves_original(sdk: _SDK) -> None:
- """无效响应仅按业务层重试三次,输出保留原层级并提示失败功能。"""
- sdk.invalid = True
- middle = _title_pages((0,))
- warnings = asyncio.run(
- enhance_outputs(middle, _llm_config(title=True), title_leveling=True, cross_page_table_cell_merge=False)
- )
- assert warnings == ("llm_title_incomplete",)
- assert middle.pages[0].blocks[1].level == 2
- assert len(sdk.requests) == 3 and sdk.closed
-
-
-def test_empty_candidates_and_missing_credentials_do_not_send_requests(sdk: _SDK) -> None:
- """无候选不是失败;密钥缺失只降级,不创建客户端或发送请求。"""
- empty = _middle_json([])
- assert (
- asyncio.run(
- enhance_outputs(empty, _llm_config(title=True, table=True), title_leveling=True, cross_page_table_cell_merge=True)
- )
- == ()
- )
- sdk.options.clear()
- warnings = asyncio.run(enhance_outputs(empty, LLMAidedConfig(), title_leveling=True, cross_page_table_cell_merge=True))
- assert warnings == ("llm_unavailable",)
- assert sdk.requests == [] and sdk.options == {}
-
-
-def test_non_pdf_skips_enhancement_even_when_requested(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
- """服务端格式守卫覆盖直接 API 请求,非适用文件没有增强调用和提示。"""
- source = tmp_path / "source.csv"
- source.write_text("a,b\n1,2\n", encoding="utf-8")
-
- async def forbidden(*args: Any, **kwargs: Any) -> tuple[str, ...]:
- """非适用格式不得进入增强或创建客户端。"""
- pytest.fail("non-PDF must not enter LLM enhancement")
-
- monkeypatch.setattr(conversion_service, "enhance_outputs", forbidden)
-
- async def scenario() -> None:
- """通过完整服务路径产生真实文件并检查没有警告。"""
- run = ConversionRun("non-pdf")
- service = ConversionService(
- _ParseClient(),
- tier_choices=("flash",),
- output_root=tmp_path,
- max_pages=20,
- slot=asyncio.Semaphore(1),
- llm_aided_config=_llm_config(title=True, table=True),
- )
- outcome = await service.execute(
- run, ConversionInput(str(source), 0, "", False, True, True), public_base_url="http://localhost"
- )
- assert isinstance(outcome, ConversionSuccess)
- assert not run.state.warning_keys
-
- asyncio.run(scenario())
-
-
[email protected]("extension", ["pdf", "png"])
-def test_enhancement_runs_after_parse_timer_and_before_persistence(
- tmp_path: Path, monkeypatch: pytest.MonkeyPatch, extension: str
-) -> None:
- """用受控增强等待验证 PDF 和图片的时序,并检查落盘与预览采用增强结果。"""
- source = tmp_path / f"source.{extension}"
- source.touch()
- run = ConversionRun("output-timing")
- entered = asyncio.Event()
- release = asyncio.Event()
- order: list[str] = []
- # CSV 语义避免测试依赖 PDF 渲染,输入后缀仍真实走 PDF/图片增强分支。
- result = ParseResult(middle_json=simple_middle_json(with_image=False, file_suffix="csv"))
-
- async def parse_file(*args: Any, **kwargs: Any) -> ParseResult:
- """发出真实解析阶段和固定服务端耗时。"""
- order.append("parse")
- kwargs["status_callback"](STATUS_PROCESSING_ON_SERVER)
- kwargs["status_callback"](ParseStatusUpdate(STATUS_PROCESSING_OUTPUT, duration_ms=1250))
- return result
-
- async def enhance(*args: Any, **kwargs: Any) -> tuple[str, ...]:
- """暂停增强并确认计时已经停止,再写入可由真实持久化观察的标题。"""
- assert run.state.message == STATUS_PROCESSING_OUTPUT and run.state._processing_started is None
- order.append("llm")
- entered.set()
- await release.wait()
- result.middle_json.pages[0].blocks[0] = ParagraphTitleBlock(
- type=BlockType.PARAGRAPH_TITLE, index=0, content=inline("Enhanced title"), level=3
- )
- return ("llm_cells_incomplete",)
-
- class DocumentIO:
- """复用真实保存过程,同时隔离源文件 PDF 操作。"""
-
- def effective_page_range(self, *args: Any, **kwargs: Any) -> str:
- """返回固定范围,避免本测试依赖源 PDF 有效性。"""
- return ""
-
- def persist_parse_result(self, parsed: ParseResult, original: Path, **kwargs: Any) -> Any:
- """用真实 CSV 文件保存同一增强语义,验证预览与下载的数据源。"""
- from mineru.kit.gradio.artifacts import persist_parse_result
-
- order.append("persist")
- actual_source = tmp_path / "actual.csv"
- actual_source.write_text("a,b\n1,2\n", encoding="utf-8")
- return persist_parse_result(parsed, actual_source, **kwargs)
-
- monkeypatch.setattr(conversion_service, "enhance_outputs", enhance)
-
- async def scenario() -> None:
- """增强阻塞期间没有落盘;完成后仍显示解析的 1.25 秒。"""
- service = ConversionService(
- SimpleNamespace(parse_file=parse_file),
- tier_choices=("flash",),
- output_root=tmp_path,
- max_pages=20,
- slot=asyncio.Semaphore(1),
- document_io=DocumentIO(),
- llm_aided_config=_llm_config(title=True, table=True),
- )
- task = asyncio.create_task(
- service.execute(run, ConversionInput(str(source), 0, ""), public_base_url="http://localhost")
- )
- await entered.wait()
- assert order == ["parse", "llm"] and run.state.server_elapsed == 1.25
- release.set()
- outcome = await task
- assert isinstance(outcome, ConversionSuccess)
- assert order == ["parse", "llm", "persist"]
- assert "1.25" in run.state.render() and "部分跨页单元格" in run.state.render()
- assert "### Enhanced title" in outcome.output.artifacts.markdown_path.read_text()
- assert "Enhanced title" in outcome.output.html and "Enhanced title" in outcome.output.structured_json
- assert json.loads(outcome.output.artifacts.middle_json_path.read_text())["pages"][0]["blocks"][0]["level"] == 3
-
- asyncio.run(scenario())
-
-
-def test_configured_app_appends_optional_inputs_without_exposing_key(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
- """实际 Gradio 配置保留原输入顺序、追加可选开关,并且不序列化密钥。"""
- config = _llm_config(title=True, table=True)
- config.api_key = "test-private-credential"
- demo = gradio_app.build_gradio_app(
- SimpleNamespace(),
- V1ServerCapabilities("in-process", ("flash",), ("default",), ("upload",)),
- output_root=tmp_path,
- enable_example=False,
- llm_aided_config=config,
- )
- try:
- convert = next(fn for fn in demo.fns.values() if fn.name == "convert_handler")
- assert len(convert.inputs) == 6
- assert convert.inputs[-2].value is True and convert.inputs[-1].value is True
- assert "mineru-title-leveling" in convert.inputs[-2].elem_classes
- assert "mineru-cell-merge" in convert.inputs[-1].elem_classes
- assert config.api_key not in json.dumps(demo.config, default=str)
- api = demo.get_api_info()["named_endpoints"][f"/{convert.api_name}"]["parameters"]
- assert [parameter["parameter_name"] for parameter in api[-2:]] == ["title_leveling", "cross_page_table_cell_merge"]
- assert all(parameter["parameter_has_default"] and parameter["parameter_default"] is True for parameter in api[-2:])
- received: list[ConversionInput] = []
-
- async def capture(
- self: ConversionService, run: ConversionRun, inputs: ConversionInput, **kwargs: Any
- ) -> ConversionFailure:
- """截取真实 Gradio 预处理后的输入,验证旧四参数调用正确使用新增默认值。"""
- received.append(inputs)
- return ConversionFailure("test request")
-
- monkeypatch.setattr(ConversionService, "execute", capture)
-
- async def api_call() -> None:
- """经官方客户端补默认值、Gradio 参数注入执行一次旧形式调用。"""
- from gradio_client.utils import construct_args
-
- arguments = construct_args(api, (None, 0, "", False), {})
- await demo.process_api(convert, arguments)
-
- asyncio.run(api_call())
- assert received[0].title_leveling is True and received[0].cross_page_table_cell_merge is True
- clear = next(block for block in demo.blocks.values() if block.__class__.__name__ == "ClearButton")
- for event in demo.config["dependencies"]:
- if (clear._id, "click") in event["targets"]:
- assert not set(event["outputs"]) & {component._id for component in convert.inputs[-2:]}
- finally:
- demo.close()
diff --git a/tests/unittest/test_kit_gradio_advanced_options.cjs b/tests/unittest/test_kit_gradio_advanced_options.cjs
deleted file mode 100644
index dce47808..00000000
--- a/tests/unittest/test_kit_gradio_advanced_options.cjs
+++ /dev/null
@@ -1,89 +0,0 @@
-const assert = require("node:assert/strict");
-const fs = require("node:fs");
-const path = require("node:path");
-const vm = require("node:vm");
-const source = fs.readFileSync(path.join(__dirname, "../../mineru/resources/gradio_advanced_options.js"), "utf8");
-const listeners = new Map();
-const timers = new Map();
-let timerId = 0;
-// 最小 DOM 夹具仅模拟自有节点,所有显隐、定时器和定位均执行生产脚本。
-class Element {
- constructor(kind) { this.kind = kind; this.dataset = {}; this.style = {}; this.attrs = {}; this.inert = false; }
- matches(selector) { return this.kind === "trigger" && selector === "button"; }
- closest(selector) {
- if (this.kind === "trigger" && selector.includes(".mineru-advanced-open")) return this;
- if (["panel", "input"].includes(this.kind) && selector.includes(".mineru-advanced-popover")) return panel;
- return null;
- }
- getAttribute(name) { return this.attrs[name] ?? null; }
- setAttribute(name, value) { this.attrs[name] = value; }
- querySelector(selector) { return selector === "input" ? checkbox : null; }
- getBoundingClientRect() {
- return this.kind === "trigger" ? {left: 32, right: 332, top: 700, bottom: 732} : {height: 140};
- }
- focus() { document.activeElement = this; }
-}
-const trigger = new Element("trigger"), panel = new Element("panel"), checkbox = new Element("input");
-checkbox.checked = true;
-const document = {
- activeElement: null,
- querySelector: (selector) => selector === ".mineru-advanced-open" ? trigger : panel,
- addEventListener: (event, callback) => listeners.set(event, callback),
-};
-const window = { innerWidth: 390, innerHeight: 844, addEventListener() {} };
-const context = vm.createContext({
- window, document, Element,
- setTimeout: (callback, delay) => { timers.set(++timerId, {callback, delay}); return timerId; },
- clearTimeout: (id) => timers.delete(id),
-});
-const controller = vm.runInContext(`(${source})`, context)();
-// 推进虚拟悬停时间;已取消定时器不再执行。
-function tick(delay) {
- for (const [id, timer] of [...timers]) if (timer.delay <= delay) {
- timers.delete(id);
- timer.callback();
- }
-}
-// 初始、非适用格式和清除均隐藏入口,且不触碰用户勾选。
-controller.sync();
-assert.equal(trigger.dataset.available, "false");
-assert.equal(panel.inert, true);
-controller.setFile({path: "UPPER.PDF"}, ["pdf", "png"]);
-assert.equal(trigger.dataset.available, "true");
-listeners.get("pointerover")({target: trigger, relatedTarget: null, pointerType: "mouse"});
-tick(120);
-assert.equal(panel.dataset.open, "true");
-assert.equal(trigger.attrs["aria-expanded"], "true");
-assert.equal(panel.inert, false);
-// 窄屏浮窗必须落在视口内。
-assert.ok(parseFloat(panel.style.left) >= 12);
-assert.ok(parseFloat(panel.style.left) + parseFloat(panel.style.width) <= 378);
-assert.ok(parseFloat(panel.style.top) + 140 <= 832);
-// 鼠标经过按钮和浮窗之间的间隙,进入浮窗会取消关闭定时器。
-listeners.get("pointerout")({target: trigger, relatedTarget: null});
-listeners.get("pointerover")({target: panel, relatedTarget: null, pointerType: "mouse"});
-tick(280);
-assert.equal(panel.dataset.open, "true");
-checkbox.checked = false;
-controller.setFile({path: "report.csv"}, ["pdf", "png"]);
-assert.equal(trigger.dataset.available, "false");
-assert.equal(panel.dataset.open, "false");
-assert.equal(checkbox.checked, false);
-controller.setFile("photo.png", ["pdf", "png"]);
-// 触摸不会误触发悬停;键盘点击展开并把焦点移入表单。
-listeners.get("pointerover")({target: trigger, relatedTarget: null, pointerType: "touch"});
-tick(120);
-assert.equal(panel.dataset.open, "false");
-listeners.get("click")({target: trigger, detail: 0});
-assert.equal(panel.dataset.open, "true");
-assert.equal(document.activeElement, checkbox);
-listeners.get("keydown")({key: "Escape"});
-assert.equal(panel.dataset.open, "false");
-assert.equal(document.activeElement, trigger);
-listeners.get("pointerover")({target: trigger, relatedTarget: null, pointerType: "mouse"});
-controller.setFile(null, ["pdf", "png"]);
-tick(280);
-assert.equal(trigger.dataset.available, "false");
-assert.equal(panel.dataset.open, "false");
-assert.equal(checkbox.checked, false);
-console.log("advanced options behavior passed");
diff --git a/tests/unittest/test_kit_gradio_conversion.cjs b/tests/unittest/test_kit_gradio_conversion.cjs
index e7d2ea19..bd771a63 100644
--- a/tests/unittest/test_kit_gradio_conversion.cjs
+++ b/tests/unittest/test_kit_gradio_conversion.cjs
@@ -63,13 +63,6 @@ assert.equal(corrected[0], detailedFailure);
assert.equal(corrected[15].active, false);
assert.ok(skipped(invoke('status', status(failedRun.run_id, 4, true))));
console.log('150 lifecycle iterations passed');
-// 每次提交独立固定增强选择,后续提交不能改写旧票据中的值。
-const optionsTicket = JSON.parse(invoke('begin', false, true)[0]);
-const nextOptions = JSON.parse(invoke('begin', true, false)[0]);
-assert.equal(optionsTicket.title_leveling, false);
-assert.equal(optionsTicket.cross_page_table_cell_merge, true);
-assert.equal(nextOptions.title_leveling, true);
-assert.equal(nextOptions.cross_page_table_cell_merge, false);
// 非安全上下文(纯 HTTP 局域网访问)没有 randomUUID,降级路径仍须产出服务端 uuid.UUID 可接受的票据。
const warns = [];
const insecureInvoke = vm.runInNewContext(`(${script})`, {
diff --git a/tests/unittest/test_kit_gradio_status_timer.cjs b/tests/unittest/test_kit_gradio_status_timer.cjs
index bc6ba292..42a2a1f3 100644
--- a/tests/unittest/test_kit_gradio_status_timer.cjs
+++ b/tests/unittest/test_kit_gradio_status_timer.cjs
@@ -260,12 +260,10 @@ const appContext = vm.createContext({
},
},
stubTimer: () => ({ sync() {}, showPreparing() {} }),
- stubAdvanced: () => ({ sync() {} }),
});
vm.runInContext(resource("gradio_app.js")
.replace("__MINERU_I18N__", "stubI18n")
- .replace("__MINERU_STATUS_TIMER__", "stubTimer")
- .replace("__MINERU_ADVANCED_OPTIONS__", "stubAdvanced"), appContext)();
+ .replace("__MINERU_STATUS_TIMER__", "stubTimer"), appContext)();
while (frames.length) frames.shift()();
const beforeRefresh = localizations;
observer([externalMutation]);