Skip to content

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

Route Office metafiles through metafile-render 0.3 at 200 DPI

myhloli23d6e51185b1
diff --git a/mineru/model/flash/office/image.py b/mineru/model/flash/office/image.py
index 0fd119b1..61915747 100644
--- a/mineru/model/flash/office/image.py
+++ b/mineru/model/flash/office/image.py
@@ -12,7 +12,6 @@ from loguru import logger
from metafile_render import MetafileError, MetafileResourceLimitError, render_metafile
from PIL import Image, ImageDraw, ImageFont, UnidentifiedImageError
-from ....utils.platform import is_windows_environment
from .._shared.image import image_to_b64str
VECTOR_IMAGE_FORMATS = frozenset({"WMF", "EMF"})
@@ -27,12 +26,12 @@ VECTOR_IMAGE_CONTENT_TYPES = frozenset(
}
)
PIL_IMAGE_LOAD_ERRORS = (UnidentifiedImageError, OSError, SyntaxError)
-VECTOR_IMAGE_RENDER_DPI: Final = 144
+VECTOR_IMAGE_RENDER_DPI: Final = 200
STANDARD_VECTOR_PLACEHOLDER_SIZE: Final = (320, 180)
STANDARD_VECTOR_PLACEHOLDER_LINES: Final = (
"WMF/EMF placeholder",
- "Use Windows to parse",
- "the original image",
+ "Metafile preview unavailable",
+ "See the original document",
)
@@ -166,22 +165,6 @@ def get_standard_vector_placeholder_data_uri() -> str:
return _standard_vector_placeholder_data_uri()
-def serialize_vector_image_with_placeholder(pil_image: Image.Image, image_format_override: str | None = None) -> str:
- """在支持的平台序列化矢量图,失败或不支持时返回标准占位图。"""
- image_format = (image_format_override or getattr(pil_image, "format", None) or "WMF/EMF").upper()
-
- if is_windows_environment():
- try:
- pil_image.load(dpi=VECTOR_IMAGE_RENDER_DPI)
- return image_to_b64str(pil_image, image_format="PNG")
- except PIL_IMAGE_LOAD_ERRORS as e:
- logger.warning(f"Failed to render {image_format} image: {e}, size: {pil_image.size}. Using placeholder instead.")
- else:
- logger.warning(f"Skipping {image_format} image on non-Windows environment, size: {pil_image.size}")
-
- return get_standard_vector_placeholder_data_uri()
-
-
def serialize_vector_part_with_placeholder(
part_name: object | None = None,
content_type: str | None = None,
@@ -196,29 +179,18 @@ def serialize_vector_part_with_placeholder(
return get_standard_vector_placeholder_data_uri()
-def _serialize_native_metafile(image_data: bytes, image_format: str) -> str | None:
- """在 Windows 上优先调用 Pillow/GDI 渲染原始 WMF/EMF。"""
- try:
- pil_image = Image.open(BytesIO(image_data))
- pil_image.load(dpi=VECTOR_IMAGE_RENDER_DPI)
- return image_to_b64str(pil_image, image_format="PNG")
- except PIL_IMAGE_LOAD_ERRORS as exc:
- logger.warning(f"Native Windows rendering failed for {image_format}: {exc}.")
- return None
-
-
-def _render_size_from_emu(render_size_emu: tuple[int, int] | None) -> tuple[int, int] | None:
- """把 OfficeArt ptSize 的 EMU 尺寸转换为 144 DPI 像素提示。"""
+def _render_size_from_emu(render_size_emu: tuple[int, int] | None, *, dpi: int) -> tuple[int, int] | None:
+ """把 OfficeArt ptSize 的 EMU 尺寸按指定 DPI 转换为像素提示。"""
if render_size_emu is None or render_size_emu[0] <= 0 or render_size_emu[1] <= 0:
return None
emu_per_inch = 914_400
return (
- max(1, round(render_size_emu[0] * VECTOR_IMAGE_RENDER_DPI / emu_per_inch)),
- max(1, round(render_size_emu[1] * VECTOR_IMAGE_RENDER_DPI / emu_per_inch)),
+ max(1, round(render_size_emu[0] * dpi / emu_per_inch)),
+ max(1, round(render_size_emu[1] * dpi / emu_per_inch)),
)
-def _serialize_cross_platform_metafile(
+def _serialize_metafile(
image_data: bytes,
image_format: str,
*,
@@ -231,6 +203,7 @@ def _serialize_cross_platform_metafile(
output_format="svg",
dpi=VECTOR_IMAGE_RENDER_DPI,
size_hint=size_hint,
+ backend="auto",
)
except MetafileResourceLimitError as exc:
logger.warning(f"Generated {image_format} SVG cannot be consumed safely: {exc}. Falling back to PNG.")
@@ -240,6 +213,7 @@ def _serialize_cross_platform_metafile(
output_format="png",
dpi=VECTOR_IMAGE_RENDER_DPI,
size_hint=size_hint,
+ backend="auto",
)
except MetafileError as png_exc:
logger.warning(
@@ -285,29 +259,29 @@ def serialize_office_image(
"Using placeholder instead."
)
return serialize_vector_part_with_placeholder(part_name, content_type)
- rendered = _serialize_cross_platform_metafile(
+ rendered = _serialize_metafile(
image_data,
image_format,
- size_hint=_render_size_from_emu(render_size_emu),
+ size_hint=_render_size_from_emu(render_size_emu, dpi=VECTOR_IMAGE_RENDER_DPI),
)
if rendered is not None:
return rendered
- if is_windows_environment():
- native = _serialize_native_metafile(image_data, image_format)
- if native is not None:
- return native
return serialize_vector_part_with_placeholder(part_name, content_type)
try:
pil_image = Image.open(BytesIO(image_data))
+ if is_vector_image(pil_image):
+ rendered = _serialize_metafile(
+ image_data,
+ str(pil_image.format),
+ size_hint=_render_size_from_emu(render_size_emu, dpi=VECTOR_IMAGE_RENDER_DPI),
+ )
+ return rendered if rendered is not None else get_standard_vector_placeholder_data_uri()
pil_image.load()
except PIL_IMAGE_LOAD_ERRORS as e:
logger.warning(f"Warning: image cannot be loaded by Pillow: {e}, part_name={part_name}, content_type={content_type}")
return None
- if is_vector_image(pil_image):
- return serialize_vector_image_with_placeholder(pil_image)
-
if pil_image.mode == "RGB":
return image_to_b64str(pil_image, image_format="JPEG")
diff --git a/pyproject.toml b/pyproject.toml
index ffb22e19..c88db4ad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,7 +39,7 @@ classifiers = [
]
dependencies = [
"mineru-vl-utils>=1.2.1,<2",
- "metafile-render>=0.1.0,<1.0.0",
+ "metafile-render>=0.3.0,<1.0.0",
"mineru-llama-cpp>=0.1.0,<1",
"click>=8.1.7",
"loguru>=0.7.2",
diff --git a/tests/unittest/test_emfplus_integration.py b/tests/unittest/test_emfplus_integration.py
index 97ac4a51..30daf80a 100644
--- a/tests/unittest/test_emfplus_integration.py
+++ b/tests/unittest/test_emfplus_integration.py
@@ -1,8 +1,7 @@
-"""验证 metafile-render 0.2 的 Only 图片经 Office 解析与四种消费者输出。"""
+"""验证 metafile-render 0.3 的 Only 图片经 Office 解析与四种消费者输出。"""
from __future__ import annotations
-from importlib.metadata import version
from io import BytesIO
from pathlib import Path
from unittest.mock import Mock
@@ -10,7 +9,6 @@ from zipfile import ZipFile
import pytest
from _office_image_mtef_test_utils import build_image_docx
-from packaging.version import Version
from PIL import Image
from pypdf import PdfReader
@@ -18,17 +16,12 @@ from mineru.backend.analyze import doc_analyze
from mineru.model.flash.office import image as office_image
from mineru.render import render_docx, render_epub, render_html, render_pdf
-pytestmark = pytest.mark.skipif(
- Version(version("metafile-render")) < Version("0.2.0"),
- reason="EMF+ Only feature validation requires metafile-render 0.2.0; 0.1 remains a valid base dependency",
-)
_FIXTURES = Path(__file__).parent / "fixtures" / "emfplus"
@pytest.mark.parametrize("scene", ["geometry", "fallback"])
def test_only_docx_flows_into_html_docx_pdf_epub(scene: str, monkeypatch: pytest.MonkeyPatch) -> None:
"""真实 Only 图片经 DOCX 解析进入全部消费端,安全 SVG 仍可提取 PNG fallback。"""
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
package = build_image_docx((_FIXTURES / f"{scene}-only.emf").read_bytes())
middle, _ = doc_analyze(package, effort="flash", image_analysis=False, file_suffix="docx")
html = render_html(middle)
@@ -49,7 +42,6 @@ def test_only_partial_reports_diagnostics_and_keeps_image(monkeypatch: pytest.Mo
"""样式近似的 Only 仍输出 SVG,并把部分结果诊断交给 Office 日志。"""
warning = Mock()
monkeypatch.setattr(office_image.logger, "warning", warning)
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
result = office_image.serialize_office_image((_FIXTURES / "fallback-only.emf").read_bytes())
assert result is not None and result.startswith("data:image/svg+xml;base64,")
assert any(
@@ -59,6 +51,5 @@ def test_only_partial_reports_diagnostics_and_keeps_image(monkeypatch: pytest.Mo
def test_broken_only_uses_existing_placeholder(monkeypatch: pytest.MonkeyPatch) -> None:
"""签名有效但损坏的 Only 文件沿用原有失败兜底。"""
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
data = (_FIXTURES / "geometry-only.emf").read_bytes()[:48]
assert office_image.serialize_office_image(data) == office_image.get_standard_vector_placeholder_data_uri()
diff --git a/tests/unittest/test_flash_office_metafile.py b/tests/unittest/test_flash_office_metafile.py
index 9977728c..c614ff16 100644
--- a/tests/unittest/test_flash_office_metafile.py
+++ b/tests/unittest/test_flash_office_metafile.py
@@ -130,16 +130,15 @@ def test_oversized_generated_svg_degrades_to_png_for_office_consumers(monkeypatc
png = render_metafile(data, output_format="png")
render = Mock(side_effect=[MetafileResourceLimitError("generated SVG exceeds budget"), png])
monkeypatch.setattr(office_image, "render_metafile", render)
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
data_uri = office_image.serialize_office_image(data, part_name="image.emf", content_type="image/emf")
assert data_uri is not None
assert data_uri.startswith("data:image/png;base64,")
assert [call.kwargs["output_format"] for call in render.call_args_list] == ["svg", "png"]
+ assert all(call.kwargs["dpi"] == 200 and call.kwargs["backend"] == "auto" for call in render.call_args_list)
-def test_non_windows_office_serializer_returns_generated_svg(monkeypatch: pytest.MonkeyPatch) -> None:
- """验证非 Windows Office 图片入口返回安全 SVG 和 PNG fallback。"""
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
+def test_office_serializer_returns_generated_svg(monkeypatch: pytest.MonkeyPatch) -> None:
+ """验证 Office 图片入口返回安全 SVG 和 PNG fallback。"""
data_uri = office_image.serialize_office_image(
build_emf(_basic_emf_records()),
part_name="/word/media/image1.emf",
@@ -148,14 +147,13 @@ def test_non_windows_office_serializer_returns_generated_svg(monkeypatch: pytest
assert data_uri is not None
fallback, logical_size, svg = _svg_data_uri_fallback(data_uri)
- assert logical_size == (144, 144)
+ assert logical_size == (200, 200)
assert fallback.getbbox() is not None
assert b"<path" in svg
def test_officeart_emu_size_controls_standard_wmf_output(monkeypatch: pytest.MonkeyPatch) -> None:
"""验证无 placeable header 的 OfficeArt WMF 使用 ptSize EMU 定标。"""
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
standard_wmf = basic_wmf()[22:]
data_uri = office_image.serialize_office_image(
standard_wmf,
@@ -166,8 +164,8 @@ def test_officeart_emu_size_controls_standard_wmf_output(monkeypatch: pytest.Mon
assert data_uri is not None
fallback, logical_size, _svg = _svg_data_uri_fallback(data_uri)
- assert logical_size == (144, 72)
- assert fallback.size == (288, 144)
+ assert logical_size == (200, 100)
+ assert fallback.size == (400, 200)
def test_officeart_metafile_header_preserves_payload_and_emu_size() -> None:
@@ -194,21 +192,18 @@ def test_officeart_metafile_header_preserves_payload_and_emu_size() -> None:
assert decoded.render_size_emu == (914_400, 457_200)
-def test_windows_office_serializer_prefers_svg_then_uses_native_fallback(monkeypatch: pytest.MonkeyPatch) -> None:
- """验证 Windows 优先保留 SVG,并在引擎失败时调用原生 GDI。"""
+def test_office_serializer_uses_only_library_backend(monkeypatch: pytest.MonkeyPatch) -> None:
+ """所有平台都只调用独立库,失败后直接使用占位图。"""
data = build_emf(_basic_emf_records())
- native = Mock(return_value="data:image/png;base64,native")
generated = Mock(return_value="data:image/svg+xml;base64,generated")
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: True)
- monkeypatch.setattr(office_image, "_serialize_native_metafile", native)
- monkeypatch.setattr(office_image, "_serialize_cross_platform_metafile", generated)
-
+ pillow_open = Mock(side_effect=AssertionError("MinerU must not render metafiles with Pillow"))
+ monkeypatch.setattr(office_image, "_serialize_metafile", generated)
+ monkeypatch.setattr(office_image.Image, "open", pillow_open)
+ monkeypatch.setattr(office_image, "get_standard_vector_placeholder_data_uri", lambda: "placeholder")
assert office_image.serialize_office_image(data) == "data:image/svg+xml;base64,generated"
- native.assert_not_called()
-
generated.return_value = None
- assert office_image.serialize_office_image(data) == "data:image/png;base64,native"
- native.assert_called_once()
+ assert office_image.serialize_office_image(data) == "placeholder"
+ pillow_open.assert_not_called()
def test_pptx_picture_path_uses_cross_platform_metafile_renderer(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -221,7 +216,6 @@ def test_pptx_picture_path_uses_cross_platform_metafile_renderer(monkeypatch: py
return data, "image/x-emf"
monkeypatch.setattr(converter, "_get_shape_image_data", fake_image_data)
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
converter._handle_pictures(object())
assert converter.cur_page[0]["image_base64"].startswith("data:image/svg+xml;base64,")
@@ -235,7 +229,6 @@ def test_xlsx_wps_cell_image_uses_cross_platform_metafile_renderer(monkeypatch:
converter = XlsxConverter()
converter.zf = ZipFile(BytesIO(package.getvalue()))
converter.cell_image_map = {"image-id": "media/image1.emf"}
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
try:
html = converter._resolve_cell_image('DISPIMG("image-id")')
finally:
@@ -259,7 +252,6 @@ def test_modern_office_models_emit_rendered_emf_svg(
monkeypatch: pytest.MonkeyPatch,
) -> None:
"""验证 DOCX/PPTX/XLSX 完整模型链都产出安全 EMF SVG。"""
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
package = builder(build_emf(_basic_emf_records())) # type: ignore[operator]
pages = model.predict(BytesIO(package)) # type: ignore[attr-defined]
images = _collect_image_data_uris(pages)
@@ -267,7 +259,7 @@ def test_modern_office_models_emit_rendered_emf_svg(
assert images
assert all(image.startswith("data:image/svg+xml;base64,") for image in images)
_fallback, logical_size, _svg = _svg_data_uri_fallback(images[0])
- assert logical_size == (144, 144)
+ assert logical_size == (200, 200)
@pytest.mark.parametrize(
@@ -285,20 +277,18 @@ def test_legacy_office_models_emit_rendered_wmf_svg(
monkeypatch: pytest.MonkeyPatch,
) -> None:
"""验证 DOC/PPT/XLS 的 OfficeArt/PICF WMF 预览进入跨平台 SVG。"""
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
pages = model.predict(BytesIO(builder(basic_wmf()))) # type: ignore[attr-defined,operator]
images = _collect_image_data_uris(pages)
assert images
assert all(image.startswith("data:image/svg+xml;base64,") for image in images)
fallback, logical_size, _svg = _svg_data_uri_fallback(images[0])
- assert logical_size == (144, 144)
- assert fallback.size == (288, 288)
+ assert logical_size == (200, 200)
+ assert fallback.size == (400, 400)
def test_rtf_model_emf_picture_emits_rendered_svg(monkeypatch: pytest.MonkeyPatch) -> None:
"""验证 RTF emfblip 从 pict 捕获一路进入跨平台 SVG。"""
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
emf = build_emf(_basic_emf_records())
rtf = b"{\\rtf1 before {\\pict\\emfblip " + emf.hex().encode("ascii") + b"} after\\par}"
images = _collect_image_data_uris(RtfModel().predict(BytesIO(rtf)))
@@ -322,10 +312,22 @@ def test_odf_models_emit_rendered_emf_svg(
monkeypatch: pytest.MonkeyPatch,
) -> None:
"""验证 ODT/ODS/ODP 包内 WMF/EMF 图片都复用统一渲染入口。"""
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: False)
package = builder() # type: ignore[operator]
package = _replace_zip_member(package, "Pictures/pixel.png", build_emf(_basic_emf_records()))
images = _collect_image_data_uris(model.predict(BytesIO(package))) # type: ignore[attr-defined]
assert images
assert all(image.startswith("data:image/svg+xml;base64,") for image in images)
+
+
+def test_pillow_identified_metafile_is_routed_before_load(monkeypatch: pytest.MonkeyPatch) -> None:
+ """由 Pillow 补充识别的矢量图也交给库处理,禁止触发 MinerU 内部原生加载。"""
+ image = Mock(format="WMF")
+ generated = Mock(return_value="data:image/svg+xml;base64,generated")
+ monkeypatch.setattr(office_image.Image, "open", Mock(return_value=image))
+ monkeypatch.setattr(office_image, "_serialize_metafile", generated)
+ data = b"identified-by-pillow"
+ result = office_image.serialize_office_image(data, render_size_emu=(914400, 457200))
+ assert result == "data:image/svg+xml;base64,generated"
+ generated.assert_called_once_with(data, "WMF", size_hint=(200, 100))
+ image.load.assert_not_called()
diff --git a/tests/unittest/test_office_parser_regressions.py b/tests/unittest/test_office_parser_regressions.py
index 7da3e9dd..2d67d6be 100644
--- a/tests/unittest/test_office_parser_regressions.py
+++ b/tests/unittest/test_office_parser_regressions.py
@@ -1,5 +1,4 @@
from pathlib import Path
-from unittest.mock import Mock
from pytest import MonkeyPatch
@@ -46,18 +45,11 @@ def test_vector_image_part_skip_log_is_debug(monkeypatch: MonkeyPatch) -> None:
assert fake_logger.warning_messages == []
-def test_vector_image_windows_render_uses_144_dpi(monkeypatch: MonkeyPatch) -> None:
- """验证 Windows 下 WMF/EMF 统一按 144 DPI 栅格化。"""
-
- fake_image = Mock(format="WMF", size=(640, 360))
- fake_encoder = Mock(return_value="data:image/png;base64,rendered")
- monkeypatch.setattr(office_image, "is_windows_environment", lambda: True)
- monkeypatch.setattr(office_image, "image_to_b64str", fake_encoder)
-
- assert office_image.serialize_vector_image_with_placeholder(fake_image) == "data:image/png;base64,rendered"
- fake_image.load.assert_called_once_with(dpi=office_image.VECTOR_IMAGE_RENDER_DPI)
- fake_encoder.assert_called_once_with(fake_image, image_format="PNG")
- assert office_image.VECTOR_IMAGE_RENDER_DPI == 144
+def test_vector_image_emu_size_uses_200_dpi() -> None:
+ """验证统一入口使用 200 DPI,并显式传递 EMU 换算分辨率。"""
+ assert office_image.VECTOR_IMAGE_RENDER_DPI == 200
+ assert office_image._render_size_from_emu((914400, 457200), dpi=200) == (200, 100)
+ assert office_image._render_size_from_emu((914400, 457200), dpi=144) == (144, 72)
def test_docx_nested_ordered_lists_render_with_local_markers() -> None:
@@ -70,7 +62,9 @@ def test_docx_nested_ordered_lists_render_with_local_markers() -> None:
end_marker = " - 本合同一式四份,省政府采购中心各一份"
end = markdown.index(end_marker, start) + len(end_marker)
- assert markdown[start:end] == r"""1. 如有未尽事宜,由双方依法订立[补充合同](https://github.com/opendatalab/MinerU)。
+ assert (
+ markdown[start:end]
+ == r"""1. 如有未尽事宜,由双方依法订立[补充合同](https://github.com/opendatalab/MinerU)。
2. 本合同双方应加盖骑缝章。
- 本合同一式四份,自双方签章并经省政府采购中心审核编号后生效。
- 甲方、乙方、政府采购管理部门、<u>___广东__</u>省政府采购中心各一份
@@ -85,3 +79,4 @@ def test_docx_nested_ordered_lists_render_with_local_markers() -> None:
2. 合同一式四份,采购管理部门各一份
4. 文本[超链接](https://github.com/opendatalab/MinerU)支持,由双方依法订立补充公式$x=\frac{-b\pm \sqrt{b^{2}-4ac}}{2a}$
- 本合同一式四份,省政府采购中心各一份"""
+ )