natural-pdf 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

natural_pdf/analyzers/__init__.py

@@ -2,17 +2,29 @@
 Analyzers for natural_pdf.
 """
 
+# Import these directly as they don't depend on Region
 from natural_pdf.analyzers.guides import Guides
-from natural_pdf.analyzers.layout.layout_analyzer import LayoutAnalyzer
-from natural_pdf.analyzers.layout.layout_manager import LayoutManager
-from natural_pdf.analyzers.layout.layout_options import LayoutOptions
 from natural_pdf.analyzers.shape_detection_mixin import ShapeDetectionMixin
 from natural_pdf.analyzers.text_options import TextStyleOptions
 from natural_pdf.analyzers.text_structure import TextStyleAnalyzer
 
+# Lazy imports to avoid circular dependencies
+# These will be imported when actually accessed
+def __getattr__(name):
+    if name == "LayoutAnalyzer":
+        from natural_pdf.analyzers.layout.layout_analyzer import LayoutAnalyzer
+        return LayoutAnalyzer
+    elif name == "LayoutManager":
+        from natural_pdf.analyzers.layout.layout_manager import LayoutManager
+        return LayoutManager
+    elif name == "LayoutOptions":
+        from natural_pdf.analyzers.layout.layout_options import LayoutOptions
+        return LayoutOptions
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
 __all__ = [
     "LayoutAnalyzer",
-    "LayoutManager",
+    "LayoutManager", 
     "LayoutOptions",
     "ShapeDetectionMixin",
     "TextStyleOptions",

natural_pdf/analyzers/guides.py

@@ -119,6 +119,8 @@ class GuidesList(UserList):
         align: Literal["left", "right", "center", "between"] = "left",
         outer: bool = True,
         tolerance: float = 5,
+        *,
+        append: bool = False,
     ) -> "Guides":
         """
         Create guides from content markers and add to this axis.
@@ -154,11 +156,17 @@ class GuidesList(UserList):
             tolerance=tolerance,
         )
 
-        # Add to our list
-        if self._axis == "vertical":
-            self.extend(new_guides.vertical)
+        # Replace or append based on parameter
+        if append:
+            if self._axis == "vertical":
+                self.extend(new_guides.vertical)
+            else:
+                self.extend(new_guides.horizontal)
         else:
-            self.extend(new_guides.horizontal)
+            if self._axis == "vertical":
+                self.data = list(new_guides.vertical)
+            else:
+                self.data = list(new_guides.horizontal)
 
         # Remove duplicates while preserving order
         seen = set()
@@ -183,6 +191,7 @@ class GuidesList(UserList):
         *,
         n: Optional[int] = None,
         min_gap: Optional[int] = None,
+        append: bool = False,
         **detect_kwargs,
     ) -> "Guides":
         """
@@ -241,11 +250,17 @@ class GuidesList(UserList):
             **detect_kwargs,
         )
 
-        # Add to our list
-        if self._axis == "vertical":
-            self.extend(new_guides.vertical)
+        # Replace or append based on parameter
+        if append:
+            if self._axis == "vertical":
+                self.extend(new_guides.vertical)
+            else:
+                self.extend(new_guides.horizontal)
         else:
-            self.extend(new_guides.horizontal)
+            if self._axis == "vertical":
+                self.data = list(new_guides.vertical)
+            else:
+                self.data = list(new_guides.horizontal)
 
         # Remove duplicates
         seen = set()
@@ -259,7 +274,8 @@ class GuidesList(UserList):
         return self._parent
 
     def from_whitespace(
-        self, obj: Optional[Union["Page", "Region"]] = None, min_gap: float = 10
+        self, obj: Optional[Union["Page", "Region"]] = None, min_gap: float = 10,
+        *, append: bool = False
     ) -> "Guides":
         """
         Create guides from whitespace gaps.
@@ -278,11 +294,17 @@ class GuidesList(UserList):
         # Create guides for this axis
         new_guides = Guides.from_whitespace(obj=target_obj, axis=self._axis, min_gap=min_gap)
 
-        # Add to our list
-        if self._axis == "vertical":
-            self.extend(new_guides.vertical)
+        # Replace or append
+        if append:
+            if self._axis == "vertical":
+                self.extend(new_guides.vertical)
+            else:
+                self.extend(new_guides.horizontal)
         else:
-            self.extend(new_guides.horizontal)
+            if self._axis == "vertical":
+                self.data = list(new_guides.vertical)
+            else:
+                self.data = list(new_guides.horizontal)
 
         # Remove duplicates
         seen = set()
@@ -313,11 +335,11 @@ class GuidesList(UserList):
         # Create guides using divide
         new_guides = Guides.divide(obj=target_obj, n=n, axis=self._axis)
 
-        # Add to our list
+        # Replace existing guides instead of extending (no append option here)
         if self._axis == "vertical":
-            self.extend(new_guides.vertical)
+            self.data = list(new_guides.vertical)
         else:
-            self.extend(new_guides.horizontal)
+            self.data = list(new_guides.horizontal)
 
         # Remove duplicates
         seen = set()
