docling-core 2.43.0__tar.gz → 2.44.0__tar.gz

{docling_core-2.43.0 → docling_core-2.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docling-core
-Version: 2.43.0
+Version: 2.44.0
 Summary: A python library to define and validate data types in Docling.
 Author-email: Cesar Berrospi Ramis <ceb@zurich.ibm.com>, Panos Vagenas <pva@zurich.ibm.com>, Michele Dolfi <dol@zurich.ibm.com>, Christoph Auer <cau@zurich.ibm.com>, Peter Staar <taa@zurich.ibm.com>
 Maintainer-email: Panos Vagenas <pva@zurich.ibm.com>, Michele Dolfi <dol@zurich.ibm.com>, Christoph Auer <cau@zurich.ibm.com>, Peter Staar <taa@zurich.ibm.com>, Cesar Berrospi Ramis <ceb@zurich.ibm.com>

{docling_core-2.43.0 → docling_core-2.44.0}/docling_core/transforms/serializer/html.py

@@ -713,6 +713,23 @@ class HTMLListSerializer(BaseModel, BaseListSerializer):
             **kwargs,
         )
 
+        # Append nested list to parent list item:
+        i = 0
+        while i < len(parts):
+            prt = parts[i]
+            if prt.text.startswith(("<ul>", "<ol>")):
+                for j in range(i - 1, -1, -1):
+                    if parts[j].text.startswith(("<li>", "<li ")) and parts[
+                        j
+                    ].text.endswith("</li>"):
+                        before, _, _ = parts[j].text.rpartition("</li>")
+                        parts[j].text = f"{before}\n{prt.text}\n</li>"
+                        break
+                if j > -1:
+                    parts.pop(i)
+            else:
+                i += 1
+
         # Add all child parts
         text_res = "\n".join(
             [

docling_core-2.44.0/docling_core/transforms/visualizer/key_value_visualizer.py

@@ -0,0 +1,217 @@
+"""Key‑value visualizer overlaying key/value cells and their links on page images.
+
+This module complements :py:class:`layout_visualizer.LayoutVisualizer` by drawing
+*key* and *value* cells plus the directed links between them.  It can be stacked
+on top of any other :py:class:`BaseVisualizer` – e.g. first draw the general
+layout, then add the key‑value layer.
+"""
+
+from copy import deepcopy
+from typing import Optional, Union
+
+from PIL import ImageDraw, ImageFont
+from PIL.Image import Image
+from PIL.ImageFont import FreeTypeFont
+from pydantic import BaseModel
+from typing_extensions import override
+
+from docling_core.transforms.visualizer.base import BaseVisualizer
+from docling_core.types.doc.document import ContentLayer, DoclingDocument
+from docling_core.types.doc.labels import GraphCellLabel, GraphLinkLabel
+
+# ---------------------------------------------------------------------------
+# Helper functions / constants
+# ---------------------------------------------------------------------------
+
+# Semi‑transparent RGBA colours for key / value cells and their connecting link
+_KEY_FILL = (0, 170, 0, 70)  # greenish
+_VALUE_FILL = (0, 0, 200, 70)  # bluish
+_LINK_COLOUR = (255, 0, 0, 255)  # red line (solid)
+
+_LABEL_TXT_COLOUR = (0, 0, 0, 255)
+_LABEL_BG_COLOUR = (255, 255, 255, 180)  # semi‑transparent white
+
+
+class KeyValueVisualizer(BaseVisualizer):
+    """Draw key/value graphs stored in :py:attr:`DoclingDocument.key_value_items`."""
+
+    class Params(BaseModel):
+        """Parameters for KeyValueVisualizer controlling label and cell id display, and content layers to visualize."""
+
+        show_label: bool = True  # draw cell text close to bbox
+        show_cell_id: bool = False  # annotate each rectangle with its cell_id
+        content_layers: set[ContentLayer] = {cl for cl in ContentLayer}
+
+    base_visualizer: Optional[BaseVisualizer] = None
+    params: Params = Params()
+
+    # ---------------------------------------------------------------------
+    # Internal helpers
+    # ---------------------------------------------------------------------
+
+    def _cell_fill(self, label: GraphCellLabel) -> tuple[int, int, int, int]:
+        """Return RGBA fill colour depending on *label*."""
+        return _KEY_FILL if label == GraphCellLabel.KEY else _VALUE_FILL
+
+    def _draw_key_value_layer(
+        self,
+        *,
+        image: Image,
+        doc: DoclingDocument,
+        page_no: int,
+        scale_x: float,
+        scale_y: float,
+    ) -> None:
+        """Draw every key‑value graph that has cells on *page_no* onto *image*."""
+        draw = ImageDraw.Draw(image, "RGBA")
+        # Choose a small truetype font if available, otherwise default bitmap font
+        font: Union[ImageFont.ImageFont, FreeTypeFont]
+        try:
+            font = ImageFont.truetype("arial.ttf", 12)
+        except OSError:
+            font = ImageFont.load_default()
+
+        for kv_item in doc.key_value_items:
+            cell_dict = {cell.cell_id: cell for cell in kv_item.graph.cells}
+
+            # ------------------------------------------------------------------
+            # First draw cells (rectangles + optional labels)
+            # ------------------------------------------------------------------
+            for cell in cell_dict.values():
+                if cell.prov is None or cell.prov.page_no != page_no:
+                    continue  # skip cells not on this page or without bbox
+
+                tl_bbox = cell.prov.bbox.to_top_left_origin(
+                    page_height=doc.pages[page_no].size.height
+                )
+                x0, y0, x1, y1 = tl_bbox.as_tuple()
+                x0 *= scale_x
+                x1 *= scale_x
+                y0 *= scale_y
+                y1 *= scale_y
+                fill_rgba = self._cell_fill(cell.label)
+
+                draw.rectangle(
+                    [(x0, y0), (x1, y1)],
+                    outline=fill_rgba[:-1] + (255,),
+                    fill=fill_rgba,
+                )
+
+                if self.params.show_label:
+                    txt_parts = []
+                    if self.params.show_cell_id:
+                        txt_parts.append(str(cell.cell_id))
+                    txt_parts.append(cell.text)
+                    label_text = " | ".join(txt_parts)
+
+                    tbx = draw.textbbox((x0, y0), label_text, font=font)
+                    pad = 2
+                    draw.rectangle(
+                        [(tbx[0] - pad, tbx[1] - pad), (tbx[2] + pad, tbx[3] + pad)],
+                        fill=_LABEL_BG_COLOUR,
+                    )
+                    draw.text((x0, y0), label_text, font=font, fill=_LABEL_TXT_COLOUR)
+
+            # ------------------------------------------------------------------
+            # Then draw links (after rectangles so they appear on top)
+            # ------------------------------------------------------------------
+            for link in kv_item.graph.links:
+                if link.label != GraphLinkLabel.TO_VALUE:
+                    # Future‑proof: ignore other link types silently
+                    continue
+
+                src_cell = cell_dict.get(link.source_cell_id)
+                tgt_cell = cell_dict.get(link.target_cell_id)
+                if src_cell is None or tgt_cell is None:
+                    continue
+                if (
+                    src_cell.prov is None
+                    or tgt_cell.prov is None
+                    or src_cell.prov.page_no != page_no
+                    or tgt_cell.prov.page_no != page_no
+                ):
+                    continue  # only draw if both ends are on this page
+
+                def _centre(bbox):
+                    tl = bbox.to_top_left_origin(
+                        page_height=doc.pages[page_no].size.height
+                    )
+                    l, t, r, b = tl.as_tuple()
+                    return ((l + r) / 2 * scale_x, (t + b) / 2 * scale_y)
+
+                src_xy = _centre(src_cell.prov.bbox)
+                tgt_xy = _centre(tgt_cell.prov.bbox)
+
+                draw.line([src_xy, tgt_xy], fill=_LINK_COLOUR, width=2)
+
+                # draw a small arrow‑head by rendering a short orthogonal line
+                # segment; exact geometry is not critical for visual inspection
+                arrow_len = 6
+                dx = tgt_xy[0] - src_xy[0]
+                dy = tgt_xy[1] - src_xy[1]
+                length = (dx**2 + dy**2) ** 0.5 or 1.0
+                ux, uy = dx / length, dy / length
+                # perpendicular vector
+                px, py = -uy, ux
+                # two points forming the arrow head triangle base
+                head_base_left = (
+                    tgt_xy[0] - ux * arrow_len - px * arrow_len / 2,
+                    tgt_xy[1] - uy * arrow_len - py * arrow_len / 2,
+                )
+                head_base_right = (
+                    tgt_xy[0] - ux * arrow_len + px * arrow_len / 2,
+                    tgt_xy[1] - uy * arrow_len + py * arrow_len / 2,
+                )
+                draw.polygon(
+                    [tgt_xy, head_base_left, head_base_right], fill=_LINK_COLOUR
+                )
+
+    # ---------------------------------------------------------------------
+    # Public API – BaseVisualizer implementation
+    # ---------------------------------------------------------------------
+
+    @override
+    def get_visualization(
+        self,
+        *,
+        doc: DoclingDocument,
+        included_content_layers: Optional[set[ContentLayer]] = None,
+        **kwargs,
+    ) -> dict[Optional[int], Image]:
+        """Return page‑wise images with key/value overlay (incl. base layer)."""
+        base_images = (
+            self.base_visualizer.get_visualization(
+                doc=doc, included_content_layers=included_content_layers, **kwargs
+            )
+            if self.base_visualizer
+            else None
+        )
+
+        if included_content_layers is None:
+            included_content_layers = {cl for cl in ContentLayer}
+
+        images: dict[Optional[int], Image] = {}
+
+        # Ensure we have page images to draw on
+        for page_nr, page in doc.pages.items():
+            base_img = (base_images or {}).get(page_nr)
+            if base_img is None:
+                if page.image is None or (pil_img := page.image.pil_image) is None:
+                    raise RuntimeError("Cannot visualize document without page images")
+                base_img = deepcopy(pil_img)
+            images[page_nr] = base_img
+
+        # Overlay key‑value content
+        for page_nr, img in images.items():  # type: ignore
+            assert isinstance(page_nr, int)
+            scale_x = img.width / doc.pages[page_nr].size.width
+            scale_y = img.height / doc.pages[page_nr].size.height
+            self._draw_key_value_layer(
+                image=img,
+                doc=doc,
+                page_no=page_nr,
+                scale_x=scale_x,
+                scale_y=scale_y,
+            )
+
+        return images

{docling_core-2.43.0 → docling_core-2.44.0}/docling_core/transforms/visualizer/layout_visualizer.py

@@ -148,7 +148,9 @@ class LayoutVisualizer(BaseVisualizer):
         prev_image = None
         prev_page_nr = None
         for idx, (elem, _) in enumerate(
-            doc.iterate_items(included_content_layers=included_content_layers)
+            doc.iterate_items(
+                included_content_layers=included_content_layers, traverse_pictures=True
+            )
         ):
             if not isinstance(elem, DocItem):
                 continue

{docling_core-2.43.0 → docling_core-2.44.0}/docling_core/types/doc/document.py

@@ -5543,8 +5543,27 @@ class DoclingDocument(BaseModel):
         self,
         show_label: bool = True,
         show_branch_numbering: bool = False,
+        viz_mode: Literal["reading_order", "key_value"] = "reading_order",
+        show_cell_id: bool = False,
     ) -> dict[Optional[int], PILImage.Image]:
-        """Get visualization of the document as images by page."""
+        """Get visualization of the document as images by page.
+
+        :param show_label: Show labels on elements (applies to all visualizers).
+        :type show_label: bool
+        :param show_branch_numbering: Show branch numbering (reading order visualizer only).
+        :type show_branch_numbering: bool
+        :param visualizer: Which visualizer to use. One of 'reading_order' (default), 'key_value'.
+        :type visualizer: str
+        :param show_cell_id: Show cell IDs (key value visualizer only).
+        :type show_cell_id: bool
+
+        :returns: Dictionary mapping page numbers to PIL images.
+        :rtype: dict[Optional[int], PILImage.Image]
+        """
+        from docling_core.transforms.visualizer.base import BaseVisualizer
+        from docling_core.transforms.visualizer.key_value_visualizer import (
+            KeyValueVisualizer,
+        )
         from docling_core.transforms.visualizer.layout_visualizer import (
             LayoutVisualizer,
         )
@@ -5552,18 +5571,34 @@ class DoclingDocument(BaseModel):
             ReadingOrderVisualizer,
         )
 
