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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docling-core
-Version: 2.39.0
+Version: 2.40.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.39.0 → docling_core-2.40.0}/docling_core/types/doc/document.py

@@ -731,9 +731,11 @@ class ProvenanceItem(BaseModel):
 class ContentLayer(str, Enum):
     """ContentLayer."""
 
-    BODY = "body"
-    FURNITURE = "furniture"
-    BACKGROUND = "background"
+    BODY = "body"  # main content of the document
+    FURNITURE = "furniture"  # eg page-headers/footers
+    BACKGROUND = "background"  # eg watermarks
+    INVISIBLE = "invisible"  # hidden or invisible text
+    NOTES = "notes"  # author/speaker notes, corrections, etc
 
 
 DEFAULT_CONTENT_LAYERS = {ContentLayer.BODY}

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

@@ -122,6 +122,8 @@ class BoundingRectangle(BaseModel):
         p_1 = ((self.r_x1 + self.r_x2) / 2.0, (self.r_y1 + self.r_y2) / 2.0)
 
         delta_x, delta_y = p_1[0] - p_0[0], p_1[1] - p_0[1]
+        if self.coord_origin == CoordOrigin.TOPLEFT:
+            delta_y = -delta_y
 
         if abs(delta_y) < 1.0e-3:
             angle = 0.0
@@ -131,8 +133,7 @@ class BoundingRectangle(BaseModel):
             angle = math.atan(delta_y / delta_x)
         if delta_x < 0:
             angle += np.pi
-        if angle < 0:
-            angle += 2 * np.pi
+        angle = angle % (2 * np.pi)
         return angle
 
     @property

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "docling-core"
-version = "2.39.0"  # DO NOT EDIT, updated automatically
+version = "2.40.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/test/test_page.py

@@ -0,0 +1,214 @@
+import math
+
+import numpy as np
+import pytest
+
+from docling_core.types.doc import CoordOrigin
+from docling_core.types.doc.page import BoundingRectangle
+
+SQRT_2 = math.sqrt(2)
+
+R_0_BL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=1,
+    r_y1=0,
+    r_x2=1,
+    r_y2=1,
+    r_x3=0,
+    r_y3=1,
+    coord_origin=CoordOrigin.BOTTOMLEFT,
+)
+R_0_TL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=1,
+    r_y1=0,
+    r_x2=1,
+    r_y2=1,
+    r_x3=0,
+    r_y3=1,
+    coord_origin=CoordOrigin.TOPLEFT,
+)
+R_45_BL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=SQRT_2 / 2,
+    r_y1=SQRT_2 / 2,
+    r_x2=0,
+    r_y2=SQRT_2,
+    r_x3=-SQRT_2 / 2,
+    r_y3=SQRT_2 / 2,
+    coord_origin=CoordOrigin.BOTTOMLEFT,
+)
+R_45_TL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=SQRT_2 / 2,
+    r_y1=-SQRT_2 / 2,
+    r_x2=0,
+    r_y2=-SQRT_2,
+    r_x3=-SQRT_2 / 2,
+    r_y3=-SQRT_2 / 2,
+    coord_origin=CoordOrigin.TOPLEFT,
+)
+R_90_BL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=0,
+    r_y1=1,
+    r_x2=-1,
+    r_y2=1,
+    r_x3=-1,
+    r_y3=0,
+    coord_origin=CoordOrigin.BOTTOMLEFT,
+)
+R_90_TL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=0,
+    r_y1=-1,
+    r_x2=-1,
+    r_y2=-1,
+    r_x3=-1,
+    r_y3=0,
+    coord_origin=CoordOrigin.TOPLEFT,
+)
+R_135_BL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=-SQRT_2 / 2,
+    r_y1=SQRT_2 / 2,
+    r_x2=-SQRT_2,
+    r_y2=0,
+    r_x3=-SQRT_2 / 2,
+    r_y3=-SQRT_2 / 2,
+    coord_origin=CoordOrigin.BOTTOMLEFT,
+)
+R_135_TL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=-SQRT_2 / 2,
+    r_y1=-SQRT_2 / 2,
+    r_x2=-SQRT_2,
+    r_y2=0,
+    r_x3=-SQRT_2 / 2,
+    r_y3=SQRT_2 / 2,
+    coord_origin=CoordOrigin.TOPLEFT,
+)
+R_180_BL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=-0,
+    r_y1=0,
+    r_x2=-1,
+    r_y2=-1,
+    r_x3=0,
+    r_y3=-1,
+    coord_origin=CoordOrigin.BOTTOMLEFT,
+)
+R_180_TL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=-0,
+    r_y1=0,
+    r_x2=-1,
+    r_y2=1,
+    r_x3=0,
+    r_y3=1,
+    coord_origin=CoordOrigin.TOPLEFT,
+)
+R_225_BL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=-SQRT_2 / 2,
+    r_y1=-SQRT_2 / 2,
+    r_x2=0,
+    r_y2=-SQRT_2,
+    r_x3=SQRT_2 / 2,
+    r_y3=-SQRT_2 / 2,
+    coord_origin=CoordOrigin.BOTTOMLEFT,
+)
+R_225_TL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=-SQRT_2 / 2,
+    r_y1=SQRT_2 / 2,
+    r_x2=0,
+    r_y2=SQRT_2,
+    r_x3=SQRT_2 / 2,
+    r_y3=SQRT_2 / 2,
+    coord_origin=CoordOrigin.TOPLEFT,
+)
+R_270_BL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=0,
+    r_y1=-1,
+    r_x2=1,
+    r_y2=-1,
+    r_x3=1,
+    r_y3=0,
+    coord_origin=CoordOrigin.BOTTOMLEFT,
+)
+R_270_TL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=0,
+    r_y1=1,
+    r_x2=1,
+    r_y2=1,
+    r_x3=1,
+    r_y3=0,
+    coord_origin=CoordOrigin.TOPLEFT,
+)
+R_315_BL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=SQRT_2 / 2,
+    r_y1=-SQRT_2 / 2,
+    r_x2=SQRT_2,
+    r_y2=0,
+    r_x3=SQRT_2 / 2,
+    r_y3=SQRT_2 / 2,
+    coord_origin=CoordOrigin.BOTTOMLEFT,
+)
+R_315_TL = BoundingRectangle(
+    r_x0=0,
+    r_y0=0,
+    r_x1=SQRT_2 / 2,
+    r_y1=SQRT_2 / 2,
+    r_x2=SQRT_2,
+    r_y2=0,
+    r_x3=SQRT_2 / 2,
+    r_y3=-SQRT_2 / 2,
+    coord_origin=CoordOrigin.TOPLEFT,
+)
+
+
+@pytest.mark.parametrize(
+    ("rectangle", "expected_angle", "expected_angle_360"),
+    [
+        (R_0_BL, 0, 0.0),
+        (R_45_BL, np.pi / 4, 45),
+        (R_90_BL, np.pi / 2, 90),
+        (R_135_BL, 3 * np.pi / 4, 135),
+        (R_180_BL, np.pi, 180),
+        (R_225_BL, 5 * np.pi / 4, 225),
+        (R_270_BL, 3 * np.pi / 2, 270),
+        (R_315_BL, 7 * np.pi / 4, 315),
+        (R_0_TL, 0, 0.0),
+        (R_45_TL, np.pi / 4, 45),
+        (R_90_TL, np.pi / 2, 90),
+        (R_135_TL, 3 * np.pi / 4, 135),
+        (R_180_TL, np.pi, 180),
+        (R_225_TL, 5 * np.pi / 4, 225),
+        (R_270_TL, 3 * np.pi / 2, 270),
+        (R_315_TL, 7 * np.pi / 4, 315),
+    ],
+)
+def test_bounding_rectangle_angle(
+    rectangle: BoundingRectangle, expected_angle: float, expected_angle_360: int
+):
+    assert pytest.approx(rectangle.angle, abs=1e-6) == expected_angle
+    assert pytest.approx(rectangle.angle_360, abs=1e-6) == expected_angle_360

