docling-core 2.40.0__tar.gz → 2.41.0__tar.gz

{docling_core-2.40.0 → docling_core-2.41.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docling-core
-Version: 2.40.0
+Version: 2.41.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.40.0 → docling_core-2.41.0}/docling_core/types/doc/base.py

@@ -3,7 +3,7 @@
 from enum import Enum
 from typing import List, Tuple
 
-from pydantic import BaseModel
+from pydantic import BaseModel, FieldSerializationInfo, field_serializer
 
 
 class ImageRefMode(str, Enum):
@@ -21,12 +21,28 @@ class CoordOrigin(str, Enum):
     BOTTOMLEFT = "BOTTOMLEFT"
 
 
+_CTX_COORD_PREC = "coord_prec"
+
+
+def _serialize_precision(
+    value: float, info: FieldSerializationInfo, ctx_key: str
+) -> float:
+    precision = info.context.get(ctx_key) if info.context else None
+    if isinstance(precision, int):
+        return round(value, precision)
+    return value
+
+
 class Size(BaseModel):
     """Size."""
 
     width: float = 0.0
     height: float = 0.0
 
+    @field_serializer("width", "height")
+    def _serialize(self, value: float, info: FieldSerializationInfo) -> float:
+        return _serialize_precision(value, info, _CTX_COORD_PREC)
+
     def as_tuple(self):
         """as_tuple."""
         return (self.width, self.height)
@@ -52,6 +68,10 @@ class BoundingBox(BaseModel):
         """height."""
         return abs(self.t - self.b)
 
+    @field_serializer("l", "t", "r", "b")
+    def _serialize(self, value: float, info: FieldSerializationInfo) -> float:
+        return _serialize_precision(value, info, _CTX_COORD_PREC)
+
     def resize_by_scale(self, x_scale: float, y_scale: float):
         """resize_by_scale."""
         return BoundingBox(

{docling_core-2.40.0 → docling_core-2.41.0}/docling_core/types/doc/document.py

@@ -26,8 +26,10 @@ from pydantic import (
     BaseModel,
     ConfigDict,
     Field,
+    FieldSerializationInfo,
     StringConstraints,
     computed_field,
+    field_serializer,
     field_validator,
     model_validator,
     validate_call,
@@ -38,7 +40,12 @@ from typing_extensions import Annotated, Self, deprecated
 from docling_core.search.package import VERSION_PATTERN
 from docling_core.types.base import _JSON_POINTER_REGEX
 from docling_core.types.doc import BoundingBox, Size
-from docling_core.types.doc.base import CoordOrigin, ImageRefMode
+from docling_core.types.doc.base import (
+    _CTX_COORD_PREC,
+    CoordOrigin,
+    ImageRefMode,
+    _serialize_precision,
+)
 from docling_core.types.doc.labels import (
     CodeLanguageLabel,
     DocItemLabel,
@@ -85,6 +92,8 @@ DOCUMENT_TOKENS_EXPORT_LABELS.update(
     ]
 )
 
+_CTX_CONFID_PREC = "confid_prec"
+
 
 class BaseAnnotation(BaseModel):
     """Base class for all annotation types."""
@@ -98,6 +107,10 @@ class PictureClassificationClass(BaseModel):
     class_name: str
     confidence: float
 
+    @field_serializer("confidence")
+    def _serialize(self, value: float, info: FieldSerializationInfo) -> float:
+        return _serialize_precision(value, info, _CTX_CONFID_PREC)
+
 
 class PictureClassificationData(BaseAnnotation):
     """PictureClassificationData."""
@@ -125,6 +138,10 @@ class PictureMoleculeData(BaseAnnotation):
     segmentation: List[Tuple[float, float]]
     provenance: str
 
+    @field_serializer("confidence")
+    def _serialize(self, value: float, info: FieldSerializationInfo) -> float:
+        return _serialize_precision(value, info, _CTX_CONFID_PREC)
+
 
 class MiscAnnotation(BaseAnnotation):
     """MiscAnnotation."""
@@ -3048,6 +3065,8 @@ class DoclingDocument(BaseModel):
         artifacts_dir: Optional[Path] = None,
         image_mode: ImageRefMode = ImageRefMode.EMBEDDED,
         indent: int = 2,
+        coord_precision: Optional[int] = None,
+        confid_precision: Optional[int] = None,
     ):
         """Save as json."""
         if isinstance(filename, str):
@@ -3061,7 +3080,9 @@ class DoclingDocument(BaseModel):
             artifacts_dir, image_mode, reference_path=reference_path
         )
 
-        out = new_doc.export_to_dict()
+        out = new_doc.export_to_dict(
+            coord_precision=coord_precision, confid_precision=confid_precision
+        )
         with open(filename, "w", encoding="utf-8") as fw:
             json.dump(out, fw, indent=indent)
 
@@ -3087,6 +3108,8 @@ class DoclingDocument(BaseModel):
         artifacts_dir: Optional[Path] = None,
         image_mode: ImageRefMode = ImageRefMode.EMBEDDED,
         default_flow_style: bool = False,
+        coord_precision: Optional[int] = None,
+        confid_precision: Optional[int] = None,
     ):
         """Save as yaml."""
         if isinstance(filename, str):
@@ -3100,7 +3123,9 @@ class DoclingDocument(BaseModel):
             artifacts_dir, image_mode, reference_path=reference_path
         )
 
-        out = new_doc.export_to_dict()
+        out = new_doc.export_to_dict(
+            coord_precision=coord_precision, confid_precision=confid_precision
+        )
         with open(filename, "w", encoding="utf-8") as fw:
             yaml.dump(out, fw, default_flow_style=default_flow_style)
 