-        visualizer = ReadingOrderVisualizer(
-            base_visualizer=LayoutVisualizer(
-                params=LayoutVisualizer.Params(
+        visualizer_obj: BaseVisualizer
+        if viz_mode == "reading_order":
+            visualizer_obj = ReadingOrderVisualizer(
+                base_visualizer=LayoutVisualizer(
+                    params=LayoutVisualizer.Params(
+                        show_label=show_label,
+                    ),
+                ),
+                params=ReadingOrderVisualizer.Params(
+                    show_branch_numbering=show_branch_numbering,
+                ),
+            )
+        elif viz_mode == "key_value":
+            visualizer_obj = KeyValueVisualizer(
+                base_visualizer=LayoutVisualizer(
+                    params=LayoutVisualizer.Params(
+                        show_label=show_label,
+                    ),
+                ),
+                params=KeyValueVisualizer.Params(
                     show_label=show_label,
+                    show_cell_id=show_cell_id,
                 ),
-            ),
-            params=ReadingOrderVisualizer.Params(
-                show_branch_numbering=show_branch_numbering,
-            ),
-        )
-        images = visualizer.get_visualization(doc=self)
+            )
+        else:
+            raise ValueError(f"Unknown visualization mode: {viz_mode}")
 
+        images = visualizer_obj.get_visualization(doc=self)
         return images
 
     @field_validator("version")

{docling_core-2.43.0 → docling_core-2.44.0}/docling_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docling-core
-Version: 2.43.0
+Version: 2.44.0
 Summary: A python library to define and validate data types in Docling.
 Author-email: Cesar Berrospi Ramis <ceb@zurich.ibm.com>, Panos Vagenas <pva@zurich.ibm.com>, Michele Dolfi <dol@zurich.ibm.com>, Christoph Auer <cau@zurich.ibm.com>, Peter Staar <taa@zurich.ibm.com>
 Maintainer-email: Panos Vagenas <pva@zurich.ibm.com>, Michele Dolfi <dol@zurich.ibm.com>, Christoph Auer <cau@zurich.ibm.com>, Peter Staar <taa@zurich.ibm.com>, Cesar Berrospi Ramis <ceb@zurich.ibm.com>

{docling_core-2.43.0 → docling_core-2.44.0}/docling_core.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ docling_core/transforms/serializer/html_styles.py
 docling_core/transforms/serializer/markdown.py
 docling_core/transforms/visualizer/__init__.py
 docling_core/transforms/visualizer/base.py
+docling_core/transforms/visualizer/key_value_visualizer.py
 docling_core/transforms/visualizer/layout_visualizer.py
 docling_core/transforms/visualizer/reading_order_visualizer.py
 docling_core/transforms/visualizer/table_visualizer.py

{docling_core-2.43.0 → docling_core-2.44.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "docling-core"
-version = "2.43.0"  # DO NOT EDIT, updated automatically
+version = "2.44.0"  # DO NOT EDIT, updated automatically
 description = "A python library to define and validate data types in Docling."
 license = "MIT"
 license-files = ["LICENSE"]

{docling_core-2.43.0 → docling_core-2.44.0}/test/test_base.py

@@ -36,8 +36,8 @@ def test_identifier():
     )
 
     # schema_json(): no need to set by_alias since it is True by the default
-    tf = open("test/data/json_schemas/base_identifier.json", encoding="utf-8")
-    gold_json = json.load(tf)
+    with open("test/data/json_schemas/base_identifier.json", encoding="utf-8") as tf:
+        gold_json = json.load(tf)
 
     assert Identifier.model_json_schema() == gold_json
 

{docling_core-2.43.0 → docling_core-2.44.0}/test/test_docling_doc.py

@@ -1819,9 +1819,10 @@ def test_document_manipulation():
 
     # Test the handling of list items in insert_* methods, both with and without parent groups
 
-    li_sibling = doc.insert_list_item(
-        sibling=node, text="Inserted List Item, Incorrect Parent", after=False
-    )
+    with pytest.warns(DeprecationWarning, match="ListItem parent must be a ListGroup"):
+        li_sibling = doc.insert_list_item(
+            sibling=node, text="Inserted List Item, Incorrect Parent", after=False
+        )
     doc.insert_list_item(
         sibling=li_sibling, text="Inserted List Item, Correct Parent", after=True
     )
@@ -1831,12 +1832,13 @@ def test_document_manipulation():
         text="Inserted Text with LIST_ITEM Label, Correct Parent",
         after=False,
     )