@@ -1982,6 +2004,53 @@ class Guides:
         row_boundaries = sorted(list(set(row_boundaries)))
         col_boundaries = sorted(list(set(col_boundaries)))
 
+        # ------------------------------------------------------------------
+        # Clean-up: remove any previously created grid regions (table, rows,
+        # columns, cells) that were generated by the same `source` label and
+        # overlap the area we are about to populate.  This prevents the page's
+        # `ElementManager` from accumulating stale/duplicate regions when the
+        # user rebuilds the grid multiple times.
+        # ------------------------------------------------------------------
+        try:
+            # Bounding box of the grid we are about to create
+            if row_boundaries and col_boundaries:
+                grid_bbox = (
+                    col_boundaries[0],  # x0
+                    row_boundaries[0],  # top
+                    col_boundaries[-1],  # x1
+                    row_boundaries[-1],  # bottom
+                )
+
+                def _bbox_overlap(b1, b2):
+                    """Return True if two (x0, top, x1, bottom) bboxes overlap."""
+                    return not (
+                        b1[2] <= b2[0]  # b1 right ≤ b2 left
+                        or b1[0] >= b2[2]  # b1 left ≥ b2 right
+                        or b1[3] <= b2[1]  # b1 bottom ≤ b2 top
+                        or b1[1] >= b2[3]  # b1 top ≥ b2 bottom
+                    )
+
+                # Collect existing regions that match the source & region types
+                regions_to_remove = [
+                    r
+                    for r in element_manager.regions
+                    if getattr(r, "source", None) == source
+                    and getattr(r, "region_type", None)
+                    in {"table", "table_row", "table_column", "table_cell"}
+                    and hasattr(r, "bbox")
+                    and _bbox_overlap(r.bbox, grid_bbox)
+                ]
+
+                for r in regions_to_remove:
+                    element_manager.remove_element(r, element_type="regions")
+
+                if regions_to_remove:
+                    logger.debug(
+                        f"Removed {len(regions_to_remove)} existing grid region(s) prior to rebuild"
+                    )
+        except Exception as cleanup_err:  # pragma: no cover – cleanup must never crash
+            logger.warning(f"Grid cleanup failed: {cleanup_err}")
+
         logger.debug(
             f"Building grid with {len(row_boundaries)} row and {len(col_boundaries)} col boundaries"
         )

natural_pdf/core/page.py