@@ -3125,9 +3150,18 @@ class DoclingDocument(BaseModel):
         mode: str = "json",
         by_alias: bool = True,
         exclude_none: bool = True,
+        coord_precision: Optional[int] = None,
+        confid_precision: Optional[int] = None,
     ) -> Dict[str, Any]:
         """Export to dict."""
-        out = self.model_dump(mode=mode, by_alias=by_alias, exclude_none=exclude_none)
+        context = {}
+        if coord_precision is not None:
+            context[_CTX_COORD_PREC] = coord_precision
+        if confid_precision is not None:
+            context[_CTX_CONFID_PREC] = confid_precision
+        out = self.model_dump(
+            mode=mode, by_alias=by_alias, exclude_none=exclude_none, context=context
+        )
 
         return out
 

{docling_core-2.40.0 → docling_core-2.41.0}/docling_core/types/doc/page.py

@@ -25,9 +25,21 @@ import numpy as np
 from PIL import Image as PILImage
 from PIL import ImageColor, ImageDraw, ImageFont
 from PIL.ImageFont import FreeTypeFont
-from pydantic import AnyUrl, BaseModel, Field, model_validator
+from pydantic import (
+    AnyUrl,
+    BaseModel,
+    Field,
+    FieldSerializationInfo,
+    field_serializer,
+    model_validator,
+)
 
-from docling_core.types.doc.base import BoundingBox, CoordOrigin
+from docling_core.types.doc.base import (
+    _CTX_COORD_PREC,
+    BoundingBox,
+    CoordOrigin,
+    _serialize_precision,
+)
 from docling_core.types.doc.document import ImageRef
 
 _logger = logging.getLogger(__name__)
@@ -105,6 +117,10 @@ class BoundingRectangle(BaseModel):
 
     coord_origin: CoordOrigin = CoordOrigin.BOTTOMLEFT
 
+    @field_serializer("r_x0", "r_y0", "r_x1", "r_y1", "r_x2", "r_y2", "r_x3", "r_y3")
+    def _serialize(self, value: float, info: FieldSerializationInfo) -> float:
+        return _serialize_precision(value, info, _CTX_COORD_PREC)
+
     @property
     def width(self) -> float:
         """Calculate the width of the rectangle."""

{docling_core-2.40.0 → docling_core-2.41.0}/docling_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docling-core
-Version: 2.40.0
+Version: 2.41.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.40.0 → docling_core-2.41.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "docling-core"
-version = "2.40.0"  # DO NOT EDIT, updated automatically
+version = "2.41.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.40.0 → docling_core-2.41.0}/test/test_docling_doc.py

@@ -1463,7 +1463,9 @@ def test_save_to_disk():
 
     filename = Path("test/data/doc/constructed_doc.embedded.json")
     doc.save_as_json(
-        filename=filename, artifacts_dir=image_dir, image_mode=ImageRefMode.EMBEDDED
+        filename=filename,
+        artifacts_dir=image_dir,
+        image_mode=ImageRefMode.EMBEDDED,
     )
     _verify_saved_output(filename=filename, paths=paths)
 
@@ -1472,7 +1474,9 @@ def test_save_to_disk():
 
     filename = Path("test/data/doc/constructed_doc.referenced.json")
     doc.save_as_json(
-        filename=filename, artifacts_dir=image_dir, image_mode=ImageRefMode.REFERENCED
+        filename=filename,
+        artifacts_dir=image_dir,
+        image_mode=ImageRefMode.REFERENCED,
     )
     _verify_saved_output(filename=filename, paths=paths)
 
@@ -1483,13 +1487,17 @@ def test_save_to_disk():
 
     filename = Path("test/data/doc/constructed_doc.embedded.yaml")
     doc.save_as_yaml(
-        filename=filename, artifacts_dir=image_dir, image_mode=ImageRefMode.EMBEDDED
+        filename=filename,
+        artifacts_dir=image_dir,
+        image_mode=ImageRefMode.EMBEDDED,
     )
     _verify_saved_output(filename=filename, paths=paths)
 
     filename = Path("test/data/doc/constructed_doc.referenced.yaml")
     doc.save_as_yaml(
-        filename=filename, artifacts_dir=image_dir, image_mode=ImageRefMode.REFERENCED
+        filename=filename,
+        artifacts_dir=image_dir,
+        image_mode=ImageRefMode.REFERENCED,
     )
     _verify_saved_output(filename=filename, paths=paths)
 
@@ -1523,7 +1531,11 @@ def test_document_manipulation():
         ref = RefItem(cref=cref)
         return ref.resolve(doc=doc)
 
-    def _verify(filename: Path, document: DoclingDocument, generate: bool = False):
+    def _verify(
+        filename: Path,
+        document: DoclingDocument,
+        generate: bool = False,
+    ):
         if generate or (not os.path.exists(_gt_filename(filename=filename))):
             doc.save_as_json(
                 filename=_gt_filename(filename=filename),
@@ -1659,3 +1671,16 @@ def test_misplaced_list_items():
     else:
         exp_doc = DoclingDocument.load_from_yaml(exp_file)
         assert doc == exp_doc
+
+
+def test_export_with_precision():
+    doc = DoclingDocument.load_from_yaml(filename="test/data/doc/dummy_doc_2.yaml")
+    act_data = doc.export_to_dict(coord_precision=2, confid_precision=1)
+    exp_file = Path("test/data/doc/dummy_doc_2_prec.yaml")
+    if GEN_TEST_DATA:
+        with open(exp_file, "w", encoding="utf-8") as f:
+            yaml.dump(act_data, f, default_flow_style=False)
+    else:
+        with open(exp_file, "r", encoding="utf-8") as f:
+            exp_data = yaml.load(f, Loader=yaml.FullLoader)
+        assert act_data == exp_data