-    doc.insert_text(
-        sibling=node,
-        label=DocItemLabel.LIST_ITEM,
-        text="Inserted Text with LIST_ITEM Label, Incorrect Parent",
-        after=True,
-    )
+    with pytest.warns(DeprecationWarning, match="ListItem parent must be a ListGroup"):
+        doc.insert_text(
+            sibling=node,
+            label=DocItemLabel.LIST_ITEM,
+            text="Inserted Text with LIST_ITEM Label, Incorrect Parent",
+            after=True,
+        )
 
     filename = Path(
         "test/data/doc/constructed_doc.inserted_list_items_with_insert_*.json"

{docling_core-2.43.0 → docling_core-2.44.0}/test/test_doctags_load.py

@@ -60,7 +60,8 @@ def test_doctags_load_from_files():
 
 def test_doctags_load_from_memory():
 
-    doctags = Path("test/data/doc/page_with_pic.dt").open("r").read()
+    with Path("test/data/doc/page_with_pic.dt").open() as file:
+        doctags = file.read()
     image = PILImage.open(Path("test/data/doc/page_with_pic.png"))
 
     doctags_doc = DocTagsDocument.from_doctags_and_image_pairs([doctags], [image])
@@ -75,7 +76,8 @@ def test_doctags_load_from_memory():
 
 
 def test_doctags_load_without_image():
-    doctags = Path("test/data/doc/page_with_pic.dt").open("r").read()
+    with Path("test/data/doc/page_with_pic.dt").open() as file:
+        doctags = file.read()
     doctags_doc = DocTagsDocument.from_doctags_and_image_pairs([doctags], None)
     doc = DoclingDocument.load_from_doctags(doctags_doc)
     exp = "test/data/doc/page_without_pic.dt.json"
@@ -86,7 +88,8 @@ def test_doctags_load_without_image():
 
 
 def test_doctags_load_for_kv_region():
-    doctags = Path("test/data/doc/doc_with_kv.dt").open("r").read()
+    with Path("test/data/doc/doc_with_kv.dt").open() as file:
+        doctags = file.read()
     image = PILImage.open(Path("test/data/doc/doc_with_kv.png"))
     doctags_doc = DocTagsDocument.from_doctags_and_image_pairs([doctags], [image])
     doc = DoclingDocument.load_from_doctags(doctags_doc)
@@ -98,7 +101,8 @@ def test_doctags_load_for_kv_region():
 
 
 def test_multipage_doctags_load():
-    doctags = Path("test/data/doc/2206.01062.yaml.dt").open("r").read()
+    with Path("test/data/doc/2206.01062.yaml.dt").open() as file:
+        doctags = file.read()
     doctags_doc = DocTagsDocument.from_multipage_doctags_and_images(doctags, None)
     doc = DoclingDocument.load_from_doctags(doctags_doc)
     exp = "test/data/doc/2206.01062.yaml.dt.json"