docling-core 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

docling_core/types/doc/base.py

@@ -128,37 +128,28 @@ class GlmTableCell(TableCell):
     )
 
 
-class Table(AliasModel):
-    """Table."""
+class BaseCell(AliasModel):
+    """Base cell."""
 
-    num_cols: int = Field(alias="#-cols")
-    num_rows: int = Field(alias="#-rows")
     bounding_box: Optional[BoundingBoxContainer] = Field(
         default=None, alias="bounding-box", json_schema_extra=es_field(suppress=True)
     )
-    data: Optional[list[list[Union[GlmTableCell, TableCell]]]] = None
-    model: Optional[str] = None
     prov: Optional[list[Prov]] = None
     text: Optional[str] = Field(
         default=None, json_schema_extra=es_field(term_vector="with_positions_offsets")
     )
     obj_type: str = Field(
-        alias="type",
-        json_schema_extra=es_field(type="keyword", ignore_above=8191),
+        alias="type", json_schema_extra=es_field(type="keyword", ignore_above=8191)
     )
 
 
-class BaseCell(AliasModel):
-    """Base cell."""
+class Table(BaseCell):
+    """Table."""
 
-    bounding_box: Optional[BoundingBoxContainer] = Field(
-        default=None, alias="bounding-box", json_schema_extra=es_field(suppress=True)
-    )
-    prov: Optional[list[Prov]] = None
-    text: Optional[str] = None
-    obj_type: str = Field(
-        alias="type", json_schema_extra=es_field(type="keyword", ignore_above=8191)
-    )
+    num_cols: int = Field(alias="#-cols")
+    num_rows: int = Field(alias="#-rows")
+    data: Optional[list[list[Union[GlmTableCell, TableCell]]]] = None
+    model: Optional[str] = None
 
 
 class BaseText(AliasModel):

docling_core/types/doc/document.py

