natural-pdf 0.2.11__tar.gz → 0.2.13__tar.gz

{natural_pdf-0.2.11/natural_pdf.egg-info → natural_pdf-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: natural-pdf
-Version: 0.2.11
+Version: 0.2.13
 Summary: A more intuitive interface for working with PDFs
 Author-email: Jonathan Soma <jonathan.soma@gmail.com>
 License-Expression: MIT

{natural_pdf-0.2.11 → natural_pdf-0.2.13}/natural_pdf/analyzers/guides.py

@@ -185,7 +185,9 @@ class GuidesList(UserList):
         self,
         markers: Union[str, List[str], "ElementCollection", Callable, None],
         obj: Optional[Union["Page", "Region", "FlowRegion"]] = None,
-        align: Literal["left", "right", "center", "between"] = "left",
+        align: Union[
+            Literal["left", "right", "center", "between"], Literal["top", "bottom"]
+        ] = "left",
         outer: bool = True,
         tolerance: float = 5,
         *,
@@ -203,7 +205,10 @@ class GuidesList(UserList):
                 - Callable: function that takes a page and returns markers
                 - None: no markers
             obj: Page/Region/FlowRegion to search (uses parent's context if None)
-            align: How to align guides relative to found elements
+            align: How to align guides relative to found elements:
+                - For vertical guides: 'left', 'right', 'center', 'between'
+                - For horizontal guides: 'top', 'bottom', 'center', 'between'
+                - Note: 'left'/'right' also work for horizontal (mapped to top/bottom)
             outer: Whether to add outer boundary guides
             tolerance: Tolerance for snapping to element edges
             apply_exclusions: Whether to apply exclusion zones when searching for text
@@ -224,19 +229,25 @@ class GuidesList(UserList):
             self._callable = None
             actual_markers = markers
 
+        # Normalize alignment for horizontal guides
+        if self._axis == "horizontal":
+            if align == "top":
+                align = "left"
+            elif align == "bottom":
+                align = "right"
+
         # Check if parent is in flow mode
         if self._parent.is_flow_region:
             # Create guides across all constituent regions
             all_guides = []
             for region in self._parent.context.constituent_regions:
-                # Normalize markers for this region
-                marker_texts = _normalize_markers(actual_markers, region)
+                # Pass markers directly - from_content will handle them properly
 
                 # Create guides for this region
                 region_guides = Guides.from_content(
                     obj=region,
                     axis=self._axis,
-                    markers=marker_texts,
+                    markers=actual_markers,  # Pass original markers, not normalized text
                     align=align,
                     outer=outer,
                     tolerance=tolerance,
@@ -312,14 +323,14 @@ class GuidesList(UserList):
             return self._parent
 
         # Original single-region logic
-        # Normalize markers to list of text strings
-        marker_texts = _normalize_markers(actual_markers, target_obj)
+        # Pass markers directly to from_content which will handle them properly
+        # (no need to normalize here since from_content now handles ElementCollection)
 
         # Create guides for this axis
         new_guides = Guides.from_content(
             obj=target_obj,
             axis=self._axis,
-            markers=marker_texts,
+            markers=actual_markers,  # Pass original markers, not normalized text
             align=align,
             outer=outer,
             tolerance=tolerance,
@@ -930,6 +941,82 @@ class GuidesList(UserList):
         self.data.clear()
         return self._parent
 
+    def from_stripes(
+        self,
+        stripes=None,
+        color=None,  # Explicitly specify stripe color
+    ) -> "Guides":
+        """Create guides from striped table rows or columns.
+
+        Creates guides at both edges of stripe elements (e.g., colored table rows).
+        Perfect for zebra-striped tables where you need guides at every row boundary.
+
+        Args:
+            stripes: Elements representing stripes. If None, auto-detects.
+            color: Specific color to look for (e.g., '#00ffff'). If None, finds most common.
+
+        Examples:
+            # Auto-detect zebra stripes
+            guides.horizontal.from_stripes()
+
+            # Specific color
+            guides.horizontal.from_stripes(color='#00ffff')
+
+            # Manual selection
+            stripes = page.find_all('rect[fill=#00ffff]')
+            guides.horizontal.from_stripes(stripes)
+
+            # Vertical stripes
+            guides.vertical.from_stripes(color='#e0e0e0')
+
+        Returns:
+            Parent Guides object for chaining
+        """
+        from collections import defaultdict
+
+        target_obj = self._parent.context
+        if target_obj is None:
+            raise ValueError("No context available for stripe detection")
+
+        if stripes is None:
+            if color:
+                # User specified color
+                stripes = target_obj.find_all(f"rect[fill={color}]")
+            else:
+                # Auto-detect most common non-white fill
+                all_rects = target_obj.find_all("rect[fill]")
+
+                # Group by fill color
+                fill_counts = defaultdict(list)
+                for rect in all_rects:
+                    if rect.fill and rect.fill not in ["#ffffff", "white", "none", "transparent"]:
+                        fill_counts[rect.fill].append(rect)
+
+                if not fill_counts:
+                    return self._parent  # No stripes found
+
+                # Find most common fill color
+                stripes = max(fill_counts.values(), key=len)
+
+        if not stripes:
+            return self._parent
+
+        # Get both edges of each stripe
+        edges = []
+        if self._axis == "horizontal":
+            for stripe in stripes:
+                edges.extend([stripe.top, stripe.bottom])
+        else:
+            for stripe in stripes:
+                edges.extend([stripe.x0, stripe.x1])
+
+        # Remove duplicates and sort
+        edges = sorted(set(edges))
+
+        # Add guides
+        self.extend(edges)
+        return self._parent
+
     def __add__(self, other):
         """Handle addition of GuidesList objects by returning combined data."""
         if isinstance(other, GuidesList):
@@ -1459,7 +1546,9 @@ class Guides:
         obj: Union["Page", "Region", "FlowRegion"],
         axis: Literal["vertical", "horizontal"] = "vertical",
         markers: Union[str, List[str], "ElementCollection", None] = None,
-        align: Literal["left", "right", "center", "between"] = "left",
+        align: Union[
+            Literal["left", "right", "center", "between"], Literal["top", "bottom"]
+        ] = "left",
         outer: bool = True,
         tolerance: float = 5,
         apply_exclusions: bool = True,
@@ -1475,7 +1564,9 @@ class Guides:
                 - List[str]: list of selectors or literal text strings
                 - ElementCollection: collection of elements to extract text from
                 - None: no markers
-            align: Where to place guides relative to found text
+            align: Where to place guides relative to found text:
+                - For vertical guides: 'left', 'right', 'center', 'between'
+                - For horizontal guides: 'top', 'bottom', 'center', 'between'
             outer: Whether to add guides at the boundaries
             tolerance: Maximum distance to search for text
             apply_exclusions: Whether to apply exclusion zones when searching for text
@@ -1483,6 +1574,13 @@ class Guides:
         Returns:
             New Guides object aligned to text content
         """
+        # Normalize alignment for horizontal guides
+        if axis == "horizontal":
+            if align == "top":
+                align = "left"
+            elif align == "bottom":
+                align = "right"
+
         # Handle FlowRegion
         if hasattr(obj, "constituent_regions"):
             guides = cls(context=obj)
@@ -1530,39 +1628,51 @@ class Guides:
         elif hasattr(obj, "width"):
             bounds = (0, 0, obj.width, obj.height)
 
-        # Normalize markers to list of text strings
-        marker_texts = _normalize_markers(markers, obj)
+        # Handle different marker types
+        elements_to_process = []
 
-        # Find each marker and determine guide position
-        for marker in marker_texts:
-            if hasattr(obj, "find"):
-                element = obj.find(f'text:contains("{marker}")', apply_exclusions=apply_exclusions)
-                if element:
-                    if axis == "vertical":
-                        if align == "left":
-                            guides_coords.append(element.x0)
-                        elif align == "right":
-                            guides_coords.append(element.x1)
-                        elif align == "center":
-                            guides_coords.append((element.x0 + element.x1) / 2)
-                        elif align == "between":
-                            # For between, collect left edges for processing later
-                            guides_coords.append(element.x0)
-                    else:  # horizontal
-                        if align == "left":  # top for horizontal
-                            guides_coords.append(element.top)
-                        elif align == "right":  # bottom for horizontal
-                            guides_coords.append(element.bottom)
-                        elif align == "center":
-                            guides_coords.append((element.top + element.bottom) / 2)
-                        elif align == "between":
-                            # For between, collect top edges for processing later
-                            guides_coords.append(element.top)
+        # Check if markers is an ElementCollection or has elements attribute
+        if hasattr(markers, "elements") or hasattr(markers, "_elements"):
+            # It's an ElementCollection - use elements directly
+            elements_to_process = getattr(markers, "elements", getattr(markers, "_elements", []))
+        elif hasattr(markers, "__iter__") and not isinstance(markers, str):
+            # Check if it's an iterable of elements (not strings)
+            try:
+                markers_list = list(markers)
+                if markers_list and hasattr(markers_list[0], "x0"):
+                    # It's a list of elements
+                    elements_to_process = markers_list
+            except:
+                pass
 
-        # Handle 'between' alignment - find midpoints between adjacent markers
-        if align == "between" and len(guides_coords) >= 2:
-            # We need to get the right and left edges of each marker
-            marker_bounds = []
+        if elements_to_process:
+            # Process elements directly without text search
+            for element in elements_to_process:
+                if axis == "vertical":
+                    if align == "left":
+                        guides_coords.append(element.x0)
+                    elif align == "right":
+                        guides_coords.append(element.x1)
+                    elif align == "center":
+                        guides_coords.append((element.x0 + element.x1) / 2)
+                    elif align == "between":
+                        # For between, collect left edges for processing later
+                        guides_coords.append(element.x0)
+                else:  # horizontal
+                    if align == "left":  # top for horizontal
+                        guides_coords.append(element.top)
+                    elif align == "right":  # bottom for horizontal
+                        guides_coords.append(element.bottom)
+                    elif align == "center":
+                        guides_coords.append((element.top + element.bottom) / 2)
+                    elif align == "between":
+                        # For between, collect top edges for processing later
+                        guides_coords.append(element.top)
+        else:
+            # Fall back to text-based search
+            marker_texts = _normalize_markers(markers, obj)
+
+            # Find each marker and determine guide position
             for marker in marker_texts:
                 if hasattr(obj, "find"):
                     element = obj.find(
@@ -1570,9 +1680,52 @@ class Guides:
                     )
                     if element:
                         if axis == "vertical":
-                            marker_bounds.append((element.x0, element.x1))
+                            if align == "left":
+                                guides_coords.append(element.x0)
+                            elif align == "right":
+                                guides_coords.append(element.x1)
+                            elif align == "center":
+                                guides_coords.append((element.x0 + element.x1) / 2)
+                            elif align == "between":
+                                # For between, collect left edges for processing later
+                                guides_coords.append(element.x0)
                         else:  # horizontal
-                            marker_bounds.append((element.top, element.bottom))
+                            if align == "left":  # top for horizontal
+                                guides_coords.append(element.top)
+                            elif align == "right":  # bottom for horizontal
+                                guides_coords.append(element.bottom)
+                            elif align == "center":
+                                guides_coords.append((element.top + element.bottom) / 2)
+                            elif align == "between":
+                                # For between, collect top edges for processing later
+                                guides_coords.append(element.top)
+
+        # Handle 'between' alignment - find midpoints between adjacent markers
+        if align == "between" and len(guides_coords) >= 2:
+            # We need to get the right and left edges of each marker
+            marker_bounds = []
+
+            if elements_to_process:
+                # Use elements directly
+                for element in elements_to_process:
+                    if axis == "vertical":
+                        marker_bounds.append((element.x0, element.x1))
+                    else:  # horizontal
+                        marker_bounds.append((element.top, element.bottom))
+            else:
+                # Fall back to text search
+                if "marker_texts" not in locals():
+                    marker_texts = _normalize_markers(markers, obj)
+                for marker in marker_texts:
+                    if hasattr(obj, "find"):
+                        element = obj.find(
+                            f'text:contains("{marker}")', apply_exclusions=apply_exclusions
+                        )
+                        if element:
+                            if axis == "vertical":
+                                marker_bounds.append((element.x0, element.x1))
+                            else:  # horizontal
+                                marker_bounds.append((element.top, element.bottom))
 
             # Sort markers by their left edge (or top edge for horizontal)
             marker_bounds.sort(key=lambda x: x[0])

{natural_pdf-0.2.11 → natural_pdf-0.2.13}/natural_pdf/core/highlighting_service.py

@@ -92,6 +92,16 @@ class HighlightRenderer:
 
     def _draw_highlights(self):
         """Draws all highlight shapes, borders, vertices, and attributes."""
+        # Get the pdfplumber page offset for coordinate translation
+        page_offset_x = 0
+        page_offset_y = 0
+
+        if hasattr(self.page, "_page") and hasattr(self.page._page, "bbox"):
+            # PDFPlumber page bbox might have negative offsets
+            page_offset_x = -self.page._page.bbox[0]
+            page_offset_y = -self.page._page.bbox[1]
+            logger.debug(f"Applying highlight offset: x={page_offset_x}, y={page_offset_y}")
+
         for highlight in self.highlights:
             # Create a transparent overlay for this single highlight
             overlay = Image.new("RGBA", self.base_image.size, (0, 0, 0, 0))
@@ -101,7 +111,11 @@ class HighlightRenderer:
 
             if highlight.is_polygon:
                 scaled_polygon = [
-                    (p[0] * self.scale_factor, p[1] * self.scale_factor) for p in highlight.polygon
+                    (
+                        (p[0] + page_offset_x) * self.scale_factor,
+                        (p[1] + page_offset_y) * self.scale_factor,
+                    )
+                    for p in highlight.polygon
                 ]
                 # Draw polygon fill and border
                 draw.polygon(
@@ -117,11 +131,16 @@ class HighlightRenderer:
             else:  # Rectangle
                 x0, top, x1, bottom = highlight.bbox
                 x0_s, top_s, x1_s, bottom_s = (
-                    x0 * self.scale_factor,
-                    top * self.scale_factor,
-                    x1 * self.scale_factor,
-                    bottom * self.scale_factor,
+                    (x0 + page_offset_x) * self.scale_factor,
+                    (top + page_offset_y) * self.scale_factor,
+                    (x1 + page_offset_x) * self.scale_factor,
+                    (bottom + page_offset_y) * self.scale_factor,
                 )
+                logger.debug(f"Original bbox: ({x0}, {top}, {x1}, {bottom})")
+                logger.debug(
+                    f"Offset bbox: ({x0 + page_offset_x}, {top + page_offset_y}, {x1 + page_offset_x}, {bottom + page_offset_y})"
+                )
+                logger.debug(f"Scaled bbox: ({x0_s}, {top_s}, {x1_s}, {bottom_s})")
                 scaled_bbox = [x0_s, top_s, x1_s, bottom_s]
                 # Draw rectangle fill and border
                 draw.rectangle(
@@ -1482,11 +1501,22 @@ class HighlightingService:
                 offset_x = crop_offset[0] * scale_factor
                 offset_y = crop_offset[1] * scale_factor
 
+            # Add pdfplumber page offset for coordinate translation
+            page_offset_x = 0
+            page_offset_y = 0
+            if hasattr(page, "_page") and hasattr(page._page, "bbox"):
+                # PDFPlumber page bbox might have negative offsets
+                page_offset_x = -page._page.bbox[0]
+                page_offset_y = -page._page.bbox[1]
+
             # Draw the highlight
             if polygon:
                 # Scale polygon points and apply offset
                 scaled_polygon = [
-                    (p[0] * scale_factor - offset_x, p[1] * scale_factor - offset_y)
+                    (
+                        (p[0] + page_offset_x) * scale_factor - offset_x,
+                        (p[1] + page_offset_y) * scale_factor - offset_y,
+                    )
                     for p in polygon
                 ]
                 draw.polygon(
@@ -1496,10 +1526,10 @@ class HighlightingService:
                 # Scale bbox and apply offset
                 x0, y0, x1, y1 = bbox
                 scaled_bbox = [
-                    x0 * scale_factor - offset_x,
-                    y0 * scale_factor - offset_y,
-                    x1 * scale_factor - offset_x,
-                    y1 * scale_factor - offset_y,
+                    (x0 + page_offset_x) * scale_factor - offset_x,
+                    (y0 + page_offset_y) * scale_factor - offset_y,
+                    (x1 + page_offset_x) * scale_factor - offset_x,
+                    (y1 + page_offset_y) * scale_factor - offset_y,
                 ]
                 draw.rectangle(
                     scaled_bbox, fill=color, outline=(color[0], color[1], color[2], BORDER_ALPHA)

{natural_pdf-0.2.11 → natural_pdf-0.2.13}/natural_pdf/core/page.py

@@ -815,11 +815,38 @@ class Page(
                             if debug:
                                 print(f"    ✗ Empty iterable returned from callable '{label}'")
                     elif region_result:
-                        logger.warning(
-                            f"Callable exclusion '{exclusion_label}' returned non-Region object: {type(region_result)}. Skipping."
-                        )
-                        if debug:
-                            print(f"    ✗ Callable returned non-Region/None: {type(region_result)}")
+                        # Check if it's a single Element that can be converted to a Region
+                        from natural_pdf.elements.base import Element
+
+                        if isinstance(region_result, Element) or (
+                            hasattr(region_result, "bbox") and hasattr(region_result, "expand")
+                        ):
+                            try:
+                                # Convert Element to Region using expand()
+                                expanded_region = region_result.expand()
+                                if isinstance(expanded_region, Region):
+                                    expanded_region.label = label
+                                    regions.append(expanded_region)
+                                    if debug:
+                                        print(
+                                            f"    ✓ Converted Element to Region from callable '{label}': {expanded_region}"
+                                        )
+                                else:
+                                    if debug:
+                                        print(
+                                            f"    ✗ Element.expand() did not return a Region: {type(expanded_region)}"
+                                        )
+                            except Exception as e:
+                                if debug:
+                                    print(f"    ✗ Failed to convert Element to Region: {e}")
+                        else:
+                            logger.warning(
+                                f"Callable exclusion '{exclusion_label}' returned non-Region object: {type(region_result)}. Skipping."
+                            )
+                            if debug:
+                                print(
+                                    f"    ✗ Callable returned non-Region/None: {type(region_result)}"
+                                )
                     else:
                         if debug:
                             print(
@@ -839,6 +866,27 @@ class Page(
                 if debug:
                     print(f"  - Added direct region '{label}': {exclusion_item}")
 
+            # Process direct Element objects - convert to Region
+            elif hasattr(exclusion_item, "bbox") and hasattr(exclusion_item, "expand"):
+                try:
+                    # Convert Element to Region using expand()
+                    expanded_region = exclusion_item.expand()
+                    if isinstance(expanded_region, Region):
+                        expanded_region.label = label
+                        regions.append(expanded_region)
+                        if debug:
+                            print(
+                                f"  - Converted direct Element to Region '{label}': {expanded_region}"
+                            )
+                    else:
+                        if debug:
+                            print(
+                                f"  - Element.expand() did not return a Region: {type(expanded_region)}"
+                            )
+                except Exception as e:
+                    if debug:
+                        print(f"  - Failed to convert Element to Region: {e}")
+
             # Process string selectors (from PDF-level exclusions)
             elif isinstance(exclusion_item, str):
                 selector_str = exclusion_item
@@ -1081,7 +1129,7 @@ class Page(
         )  # _apply_selector doesn't filter
 
         # Filter the results based on exclusions if requested
-        if apply_exclusions and self._exclusions and results_collection:
+        if apply_exclusions and results_collection:
             filtered_elements = self._filter_elements_by_exclusions(results_collection.elements)
             # Return the first element from the filtered list
             return filtered_elements[0] if filtered_elements else None
@@ -1176,7 +1224,7 @@ class Page(
         )  # _apply_selector doesn't filter
 
         # Filter the results based on exclusions if requested
-        if apply_exclusions and self._exclusions and results_collection:
+        if apply_exclusions and results_collection:
             filtered_elements = self._filter_elements_by_exclusions(results_collection.elements)
             return ElementCollection(filtered_elements)
         else:
@@ -1548,7 +1596,7 @@ class Page(
         all_elements = self._element_mgr.get_all_elements()
 
         # Apply exclusions if requested
-        if apply_exclusions and self._exclusions:
+        if apply_exclusions:
             return self._filter_elements_by_exclusions(
                 all_elements, debug_exclusions=debug_exclusions
             )

{natural_pdf-0.2.11 → natural_pdf-0.2.13}/natural_pdf/elements/base.py

@@ -106,6 +106,7 @@ class DirectionalMixin:
         include_source: bool = False,
         until: Optional[str] = None,
         include_endpoint: bool = True,
+        offset: float = 0.1,
         **kwargs,
     ) -> "Region":
         """
@@ -118,6 +119,7 @@ class DirectionalMixin:
             include_source: Whether to include this element/region's area in the result
             until: Optional selector string to specify a boundary element
             include_endpoint: Whether to include the boundary element found by 'until'
+            offset: Pixel offset when excluding source/endpoint (default: 0.1)
             **kwargs: Additional parameters for the 'until' selector search
 
         Returns:
@@ -127,7 +129,7 @@ class DirectionalMixin:
 
         is_horizontal = direction in ("left", "right")
         is_positive = direction in ("right", "below")  # right/below are positive directions
-        pixel_offset = 1  # Offset for excluding elements/endpoints
+        pixel_offset = offset  # Use provided offset for excluding elements/endpoints
 
         # 1. Determine initial boundaries based on direction and include_source
         if is_horizontal:
@@ -260,6 +262,7 @@ class DirectionalMixin:
         include_source: bool = False,
         until: Optional[str] = None,
         include_endpoint: bool = True,
+        offset: float = 0.1,
         **kwargs,
     ) -> "Region":
         """
@@ -271,6 +274,7 @@ class DirectionalMixin:
             include_source: Whether to include this element/region in the result (default: False)
             until: Optional selector string to specify an upper boundary element
             include_endpoint: Whether to include the boundary element in the region (default: True)
+            offset: Pixel offset when excluding source/endpoint (default: 0.1)
             **kwargs: Additional parameters
 
         Returns:
@@ -295,6 +299,7 @@ class DirectionalMixin:
             include_source=include_source,
             until=until,
             include_endpoint=include_endpoint,
+            offset=offset,
             **kwargs,
         )
 
@@ -305,6 +310,7 @@ class DirectionalMixin:
         include_source: bool = False,
         until: Optional[str] = None,
         include_endpoint: bool = True,
+        offset: float = 0.1,
         **kwargs,
     ) -> "Region":
         """
@@ -316,6 +322,7 @@ class DirectionalMixin:
             include_source: Whether to include this element/region in the result (default: False)
             until: Optional selector string to specify a lower boundary element
             include_endpoint: Whether to include the boundary element in the region (default: True)
+            offset: Pixel offset when excluding source/endpoint (default: 0.1)
             **kwargs: Additional parameters
 
         Returns:
@@ -340,6 +347,7 @@ class DirectionalMixin:
             include_source=include_source,
             until=until,
             include_endpoint=include_endpoint,
+            offset=offset,
             **kwargs,
         )
 
@@ -350,6 +358,7 @@ class DirectionalMixin:
         include_source: bool = False,
         until: Optional[str] = None,
         include_endpoint: bool = True,
+        offset: float = 0.1,
         **kwargs,
     ) -> "Region":
         """
@@ -361,6 +370,7 @@ class DirectionalMixin:
             include_source: Whether to include this element/region in the result (default: False)
             until: Optional selector string to specify a left boundary element
             include_endpoint: Whether to include the boundary element in the region (default: True)
+            offset: Pixel offset when excluding source/endpoint (default: 0.1)
             **kwargs: Additional parameters
 
         Returns:
@@ -385,6 +395,7 @@ class DirectionalMixin:
             include_source=include_source,
             until=until,
             include_endpoint=include_endpoint,
+            offset=offset,
             **kwargs,
         )
 
@@ -395,6 +406,7 @@ class DirectionalMixin:
         include_source: bool = False,
         until: Optional[str] = None,
         include_endpoint: bool = True,
+        offset: float = 0.1,
         **kwargs,
     ) -> "Region":
         """
@@ -406,6 +418,7 @@ class DirectionalMixin:
             include_source: Whether to include this element/region in the result (default: False)
             until: Optional selector string to specify a right boundary element
             include_endpoint: Whether to include the boundary element in the region (default: True)
+            offset: Pixel offset when excluding source/endpoint (default: 0.1)
             **kwargs: Additional parameters
 
         Returns:
@@ -430,6 +443,7 @@ class DirectionalMixin:
             include_source=include_source,
             until=until,
             include_endpoint=include_endpoint,
+            offset=offset,
             **kwargs,
         )