Skip to content

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

fix(gradio): release public runs and preserve final errors

myhloli7eb42b7e4d3a
diff --git a/mineru/kit/gradio/app.py b/mineru/kit/gradio/app.py
index 3571a923..511d7077 100644
--- a/mineru/kit/gradio/app.py
+++ b/mineru/kit/gradio/app.py
@@ -821,7 +821,7 @@ def build_gradio_app(
def failure(message: str) -> tuple[Any, ...]:
"""把输入或输出错误收敛成可轮询的失败终态。"""
- run.publish(f"Failed: {message}")
+ run.publish(f"Failed: {message}", final_failure=True)
return (run.state.render(), *reset_result[1:])
if not file_path:
@@ -935,8 +935,7 @@ def build_gradio_app(
try:
return await execute_conversion(run, file_path, tier_position, raw_page_range, force_ocr, request)
finally:
- if not getattr(request, "session_hash", None):
- conversions.cancel(session, run.run_id)
+ conversions.cancel(session, run.run_id)
convert_outputs = [
status_panel,
diff --git a/mineru/kit/gradio/conversion.py b/mineru/kit/gradio/conversion.py
index f2376734..ba9d0e5b 100644
--- a/mineru/kit/gradio/conversion.py
+++ b/mineru/kit/gradio/conversion.py
@@ -31,9 +31,11 @@ class ConversionRun:
self.state = StatusPanelState(run_id=self.run_id)
self.publish(STATUS_PREPARING_REQUEST)
- def publish(self, message: str | ParseStatusUpdate, *, at: float | None = None) -> None:
- """阶段或耗时变化生成新快照,终态拒绝迟到的后台通知。"""
- if self.cancelled or self.terminal or not self.state.append(message, at=at):
+ def publish(self, message: str | ParseStatusUpdate, *, at: float | None = None, final_failure: bool = False) -> None:
+ """最终错误可补全已有失败快照,成功、取消和迟到通知仍受终态保护。"""
+ text = message.message if isinstance(message, ParseStatusUpdate) else message
+ replace_failure = final_failure and self.state.message.startswith("Failed:") and text.startswith("Failed:")
+ if self.cancelled or (self.terminal and not replace_failure) or not self.state.append(message, at=at):
return
self.terminal = self.state.message == STATUS_COMPLETED or self.state.message.startswith("Failed:")
self.snapshot = json.dumps(
diff --git a/tests/unittest/test_kit_gradio_conversion.cjs b/tests/unittest/test_kit_gradio_conversion.cjs
index 5f25da6c..bb32e016 100644
--- a/tests/unittest/test_kit_gradio_conversion.cjs
+++ b/tests/unittest/test_kit_gradio_conversion.cjs
@@ -53,4 +53,12 @@ for (let index = 0; index < 150; index++) {
assert.ok(skipped(invoke('status', status(third.run_id, 3))));
assert.ok(skipped(invoke('status', status(third.run_id, 4, true))));
}
+// 通用失败快照已停止轮询时,更高序号的具体错误回执仍必须应用。
+const failedRun = JSON.parse(invoke('begin')[0]);
+invoke('status', status(failedRun.run_id, 2, true));
+const detailedFailure = 'Failed: page_range_invalid: requested page does not exist';
+const corrected = invoke('result', result(failedRun.run_id, 3, detailedFailure));
+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');
diff --git a/tests/unittest/test_kit_gradio_conversion.py b/tests/unittest/test_kit_gradio_conversion.py
index 8f27a6dd..f1b52af1 100644
--- a/tests/unittest/test_kit_gradio_conversion.py
+++ b/tests/unittest/test_kit_gradio_conversion.py
@@ -17,7 +17,9 @@ from urllib.parse import unquote
import pytest
from mineru.kit.gradio import app as gradio_app
-from mineru.kit.gradio.client import V1ServerCapabilities
+from mineru.kit.gradio.client import V1ArtifactError, V1ServerCapabilities
+from mineru.kit.gradio.conversion import ConversionRun, SessionConversions
+from mineru.kit.gradio.status import STATUS_COMPLETED, STATUS_PROCESSING_ON_SERVER
from mineru.parser.base import ParseResult
from tests.unittest.test_kit_gradio import _middle_json, _pdf_bytes
@@ -42,6 +44,154 @@ def _ticket(index: int) -> str:
return json.dumps({"run_id": f"{index:032x}", "revision": index})
+def _conversions(app: Any) -> SessionConversions:
+ """读取公开回调持有的注册表,验证请求结束后的资源所有权。"""
+ return inspect.getclosurevars(_callback(app, "convert_handler")).nonlocals["conversions"]
+
+
[email protected]("with_session", [False, True])
[email protected]("outcome", ["success", "input_error", "parse_error", "cancelled"])
+def test_public_conversion_releases_runs(tmp_path: Path, with_session: bool, outcome: str) -> None:
+ """公开请求的所有退出路径都释放任务,成功响应中的素材仍能独立下载。"""
+ source = tmp_path / "source.pdf"
+ source.write_bytes(_pdf_bytes())
+ client = SimpleNamespace(parse_file=AsyncMock(return_value=ParseResult(middle_json=_middle_json(with_image=False))))
+ if outcome == "parse_error":
+ client.parse_file.side_effect = V1ArtifactError("controlled failure")
+ elif outcome == "cancelled":
+ client.parse_file.side_effect = asyncio.CancelledError()
+ app = _application(tmp_path, client)
+ convert = _callback(app, "convert_handler")
+ downloader = _callback(app, "handler")
+ conversions = _conversions(app)
+
+ async def scenario() -> None:
+ """连续使用不同 API 会话,确认注册表不会随请求数量增长。"""
+ for index in range(3):
+ request = SimpleNamespace(session_hash=f"api-{index}") if with_session else None
+ response = await convert(None if outcome == "input_error" else str(source), 0, "", False, request)
+ assert len(response) == 16
+ assert conversions.runs == {}
+ assert conversions.revisions == {}
+ if outcome == "success":
+ state = response[6]
+ assert state and Path(state["root"]).is_dir()
+ path, receipt = downloader(state, json.dumps({"run_id": response[7]}), request)
+ assert path and Path(path).is_file() and not json.loads(receipt)["error"]
+ elif outcome != "cancelled":
+ assert "Failed:" in response[0] and response[6] is None
+
+ asyncio.run(scenario())
+
+
+def test_public_cleanup_preserves_replacement_ui_run(tmp_path: Path) -> None:
+ """旧公开请求结束时只清理自身,不能删除同会话的新浏览器任务。"""
+ source = tmp_path / "source.pdf"
+ source.write_bytes(_pdf_bytes())
+ first_started, second_started, release = asyncio.Event(), asyncio.Event(), asyncio.Event()
+ calls = 0
+
+ async def parse_file(*_args: Any, **_kwargs: Any) -> ParseResult:
+ """让旧请求等待取消,新任务保持运行直到检查完旧请求的清理。"""
+ nonlocal calls
+ calls += 1
+ if calls == 1:
+ first_started.set()
+ await asyncio.Future()
+ second_started.set()
+ await release.wait()
+ return ParseResult(middle_json=_middle_json(with_image=False))
+
+ app = _application(tmp_path, SimpleNamespace(parse_file=parse_file))
+ public, ui, poll = (_callback(app, name) for name in ("convert_handler", "convert_ui", "read_conversion_status"))
+ request = SimpleNamespace(session_hash="replacement")
+
+ async def scenario() -> None:
+ """以真实回调触发替换,并验证新任务完成后的快照仍可轮询。"""
+ first = asyncio.create_task(public(str(source), 0, "", False, request))
+ second = None
+ try:
+ await asyncio.wait_for(first_started.wait(), 3)
+ second = asyncio.create_task(ui(str(source), 0, "", False, _ticket(1), request))
+ await asyncio.wait_for(second_started.wait(), 3)
+ await asyncio.wait_for(first, 3)
+ assert _conversions(app).current("replacement", f"{1:032x}") is not None
+ assert not second.done()
+ release.set()
+ receipt = json.loads(await asyncio.wait_for(second, 3))
+ snapshot = json.loads(poll(_ticket(1), request))
+ assert snapshot["terminal"] and snapshot["sequence"] == receipt["sequence"]
+ assert "Completed" in receipt["outputs"][0]
+ finally:
+ release.set()
+ first.cancel()
+ if second is not None:
+ second.cancel()
+ await asyncio.gather(first, *([second] if second is not None else []), return_exceptions=True)
+
+ asyncio.run(scenario())
+
+
[email protected]("status", ["failed", "canceled"])
[email protected]("browser", [False, True])
+def test_final_error_replaces_provisional_failure(tmp_path: Path, status: str, browser: bool) -> None:
+ """失败通知先到达时,公开响应和浏览器回执仍包含最终错误详情。"""
+ source = tmp_path / "source.pdf"
+ source.write_bytes(_pdf_bytes())
+ provisional = f"Failed: server task {status}"
+ detail = "page_range_invalid: requested page does not exist"
+
+ async def parse_file(*_args: Any, status_callback: Any, **_kwargs: Any) -> ParseResult:
+ """模拟 HTTP 客户端关闭时让出事件循环,确保通用失败先被发布。"""
+ status_callback(provisional)
+ await asyncio.sleep(0)
+ raise V1ArtifactError(detail, code="page_range_invalid")
+
+ app = _application(tmp_path, SimpleNamespace(parse_file=parse_file))
+ request = SimpleNamespace(session_hash="failure-detail")
+
+ async def scenario() -> None:
+ """最终回执可覆盖已到达的失败快照,随后普通通知不能覆盖错误。"""
+ if browser:
+ receipt = json.loads(await _callback(app, "convert_ui")(str(source), 0, "", False, _ticket(1), request))
+ response = receipt["outputs"]
+ run = _conversions(app).runs[request.session_hash]
+ assert detail in run.snapshot and run.state.message == f"Failed: {detail}"
+ snapshot = json.loads(_callback(app, "read_conversion_status")(_ticket(1), request))
+ assert snapshot["sequence"] == receipt["sequence"] and snapshot["terminal"]
+ run.publish(provisional)
+ assert run.state.message == f"Failed: {detail}"
+ else:
+ response = await _callback(app, "convert_handler")(str(source), 0, "", False, request)
+ assert detail in response[0] and "server task" not in response[0]
+ assert response[6] == ("" if browser else None)
+
+ asyncio.run(scenario())
+
+
[email protected]("terminal", ["failed", "completed", "cancelled"])
+def test_final_failure_respects_terminal_boundaries(terminal: str) -> None:
+ """明确的最终失败只能替换失败,成功和取消终态仍拒绝任何更新。"""
+ run = ConversionRun("terminal-boundary")
+ if terminal == "cancelled":
+ run.cancel()
+ else:
+ run.publish("Failed: provisional" if terminal == "failed" else STATUS_COMPLETED)
+ previous_snapshot = run.snapshot
+ previous_sequence = run.state.sequence
+ run.publish("Failed: final detail", final_failure=True)
+ if terminal == "failed":
+ assert run.state.message == "Failed: final detail"
+ assert run.state.sequence == previous_sequence + 1
+ assert json.loads(run.snapshot)["terminal"]
+ else:
+ assert run.snapshot == previous_snapshot and run.state.sequence == previous_sequence
+ final_snapshot = run.snapshot
+ run.publish(STATUS_PROCESSING_ON_SERVER, final_failure=True)
+ run.publish("Failed: late callback")
+ assert run.snapshot == final_snapshot
+
+
def test_frontend_conversion_receipts() -> None:
"""执行真实前端脚本,覆盖迟到状态、清除、失败和重复回执。"""
node = shutil.which("node")