@@ -1780,8 +1780,14 @@ class Page(ClassificationMixin, ExtractionMixin, ShapeDetectionMixin, DescribeMi
         # Apply global options as defaults, but allow explicit parameters to override
         import natural_pdf
 
+        # Determine if this is likely a computational use (OCR, analysis, etc.)
+        # If resolution is explicitly provided but width is not, assume computational use
+        # and don't apply global display width settings
+        is_computational_use = (resolution is not None and width is None and 
+                               kwargs.get('include_highlights', True) is False)
+
         # Use global options if parameters are not explicitly set
-        if width is None:
+        if width is None and not is_computational_use:
             width = natural_pdf.options.image.width
         if resolution is None:
             if natural_pdf.options.image.resolution is not None:

{natural_pdf-0.1.34.dist-info → natural_pdf-0.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: natural-pdf
-Version: 0.1.34
+Version: 0.1.36
 Summary: A more intuitive interface for working with PDFs
 Author-email: Jonathan Soma <jonathan.soma@gmail.com>
 License-Expression: MIT
@@ -11,6 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: scikit-learn
 Requires-Dist: markdown
 Requires-Dist: pandas
 Requires-Dist: pdfplumber

{natural_pdf-0.1.34.dist-info → natural_pdf-0.1.36.dist-info}/RECORD

@@ -1,7 +1,7 @@
 natural_pdf/__init__.py,sha256=qDFJNF8sbEDO-2WSFAxoWEM8updOUP6dB-ckya0kxfs,3275
 natural_pdf/cli.py,sha256=SkPwhhMM-GhLsj3O1n1Agxz4KOxcZ08sj8hVQSFJB5c,4064
-natural_pdf/analyzers/__init__.py,sha256=IPu_PMKFviDeEIeiC8_2KdeqH7z8OQ6q2v980hkByFY,672
-natural_pdf/analyzers/guides.py,sha256=76gEVJ3EGeIBq8KP-BZtEn__qHQfrQ-DTwenup54vI4,89165
+natural_pdf/analyzers/__init__.py,sha256=M5oD4oEsIBWrzgTaeg4uBYrC4OPd7Mp7tz8ootKN_l8,1134
+natural_pdf/analyzers/guides.py,sha256=5Lqc51trtqmLvjxLjDS__mgeyviRrjV-CIIT69RmEt4,92327
 natural_pdf/analyzers/shape_detection_mixin.py,sha256=Ef1o73QYVXQ2QcQMM_W9XRwY6vaIQHgxzD7etJ6LbiM,62820
 natural_pdf/analyzers/text_options.py,sha256=qEkDaYWla0rIM_gszEOsu52q7C_dAfV81P2HLJZM2sw,3333
 natural_pdf/analyzers/text_structure.py,sha256=VfKTsTFrK877sC0grsis9jK3rrgp0Mbp13VWEbukTcs,28437
@@ -27,7 +27,7 @@ natural_pdf/collections/pdf_collection.py,sha256=sDVEbFMNME_2OaHIsCoR_W7V1cAATNw
 natural_pdf/core/__init__.py,sha256=QC8H4M3KbXwMFiQORZ0pdPlzx1Ix6oKKQSS7Ib2KEaA,38
 natural_pdf/core/element_manager.py,sha256=DRZvntd99wjXy6KeDjCq5uRhjMftZop9QklOZqlUH8M,55349
 natural_pdf/core/highlighting_service.py,sha256=2tBrrEq6d6hz5f6Yf7z5TysJdlTyuHTURBnQxokJnDM,40645
-natural_pdf/core/page.py,sha256=obo8Fkomz39cvr-s8a2CAyhAFmYp-3-jENotfhxcc98,132790
+natural_pdf/core/page.py,sha256=Jw5SDshnHesqoC4yhtKEokeV08wMHuWZyWs5kDMOAjo,133204
 natural_pdf/core/pdf.py,sha256=9t8Ks-AZp3yjH_lRkFZAyIkjUQoCTRbmXK7vSi1e4UE,92415
 natural_pdf/describe/__init__.py,sha256=kIV7ORmWWB1SAur7nK2aAwR-wHqSedhKfUsaUl4hG0A,586
 natural_pdf/describe/base.py,sha256=CLhZXYQO6SOPUVWLt6VwZ7MK48t_6wgPMyFMLtTCKRc,18166
@@ -97,7 +97,7 @@ natural_pdf/utils/text_extraction.py,sha256=mDeN1_VevNi3RwvFe48PM5vBh-A5WeBlYgP6
 natural_pdf/utils/visualization.py,sha256=olDkWtuVzP0NxRg0CP0DL-eXNCY7Bs-SH-2Xn-cjbo0,9370
 natural_pdf/widgets/__init__.py,sha256=QTVaUmsw__FCweFYZebwPssQxxUFUMd0wpm_cUbGZJY,181
 natural_pdf/widgets/viewer.py,sha256=KW3JogdR2TMg2ECUMYp8hwd060hfg8EsYBWxb5IEzBY,24942
-natural_pdf-0.1.34.dist-info/licenses/LICENSE,sha256=9zfwINwJlarbDmdh6iJV4QUG54QSJlSAUcnC1YiC_Ns,1074
+natural_pdf-0.1.36.dist-info/licenses/LICENSE,sha256=9zfwINwJlarbDmdh6iJV4QUG54QSJlSAUcnC1YiC_Ns,1074
 optimization/memory_comparison.py,sha256=F90D_5WhliSGAct_lyx93xd4q4F-jeo8QpGyDr8tmNw,6543
 optimization/pdf_analyzer.py,sha256=xf6h-FNlqCpsm8NriXcs_bQZOB8eQkxgGGKVRL_jgCM,19347
 optimization/performance_analysis.py,sha256=RjAqeE3YS1r_7qTWkY6Ng5YMbb6MXJXfXX6LoVjg_xQ,13035
@@ -114,8 +114,8 @@ tools/bad_pdf_eval/llm_enrich.py,sha256=mCh4KGi1HmIkzGjj5rrHz1Osd7sEX1IZ_FW08H1t
 tools/bad_pdf_eval/llm_enrich_with_retry.py,sha256=XUtPF1hUvqd3frDXT0wDTXoonuAivhjM5vgFdZ-tm0A,9373
 tools/bad_pdf_eval/reporter.py,sha256=e1g__mkSB4q02p3mGWOwMhvFs7F2HJosNBxup0-LkyU,400
 tools/bad_pdf_eval/utils.py,sha256=hR95XQ7qf7Cu6BdyX0L7ggGVx-ah5sK0jHWblTJUUic,4896
-natural_pdf-0.1.34.dist-info/METADATA,sha256=zFL9gCQDfqhmApuwRXOcaOCENRPmeJ0C9Lt4uXRzKG0,6711
-natural_pdf-0.1.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-natural_pdf-0.1.34.dist-info/entry_points.txt,sha256=1R_KMv7g60UBBpRqGfw7bppsMNGdayR-iJlb9ohEk_8,81
-natural_pdf-0.1.34.dist-info/top_level.txt,sha256=oZlRzSc3nZ9sV3L6kD_Di734Pp62ANrm46imFVa51qQ,58
-natural_pdf-0.1.34.dist-info/RECORD,,
+natural_pdf-0.1.36.dist-info/METADATA,sha256=bAjoKpKPZW76v_QVBA0HgyXvA9ZP2uFrrD50mJq051M,6739
+natural_pdf-0.1.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+natural_pdf-0.1.36.dist-info/entry_points.txt,sha256=1R_KMv7g60UBBpRqGfw7bppsMNGdayR-iJlb9ohEk_8,81
+natural_pdf-0.1.36.dist-info/top_level.txt,sha256=oZlRzSc3nZ9sV3L6kD_Di734Pp62ANrm46imFVa51qQ,58
+natural_pdf-0.1.36.dist-info/RECORD,,