feat: add return_word_box option and simplify progress checkpoints
Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
+28
-11
@@ -12,11 +12,11 @@ class FakeOCR:
|
||||
|
||||
def recognize(self, _: Path, on_progress=None) -> list[dict]:
|
||||
for percent, message in (
|
||||
(5, "开始推理"),
|
||||
(10, "模型已就绪"),
|
||||
(20, "图片已解码,开始文字检测"),
|
||||
(50, "文字检测完成"),
|
||||
(80, "文字识别完成"),
|
||||
(5, "任务开始"),
|
||||
(10, "模型就绪"),
|
||||
(20, "图片就绪"),
|
||||
(50, "框识别完成"),
|
||||
(80, "文本识别完成"),
|
||||
):
|
||||
self.progress.append(percent)
|
||||
if on_progress is not None:
|
||||
@@ -101,6 +101,23 @@ def test_ocr_service_resolves_threads_and_stores_mkldnn() -> None:
|
||||
assert plain._enable_mkldnn is False
|
||||
|
||||
|
||||
def test_build_document_preserves_word_boxes() -> None:
|
||||
recognized = [
|
||||
{
|
||||
"text": "姓名:万镭",
|
||||
"confidence": 0.99,
|
||||
"polygon": [[0, 0], [100, 0], [100, 20], [0, 20]],
|
||||
"words": [
|
||||
[[0, 0], [50, 0], [50, 20], [0, 20]],
|
||||
[[50, 0], [100, 0], [100, 20], [50, 20]],
|
||||
],
|
||||
}
|
||||
]
|
||||
document = OCRTaskQueue.build_document(recognized)
|
||||
|
||||
assert document.polygon["text1"].words == recognized[0]["words"]
|
||||
|
||||
|
||||
def test_document_rows_groups_by_coordinates() -> None:
|
||||
"""行文本按坐标(bbox 纵向重叠)归并,供字段抽取的 row 选项使用。"""
|
||||
recognized = [
|
||||
@@ -128,12 +145,12 @@ def test_progress_is_monotonic_and_includes_checkpoints() -> None:
|
||||
seen: list[int] = []
|
||||
service._progress_callback = lambda percent, message: seen.append(percent)
|
||||
|
||||
service._emit_progress(5, "开始推理")
|
||||
service._emit_progress(10, "模型已就绪")
|
||||
service._emit_progress(20, "图片已解码")
|
||||
service._emit_progress(5, "任务开始")
|
||||
service._emit_progress(10, "模型就绪")
|
||||
service._emit_progress(20, "图片就绪")
|
||||
service._emit_progress(10, "重复的低进度应被忽略")
|
||||
service._emit_progress(50, "文字检测完成")
|
||||
service._emit_progress(80, "文字识别完成")
|
||||
service._emit_progress(100, "识别完成")
|
||||
service._emit_progress(50, "框识别完成")
|
||||
service._emit_progress(80, "文本识别完成")
|
||||
service._emit_progress(100, "完成")
|
||||
|
||||
assert seen == [5, 10, 20, 50, 80, 100]
|
||||
|
||||
Reference in New Issue
Block a user