deepdoctection 0.41.0__py3-none-any.whl → 0.42.1__py3-none-any.whl

deepdoctection/__init__.py

@@ -25,7 +25,7 @@ from .utils.logger import LoggingRecord, logger
 
 # pylint: enable=wrong-import-position
 
-__version__ = "0.41.0"
+__version__ = "0.42.1"
 
 _IMPORT_STRUCTURE = {
     "analyzer": ["config_sanity_checks", "get_dd_analyzer", "ServiceFactory"],
@@ -95,6 +95,7 @@ _IMPORT_STRUCTURE = {
         "Image",
         "Word",
         "Layout",
+        "List",
         "Cell",
         "Table",
         "Page",
@@ -440,7 +441,7 @@ if TYPE_CHECKING:
     from .eval import *
     from .extern import *  # type: ignore
     from .mapper import *  # type: ignore
-    from .pipe import *
+    from .pipe import *  # type: ignore
     from .train import *
     from .utils import *
 

deepdoctection/analyzer/_config.py

@@ -40,7 +40,7 @@ cfg.TF.CELL.FILTER = None
 cfg.TF.ITEM.WEIGHTS = "item/model-1620000_inf_only.data-00000-of-00001"
 cfg.TF.ITEM.FILTER = None
 
-cfg.PT.ENFORCE_WEIGHTS = False
+cfg.PT.ENFORCE_WEIGHTS.LAYOUT = True
 cfg.PT.LAYOUT.WEIGHTS = "layout/d2_model_0829999_layout_inf_only.pt"
 cfg.PT.LAYOUT.WEIGHTS_TS = "layout/d2_model_0829999_layout_inf_only.ts"
 cfg.PT.LAYOUT.FILTER = None
@@ -49,6 +49,7 @@ cfg.PT.LAYOUT.PAD.RIGHT = 60
 cfg.PT.LAYOUT.PAD.BOTTOM = 60
 cfg.PT.LAYOUT.PAD.LEFT = 60
 
+cfg.PT.ENFORCE_WEIGHTS.ITEM = True
 cfg.PT.ITEM.WEIGHTS = "item/d2_model_1639999_item_inf_only.pt"
 cfg.PT.ITEM.WEIGHTS_TS = "item/d2_model_1639999_item_inf_only.ts"
 cfg.PT.ITEM.FILTER = None
@@ -57,6 +58,7 @@ cfg.PT.ITEM.PAD.RIGHT = 60
 cfg.PT.ITEM.PAD.BOTTOM = 60
 cfg.PT.ITEM.PAD.LEFT = 60
 
+cfg.PT.ENFORCE_WEIGHTS.CELL = True
 cfg.PT.CELL.WEIGHTS = "cell/d2_model_1849999_cell_inf_only.pt"
 cfg.PT.CELL.WEIGHTS_TS = "cell/d2_model_1849999_cell_inf_only.ts"
 cfg.PT.CELL.FILTER = None
@@ -137,6 +139,7 @@ cfg.TEXT_ORDERING.HEIGHT_TOLERANCE = 2.0
 cfg.TEXT_ORDERING.PARAGRAPH_BREAK = 0.035
 
 cfg.USE_LAYOUT_LINK = False
+cfg.USE_LINE_MATCHER = False
 cfg.LAYOUT_LINK.PARENTAL_CATEGORIES = []
 cfg.LAYOUT_LINK.CHILD_CATEGORIES = []
 

deepdoctection/analyzer/dd.py

@@ -32,7 +32,7 @@ from ..extern.pt.ptutils import get_torch_device
 from ..extern.tp.tfutils import disable_tp_layer_logging, get_tf_device
 from ..pipe.doctectionpipe import DoctectionPipe
 from ..utils.env_info import ENV_VARS_TRUE
-from ..utils.file_utils import tensorpack_available
+from ..utils.file_utils import tensorpack_available, detectron2_available
 from ..utils.fs import get_configs_dir_path, get_package_path, maybe_copy_config_to_cache
 from ..utils.logger import LoggingRecord, logger
 from ..utils.metacfg import set_config_by_yaml
@@ -140,6 +140,12 @@ def get_dd_analyzer(
     cfg.LANGUAGE = None
     cfg.LIB = lib
     cfg.DEVICE = device
+    if not detectron2_available() or cfg.PT.LAYOUT.WEIGHTS is None:
+        cfg.PT.ENFORCE_WEIGHTS.LAYOUT=False
+    if not detectron2_available() or cfg.PT.ITEM.WEIGHTS is None:
+        cfg.PT.ENFORCE_WEIGHTS.ITEM=False
+    if not detectron2_available() or cfg.PT.CELL.WEIGHTS is None:
+        cfg.PT.ENFORCE_WEIGHTS.CELL=False
     cfg.freeze()
 
     if config_overwrite:

deepdoctection/analyzer/factory.py

@@ -50,7 +50,6 @@ from ..pipe.sub_layout import DetectResultGenerator, SubImageLayoutService
 from ..pipe.text import TextExtractionService
 from ..pipe.transform import SimpleTransformService
 from ..utils.error import DependencyError
-from ..utils.file_utils import detectron2_available
 from ..utils.fs import get_configs_dir_path
 from ..utils.metacfg import AttrDict
 from ..utils.settings import CellType, LayoutType, Relationships
@@ -96,12 +95,13 @@ class ServiceFactory:
         """
         if config.LIB is None:
             raise DependencyError("At least one of the env variables DD_USE_TF or DD_USE_TORCH must be set.")
+
         weights = (
             getattr(config.TF, mode).WEIGHTS
             if config.LIB == "TF"
             else (
                 getattr(config.PT, mode).WEIGHTS
-                if detectron2_available() or config.PT.ENFORCE_WEIGHTS
+                if getattr(config.PT.ENFORCE_WEIGHTS,mode)
                 else getattr(config.PT, mode).WEIGHTS_TS
             )
         )
@@ -240,8 +240,6 @@ class ServiceFactory:
 
         :param config: configuration object
         """
-        if not detectron2_available() and config.LIB == "PT":
-            raise ModuleNotFoundError("LAYOUT_NMS_PAIRS is only available for detectron2")
         if not isinstance(config.LAYOUT_NMS_PAIRS.COMBINATIONS, list) and not isinstance(
             config.LAYOUT_NMS_PAIRS.COMBINATIONS[0], list
         ):
@@ -577,7 +575,14 @@ class ServiceFactory:
                 parent_categories=config.WORD_MATCHING.PARENTAL_CATEGORIES,
                 child_categories=config.TEXT_CONTAINER,
                 relationship_key=Relationships.CHILD,
-            )
+            ),
+            FamilyCompound(
+                parent_categories=[LayoutType.LIST],
+                child_categories=[LayoutType.LIST_ITEM],
+                relationship_key=Relationships.CHILD,
+                create_synthetic_parent=True,
+                synthetic_parent=LayoutType.LIST,
+            ),
         ]
         return MatchingService(
             family_compounds=family_compounds,
@@ -622,6 +627,34 @@ class ServiceFactory:
         """
         return ServiceFactory._build_layout_link_matching_service(config)
 
+    @staticmethod
+    def _build_line_matching_service(config: AttrDict) -> MatchingService:
+        matcher = IntersectionMatcher(
+            matching_rule=config.WORD_MATCHING.RULE,
+            threshold=config.WORD_MATCHING.THRESHOLD,
+            max_parent_only=config.WORD_MATCHING.MAX_PARENT_ONLY,
+        )
+        family_compounds = [
+            FamilyCompound(
+                parent_categories=[LayoutType.LIST],
+                child_categories=[LayoutType.LINE],
+                relationship_key=Relationships.CHILD,
+            ),
+        ]
+        return MatchingService(
+            family_compounds=family_compounds,
+            matcher=matcher,
+        )
+
+    @staticmethod
+    def build_line_matching_service(config: AttrDict) -> MatchingService:
+        """Building a word matching service
+
+        :param config: configuration object
+        :return: MatchingService
+        """
+        return ServiceFactory._build_line_matching_service(config)
+
     @staticmethod
     def _build_text_order_service(config: AttrDict) -> TextOrderService:
         """Building a text order service
@@ -748,6 +781,10 @@ class ServiceFactory:
             layout_link_matching_service = ServiceFactory.build_layout_link_matching_service(config)
             pipe_component_list.append(layout_link_matching_service)
 
+        if config.USE_LINE_MATCHER:
+            line_list_matching_service = ServiceFactory.build_line_matching_service(config)
+            pipe_component_list.append(line_list_matching_service)
+
         page_parsing_service = ServiceFactory.build_page_parsing_service(config)
 
         return DoctectionPipe(pipeline_component_list=pipe_component_list, page_parsing_service=page_parsing_service)

deepdoctection/datapoint/view.py

@@ -25,7 +25,6 @@ from copy import copy
 from typing import Any, Mapping, Optional, Sequence, Type, TypedDict, Union, no_type_check
 
 import numpy as np
-from typing_extensions import LiteralString
 
 from ..utils.error import AnnotationError, ImageError
 from ..utils.logger import LoggingRecord, log_once, logger
@@ -285,6 +284,52 @@ class Cell(Layout):
         return set(CellType).union(super().get_attribute_names())
 
 
+class List(Layout):
+    """
+    List specific subclass of `ImageAnnotationBaseView` modelled by `LayoutType`.
+    """
+
+    @property
+    def words(self) -> list[ImageAnnotationBaseView]:
+        """
+        Get a list of `ImageAnnotationBaseView` objects with `LayoutType` defined by `text_container`.
+        It will only select those among all annotations that have an entry in `Relationships.child` .
+        """
+        all_words: list[ImageAnnotationBaseView] = []
+
+        for list_item in self.list_items:
+            all_words.extend(list_item.words)  # type: ignore
+        return all_words
+
+    def get_ordered_words(self) -> list[ImageAnnotationBaseView]:
+        """Returns a list of words order by reading order. Words with no reading order will not be returned"""
+        try:
+            list_items = self.list_items
+            all_words = []
+            list_items.sort(key=lambda x: x.bbox[1])
+            for list_item in list_items:
+                all_words.extend(list_item.get_ordered_words()) # type: ignore
+            return all_words
+        except (TypeError, AnnotationError):
+            return super().get_ordered_words()
+
+    @property
+    def list_items(self) -> list[ImageAnnotationBaseView]:
+        """
+        A list of a list items.
+        """
+        all_relation_ids = self.get_relationship(Relationships.CHILD)
+        list_items = self.base_page.get_annotation(
+            annotation_ids=all_relation_ids,
+            category_names=(
+                LayoutType.LIST_ITEM,
+                LayoutType.LINE,
+            ),
+        )
+        list_items.sort(key=lambda x: x.bbox[1])
+        return list_items
+
+
 class Table(Layout):
     """
     Table specific sub class of `ImageAnnotationBaseView` modelled by `TableType`.
@@ -372,7 +417,7 @@ class Table(Layout):
             category_names=[LayoutType.CELL, CellType.SPANNING], annotation_ids=all_relation_ids
         )
         row_cells = list(
-            filter(lambda c: row_number in (c.row_number, c.row_number + c.row_span), all_cells)  # type: ignore
+            filter(lambda c: c.row_number <= row_number <= c.row_number + c.row_span - 1, all_cells)  # type: ignore
         )
         row_cells.sort(key=lambda c: c.column_number)  # type: ignore
         column_header_cells = self.column_header_cells
@@ -560,6 +605,7 @@ IMAGE_ANNOTATION_TO_LAYOUTS: dict[ObjectTypes, Type[Union[Layout, Table, Word]]]
     LayoutType.TABLE_ROTATED: Table,
     LayoutType.WORD: Word,
     LayoutType.CELL: Cell,
+    LayoutType.LIST: List,
     CellType.SPANNING: Cell,
     CellType.ROW_HEADER: Cell,
     CellType.COLUMN_HEADER: Cell,
@@ -573,6 +619,7 @@ class ImageDefaults(TypedDict):
     text_container: LayoutType
     floating_text_block_categories: tuple[Union[LayoutType, CellType], ...]
     text_block_categories: tuple[Union[LayoutType, CellType], ...]
+    residual_layouts: tuple[LayoutType, ...]
 
 
 IMAGE_DEFAULTS: ImageDefaults = {
@@ -591,6 +638,7 @@ IMAGE_DEFAULTS: ImageDefaults = {
         LayoutType.FIGURE,
         CellType.SPANNING,
     ),
+    "residual_layouts": (LayoutType.LINE,),
 }
 
 
@@ -770,19 +818,8 @@ class Page(Image):
         """
         return self.get_annotation(category_names=self._get_residual_layout())
 
-    def _get_residual_layout(self) -> list[LiteralString]:
-        layouts = copy(list(self.floating_text_block_categories))
-        layouts.extend(
-            [
-                LayoutType.TABLE,
-                LayoutType.FIGURE,
-                self.text_container,
-                LayoutType.CELL,
-                LayoutType.ROW,
-                LayoutType.COLUMN,
-            ]
-        )
-        return [layout for layout in LayoutType if layout not in layouts]
+    def _get_residual_layout(self) -> tuple[LayoutType, ...]:
+        return IMAGE_DEFAULTS["residual_layouts"]
 
     @classmethod
     def from_image(

deepdoctection/extern/doctrocr.py

@@ -424,7 +424,8 @@ class DoctrTextRecognizer(TextRecognizer):
             custom_configs.pop("task", None)
             recognition_configs["mean"] = custom_configs.pop("mean")
             recognition_configs["std"] = custom_configs.pop("std")
-            batch_size = custom_configs.pop("batch_size")
+            if "batch_size" in custom_configs:
+                batch_size = custom_configs.pop("batch_size")
         recognition_configs["batch_size"] = batch_size
 
         if isinstance(architecture, str):

deepdoctection/mapper/d2struct.py

@@ -102,7 +102,7 @@ def image_to_d2_frcnn_training(
     return output
 
 
-def pt_nms_image_annotations(
+def pt_nms_image_annotations_depr(
     anns: Sequence[ImageAnnotation], threshold: float, image_id: Optional[str] = None, prio: str = ""
 ) -> Sequence[str]:
     """
@@ -147,6 +147,69 @@ def pt_nms_image_annotations(
     return []
 
 
+def pt_nms_image_annotations(
+    anns: Sequence[ImageAnnotation], threshold: float, image_id: Optional[str] = None, prio: str = ""
+) -> Sequence[str]:
+    """
+    Processing given image annotations through NMS. This is useful, if you want to supress some specific image
+    annotation, e.g. given by name or returned through different predictors. This is the pt version, for tf check
+    `mapper.tpstruct`
+
+    :param anns: A sequence of ImageAnnotations. All annotations will be treated as if they belong to one category
+    :param threshold: NMS threshold
+    :param image_id: id in order to get the embedding bounding box
+    :param prio: If an annotation has prio, it will overwrite its given score to 1 so that it will never be suppressed
+    :return: A list of annotation_ids that belong to the given input sequence and that survive the NMS process
+    """
+    if len(anns) == 1:
+        return [anns[0].annotation_id]
+
+    if not anns:
+        return []
+
+    # First, identify priority annotations that should always be kept
+    priority_ann_ids = []
+
+    if prio:
+        for ann in anns:
+            if ann.category_name == prio:
+                priority_ann_ids.append(ann.annotation_id)
+
+    # If all annotations are priority or none are left for NMS, return all priority IDs
+    if len(priority_ann_ids) == len(anns):
+        return priority_ann_ids
+
+    def priority_to_confidence(ann: ImageAnnotation, priority: str) -> float:
+        if ann.category_name == priority:
+            return 1.0
+        if ann.score:
+            return ann.score
+        raise ValueError("score cannot be None")
+
+    # Perform NMS only on non-priority annotations
+    ann_ids = np.array([ann.annotation_id for ann in anns], dtype="object")
+
+    # Get boxes for non-priority annotations
+    boxes = torch.tensor(
+        [ann.get_bounding_box(image_id).to_list(mode="xyxy") for ann in anns if ann.bounding_box is not None]
+    )
+
+    scores = torch.tensor([priority_to_confidence(ann, prio) for ann in anns])
+    class_mask = torch.ones(len(boxes), dtype=torch.uint8)
+
+    keep = batched_nms(boxes, scores, class_mask, threshold)
+    kept_ids = ann_ids[keep]
+
+    # Convert to list if necessary
+    if isinstance(kept_ids, str):
+        kept_ids = [kept_ids]
+    elif not isinstance(kept_ids, list):
+        kept_ids = kept_ids.tolist()
+
+    # Combine priority annotations with surviving non-priority annotations
+    return list(set(priority_ann_ids + kept_ids))
+
+
 def _get_category_attributes(
     ann: ImageAnnotation, cat_to_sub_cat: Optional[Mapping[ObjectTypes, ObjectTypes]] = None
 ) -> tuple[ObjectTypes, int, Optional[float]]:

deepdoctection/mapper/tpstruct.py

@@ -95,11 +95,21 @@ def tf_nms_image_annotations(
     """
     if len(anns) == 1:
         return [anns[0].annotation_id]
+
     if not anns:
         return []
-    ann_ids = np.array([ann.annotation_id for ann in anns], dtype="object")
 
-    boxes = convert_to_tensor([ann.get_bounding_box(image_id).to_list(mode="xyxy") for ann in anns])
+    # First, identify priority annotations that should always be kept
+    priority_ann_ids = []
+
+    if prio:
+        for ann in anns:
+            if ann.category_name == prio:
+                priority_ann_ids.append(ann.annotation_id)
+
+    # If all annotations are priority or none are left for NMS, return all priority IDs
+    if len(priority_ann_ids) == len(anns):
+        return priority_ann_ids
 
     def priority_to_confidence(ann: ImageAnnotation, priority: str) -> float:
         if ann.category_name == priority:
@@ -108,10 +118,24 @@ def tf_nms_image_annotations(
             return ann.score
         raise ValueError("score cannot be None")
 
+    # Perform NMS only on non-priority annotations
+    ann_ids = np.array([ann.annotation_id for ann in anns], dtype="object")
+
+    # Get boxes for non-priority annotations
+    boxes = convert_to_tensor([ann.get_bounding_box(image_id).to_list(mode="xyxy") for ann in anns if ann.bounding_box
+                               is not None])
+
     scores = convert_to_tensor([priority_to_confidence(ann, prio) for ann in anns])
     class_mask = convert_to_tensor(len(boxes), dtype=uint8)
+
     keep = non_max_suppression(boxes, scores, class_mask, iou_threshold=threshold)
-    ann_ids_keep = ann_ids[keep]
-    if not isinstance(ann_ids_keep, str):
-        return ann_ids_keep.tolist()
-    return []
+    kept_ids = ann_ids[keep]
+
+    # Convert to list if necessary
+    if isinstance(kept_ids, str):
+        kept_ids = [kept_ids]
+    elif not isinstance(kept_ids, list):
+        kept_ids = kept_ids.tolist()
+
+    # Combine priority annotations with surviving non-priority annotations
+    return list(set(priority_ann_ids + kept_ids))

deepdoctection/pipe/common.py

@@ -30,6 +30,7 @@ import numpy as np
 from ..dataflow import DataFlow, MapData
 from ..datapoint.image import Image
 from ..datapoint.view import IMAGE_DEFAULTS, Page
+from ..extern.base import DetectionResult
 from ..mapper.match import match_anns_by_distance, match_anns_by_intersection
 from ..mapper.misc import to_image
 from ..utils.settings import LayoutType, ObjectTypes, Relationships, TypeOrStr, get_type
@@ -51,9 +52,9 @@ class ImageCroppingService(PipelineComponent):
     """
 
     def __init__(
-        self,
-        category_names: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
-        service_ids: Optional[Sequence[str]] = None,
+            self,
+            category_names: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
+            service_ids: Optional[Sequence[str]] = None,
     ) -> None:
         """
         :param category_names: A single name or a list of category names to crop
@@ -106,11 +107,11 @@ class IntersectionMatcher:
     """
 
     def __init__(
-        self,
-        matching_rule: Literal["iou", "ioa"],
-        threshold: float,
-        use_weighted_intersections: bool = False,
-        max_parent_only: bool = False,
+            self,
+            matching_rule: Literal["iou", "ioa"],
+            threshold: float,
+            use_weighted_intersections: bool = False,
+            max_parent_only: bool = False,
     ) -> None:
         """
         :param matching_rule: "iou" or "ioa"
@@ -130,12 +131,12 @@ class IntersectionMatcher:
         self.max_parent_only = max_parent_only
 
     def match(
-        self,
-        dp: Image,
-        parent_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
-        child_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
-        parent_ann_service_ids: Optional[Union[str, Sequence[str]]] = None,
-        child_ann_service_ids: Optional[Union[str, Sequence[str]]] = None,
+            self,
+            dp: Image,
+            parent_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
+            child_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
+            parent_ann_service_ids: Optional[Union[str, Sequence[str]]] = None,
+            child_ann_service_ids: Optional[Union[str, Sequence[str]]] = None,
     ) -> list[tuple[str, str]]:
         """
         The matching algorithm
@@ -188,12 +189,12 @@ class NeighbourMatcher:
     """
 
     def match(
-        self,
-        dp: Image,
-        parent_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
-        child_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
-        parent_ann_service_ids: Optional[Union[str, Sequence[str]]] = None,
-        child_ann_service_ids: Optional[Union[str, Sequence[str]]] = None,
+            self,
+            dp: Image,
+            parent_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
+            child_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
+            parent_ann_service_ids: Optional[Union[str, Sequence[str]]] = None,
+            child_ann_service_ids: Optional[Union[str, Sequence[str]]] = None,
     ) -> list[tuple[str, str]]:
         """
         The matching algorithm
@@ -233,6 +234,8 @@ class FamilyCompound:
     child_categories: Optional[Union[ObjectTypes, Sequence[ObjectTypes]]] = field(default=None)
     parent_ann_service_ids: Optional[Union[str, Sequence[str]]] = field(default=None)
     child_ann_service_ids: Optional[Union[str, Sequence[str]]] = field(default=None)
+    create_synthetic_parent: bool = field(default=False)
+    synthetic_parent: Optional[ObjectTypes] = field(default=None)
 
     def __post_init__(self) -> None:
         if isinstance(self.parent_categories, str):
@@ -257,9 +260,9 @@ class MatchingService(PipelineComponent):
     """
 
     def __init__(
-        self,
-        family_compounds: Sequence[FamilyCompound],
-        matcher: Union[IntersectionMatcher, NeighbourMatcher],
+            self,
+            family_compounds: Sequence[FamilyCompound],
+            matcher: Union[IntersectionMatcher, NeighbourMatcher],
     ) -> None:
         """
         :param family_compounds: A list of FamilyCompounds
@@ -287,6 +290,28 @@ class MatchingService(PipelineComponent):
 
             for pair in matched_pairs:
                 self.dp_manager.set_relationship_annotation(family_compound.relationship_key, pair[0], pair[1])
+            if family_compound.synthetic_parent:
+                parent_anns = dp.get_annotation(category_names=family_compound.parent_categories)
+                child_anns = dp.get_annotation(category_names=family_compound.child_categories)
+                child_ann_ids = []
+                for parent in parent_anns:
+                    if family_compound.relationship_key in parent.relationships:
+                        child_ann_ids.extend(parent.get_relationship(family_compound.relationship_key))
+                detect_result_list = []
+                for child_ann in child_anns:
+                    if child_ann.annotation_id not in child_ann_ids:
+                        detect_result_list.append(DetectionResult(
+                            class_name=family_compound.synthetic_parent,
+                            box=child_ann.get_bounding_box(dp.image_id).to_list(mode="xyxy"),
+                            absolute_coords=child_ann.get_bounding_box(dp.image_id).absolute_coords,
+                            relationships={family_compound.relationship_key: child_ann.annotation_id}))
+                for detect_result in detect_result_list:
+                    annotation_id = self.dp_manager.set_image_annotation(detect_result)
+                    if annotation_id is not None and detect_result.relationships is not None:
+                        self.dp_manager.set_relationship_annotation(family_compound.relationship_key,
+                                                                    annotation_id,
+                                                                    detect_result.relationships.get(
+                                                                        family_compound.relationship_key, None))
 
     def clone(self) -> PipelineComponent:
         return self.__class__(self.family_compounds, self.matcher)
@@ -316,10 +341,10 @@ class PageParsingService(PipelineComponent):
     """
 
     def __init__(
-        self,
-        text_container: TypeOrStr,
-        floating_text_block_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
-        include_residual_text_container: bool = True,
+            self,
+            text_container: TypeOrStr,
+            floating_text_block_categories: Optional[Union[TypeOrStr, Sequence[TypeOrStr]]] = None,
+            include_residual_text_container: bool = True,
     ):
         """
         :param text_container: name of an image annotation that has a CHARS sub category. These annotations will be
@@ -401,10 +426,10 @@ class AnnotationNmsService(PipelineComponent):
     """
 
     def __init__(
-        self,
-        nms_pairs: Sequence[Sequence[TypeOrStr]],
-        thresholds: Union[float, Sequence[float]],
-        priority: Optional[Sequence[Union[Optional[TypeOrStr]]]] = None,
+            self,
+            nms_pairs: Sequence[Sequence[TypeOrStr]],
+            thresholds: Union[float, Sequence[float]],
+            priority: Optional[Sequence[Union[Optional[TypeOrStr]]]] = None,
     ):
         """
         :param nms_pairs: Groups of categories, either as string or by `ObjectType`.

deepdoctection/pipe/segment.py

@@ -441,6 +441,7 @@ def segment_table(
         matching_rule=segment_rule,
         threshold=threshold_rows,
         use_weighted_intersections=True,
+        # Rows and columns are child annotations of the table.
         parent_ann_ids=child_ann_ids,
         child_ann_ids=child_ann_ids,
     )
@@ -452,6 +453,7 @@ def segment_table(
         matching_rule=segment_rule,
         threshold=threshold_cols,
         use_weighted_intersections=True,
+        # Rows and columns are child annotations of the table.
         parent_ann_ids=child_ann_ids,
         child_ann_ids=child_ann_ids,
     )
@@ -624,6 +626,7 @@ def segment_pubtables(
         matching_rule=segment_rule,
         threshold=threshold_rows,
         use_weighted_intersections=True,
+        # Rows and columns are child annotations of the table.
         parent_ann_ids=child_ann_ids,
         child_ann_ids=child_ann_ids,
     )
@@ -635,6 +638,7 @@ def segment_pubtables(
         matching_rule=segment_rule,
         threshold=threshold_cols,
         use_weighted_intersections=True,
+        # Rows and columns are child annotations of the table.
         parent_ann_ids=child_ann_ids,
         child_ann_ids=child_ann_ids,
     )

deepdoctection/train/hf_detr_train.py

@@ -276,7 +276,7 @@ def train_hf_detr(
 
     if path_weights != "":
         model = TableTransformerForObjectDetection.from_pretrained(
-            pretrained_model_name_or_path=path_weights, config=config
+            pretrained_model_name_or_path=path_weights, config=config, ignore_mismatched_sizes=True
         )
     else:
         model = TableTransformerForObjectDetection(config)

{deepdoctection-0.41.0.dist-info → deepdoctection-0.42.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepdoctection
-Version: 0.41.0
+Version: 0.42.1
 Summary: Repository for Document AI
 Home-page: https://github.com/deepdoctection/deepdoctection
 Author: Dr. Janis Meyer
@@ -33,7 +33,7 @@ Requires-Dist: pyzmq>=16
 Requires-Dist: scipy>=1.13.1
 Requires-Dist: termcolor>=1.1
 Requires-Dist: tabulate>=0.7.7
-Requires-Dist: tqdm==4.64.0
+Requires-Dist: tqdm>=4.64.0
 Provides-Extra: tf
 Requires-Dist: catalogue==2.0.10; extra == "tf"
 Requires-Dist: huggingface_hub>=0.26.0; extra == "tf"
@@ -52,7 +52,7 @@ Requires-Dist: pyzmq>=16; extra == "tf"
 Requires-Dist: scipy>=1.13.1; extra == "tf"
 Requires-Dist: termcolor>=1.1; extra == "tf"
 Requires-Dist: tabulate>=0.7.7; extra == "tf"
-Requires-Dist: tqdm==4.64.0; extra == "tf"
+Requires-Dist: tqdm>=4.64.0; extra == "tf"
 Requires-Dist: tensorpack==0.11; extra == "tf"
 Requires-Dist: protobuf==3.20.1; extra == "tf"
 Requires-Dist: tensorflow-addons>=0.17.1; extra == "tf"
@@ -84,7 +84,7 @@ Requires-Dist: pyzmq>=16; extra == "pt"
 Requires-Dist: scipy>=1.13.1; extra == "pt"
 Requires-Dist: termcolor>=1.1; extra == "pt"
 Requires-Dist: tabulate>=0.7.7; extra == "pt"
-Requires-Dist: tqdm==4.64.0; extra == "pt"
+Requires-Dist: tqdm>=4.64.0; extra == "pt"
 Requires-Dist: timm>=0.9.16; extra == "pt"
 Requires-Dist: transformers>=4.48.0; extra == "pt"
 Requires-Dist: accelerate>=0.29.1; extra == "pt"

{deepdoctection-0.41.0.dist-info → deepdoctection-0.42.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-deepdoctection/__init__.py,sha256=cr4wBN6EV5-nllpbHfU9jPaHa-L0QfPKcdqFThHeJFc,12850
+deepdoctection/__init__.py,sha256=rNPP6I2lwOt7lHvcnYd1UJq9oNzYMcH9Zsd8sbs9iaQ,12882
 deepdoctection/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deepdoctection/analyzer/__init__.py,sha256=icClxrd20XutD6LxLgEPIWceSs4j_QfI3szCE-9BL2w,729
-deepdoctection/analyzer/_config.py,sha256=kxQzDQvl2ygH84VTnumbRF7JLGM6VeJoBzv1xssm6H4,5019
-deepdoctection/analyzer/dd.py,sha256=bfR7e1JV7BwUNDRLu0jYZU7qQXnyA_vbRAJl2Ylrq5o,5905
-deepdoctection/analyzer/factory.py,sha256=aw6Nrqfjcg3M0Qy6214nX-oBv3GKTv62Wnz6WRTw2c8,33267
+deepdoctection/analyzer/_config.py,sha256=nJoTP4OZEKFxdNcMqJZFE3xCbtTGZ0w8V5nW1BCMBVQ,5124
+deepdoctection/analyzer/dd.py,sha256=Mnt3cwRWNSlQ8Vf2_fgRC30aU2J39QjYJWQSU22JiRY,6255
+deepdoctection/analyzer/factory.py,sha256=py6e2NlKG8-LYzw8k8dgvfp9o1VOuy-OMRDQelKWI9o,34520
 deepdoctection/configs/__init__.py,sha256=TX_P6tqDOF1LK1mi9ruAl7x0mtv1Asm8cYWCz3Pe2dk,646
 deepdoctection/configs/conf_dd_one.yaml,sha256=qnrDAST1PHBtdIKE_hdkZexW22FqVvNTI-PEo9wvinM,3025
 deepdoctection/configs/conf_tesseract.yaml,sha256=oF6szDyoi15FHvq7yFUNIEjfA_jNLhGxoowiRsz_zY4,35
@@ -20,7 +20,7 @@ deepdoctection/datapoint/annotation.py,sha256=FEgz4COxVDfjic0gG7kS6iHnWLBIgFnquQ
 deepdoctection/datapoint/box.py,sha256=XPhC_xHqLZJjzafg1pIS_CxnVB5-0_yk-twsZZ3ncUU,30093
 deepdoctection/datapoint/convert.py,sha256=h3ky-Qn6YA8Qoyy5SMUkjJq___cK0hbcwFygDyqqm-4,7123
 deepdoctection/datapoint/image.py,sha256=_jN46UJUsOi6GC6VEUcp3L_vLL-iYRW05RKcFLWb6Dc,34048
-deepdoctection/datapoint/view.py,sha256=-4EygREbqQ0gNwS_LUWBX9svmug8wAE2vPA3k4zyyc4,50762
+deepdoctection/datapoint/view.py,sha256=Gj47_nlIVoaDvTtypQHzxHLJLXN2uxOhhVRHERDQJlE,52135
 deepdoctection/datasets/__init__.py,sha256=-A3aR90aDsHPmVM35JavfnQ2itYSCn3ujl4krRni1QU,1076
 deepdoctection/datasets/adapter.py,sha256=Ly_vbOAgVI73V41FUccnSX1ECTOyesW_qsuvQuvOZbw,7796
 deepdoctection/datasets/base.py,sha256=X5Sr0yyal9x8rqWaWYr5mA_bE11UzN1iFXmWu605q2Y,22713
@@ -53,7 +53,7 @@ deepdoctection/extern/__init__.py,sha256=9Iks9b4Q_LynjcV167TVCoK8YsQRUcA2jjmAmDN
 deepdoctection/extern/base.py,sha256=oRuoAduVchsR3H7Ddm-KAe_smt0N6PlQftPqJ75FWfA,28944
 deepdoctection/extern/d2detect.py,sha256=zrKv1yurApnjD7QZIZk_8LYCahjmN82MQUjHjv8zvkQ,22127
 deepdoctection/extern/deskew.py,sha256=iax1ztkguGDfD4KQMDyuvanR4J2VgpCRuVWWDTwViu4,3083
-deepdoctection/extern/doctrocr.py,sha256=iUww7PuhCioEEv8ModrAElPPeEBa32zwUEa6OQf_y_c,24672
+deepdoctection/extern/doctrocr.py,sha256=htlFswrdRncEqC3PKjzXIifEu4ua3i09CNtrfEnlgBg,24723
 deepdoctection/extern/fastlang.py,sha256=F4gK-SEwcCujjxH327ZDzMGWToJ49xS_dCKcePQ9IlY,4780
 deepdoctection/extern/hfdetr.py,sha256=JzHrrTyzS9qh6T2TsvKboAGZkIhno2txmSoLQ5Vd-lo,12077
 deepdoctection/extern/hflayoutlm.py,sha256=tFaf90FRbZzhSycdp8rGkeiPywQa6UcTEEwbayIXkr0,57023
@@ -90,7 +90,7 @@ deepdoctection/extern/tp/tpfrcnn/utils/np_box_ops.py,sha256=O-q1GQiOEd1lN1MQDsJv
 deepdoctection/mapper/__init__.py,sha256=Xqb34aCjslZDQnqQgCSvnloL5DbdT9eHhn-StpVPbzE,1130
 deepdoctection/mapper/cats.py,sha256=O06WGkpOIlSNMCy5VESl2HYOFDTuT9ls4aZIaWUv9VU,16602
 deepdoctection/mapper/cocostruct.py,sha256=GcbUpPFUg67pcOHQluWBFOFcGaYnlZcTmwBDERBVgCA,5978
-deepdoctection/mapper/d2struct.py,sha256=Dx-YnycsIQH4a5-9Gn_yMhiQ-gOFgMueNeH3rhXjuCU,8555
+deepdoctection/mapper/d2struct.py,sha256=CPmjBIqGpBUEh-4hcLbHXQQPHIMTyNvcp9B5miCqZd0,11019
 deepdoctection/mapper/hfstruct.py,sha256=2PjGKsYturVJBimLT1CahYh09KSRAFEHz_QNtC162kQ,5551
 deepdoctection/mapper/laylmstruct.py,sha256=Es_aQOsfCkereJLOd1yaXhNAEEFJkODRuThUJ-d6hHU,42904
 deepdoctection/mapper/maputils.py,sha256=eI6ZcDg9W5uB6xQNBZpMIdEd86HlCxTtkJuyROdTqiw,8146
@@ -99,12 +99,12 @@ deepdoctection/mapper/misc.py,sha256=vX-fV420Te00eD-cqTiWBV2twHqdBcBV2_7rAFRgPRg
 deepdoctection/mapper/pascalstruct.py,sha256=TzVU1p0oiw0nOuxTFFbEB9vXJxH1v6VUvTJ7MD0manU,3828
 deepdoctection/mapper/prodigystruct.py,sha256=Re4Sd_zAp6qOvbXZLmMJeG0IGEfMQxebuyDeZgMcTa8,6827
 deepdoctection/mapper/pubstruct.py,sha256=PAJ2N1HSPNS6F2ZrIwlD7PiBhIM-rJscK_Ti8OR_IGs,23370
-deepdoctection/mapper/tpstruct.py,sha256=YNABRibvcISD5Lavg3jouoE4FMdqXEJoM-hNoB_rnww,4481
+deepdoctection/mapper/tpstruct.py,sha256=W8-K3DKM9U0LwsmAMqtEqpfol1F1t5rNXh2595GCPTk,5251
 deepdoctection/mapper/xfundstruct.py,sha256=_3r3c0K82fnF2h1HxA85h-9ETYrHwcERa6MNc6Ko6Z8,8807
 deepdoctection/pipe/__init__.py,sha256=ywTVoetftdL6plXg2YlBzMfmqBZupq7yXblSVyvvkcQ,1127
 deepdoctection/pipe/anngen.py,sha256=7wvp7eghDwrgcIyu1vjRxmVy4SADPbn-k4ud8y2bgjU,15338
 deepdoctection/pipe/base.py,sha256=wlza9aDOKnHKrXmaz8MLyLz0nMqqcIWQ-6Lu944aicE,15390
-deepdoctection/pipe/common.py,sha256=lY4kvQ5iOxp1NtdZf1KPrWXHMjU7Px8NtEBdUTDl9RQ,21032
+deepdoctection/pipe/common.py,sha256=qnNa9ZzDJgMx62rlQ0bx_rtfhrHeLCK29swtSZjei3o,23058
 deepdoctection/pipe/concurrency.py,sha256=AAKRsVgaBEYNluntbDa46SBF1JZ_XqnWLDSWrNvAzEo,9657
 deepdoctection/pipe/doctectionpipe.py,sha256=bGW3ugky-fb-nEe-3bvO6Oc_4_6w82cQboGM_6p2eIo,12530
 deepdoctection/pipe/language.py,sha256=5zI0UQC6Fh12_r2pfVL42HoCGz2hpHrOhpXAn5m-rYw,5451
@@ -113,13 +113,13 @@ deepdoctection/pipe/lm.py,sha256=x9NoYpivdjQF1r76a7PPrUuBEmuHP7ZukuXFDkXhXBc,175
 deepdoctection/pipe/order.py,sha256=0KNiMinedjfuDVVHxJSaDL1yl4Sub-miMPcEC4gGwPA,39423
 deepdoctection/pipe/refine.py,sha256=dTfI396xydPdbzpfo4yqFcuxl3UAB1y-WbSQn1o76ec,22367
 deepdoctection/pipe/registry.py,sha256=aFx-Tn0xhVA5l5H18duNW5QoTNKQltybsEUEzsMgUfg,902
-deepdoctection/pipe/segment.py,sha256=sny59GuP7dxLGX3YjHF0wllPxSiXL1GNQEhMGKcF8ZU,59594
+deepdoctection/pipe/segment.py,sha256=lR_aCY7yJm0GCygLPRVQBv_WgWvCNgG9F_B-37qrbMU,59846
 deepdoctection/pipe/sub_layout.py,sha256=D73H5b2Zl35fN58TaY0_nGhwI9Nwj3wqDdDPz8ce9Fg,13538
 deepdoctection/pipe/text.py,sha256=tLlJtneM__WsrAvp4pQFqwNlmq2RLqKqiPXlJ2lkniU,10483
 deepdoctection/pipe/transform.py,sha256=eCSRbyxHLz11owOHFA9UDX7tOJPZG2eiPWIGJv2odbk,4890
 deepdoctection/train/__init__.py,sha256=YFTRAZF1F7cEAKTdAIi1BLyYb6rSRcwq09Ui5Lu8d6E,1071
 deepdoctection/train/d2_frcnn_train.py,sha256=sFc_G-mEpaM8d1CCE0_6Gl4nBh11X2RYRBA3p_ylFJQ,16000
-deepdoctection/train/hf_detr_train.py,sha256=uBkkRyxrJF5UF__KbYvIlmb-HRWQ9TY6LiJr1Rm56kI,12043
+deepdoctection/train/hf_detr_train.py,sha256=cFZdV0XEYsReMBCrIYZsNFT6E2OBpp6vb1FJAE-qGRs,12073
 deepdoctection/train/hf_layoutlm_train.py,sha256=8kiGp_8GEyqCkLgeMgCJOLJWSVoKWkUBHsZtDjZOcRk,22556
 deepdoctection/train/tp_frcnn_train.py,sha256=pEpXokSVGveqo82pRnhnAmHPmjQ_8wQWpqM4ZyNHJgs,13049
 deepdoctection/utils/__init__.py,sha256=brBceRWeov9WXMiJTjyJOF2rHMP8trGGRRjhMdZ61nI,2371
@@ -141,8 +141,8 @@ deepdoctection/utils/transform.py,sha256=5mY5D6hhk6cKFp0T1LJ2_jMjjBxJopcFZffAN5P
 deepdoctection/utils/types.py,sha256=ti4WdtIJSg3TGK_YPkkoY9PYGMnR2tTX6Xfik8U1pNk,2986
 deepdoctection/utils/utils.py,sha256=csVs_VvCq4QBETPoE2JdTTL4MFYnD4xh-Js5vRb612g,6492
 deepdoctection/utils/viz.py,sha256=Jf8ePNYWlpuyaS6SeTYQ4OyA3eNhtgjvAQZnGNdgHC0,27051
-deepdoctection-0.41.0.dist-info/licenses/LICENSE,sha256=GQ0rUvuGdrMNEI3iHK5UQx6dIMU1QwAuyXsxUHn5MEQ,11351
-deepdoctection-0.41.0.dist-info/METADATA,sha256=-okfYzsN5uUB9BR6j3eKaLZtzxCr9lRWsoyvf-RgXwM,19763
-deepdoctection-0.41.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-deepdoctection-0.41.0.dist-info/top_level.txt,sha256=hs2DdoOL9h4mnHhmO82BT4pz4QATIoOZ20PZmlnxFI8,15
-deepdoctection-0.41.0.dist-info/RECORD,,
+deepdoctection-0.42.1.dist-info/licenses/LICENSE,sha256=GQ0rUvuGdrMNEI3iHK5UQx6dIMU1QwAuyXsxUHn5MEQ,11351
+deepdoctection-0.42.1.dist-info/METADATA,sha256=ckwg7bNCfNi-IPFAnYURuZULlHgrf2SfikingNB8ztM,19763
+deepdoctection-0.42.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+deepdoctection-0.42.1.dist-info/top_level.txt,sha256=hs2DdoOL9h4mnHhmO82BT4pz4QATIoOZ20PZmlnxFI8,15
+deepdoctection-0.42.1.dist-info/RECORD,,

{deepdoctection-0.41.0.dist-info → deepdoctection-0.42.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any