docling_core-2.39.0/test/test_page.py

@@ -1,79 +0,0 @@
-import math
-
-import numpy as np
-import pytest
-
-from docling_core.types.doc.page import BoundingRectangle
-
-SQRT_2 = math.sqrt(2)
-
-R_0 = BoundingRectangle(r_x0=0, r_y0=0, r_x1=1, r_y1=0, r_x2=1, r_y2=1, r_x3=0, r_y3=1)
-R_45 = BoundingRectangle(
-    r_x0=0,
-    r_y0=0,
-    r_x1=SQRT_2 / 2,
-    r_y1=SQRT_2 / 2,
-    r_x2=0,
-    r_y2=SQRT_2,
-    r_x3=-SQRT_2 / 2,
-    r_y3=SQRT_2 / 2,
-)
-R_90 = BoundingRectangle(
-    r_x0=0, r_y0=0, r_x1=0, r_y1=1, r_x2=-1, r_y2=1, r_x3=-1, r_y3=0
-)
-R_135 = BoundingRectangle(
-    r_x0=0,
-    r_y0=0,
-    r_x1=-SQRT_2 / 2,
-    r_y1=SQRT_2 / 2,
-    r_x2=-SQRT_2,
-    r_y2=0,
-    r_x3=-SQRT_2 / 2,
-    r_y3=-SQRT_2 / 2,
-)
-R_180 = BoundingRectangle(
-    r_x0=0, r_y0=0, r_x1=-0, r_y1=0, r_x2=-1, r_y2=-1, r_x3=0, r_y3=-1
-)
-R_MINUS_135 = BoundingRectangle(
-    r_x0=0,
-    r_y0=0,
-    r_x1=-SQRT_2 / 2,
-    r_y1=-SQRT_2 / 2,
-    r_x2=0,
-    r_y2=-SQRT_2,
-    r_x3=SQRT_2 / 2,
-    r_y3=-SQRT_2 / 2,
-)
-R_MINUS_90 = BoundingRectangle(
-    r_x0=0, r_y0=0, r_x1=0, r_y1=-1, r_x2=1, r_y2=-1, r_x3=1, r_y3=0
-)
-R_MINUS_45 = BoundingRectangle(
-    r_x0=0,
-    r_y0=0,
-    r_x1=SQRT_2 / 2,
-    r_y1=-SQRT_2 / 2,
-    r_x2=SQRT_2,
-    r_y2=0,
-    r_x3=SQRT_2 / 2,
-    r_y3=SQRT_2 / 2,
-)
-
-
-@pytest.mark.parametrize(
-    ("rectangle", "expected_angle", "expected_angle_360"),
-    [
-        (R_0, 0, 0.0),
-        (R_45, np.pi / 4, 45),
-        (R_90, np.pi / 2, 90),
-        (R_135, 3 * np.pi / 4, 135),
-        (R_180, np.pi, 180),
-        (R_MINUS_135, 5 * np.pi / 4, 225),
-        (R_MINUS_90, 3 * np.pi / 2, 270),
-        (R_MINUS_45, 7 * np.pi / 4, 315),
-    ],
-)
-def test_bounding_rectangle_angle(
-    rectangle: BoundingRectangle, expected_angle: float, expected_angle_360: int
-):
-    assert pytest.approx(rectangle.angle, abs=1e-6) == expected_angle
-    assert pytest.approx(rectangle.angle_360, abs=1e-6) == expected_angle_360