docvortex 0.4.3__tar.gz → 0.4.5__tar.gz

{docvortex-0.4.3/src/docvortex.egg-info → docvortex-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docvortex
-Version: 0.4.3
+Version: 0.4.5
 Summary: A fast, multi-format document parsing and conversion engine
 License-Expression: MIT
 Project-URL: Repository, https://github.com/myhloli/DocVortex
@@ -36,13 +36,14 @@ Requires-Dist: pylatexenc<3,>=2.10
 Requires-Dist: latex2mathml<4,>=3.81.0
 Requires-Dist: mathml2omml==0.0.2
 Requires-Dist: resvg_py<0.6,>=0.5.0
-Requires-Dist: reportlab
+Requires-Dist: reportlab[accel]
 Requires-Dist: ziamath<0.14,>=0.13
 Requires-Dist: magika<1.1.0,>=0.6.2
 Requires-Dist: opencv-python>=4.11.0.86
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-xdist<4,>=3.8; extra == "test"
 Requires-Dist: markdown; extra == "test"
 Requires-Dist: jsonschema<5,>=4; extra == "test"
 Provides-Extra: dev
@@ -182,7 +183,7 @@ reads metadata without parsing the document body.
 
 - **Text PDFs:** native parsing uses the document's existing text and structure. Scanned pages requiring OCR need an external OCR or inference service.
 - **PDF classification:** `docvortex classify report.pdf` returns `txt` or `ocr`. Classification is explicit and does not start inference; parsing does not automatically switch backends.
-- **PDF export:** PDF sources with page geometry default to block layout restoration, with selectable text and region images for tables/charts. Other sources and older results use semantic reflow. Use `--pdf-layout original|reflow` to select explicitly; fonts, line breaks and drawing instructions are not reproduced losslessly. See [PDF output layout](docs/USAGE.md#pdf-output-layout).
+- **PDF export:** PDF sources with page geometry default to block layout restoration, with selectable text and HTML-based tables; charts retain region images. Other sources and older results use semantic reflow. Use `--pdf-layout original|reflow` to select explicitly; fonts, line breaks and drawing instructions are not reproduced losslessly. See [PDF output layout](docs/USAGE.md#pdf-output-layout).
 
 ## Documentation
 

{docvortex-0.4.3 → docvortex-0.4.5}/README.md

@@ -129,7 +129,7 @@ reads metadata without parsing the document body.
 
 - **Text PDFs:** native parsing uses the document's existing text and structure. Scanned pages requiring OCR need an external OCR or inference service.
 - **PDF classification:** `docvortex classify report.pdf` returns `txt` or `ocr`. Classification is explicit and does not start inference; parsing does not automatically switch backends.
-- **PDF export:** PDF sources with page geometry default to block layout restoration, with selectable text and region images for tables/charts. Other sources and older results use semantic reflow. Use `--pdf-layout original|reflow` to select explicitly; fonts, line breaks and drawing instructions are not reproduced losslessly. See [PDF output layout](docs/USAGE.md#pdf-output-layout).
+- **PDF export:** PDF sources with page geometry default to block layout restoration, with selectable text and HTML-based tables; charts retain region images. Other sources and older results use semantic reflow. Use `--pdf-layout original|reflow` to select explicitly; fonts, line breaks and drawing instructions are not reproduced losslessly. See [PDF output layout](docs/USAGE.md#pdf-output-layout).
 
 ## Documentation
 

{docvortex-0.4.3 → docvortex-0.4.5}/docs/JSON_PROTOCOL.md

@@ -113,8 +113,9 @@ when selecting a subset of an existing result.
 Pages may also contain `image_rotations`, such as `{"3":270}`: keys are source
 block indices encoded as strings, and values are the 0/90/180/270-degree angles
 used to turn region crops upright. The original-layout renderer reverses this
-crop transform when placing the image. This preserves rotated table images
-without duplicating image data or adding rotated-text reconstruction.
+crop transform when placing the image. Structured HTML tables use the same angle
+to restore the source orientation after layout in upright coordinates. No extra
+image data or schema fields are required.
 
 This uses the existing JSON extension mechanism; Model/Middle/bundle schema
 versions remain 2.0. Older documents without this extension remain readable.

{docvortex-0.4.3 → docvortex-0.4.5}/docs/USAGE.md

@@ -99,8 +99,22 @@ document and the original source file.
 PDF output defaults to `PdfLayout.AUTO`. Newly parsed PDF sources preserve their
 page dimensions, page boundaries, headers, footers, and block positions. Text is
 selectable and reflows inside each source block; original fonts and line breaks
-are approximate. Tables and charts prefer existing region images, and equations
-prefer vector rendering. Content absent from the parsed result cannot be restored.
+are approximate. Tables prefer parsed HTML with selectable text and vector borders;
+charts retain region images, and equations prefer vector rendering. Content absent
+from the parsed result cannot be restored.
+
+Original-layout tables use content-based column widths and compact cell padding.
+They first fit their source box, then may use safe space in the same column while
+preserving page margins and a 2 pt gap from other blocks. Existing spanning tables
+retain their span. Rotation is restored after layout in upright coordinates;
+tables do not move to another page. Captions and notes remain separate when their
+own coordinates are available, or share the parent box when child coordinates
+are missing. If 6 pt text still cannot fit, the table is scaled further and
+`pdf_layout_small_text` is reported. Small text alone never triggers an image
+fallback. Missing, invalid, or unrenderable HTML falls back to the region image,
+then text or a placeholder, with `pdf_table_fallback` and `pdf_table_source`
+diagnostics. `pdf_table_layout` records the source, rotation, effective font size,
+and original/drawing bounds. Reflow table layout is unchanged.
 
 ```python
 import docvortex
@@ -160,8 +174,9 @@ adjacent titles divide their gap at its midpoint. The original top edge is
 preferred, shifting upward when needed. Only a title that cannot fit its safe
 area shrinks, in 0.1 pt steps before the existing below-6-pt fallback. Script and
 inline-formula ink extents are included in title measurement. Index references
-and approximate parent groups do not participate; body text, captions, code and
-tables retain their original independent fitting results.
+and approximate parent groups do not participate; body text, captions and code
+retain their original independent fitting results. Structured tables are placed
+after titles and equations, respecting their final drawing bounds.
 
 `pdf_title_layout_expanded` identifies expanded title areas.
 `pdf_layout_font_exception` records local-body increases or insufficient-space

{docvortex-0.4.3 → docvortex-0.4.5}/pyproject.toml

@@ -27,12 +27,12 @@ dependencies = [
     "mammoth>=1.11.0,<2", "openpyxl>=3.1.5,<4", "olefile>=0.47,<1",
     "pylatexenc>=2.10,<3", "latex2mathml>=3.81.0,<4", "mathml2omml==0.0.2",
     "resvg_py>=0.5.0,<0.6",
-    "reportlab", "ziamath>=0.13,<0.14",
+    "reportlab[accel]", "ziamath>=0.13,<0.14",
     "magika>=0.6.2,<1.1.0", "opencv-python>=4.11.0.86",
 ]
 
 [project.optional-dependencies]
-test = ["pytest", "pytest-cov", "markdown", "jsonschema>=4,<5"]
+test = ["pytest", "pytest-cov", "pytest-xdist>=3.8,<4", "markdown", "jsonschema>=4,<5"]
 dev = ["ruff==0.14.2", "build", "twine"]
 
 [project.urls]

{docvortex-0.4.3 → docvortex-0.4.5}/src/docvortex/analyzers/native/pdf/_script_geometry.py

@@ -208,42 +208,46 @@ def _cluster_baselines(
     median_loose_height = statistics.median(feature.loose_height for feature in anchors)
     tolerance = max(SCRIPT_BASELINE_ABSOLUTE_TOLERANCE, median_loose_height * SCRIPT_BASELINE_LOOSE_HEIGHT_RATIO)
     groups: list[list[int]] = []
+    group_origins: list[list[float]] = []
     for feature in sorted(anchors, key=lambda item: item.origin[1] if item.origin is not None else 0.0):
         baseline = feature.origin[1] if feature.origin is not None else 0.0
         if not groups:
             groups.append([feature.index])
+            group_origins.append([baseline])
             continue
-        previous_baseline = statistics.median(
-            features[index].origin[1] for index in groups[-1] if features[index].origin is not None
-        )
+        previous_baseline = _sorted_origin_median(group_origins[-1])
         if abs(baseline - previous_baseline) <= tolerance:
             groups[-1].append(feature.index)
+            group_origins[-1].append(baseline)
         else:
             groups.append([feature.index])
+            group_origins.append([baseline])
     return (
         [
             ScriptBaselineCluster(
-                baseline=statistics.median(features[index].origin[1] for index in group if features[index].origin is not None),
+                baseline=_sorted_origin_median(origins),
                 member_indices=tuple(group),
             )
-            for group in groups
+            for group, origins in zip(groups, group_origins, strict=True)
         ],
         tolerance,
     )
 
 
+def _sorted_origin_median(origins: list[float]) -> float:
+    """原始字符已按 origin 排序，直接使用与 statistics.median 相同的中位运算。"""
+    middle = len(origins) // 2
+    return origins[middle] if len(origins) % 2 else (origins[middle - 1] + origins[middle]) / 2
+
+
 def _cluster_tight_height(features: list[ScriptCharFeature], cluster: ScriptBaselineCluster) -> float:
     """返回基线簇的高分位 tight 高度。"""
-    return _quantile(
-        [features[index].tight_height for index in cluster.member_indices if features[index].tight_height > 0], 0.9
-    )
+    return _quantile([height for index in cluster.member_indices if (height := features[index].tight_height) > 0], 0.9)
 
 
 def _cluster_loose_height(features: list[ScriptCharFeature], cluster: ScriptBaselineCluster) -> float:
     """返回基线簇的高分位 loose 高度。"""
-    return _quantile(
-        [features[index].loose_height for index in cluster.member_indices if features[index].loose_height > 0], 0.9
-    )
+    return _quantile([height for index in cluster.member_indices if (height := features[index].loose_height) > 0], 0.9)
 
 
 def _cluster_tight_center(features: list[ScriptCharFeature], cluster: ScriptBaselineCluster) -> float:
@@ -283,29 +287,33 @@ def _cluster_has_consistent_displacement(
 def _choose_body_band(
     features: list[ScriptCharFeature],
     clusters: list[ScriptBaselineCluster],
+    heights: dict[ScriptBaselineCluster, tuple[float, float]] | None = None,
 ) -> tuple[ScriptBodyBand, ScriptBaselineCluster] | None:
     """在接近最高字形的基线簇中按字符数选择正文基线。"""
     if not clusters:
         return None
-    maximum_height = max(_cluster_tight_height(features, cluster) for cluster in clusters)
+    if heights is None:
+        heights = {
+            cluster: (_cluster_tight_height(features, cluster), _cluster_loose_height(features, cluster))
+            for cluster in clusters
+        }
+    maximum_height = max(heights[cluster][0] for cluster in clusters)
     comparable = [
-        cluster
-        for cluster in clusters
-        if _cluster_tight_height(features, cluster) >= maximum_height * SCRIPT_BODY_COMPARABLE_HEIGHT_RATIO
+        cluster for cluster in clusters if heights[cluster][0] >= maximum_height * SCRIPT_BODY_COMPARABLE_HEIGHT_RATIO
     ]
     body_cluster = max(
         comparable,
         key=lambda cluster: (
             len(cluster.member_indices),
-            _cluster_tight_height(features, cluster),
-            _cluster_loose_height(features, cluster),
+            heights[cluster][0],
+            heights[cluster][1],
         ),
     )
     return (
         ScriptBodyBand(
             baseline=body_cluster.baseline,
-            tight_height=_cluster_tight_height(features, body_cluster),
-            loose_height=_cluster_loose_height(features, body_cluster),
+            tight_height=heights[body_cluster][0],
+            loose_height=heights[body_cluster][1],
             member_indices=frozenset(body_cluster.member_indices),
         ),
         body_cluster,
@@ -508,6 +516,7 @@ def _recheck_weak_clusters_with_local_font_body(
     component_indices: list[int],
     body_band: ScriptBodyBand,
     cluster_roles: dict[ScriptBaselineCluster, ScriptRole],
+    heights: dict[ScriptBaselineCluster, tuple[float, float]],
 ) -> None:
     """用同字体局部正文撤销弱误判；不制造角标，不让撤销结果成为新参考。"""
     initial_roles = dict(cluster_roles)
@@ -543,7 +552,7 @@ def _recheck_weak_clusters_with_local_font_body(
             continue
         shift = cluster.baseline - reference.baseline
         strong_shift = abs(shift) >= height * SCRIPT_STRONG_SHIFT_RATIO
-        tight_ratio = _cluster_tight_height(features, cluster) / height
+        tight_ratio = heights[cluster][0] / height
         if abs(shift) < max(SCRIPT_ORIGIN_MIN_SHIFT_ABSOLUTE, height * SCRIPT_ORIGIN_MIN_SHIFT_RATIO) or (
             tight_ratio > SCRIPT_TIGHT_HEIGHT_RATIO and not (strong_shift and tight_ratio <= SCRIPT_STRONG_MAX_HEIGHT_RATIO)
         ):
@@ -559,7 +568,11 @@ def _assign_component(
 ) -> None:
     """在单个视觉组件内按 origin 基线簇和双 bbox 一致性分配角色。"""
     clusters, tolerance = _cluster_baselines(features, component_indices)
-    body_result = _choose_body_band(features, clusters)
+    # 基线簇在本次组件判定内不变，高度分位数可供正文选择与各角标规则共享。
+    heights = {
+        cluster: (_cluster_tight_height(features, cluster), _cluster_loose_height(features, cluster)) for cluster in clusters
+    }
+    body_result = _choose_body_band(features, clusters, heights)
     if body_result is None:
         return
     body_band, body_cluster = body_result
@@ -570,8 +583,8 @@ def _assign_component(
         if cluster is body_cluster:
             continue
         shift = cluster.baseline - body_band.baseline
-        tight_ratio = _cluster_tight_height(features, cluster) / body_band.tight_height
-        loose_ratio = _cluster_loose_height(features, cluster) / body_band.loose_height
+        tight_ratio = heights[cluster][0] / body_band.tight_height
+        loose_ratio = heights[cluster][1] / body_band.loose_height
         minimum_shift = max(SCRIPT_ORIGIN_MIN_SHIFT_ABSOLUTE, body_band.tight_height * SCRIPT_ORIGIN_MIN_SHIFT_RATIO)
         strong_shift = abs(shift) >= body_band.tight_height * SCRIPT_STRONG_SHIFT_RATIO
         if (
@@ -587,7 +600,7 @@ def _assign_component(
             cluster_roles[cluster] = "body"
         else:
             cluster_roles[cluster] = _script_role(shift)
-    _recheck_weak_clusters_with_local_font_body(features, font_keys, component_indices, body_band, cluster_roles)
+    _recheck_weak_clusters_with_local_font_body(features, font_keys, component_indices, body_band, cluster_roles, heights)
     for index in component_indices:
         feature = features[index]
         if (

{docvortex-0.4.3 → docvortex-0.4.5}/src/docvortex/analyzers/native/pdf/_table_recovery/candidate.py

@@ -143,6 +143,14 @@ def _choose_cell_for_glyph_indexed(
         0,
         min(rows - 1, bisect_left(index.y_tracks, glyph.bbox[3]) - 1),
     )
+    if left_col == right_col and top_row == bottom_row:
+        # 只覆盖一个原子格时仍执行原面积/中心判定，省去候选集合与排序。
+        cell_index = index.owners[top_row][left_col]
+        bbox = specs[cell_index].bbox
+        if glyph_overlap_ratio(glyph, bbox) > 0:
+            return cell_index, False
+        center_x, center_y = bbox_center(glyph.bbox)
+        return (cell_index, False) if bbox[0] <= center_x <= bbox[2] and bbox[1] <= center_y <= bbox[3] else (None, False)
     candidate_indices = {
         index.owners[row][col] for row in range(top_row, bottom_row + 1) for col in range(left_col, right_col + 1)
     }

{docvortex-0.4.3 → docvortex-0.4.5}/src/docvortex/analyzers/native/pdf/_table_recovery/text.py

@@ -32,7 +32,7 @@ def _select_pending_glyphs(table_input: NativeTableInput) -> list[_PendingGlyph]
     table_bbox = normalize_bbox(table_input.table_bbox)
     if table_bbox is None:
         return []
-    selected: list[tuple[int, int, Char]] = []
+    selected: list[tuple[int, int, Char, BBox]] = []
     for fallback_index, char in enumerate(table_input.chars):
         char_bbox = normalize_bbox(char.get("bbox"))
         if char_bbox is None:
@@ -44,14 +44,14 @@ def _select_pending_glyphs(table_input: NativeTableInput) -> list[_PendingGlyph]
             source_index = int(char.get("char_idx", fallback_index))
         except (TypeError, ValueError):
             source_index = fallback_index
-        selected.append((source_index, fallback_index, char))
+        selected.append((source_index, fallback_index, char, char_bbox))
 
     selected.sort(key=lambda item: (item[0], item[1]))
     output: list[_PendingGlyph] = []
     angle = normalize_angle(table_input.angle)
     pending_space = False
     pending_break = False
-    for _source_sort, fallback_index, char in selected:
+    for source_index, _fallback_index, char, absolute_bbox in selected:
         raw_text = str(char.get("char") or "")
         if not raw_text:
             continue
@@ -66,9 +66,6 @@ def _select_pending_glyphs(table_input: NativeTableInput) -> list[_PendingGlyph]
         text = _normalize_table_text(raw_text)
         if not text or text.isspace():
             continue
-        absolute_bbox = normalize_bbox(char.get("bbox"))
-        if absolute_bbox is None:
-            continue
         local_bbox = page_bbox_to_table_local(
             absolute_bbox,
             table_bbox,
@@ -76,10 +73,6 @@ def _select_pending_glyphs(table_input: NativeTableInput) -> list[_PendingGlyph]
         )
         if local_bbox is None or local_bbox[3] - local_bbox[1] < 0.5:
             continue
-        try:
-            source_index = int(char.get("char_idx", fallback_index))
-        except (TypeError, ValueError):
-            source_index = fallback_index
         output.append(
             _PendingGlyph(
                 glyph_id=len(output),
@@ -153,7 +146,14 @@ def _assign_visual_rows(
             )
         else:
             rows[best_index].append(glyph)
-            row_bboxes[best_index] = bbox_union([row_bboxes[best_index], glyph.bbox])
+            # 两框合并保持原 min/max 顺序，避免为每个字符建立通用迭代器。
+            previous_bbox = row_bboxes[best_index]
+            row_bboxes[best_index] = (
+                min(previous_bbox[0], glyph.bbox[0]),
+                min(previous_bbox[1], glyph.bbox[1]),
+                max(previous_bbox[2], glyph.bbox[2]),
+                max(previous_bbox[3], glyph.bbox[3]),
+            )
             for row_index in range(best_index, len(row_bboxes)):
                 prefix_max_bottoms[row_index] = max(
                     prefix_max_bottoms[row_index - 1] if row_index > 0 else row_bboxes[row_index][3],
@@ -170,7 +170,11 @@ def _assign_visual_rows(
 def _contains_cjk(text: str) -> bool:
     """判断文本是否包含常见中日韩统一表意字符。"""
 
-    return any("\u3400" <= char <= "\u9fff" for char in text)
+    # 组行热路径通常只传入相邻两个字符，直接遍历避免逐次创建生成器。
+    for char in text:
+        if "\u3400" <= char <= "\u9fff":
+            return True
+    return False
 
 
 def _join_glyph_line(
@@ -248,12 +252,14 @@ def _cell_row_separator(
 def _glyph_line_parts(
     glyphs: list[NativeTableGlyph] | list[_PendingGlyph],
     median_height: float,
+    *,
+    presorted: bool = False,
 ) -> list[tuple[str, int | None]]:
     """重建单行文本片段，并保留每个可见片段的原字符索引。"""
 
     if not glyphs:
         return []
-    ordered = sorted(glyphs, key=lambda glyph: (glyph.bbox[0], glyph.bbox[1], glyph.glyph_id))
+    ordered = glyphs if presorted else sorted(glyphs, key=lambda glyph: (glyph.bbox[0], glyph.bbox[1], glyph.glyph_id))
     parts: list[tuple[str, int | None]] = [(ordered[0].text, ordered[0].source_index)]
     previous = ordered[0]
     for glyph in ordered[1:]:
@@ -292,7 +298,8 @@ def _tokenize_row(
             groups[-1].append(glyph)
     tokens: list[NativeTableToken] = []
     for group in groups:
-        content = _join_glyph_line(group, median_height)
+        # group 是视觉行按同一排序键切出的连续片段，不必再次排序。
+        content = "".join(text for text, _source_index in _glyph_line_parts(group, median_height, presorted=True))
         if not content:
             continue
         tokens.append(

{docvortex-0.4.3 → docvortex-0.4.5}/src/docvortex/analyzers/native/pdf/_table_recovery/vector.py

@@ -47,6 +47,78 @@ class _CanonicalTrack:
     aliases: tuple[float, ...]
 
 
+class _IndexedRules(list[_MergedRule]):
+    """保存单次候选构造中的只读线段及轨道区间缓存，使用期间不修改线段。"""
+
+    def __init__(self, rules: list[_MergedRule]) -> None:
+        """按方向分组并保留原始线段顺序，缓存随当前表格调用释放。"""
+        super().__init__(rules)
+        self._oriented = {
+            orientation: tuple(rule for rule in rules if rule.orientation == orientation)
+            for orientation in ("horizontal", "vertical")
+        }
+        self._intervals: dict[tuple[str, tuple[float, ...], float], list[tuple[float, float]]] = {}
+        self._coverages: dict[tuple[str, tuple[float, ...], float, float, float], float] = {}
+
+    def coverage(self, orientation: str, aliases: tuple[float, ...], start: float, end: float, tolerance: float) -> float:
+        """复用轨道匹配和相同查询，区间覆盖仍执行原有裁剪与浮点累加。"""
+        key = orientation, aliases, tolerance
+        coverage_key = (*key, start, end)
+        cached = self._coverages.get(coverage_key)
+        if cached is not None:
+            return cached
+        intervals = self._intervals.get(key)
+        if intervals is None:
+            oriented = self._oriented.get(orientation, ())
+            if len(aliases) == 1:
+                coordinate = aliases[0]
+                intervals = [(rule.start, rule.end) for rule in oriented if abs(rule.coordinate - coordinate) <= tolerance]
+            else:
+                intervals = [
+                    (rule.start, rule.end)
+                    for rule in oriented
+                    if any(abs(rule.coordinate - alias) <= tolerance for alias in aliases)
+                ]
+            self._intervals[key] = intervals
+        result = covered_interval_ratio(intervals, start, end)
+        self._coverages[coverage_key] = result
+        return result
+
+
+@dataclass(frozen=True, slots=True)
+class _RulePreparation:
+    """保存相同裁剪范围的线段与原始轨道，供 raw/supported 假设复用。"""
+
+    fragments: list[_MergedRule]
+    rules: _IndexedRules
+    inferred: tuple[list[float], list[float], list[float]]
+
+
+def _prepare_rule_evidence(
+    table_input: NativeTableInput,
+    snap_tolerance: float,
+    join_gap: float,
+    width: float,
+    height: float,
+    *,
+    include_drawing: bool,
+    include_rectangles: bool,
+    evidence_halo: float,
+) -> _RulePreparation:
+    """一次构造裁剪、合并和原始轨道证据，不缓存后续假设判定。"""
+    fragments = _local_rule_fragments(
+        table_input,
+        snap_tolerance,
+        include_drawing=include_drawing,
+        include_rectangles=include_rectangles,
+        evidence_halo=evidence_halo,
+    )
+    if evidence_halo == 0.0 and (not fragments or len(fragments) > MAX_PRIMITIVES_PER_TABLE):
+        return _RulePreparation(fragments, _IndexedRules([]), ([], [], []))
+    rules = _IndexedRules(_merge_rule_fragments(fragments, snap_tolerance, join_gap))
+    return _RulePreparation(fragments, rules, _infer_grid_tracks(rules, snap_tolerance, width, height))
+
+
 @dataclass(frozen=True, slots=True)
 class _PhysicalRowEvidence:
     """保存一个原子行由 drawing 独立验证的边界可靠度。"""
@@ -710,6 +782,8 @@ def _separator_coverage_for_track(
 ) -> float:
     """按规范轨道全部 alias 合并计算 separator 覆盖率。"""
 
+    if isinstance(rules, _IndexedRules):
+        return rules.coverage(orientation, track.aliases, start, end, snap_tolerance)
     intervals = [
         (rule.start, rule.end)
         for rule in rules
@@ -787,6 +861,8 @@ def _separator_coverage(
 ) -> float:
     """计算指定潜在隔断被同轴物理线段覆盖的比例。"""
 
+    if isinstance(rules, _IndexedRules):
+        return rules.coverage(orientation, (coordinate,), start, end, snap_tolerance)
     intervals = [
         (rule.start, rule.end)
         for rule in rules
@@ -1196,6 +1272,7 @@ def _build_vector_tracks(
     include_rectangles: bool,
     prune_unsupported_horizontal: bool,
     diagnostics: dict[str, Any] | None,
+    rule_cache: dict[tuple[bool, bool, float], _RulePreparation] | None = None,
 ) -> _VectorTracks | None:
     """构造并规范化轨道，保持 halo、别名及物理行数的原有拒绝顺序。"""
 
@@ -1225,26 +1302,26 @@ def _build_vector_tracks(
         table_bbox,
         normalize_angle(table_input.angle),
     )
-    exact_fragments = _local_rule_fragments(
-        table_input,
-        snap_tolerance,
-        include_drawing=include_drawing,
-        include_rectangles=include_rectangles,
-        evidence_halo=0.0,
-    )
+    if rule_cache is None:
+        rule_cache = {}
+    exact_key = include_drawing, include_rectangles, 0.0
+    exact = rule_cache.get(exact_key)
+    if exact is None:
+        exact = _prepare_rule_evidence(
+            table_input,
+            snap_tolerance,
+            join_gap,
+            local_width,
+            local_height,
+            include_drawing=include_drawing,
+            include_rectangles=include_rectangles,
+            evidence_halo=0.0,
+        )
+        rule_cache[exact_key] = exact
+    exact_fragments = exact.fragments
     if not exact_fragments or len(exact_fragments) > MAX_PRIMITIVES_PER_TABLE:
         return _reject_vector_candidate(diagnostics, "raw_fragments")
-    exact_rules = _merge_rule_fragments(
-        exact_fragments,
-        snap_tolerance,
-        join_gap,
-    )
-    exact_x_tracks, exact_y_tracks, _removed = _infer_grid_tracks(
-        exact_rules,
-        snap_tolerance,
-        local_width,
-        local_height,
-    )
+    exact_x_tracks, exact_y_tracks, _removed = exact.inferred
     # 多行表格保持原始 bbox 裁剪；halo 只服务可能退化为单物理行的
     # 边界片段，避免吸入相邻行或页外端点改变既有拓扑。
     single_column_halo_hint = (
@@ -1278,29 +1355,29 @@ def _build_vector_tracks(
         else 0.0
     )
     if evidence_halo > 0:
-        raw_fragments = _local_rule_fragments(
-            table_input,
-            snap_tolerance,
-            include_drawing=include_drawing,
-            include_rectangles=include_rectangles,
-            evidence_halo=evidence_halo,
-        )
-        rules = _merge_rule_fragments(
-            raw_fragments,
-            snap_tolerance,
-            join_gap,
-        )
+        halo_key = include_drawing, include_rectangles, evidence_halo
+        prepared = rule_cache.get(halo_key)
+        if prepared is None:
+            prepared = _prepare_rule_evidence(
+                table_input,
+                snap_tolerance,
+                join_gap,
+                local_width,
+                local_height,
+                include_drawing=include_drawing,
+                include_rectangles=include_rectangles,
+                evidence_halo=evidence_halo,
+            )
+            rule_cache[halo_key] = prepared
     else:
-        raw_fragments = exact_fragments
-        rules = exact_rules
+        prepared = exact
+    raw_fragments, rules = prepared.fragments, prepared.rules
     if diagnostics is not None:
         diagnostics["raw_fragment_count"] = len(raw_fragments)
-    inferred_x_tracks, inferred_y_tracks, removed_horizontal_tracks = _infer_grid_tracks(
-        rules,
-        snap_tolerance,
-        local_width,
-        local_height,
-        prune_unsupported_horizontal=prune_unsupported_horizontal,
+    inferred_x_tracks, inferred_y_tracks, removed_horizontal_tracks = (
+        _infer_grid_tracks(rules, snap_tolerance, local_width, local_height, prune_unsupported_horizontal=True)
+        if prune_unsupported_horizontal
+        else prepared.inferred
     )
     if diagnostics is not None:
         diagnostics["track_hypothesis"] = "supported" if prune_unsupported_horizontal else "raw"
@@ -1824,6 +1901,7 @@ def _build_vector_candidate(
     evidence_label: str,
     prune_unsupported_horizontal: bool = False,
     diagnostics: dict[str, Any] | None = None,
+    rule_cache: dict[tuple[bool, bool, float], _RulePreparation] | None = None,
 ) -> NativeTableCandidate | None:
     """按轨道、拓扑、文本落格及评分的固定顺序构造矢量候选。"""
 
@@ -1836,6 +1914,7 @@ def _build_vector_candidate(
         include_rectangles=include_rectangles,
         prune_unsupported_horizontal=prune_unsupported_horizontal,
         diagnostics=diagnostics,
+        rule_cache=rule_cache,
     )
     if tracks is None:
         return None
@@ -1853,6 +1932,7 @@ def build_vector_candidates(
     """分别从 drawing 中心线和矩形晶格生成矢量网格候选。"""
 
     candidates: list[NativeTableCandidate] = []
+    rule_cache: dict[tuple[bool, bool, float], _RulePreparation] = {}
     raw_line_diagnostics: dict[str, Any] | None = {} if diagnostics is not None else None
     line_candidate = _build_vector_candidate(
         table_input,
@@ -1861,6 +1941,7 @@ def build_vector_candidates(
         include_rectangles=False,
         evidence_label="line_grid",
         diagnostics=raw_line_diagnostics,
+        rule_cache=rule_cache,
     )
     line_hypotheses = [raw_line_diagnostics] if raw_line_diagnostics is not None else []
     selected_line_diagnostics = raw_line_diagnostics
@@ -1874,6 +1955,7 @@ def build_vector_candidates(
             evidence_label="line_grid",
             prune_unsupported_horizontal=True,
             diagnostics=supported_line_diagnostics,
+            rule_cache=rule_cache,
         )
         if supported_line_diagnostics is not None:
             removed_tracks = supported_line_diagnostics.get(
@@ -1900,6 +1982,7 @@ def build_vector_candidates(
         include_rectangles=True,
         evidence_label="rect_grid",
         diagnostics=rect_diagnostics,
+        rule_cache=rule_cache,
     )
     if diagnostics is not None and rect_diagnostics is not None:
         diagnostics.append(rect_diagnostics)

{docvortex-0.4.3 → docvortex-0.4.5}/src/docvortex/analyzers/native/pdf/table_geometry.py

@@ -2,18 +2,24 @@
 
 from __future__ import annotations
 
+from ....document.pdf.text._contracts import Bbox
 from ....schema import BBox
 
 
 def normalize_bbox(value: object) -> BBox | None:
     """把任意四元组规范为有效浮点 bbox，异常或退化框返回空。"""
 
+    # 自有 Bbox 的下标协议仅转发底层数组，直接读取可避免每个框五次 Python 调用。
+    # 只匹配精确类型，第三方可迭代对象及覆盖下标行为的子类仍走原协议。
+    if type(value) is Bbox:
+        value = value.bbox
     try:
         x0, y0, x1, y1 = [float(item) for item in value]  # type: ignore[arg-type]
     except (TypeError, ValueError):
         return None
-    left, right = sorted((x0, x1))
-    top, bottom = sorted((y0, y1))
+    # 与两个元素的稳定排序使用相同比较方向，保留相等值及 NaN 的顺序。
+    left, right = (x1, x0) if x1 < x0 else (x0, x1)
+    top, bottom = (y1, y0) if y1 < y0 else (y0, y1)
     if right <= left or bottom <= top:
         return None
     return left, top, right, bottom