@@ -311,6 +311,8 @@ class CCSDocument(
     @classmethod
     def from_dict(cls, data):
         """Validates and fixes the input data."""
+        if not isinstance(data, dict):
+            return data
         description_collection = data["description"].get("collection")
         if not description_collection:
             data["description"].setdefault("collection", {})
@@ -386,6 +388,8 @@ class ExportedCCSDocument(
     @classmethod
     def from_dict(cls, data):
         """Fix ref in main-text."""
+        if not isinstance(data, dict):
+            return data
         if data.get("main-text"):
             for item in data["main-text"]:
                 if ref := item.pop("__ref", None):
@@ -393,14 +397,28 @@ class ExportedCCSDocument(
 
         return data
 
-    def _resolve_ref(self, item: Ref) -> Optional[Table]:
-        """Return the resolved reference in case of table reference, otherwise None."""
-        result: Optional[Table] = None
+    def _resolve_ref(self, item: Ref) -> Optional[Union[BaseCell, BaseText]]:
+        """Return the resolved reference.
 
-        # NOTE: currently only resolves table refs & makes assumptions on ref parts
+        Resolved the Ref object within the document.
+        If the object is not found, None is returned.
+        """
+        result: Optional[Union[BaseCell, BaseText]] = None
+
+        # NOTE: currently only resolves refs explicitely, such that we can make
+        # assumptions on ref parts
         if item.obj_type == "table" and self.tables:
             parts = item.ref.split("/")
             result = self.tables[int(parts[2])]
+        elif item.obj_type == "figure" and self.figures:
+            parts = item.ref.split("/")
+            result = self.figures[int(parts[2])]
+        elif item.obj_type == "equation" and self.equations:
+            parts = item.ref.split("/")
+            result = self.equations[int(parts[2])]
+        elif item.obj_type == "footnote" and self.footnotes:
+            parts = item.ref.split("/")
+            result = self.footnotes[int(parts[2])]
 
         return result
 

{docling_core-1.1.2.dist-info → docling_core-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: docling-core
-Version: 1.1.2
+Version: 1.1.4
 Summary: A python library to define and validate data types in Docling.
 Home-page: https://ds4sd.github.io/
 License: MIT
@@ -28,7 +28,6 @@ Classifier: Typing :: Typed
 Requires-Dist: json-schema-for-humans (>=1.0.0,<2.0.0)
 Requires-Dist: jsonref (>=1.1.0,<2.0.0)
 Requires-Dist: jsonschema (>=4.16.0,<5.0.0)
-Requires-Dist: poetry (>=1.8.3,<2.0.0)
 Requires-Dist: pydantic (>=2.6.0,<3.0.0)
 Requires-Dist: pyproject-toml (>=0.0.10,<0.0.11)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
@@ -47,7 +46,7 @@ Description-Content-Type: text/markdown
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![License MIT](https://img.shields.io/github/license/ds4sd/docling-core)](https://opensource.org/licenses/MIT)
 
-Docling Core is a library that defines the data types in [Docling](https://ds4sd.github.io), leveraging pydantic models.
+Docling Core is a library that defines the data types in [Docling](https://github.com/DS4SD/docling), leveraging pydantic models.
 
 ## Installation
 
@@ -116,13 +115,15 @@ Please read [Contributing to Docling Core](./CONTRIBUTING.md) for details.
 If you use Docling Core in your projects, please consider citing the following:
 
 ```bib
-@software{Docling,
-author = {Deep Search Team},
-month = {7},
-title = {{Docling}},
-url = {https://github.com/DS4SD/docling},
-version = {main},
-year = {2024}
+@techreport{Docling,
+  author = "Deep Search Team",
+  month = 8,
+  title = "Docling Technical Report",
+  url = "https://arxiv.org/abs/2408.09869",
+  eprint = "2408.09869",
+  doi = "10.48550/arXiv.2408.09869",
+  version = "1.0.0",
+  year = 2024
 }
 ```
 

{docling_core-1.1.2.dist-info → docling_core-1.1.4.dist-info}/RECORD

@@ -16,11 +16,11 @@ docling_core/search/package.py,sha256=Lz2ml2eDy5t0ZimnGTq-DXHAn-f18w0bn4H5xrhs75
 docling_core/types/__init__.py,sha256=6mrAEKRW85uHJwNQBufwjPcMWCjm3oocA6MaO4_NLgg,805
 docling_core/types/base.py,sha256=fNtfQ20NKa_RBNBWbq0DfO8o0zC1Cec8UAMu0Znsltk,8170
 docling_core/types/doc/__init__.py,sha256=Pzj_8rft6SJTVTCHgXRwHtuZjL6LK_6dcBWjikL9biY,125
-docling_core/types/doc/base.py,sha256=ihkr_RqcyK_ngRFhTc1OhQiilIYymw5_0cgBe7VdVq0,5553
+docling_core/types/doc/base.py,sha256=Vwh-8Q8n9meFxbrbMUx2zNzt1JnUo3Y3Hpwmmf82IlM,5206
 docling_core/types/doc/doc_ann.py,sha256=8pV2efUglw19jxl4_oqB__mSxjWvtGIcllyCdqA-b2s,1196
 docling_core/types/doc/doc_ocr.py,sha256=6PC0C-OczF-MyfgRxEI1xs3PWgNOzi7i2yEQbTqZz0I,1387
 docling_core/types/doc/doc_raw.py,sha256=Y69G6IiauNDaoT-5el4xo1ypWpnBJQ75akGGkCMTZSc,3888
-docling_core/types/doc/document.py,sha256=nkJbdYLm0NEuYwvB0UumQCS1Gb_8dHJPXWh9HE1ot4I,16466
+docling_core/types/doc/document.py,sha256=kpnBa3cjhH0SKdDaZDUuNIFX7VnPZOHhoB2FlDhwq2g,17187
 docling_core/types/gen/__init__.py,sha256=C6TuCfvpSnSL5XDOFMcYHUY2-i08vvfOGRcdu6Af0pI,124
 docling_core/types/gen/generic.py,sha256=l4CZ4_Lb8ONG36WNJWbKX5hGKvTh_yU-hXp5hsm7uVU,844
 docling_core/types/nlp/__init__.py,sha256=hGcztAeVK7xkRBqRRvc4zbY4PGeJ0r0QrEsetnSx9nI,119
@@ -39,8 +39,8 @@ docling_core/utils/ds_generate_docs.py,sha256=0xGBagdC_PGjyeHXYZo90VnVrSTMZgHb0S
 docling_core/utils/ds_generate_jsonschema.py,sha256=EhNQutqWJFWuN-yl9UUPFZ7DJTvGqg54qBIvUMHTHdA,1647
 docling_core/utils/validate.py,sha256=3FmnxnKTDZC5J9OGxCL3U3DGRl0t0bBV1NcySXswdas,2031
 docling_core/utils/validators.py,sha256=fBdyWX4PvFh7o_d25ZTs4iwmeo75QTbrxsvXv2kXkTg,2777
-docling_core-1.1.2.dist-info/LICENSE,sha256=2M9-6EoQ1sxFztTOkXGAtwUDJvnWaAHdB9BYWVwGkIw,1087
-docling_core-1.1.2.dist-info/METADATA,sha256=_6KPgXt_4k2BdT7Pu6RiOvZ3DMQ4nnZ5lpgdK73IHeY,5335
-docling_core-1.1.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-docling_core-1.1.2.dist-info/entry_points.txt,sha256=XHhtJEkdUuLxXSNxLdFIzx_siQ3z2UFQEKp-P8VYAE4,189
-docling_core-1.1.2.dist-info/RECORD,,
+docling_core-1.1.4.dist-info/LICENSE,sha256=2M9-6EoQ1sxFztTOkXGAtwUDJvnWaAHdB9BYWVwGkIw,1087
+docling_core-1.1.4.dist-info/METADATA,sha256=nrVfDBk66tXsL8wbyBiE3XcGJcpc0TT5lnRoB41qH5Y,5393
+docling_core-1.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+docling_core-1.1.4.dist-info/entry_points.txt,sha256=XHhtJEkdUuLxXSNxLdFIzx_siQ3z2UFQEKp-P8VYAE4,189
+docling_core-1.1.4.dist-info/RECORD,,