fix: fix handling of generic groups in rich table cells (#383)

Signed-off-by: Panos Vagenas <[email protected]>

Author: vagenas

docling_core/transforms/serializer/common.py

@@ -394,6 +394,7 @@ def serialize(
                 item=item,
                 doc_serializer=self,
                 doc=self.doc,
+                visited=my_visited,
                 **my_kwargs,
             )
         return part

docling_core/transforms/serializer/doctags.py

@@ -32,6 +32,7 @@
     DoclingDocument,
     FloatingItem,
     FormItem,
+    GroupItem,
     InlineGroup,
     KeyValueItem,
     ListGroup,
@@ -516,7 +517,12 @@ def serialize(
         **kwargs: Any,
     ) -> SerializationResult:
         """Serializes the passed item."""
-        return create_ser_result()
+        if isinstance(item, GroupItem):
+            parts = doc_serializer.get_parts(item=item, **kwargs)
+            text_res = "\n".join([p.text for p in parts if p.text])
+            return create_ser_result(text=text_res, span_source=parts)
+        else:
+            return create_ser_result()
 
 
 class DocTagsAnnotationSerializer(BaseAnnotationSerializer):

docling_core/transforms/serializer/html.py

@@ -55,6 +55,7 @@
     FormItem,
     FormulaItem,
     GraphData,
+    GroupItem,
     ImageRef,
     InlineGroup,
     KeyValueItem,
@@ -787,21 +788,30 @@ class HTMLFallbackSerializer(BaseFallbackSerializer):
     """HTML-specific fallback serializer."""
 
     @override
-    def serialize(self, *, item: NodeItem, **kwargs: Any) -> SerializationResult:
+    def serialize(
+        self,
+        *,
+        item: NodeItem,
+        doc_serializer: "BaseDocSerializer",
+        doc: DoclingDocument,
+        **kwargs: Any,
+    ) -> SerializationResult:
         """Fallback serializer for items not handled by other serializers."""
-        if isinstance(item, DocItem):
+        if isinstance(item, GroupItem):
+            parts = doc_serializer.get_parts(item=item, **kwargs)
+            text_res = "\n".join([p.text for p in parts if p.text])
+            return create_ser_result(text=text_res, span_source=parts)
+        else:
             return create_ser_result(
                 text=f"<!-- Unhandled item type: {item.__class__.__name__} -->",
-                span_source=item,
+                span_source=item if isinstance(item, DocItem) else [],
             )
-        else:
-            # For group items, we don't generate any markup
-            return create_ser_result()
 
 
 class HTMLAnnotationSerializer(BaseModel, BaseAnnotationSerializer):
     """HTML-specific annotation serializer."""
 
+    @override
     def serialize(
         self,
         *,

docling_core/transforms/serializer/markdown.py

@@ -45,6 +45,7 @@
     Formatting,
     FormItem,
     FormulaItem,
+    GroupItem,
     ImageRef,
     InlineGroup,
     KeyValueItem,
@@ -599,13 +600,15 @@ def serialize(
         **kwargs: Any,
     ) -> SerializationResult:
         """Serializes the passed item."""
-        if isinstance(item, DocItem):
+        if isinstance(item, GroupItem):
+            parts = doc_serializer.get_parts(item=item, **kwargs)
+            text_res = "\n\n".join([p.text for p in parts if p.text])
+            return create_ser_result(text=text_res, span_source=parts)
+        else:
             return create_ser_result(
                 text="<!-- missing-text -->",
-                span_source=item,
+                span_source=item if isinstance(item, DocItem) else [],
             )
-        else:
-            return create_ser_result()
 
 
 class MarkdownDocSerializer(DocSerializer):

test/data/doc/rich_table.gt.html

@@ -128,7 +128,8 @@ <h1>Rich tables</h1>
 <table><tbody><tr><td>cell 0,0</td><td>cell 0,1</td></tr><tr><td>cell 1,0</td><td><em><p>text in italic</p></em></td></tr><tr><td><ul>
 <li>list item 1</li>
 <li>list item 2</li>
-</ul></td><td>cell 2,1</td></tr><tr><td>cell 3,0</td><td><table><tbody><tr><td>inner cell 0,0</td><td>inner cell 0,1</td><td>inner cell 0,2</td></tr><tr><td>inner cell 1,0</td><td>inner cell 1,1</td><td>inner cell 1,2</td></tr></tbody></table></td></tr></tbody></table>
+</ul></td><td>cell 2,1</td></tr><tr><td>cell 3,0</td><td><table><tbody><tr><td>inner cell 0,0</td><td>inner cell 0,1</td><td>inner cell 0,2</td></tr><tr><td>inner cell 1,0</td><td>inner cell 1,1</td><td>inner cell 1,2</td></tr></tbody></table></td></tr><tr><td><p>Some text in a generic group.</p>
+<p>More text in the group.</p></td><td>cell 4,1</td></tr></tbody></table>
 </div>
 </body>
 </html>

test/data/doc/rich_table.gt.md

@@ -1,7 +1,8 @@
 # Rich tables
 
-| cell 0,0                    | cell 0,1                                                                                                                                                                         |
-|-----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| cell 1,0                    | *text in italic*                                                                                                                                                                 |
-| - list item 1 - list item 2 | cell 2,1                                                                                                                                                                         |
-| cell 3,0                    | | inner cell 0,0   | inner cell 0,1   | inner cell 0,2   | |------------------|------------------|------------------| | inner cell 1,0   | inner cell 1,1   | inner cell 1,2   | |
+| cell 0,0                                               | cell 0,1                                                                                                                                                                         |
+|--------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| cell 1,0                                               | *text in italic*                                                                                                                                                                 |
+| - list item 1 - list item 2                            | cell 2,1                                                                                                                                                                         |
+| cell 3,0                                               | | inner cell 0,0   | inner cell 0,1   | inner cell 0,2   | |------------------|------------------|------------------| | inner cell 1,0   | inner cell 1,1   | inner cell 1,2   | |
+| Some text in a generic group.  More text in the group. | cell 4,1                                                                                                                                                                         |

test/data/doc/rich_table.out.dt

@@ -1,5 +1,6 @@
 <doctag><title>Rich tables</title>
 <otsl><fcel>cell 0,0<fcel>cell 0,1<nl><fcel>cell 1,0<fcel><text>text in italic</text><nl><fcel><unordered_list><list_item>list item 1</list_item>
 <list_item>list item 2</list_item>
-</unordered_list><fcel>cell 2,1<nl><fcel>cell 3,0<fcel><otsl><fcel>inner cell 0,0<fcel>inner cell 0,1<fcel>inner cell 0,2<nl><fcel>inner cell 1,0<fcel>inner cell 1,1<fcel>inner cell 1,2<nl></otsl><nl></otsl>
+</unordered_list><fcel>cell 2,1<nl><fcel>cell 3,0<fcel><otsl><fcel>inner cell 0,0<fcel>inner cell 0,1<fcel>inner cell 0,2<nl><fcel>inner cell 1,0<fcel>inner cell 1,1<fcel>inner cell 1,2<nl></otsl><nl><fcel><text>Some text in a generic group.</text>
+<text>More text in the group.</text><fcel>cell 4,1<nl></otsl>
 </doctag>

test/data/doc/rich_table.out.yaml

@@ -23,6 +23,15 @@ groups:
   parent:
     $ref: '#/tables/0'
   self_ref: '#/groups/0'
+- children:
+  - $ref: '#/texts/4'
+  - $ref: '#/texts/5'
+  content_layer: body
+  label: unspecified
+  name: group
+  parent:
+    $ref: '#/tables/0'
+  self_ref: '#/groups/1'
 key_value_items: []
 name: ''
 pages: {}
@@ -35,6 +44,7 @@ tables:
   - $ref: '#/texts/1'
   - $ref: '#/groups/0'
   - $ref: '#/tables/1'
+  - $ref: '#/groups/1'
   content_layer: body
   data:
     grid:
@@ -118,8 +128,28 @@ tables:
         start_col_offset_idx: 1
         start_row_offset_idx: 3
         text: ''
+    - - col_span: 1
+        column_header: false
+        end_col_offset_idx: 1
+        end_row_offset_idx: 5
+        row_header: false
+        row_section: false
+        row_span: 1
+        start_col_offset_idx: 0
+        start_row_offset_idx: 4
+        text: ''
+      - col_span: 1
+        column_header: false
+        end_col_offset_idx: 2
+        end_row_offset_idx: 5
+        row_header: false
+        row_section: false
+        row_span: 1
+        start_col_offset_idx: 1
+        start_row_offset_idx: 4
+        text: cell 4,1
     num_cols: 2
-    num_rows: 4
+    num_rows: 5
     table_cells:
     - col_span: 1
       column_header: false
@@ -207,6 +237,28 @@ tables:
       start_col_offset_idx: 1
       start_row_offset_idx: 3
       text: ''
+    - col_span: 1
+      column_header: false
+      end_col_offset_idx: 1
+      end_row_offset_idx: 5
+      ref:
+        $ref: '#/groups/1'
+      row_header: false
+      row_section: false
+      row_span: 1
+      start_col_offset_idx: 0
+      start_row_offset_idx: 4
+      text: ''
+    - col_span: 1
+      column_header: false
+      end_col_offset_idx: 2
+      end_row_offset_idx: 5
+      row_header: false
+      row_section: false
+      row_span: 1
+      start_col_offset_idx: 1
+      start_row_offset_idx: 4
+      text: cell 4,1
   footnotes: []
   label: table
   parent:
@@ -397,4 +449,22 @@ texts:
   prov: []
   self_ref: '#/texts/3'
   text: list item 2
+- children: []
+  content_layer: body
+  label: text
+  orig: Some text in a generic group.
+  parent:
+    $ref: '#/groups/1'
+  prov: []
+  self_ref: '#/texts/4'
+  text: Some text in a generic group.
+- children: []
+  content_layer: body
+  label: text
+  orig: More text in the group.
+  parent:
+    $ref: '#/groups/1'
+  prov: []
+  self_ref: '#/texts/5'
+  text: More text in the group.
 version: 1.6.0

test/data/doc/rich_table_post_text_del.out.yaml

@@ -22,6 +22,15 @@ groups:
   parent:
     $ref: '#/tables/0'
   self_ref: '#/groups/0'
+- children:
+  - $ref: '#/texts/3'
+  - $ref: '#/texts/4'
+  content_layer: body
+  label: unspecified
+  name: group
+  parent:
+    $ref: '#/tables/0'
+  self_ref: '#/groups/1'
 key_value_items: []
 name: ''
 pages: {}
@@ -34,6 +43,7 @@ tables:
   - $ref: '#/texts/0'
   - $ref: '#/groups/0'
   - $ref: '#/tables/1'
+  - $ref: '#/groups/1'
   content_layer: body
   data:
     grid:
@@ -117,8 +127,28 @@ tables:
         start_col_offset_idx: 1
         start_row_offset_idx: 3
         text: ''
+    - - col_span: 1
+        column_header: false
+        end_col_offset_idx: 1
+        end_row_offset_idx: 5
+        row_header: false
+        row_section: false
+        row_span: 1
+        start_col_offset_idx: 0
+        start_row_offset_idx: 4
+        text: ''
+      - col_span: 1
+        column_header: false
+        end_col_offset_idx: 2
+        end_row_offset_idx: 5
+        row_header: false
+        row_section: false
+        row_span: 1
+        start_col_offset_idx: 1
+        start_row_offset_idx: 4
+        text: cell 4,1
     num_cols: 2
-    num_rows: 4
+    num_rows: 5
     table_cells:
     - col_span: 1
       column_header: false
@@ -206,6 +236,28 @@ tables:
       start_col_offset_idx: 1
       start_row_offset_idx: 3
       text: ''
+    - col_span: 1
+      column_header: false
+      end_col_offset_idx: 1
+      end_row_offset_idx: 5
+      ref:
+        $ref: '#/groups/1'
+      row_header: false
+      row_section: false
+      row_span: 1
+      start_col_offset_idx: 0
+      start_row_offset_idx: 4
+      text: ''
+    - col_span: 1
+      column_header: false
+      end_col_offset_idx: 2
+      end_row_offset_idx: 5
+      row_header: false
+      row_section: false
+      row_span: 1
+      start_col_offset_idx: 1
+      start_row_offset_idx: 4
+      text: cell 4,1
   footnotes: []
   label: table
   parent:
@@ -387,4 +439,22 @@ texts:
   prov: []
   self_ref: '#/texts/2'
   text: list item 2
+- children: []
+  content_layer: body
+  label: text
+  orig: Some text in a generic group.
+  parent:
+    $ref: '#/groups/1'
+  prov: []
+  self_ref: '#/texts/3'
+  text: Some text in a generic group.
+- children: []
+  content_layer: body
+  label: text
+  orig: More text in the group.
+  parent:
+    $ref: '#/groups/1'
+  prov: []
+  self_ref: '#/texts/4'
+  text: More text in the group.
 version: 1.6.0

test/test_docling_doc.py

@@ -2102,7 +2102,7 @@ def _construct_rich_table_doc():
 
     table_item = doc.add_table(
         data=TableData(
-            num_rows=4,
+            num_rows=5,
             num_cols=2,
         ),
     )
@@ -2121,6 +2121,17 @@ def _construct_rich_table_doc():
     rich_item_3 = doc.add_table(
         data=TableData(num_rows=2, num_cols=3), parent=table_item
     )
+
+    rich_item_4 = doc.add_group(parent=table_item, label=GroupLabel.UNSPECIFIED)
+    doc.add_text(
+        parent=rich_item_4,
+        text="Some text in a generic group.",
+        label=DocItemLabel.TEXT,
+    )
+    doc.add_text(
+        parent=rich_item_4, text="More text in the group.", label=DocItemLabel.TEXT
+    )
+
     for i in range(rich_item_3.data.num_rows):
         for j in range(rich_item_3.data.num_cols):
             cell = TableCell(
@@ -2158,6 +2169,14 @@ def _construct_rich_table_doc():
                     end_col_offset_idx=j + 1,
                     ref=rich_item_3.get_ref(),
                 )
+            elif i == 4 and j == 0:
+                cell = RichTableCell(
+                    start_row_offset_idx=i,
+                    end_row_offset_idx=i + 1,
+                    start_col_offset_idx=j,
+                    end_col_offset_idx=j + 1,
+                    ref=rich_item_4.get_ref(),
+                )
             else:
                 cell = TableCell(
                     start_row_offset_idx=i,