PyPI - docling-core - Versions diffs - 2.5.0__py3-none-any.whl → 2.6.0__py3-none-any.whl - Mend

docling-core 2.5.0py3-none-any.whl → 2.6.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of docling-core might be problematic. Click here for more details.

Files changed (8) hide show

docling_core/types/doc/document.py CHANGED Viewed

@@ -10,6 +10,7 @@ import re
 import sys
 import textwrap
 import typing
+import warnings
 from io import BytesIO
 from pathlib import Path
 from typing import Any, Dict, Final, List, Literal, Optional, Tuple, Union
@@ -809,14 +810,8 @@ class PictureItem(FloatingItem):
             ):
                 return default_response
-            if (
-                isinstance(self.image.uri, AnyUrl) and self.image.uri.scheme == "file"
-            ) or isinstance(self.image.uri, Path):
-                text = f"\n![Image]({str(self.image.uri)})\n"
-                return text
-            else:
-                return default_response
+            text = f"\n![Image]({str(self.image.uri)})\n"
+            return text
         else:
             return default_response
@@ -869,14 +864,8 @@ class PictureItem(FloatingItem):
             ):
                 return default_response
-            if (
-                isinstance(self.image.uri, AnyUrl) and self.image.uri.scheme == "file"
-            ) or isinstance(self.image.uri, Path):
-                img_text = f'<img src="{str(self.image.uri)}">'
-                return f"<figure>{caption_text}{img_text}</figure>"
-            else:
-                return default_response
+            img_text = f'<img src="{str(self.image.uri)}">'
+            return f"<figure>{caption_text}{img_text}</figure>"
         else:
             return default_response
@@ -1008,14 +997,23 @@ class TableItem(FloatingItem):
                 )
         return md_table
-    def export_to_html(self, doc: "DoclingDocument", add_caption: bool = True) -> str:
+    def export_to_html(
+        self, doc: Optional["DoclingDocument"] = None, add_caption: bool = True
+    ) -> str:
         """Export the table as html."""
+        if doc is None:
+            warnings.warn(
+                "The `doc` argument will be mandatory in a future version. "
+                "It must be provided to include a caption.",
+                DeprecationWarning,
+            )
         body = ""
         nrows = self.data.num_rows
         ncols = self.data.num_cols
         text = ""
-        if add_caption and len(self.captions):
+        if doc is not None and add_caption and len(self.captions):
             text = self.caption_text(doc)
         if len(self.data.table_cells) == 0:
@@ -1201,19 +1199,58 @@ class DoclingDocument(BaseModel):
     """DoclingDocument."""
     _HTML_DEFAULT_HEAD: str = r"""<head>
+    <link rel="icon" type="image/png"
+    href="https://ds4sd.github.io/docling/assets/logo.png"/>
     <meta charset="UTF-8">
+    <title>
+    Powered by Docling
+    </title>
     <style>
+    html {
+    background-color: LightGray;
+    }
+    body {
+    margin: 0 auto;
+    width:800px;
+    padding: 30px;
+    background-color: White;
+    font-family: Arial, sans-serif;
+    box-shadow: 10px 10px 10px grey;
+    }
+    figure{
+    display: block;
+    width: 100%;
+    margin: 0px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    }
+    img {
+    display: block;
+    margin: auto;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    max-width: 640px;
+    max-height: 640px;
+    }
     table {
-    border-collapse: separate;
-    /* Maintain separate borders */
-    border-spacing: 5px; /*
-    Space between cells */
-    width: 50%;
+    min-width:500px;
+    background-color: White;
+    border-collapse: collapse;
+    cell-padding: 5px;
+    margin: auto;
+    margin-top: 10px;
+    margin-bottom: 10px;
     }
     th, td {
     border: 1px solid black;
-    /* Add lines etween cells */
-    padding: 8px; }
+    padding: 8px;
+    }
+    th {
+    font-weight: bold;
+    }
+    table tr:nth-child(even) td{
+    background-color: LightGray;
+    }
     </style>
     </head>"""
@@ -1723,6 +1760,20 @@ class DoclingDocument(BaseModel):
         with open(filename, "w") as fw:
             json.dump(out, fw, indent=indent)
+    @classmethod
+    def load_from_json(cls, filename: Path) -> "DoclingDocument":
+        """load_from_json.
+        :param filename: The filename to load a saved DoclingDocument from a .json.
+        :type filename: Path
+        :returns: The loaded DoclingDocument.
+        :rtype: DoclingDocument
+        """
+        with open(filename, "r") as f:
+            return cls.model_validate(json.loads(f.read()))
     def save_as_yaml(
         self,
         filename: Path,
@@ -1815,26 +1866,28 @@ class DoclingDocument(BaseModel):
         from_element and to_element; defaulting to the whole document.
         :param delim: Delimiter to use when concatenating the various
-                Markdown parts. Defaults to "\n\n".
-        :type delim: str
+                Markdown parts. (Default value = "\n").
+        :type delim: str = "\n"
         :param from_element: Body slicing start index (inclusive).
-                Defaults to 0.
-        :type from_element: int
+                (Default value = 0).
+        :type from_element: int = 0
         :param to_element: Body slicing stop index
-                (exclusive). Defaults to 0maxint.
-        :type to_element: int
-        :param delim: str:  (Default value = "\n\n")
-        :param labels: set[DocItemLabel]
-        :param "subtitle-level-1":
-        :param "paragraph":
-        :param "caption":
-        :param "table":
-        :param "Text":
-        :param "text":
-        :param strict_text: bool:  (Default value = False)
-        :param image_placeholder str:  (Default value = "<!-- image -->")
-            the placeholder to include to position images in the markdown.
-        :param indent: int (default=4): indent of the nested lists
+                (exclusive). (Default value = maxint).
+        :type to_element: int = sys.maxsize
+        :param labels: The set of document labels to include in the export.
+        :type labels: set[DocItemLabel] = DEFAULT_EXPORT_LABELS
+        :param strict_text: bool: Whether to only include the text content
+            of the document. (Default value = False).
+        :type strict_text: bool = False
+        :param image_placeholder: The placeholder to include to position
+            images in the markdown. (Default value = "\<!-- image --\>").
+        :type image_placeholder: str = "<!-- image -->"
+        :param image_mode: The mode to use for including images in the
+            markdown. (Default value = ImageRefMode.PLACEHOLDER).
+        :type image_mode: ImageRefMode = ImageRefMode.PLACEHOLDER
+        :param indent: The indent in spaces of the nested lists.
+            (Default value = 4).
+        :type indent: int = 4
         :returns: The exported Markdown representation.
         :rtype: str
         """
@@ -2037,7 +2090,7 @@ class DoclingDocument(BaseModel):
         if artifacts_dir is None:
             # Remove the extension and add '_pictures'
             artifacts_dir = filename.with_suffix("")
-            artifacts_dir = artifacts_dir.with_name(artifacts_dir.stem + "_artifacts")
+            artifacts_dir = artifacts_dir.with_name(artifacts_dir.name + "_artifacts")
         if artifacts_dir.is_absolute():
             reference_path = None
         else:

docling_core/types/io/__init__.py ADDED Viewed

@@ -0,0 +1,19 @@
+#
+# Copyright IBM Corp. 2024 - 2024
+# SPDX-License-Identifier: MIT
+#
+"""Models for io."""
+from io import BytesIO
+from pydantic import BaseModel, ConfigDict
+class DocumentStream(BaseModel):
+    """Wrapper class for a bytes stream with a filename."""
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+    name: str
+    stream: BytesIO

docling_core/utils/file.py CHANGED Viewed

@@ -7,28 +7,62 @@
 import importlib
 import tempfile
+from io import BytesIO
 from pathlib import Path
 from typing import Dict, Optional, Union
 import requests
 from pydantic import AnyHttpUrl, TypeAdapter, ValidationError
+from typing_extensions import deprecated
+from docling_core.types.io import DocumentStream
-def resolve_file_source(
-    source: Union[Path, AnyHttpUrl, str], headers: Optional[Dict[str, str]] = None
-) -> Path:
-    """Resolves the source (URL, path) of a file to a local file path.
-    If a URL is provided, the content is first downloaded to a temporary local file.
+def resolve_remote_filename(
+    http_url: AnyHttpUrl,
+    response_headers: Dict[str, str],
+    fallback_filename="file",
+) -> str:
+    """Resolves the filename from a remote url and its response headers.
+    Args:
+        source AnyHttpUrl: The source http url.
+        response_headers Dict: Headers received while fetching the remote file.
+        fallback_filename str: Filename to use in case none can be determined.
+    Returns:
+        str: The actual filename of the remote url.
+    """
+    fname = None
+    # try to get filename from response header
+    if cont_disp := response_headers.get("Content-Disposition"):
+        for par in cont_disp.strip().split(";"):
+            # currently only handling directive "filename" (not "*filename")
+            if (split := par.split("=")) and split[0].strip() == "filename":
+                fname = "=".join(split[1:]).strip().strip("'\"") or None
+                break
+    # otherwise, use name from URL:
+    if fname is None:
+        fname = Path(http_url.path or "").name or fallback_filename
+    return fname
+def resolve_source_to_stream(
+    source: Union[Path, AnyHttpUrl, str], headers: Optional[Dict[str, str]] = None
+) -> DocumentStream:
+    """Resolves the source (URL, path) of a file to a binary stream.
     Args:
         source (Path | AnyHttpUrl | str): The file input source. Can be a path or URL.
+        headers (Dict | None): Optional set of headers to use for fetching
+            the remote URL.
     Raises:
         ValueError: If source is of unexpected type.
     Returns:
-        Path: The local file path.
+        DocumentStream: The resolved file loaded as a stream.
     """
     try:
         http_url: AnyHttpUrl = TypeAdapter(AnyHttpUrl).validate_python(source)
@@ -44,29 +78,98 @@ def resolve_file_source(
         # fetch the page
         res = requests.get(http_url, stream=True, headers=req_headers)
         res.raise_for_status()
-        fname = None
-        # try to get filename from response header
-        if cont_disp := res.headers.get("Content-Disposition"):
-            for par in cont_disp.strip().split(";"):
-                # currently only handling directive "filename" (not "*filename")
-                if (split := par.split("=")) and split[0].strip() == "filename":
-                    fname = "=".join(split[1:]).strip().strip("'\"") or None
-                    break
-        # otherwise, use name from URL:
-        if fname is None:
-            fname = Path(http_url.path or "").name or "file"
-        local_path = Path(tempfile.mkdtemp()) / fname
-        with open(local_path, "wb") as f:
-            for chunk in res.iter_content(chunk_size=1024):  # using 1-KB chunks
-                f.write(chunk)
+        fname = resolve_remote_filename(http_url=http_url, response_headers=res.headers)
+        stream = BytesIO(res.content)
+        doc_stream = DocumentStream(name=fname, stream=stream)
     except ValidationError:
         try:
             local_path = TypeAdapter(Path).validate_python(source)
+            stream = BytesIO(local_path.read_bytes())
+            doc_stream = DocumentStream(name=local_path.name, stream=stream)
         except ValidationError:
             raise ValueError(f"Unexpected source type encountered: {type(source)}")
+    return doc_stream
+def _resolve_source_to_path(
+    source: Union[Path, AnyHttpUrl, str],
+    headers: Optional[Dict[str, str]] = None,
+    workdir: Optional[Path] = None,
+) -> Path:
+    doc_stream = resolve_source_to_stream(source=source, headers=headers)
+    # use a temporary directory if not specified
+    if workdir is None:
+        workdir = Path(tempfile.mkdtemp())
+    # create the parent workdir if it doesn't exist
+    workdir.mkdir(exist_ok=True, parents=True)
+    # save result to a local file
+    local_path = workdir / doc_stream.name
+    with local_path.open("wb") as f:
+        f.write(doc_stream.stream.read())
     return local_path
+def resolve_source_to_path(
+    source: Union[Path, AnyHttpUrl, str],
+    headers: Optional[Dict[str, str]] = None,
+    workdir: Optional[Path] = None,
+) -> Path:
+    """Resolves the source (URL, path) of a file to a local file path.
+    If a URL is provided, the content is first downloaded to a local file, located in
+      the provided workdir or in a temporary directory if no workdir provided.
+    Args:
+        source (Path | AnyHttpUrl | str): The file input source. Can be a path or URL.
+        headers (Dict | None): Optional set of headers to use for fetching
+            the remote URL.
+        workdir (Path | None): If set, the work directory where the file will
+            be downloaded, otherwise a temp dir will be used.
+    Raises:
+        ValueError: If source is of unexpected type.
+    Returns:
+        Path: The local file path.
+    """
+    return _resolve_source_to_path(
+        source=source,
+        headers=headers,
+        workdir=workdir,
+    )
+@deprecated("Use `resolve_source_to_path()` or `resolve_source_to_stream()`  instead")
+def resolve_file_source(
+    source: Union[Path, AnyHttpUrl, str],
+    headers: Optional[Dict[str, str]] = None,
+) -> Path:
+    """Resolves the source (URL, path) of a file to a local file path.
+    If a URL is provided, the content is first downloaded to a temporary local file.
+    Args:
+        source (Path | AnyHttpUrl | str): The file input source. Can be a path or URL.
+        headers (Dict | None): Optional set of headers to use for fetching
+            the remote URL.
+    Raises:
+        ValueError: If source is of unexpected type.
+    Returns:
+        Path: The local file path.
+    """
+    return _resolve_source_to_path(
+        source=source,
+        headers=headers,
+    )
 def relative_path(src: Path, target: Path) -> Path:
     """Compute the relative path from `src` to `target`.

{docling_core-2.5.0.dist-info → docling_core-2.6.0.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: docling-core
-Version: 2.5.0
+Version: 2.6.0
 Summary: A python library to define and validate data types in Docling.
 Home-page: https://ds4sd.github.io/
 License: MIT
@@ -32,6 +32,7 @@ Requires-Dist: pillow (>=10.3.0,<11.0.0)
 Requires-Dist: pydantic (>=2.6.0,<2.10)
 Requires-Dist: pyyaml (>=5.1,<7.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
+Requires-Dist: typing-extensions (>=4.12.2,<5.0.0)
 Project-URL: Repository, https://github.com/DS4SD/docling-core
 Description-Content-Type: text/markdown

{docling_core-2.5.0.dist-info → docling_core-2.6.0.dist-info}/RECORD RENAMED Viewed

@@ -21,10 +21,11 @@ docling_core/types/__init__.py,sha256=MVRSgsk5focwGyAplh_TRR3dEecIXpd98g_u3zZ5HX
 docling_core/types/base.py,sha256=PusJskRVL19y-hq0BgXr5e8--QEqSqLnFNJ8UbOqW88,8318
 docling_core/types/doc/__init__.py,sha256=bEL4zKVOG7Wxm6xQrgF58mu-Teds9aSavuEAKVNhrTU,639
 docling_core/types/doc/base.py,sha256=_ttU8QI8wXDTQRUnN5n7L6D9wYFVLSAibxlFoMbgAsk,4557
-docling_core/types/doc/document.py,sha256=05q8KZ64TVpxJoegPy7MOlvI0fmqUtKRKZMGsdvUz9c,85711
+docling_core/types/doc/document.py,sha256=K6ixUeB0vyrnd3_ljM0Ed_8JBdltLPCsrGz7IoLgjUI,87094
 docling_core/types/doc/labels.py,sha256=A8vWP82VAeXO1rlCO0oDKo_Hb8uDeQe0myOTY3P03hk,1596
 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/io/__init__.py,sha256=7QYvFRaDE0AzBg8e7tvsVNlLBbCbAbQ9rP2TU8aXR1k,350
 docling_core/types/legacy_doc/__init__.py,sha256=Pzj_8rft6SJTVTCHgXRwHtuZjL6LK_6dcBWjikL9biY,125
 docling_core/types/legacy_doc/base.py,sha256=l8NKCuORUQ1ebjdGWpj6b30oQEvtErLsIHKQHbbJiPg,14683
 docling_core/types/legacy_doc/doc_ann.py,sha256=CIQHW8yzu70bsMR9gtu7dqe4oz603Tq2eDDt9sh-tYo,1203
@@ -44,13 +45,13 @@ docling_core/types/rec/statement.py,sha256=YwcV4CbVaAbzNwh14yJ_6Py3Ww0XnUJrEEUiK
 docling_core/types/rec/subject.py,sha256=PRCERGTMs4YhR3_Ne6jogkm41zYg8uUWb1yFpM7atm4,2572
 docling_core/utils/__init__.py,sha256=VauNNpWRHG0_ISKrsy5-gTxicrdQZSau6qMfuMl3iqk,120
 docling_core/utils/alias.py,sha256=B6Lqvss8CbaNARHLR4qSmNh9OkB6LvqTpxfsFmkLAFo,874
-docling_core/utils/file.py,sha256=ug4-z0KuthkEb_d5YDRPbY79PWfNSj9GYsi16xF2sDA,3699
+docling_core/utils/file.py,sha256=B1Iu8buqk_Yz4bhrGf7NyFIiYlsa_MC37vZLwQHqKLU,6876
 docling_core/utils/generate_docs.py,sha256=BdKAoduWXOc7YMvcmlhjoJOFlUxij1ybxglj6LZDtC8,2290
 docling_core/utils/generate_jsonschema.py,sha256=uNX1O5XnjyB5nA66XqZXTt3YbGuR2tyi_OhHepHYtZg,1654
 docling_core/utils/validate.py,sha256=3FmnxnKTDZC5J9OGxCL3U3DGRl0t0bBV1NcySXswdas,2031
 docling_core/utils/validators.py,sha256=azcrndLzhNkTWnbFSu9shJ5D3j_znnLrIFA5R8hzmGU,2798
-docling_core-2.5.0.dist-info/LICENSE,sha256=2M9-6EoQ1sxFztTOkXGAtwUDJvnWaAHdB9BYWVwGkIw,1087
-docling_core-2.5.0.dist-info/METADATA,sha256=u4KdNbLkumFHT5HFI7XZo9AUeYryHHkH8iYpDDInA7Q,5468
-docling_core-2.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-docling_core-2.5.0.dist-info/entry_points.txt,sha256=jIxlWv3tnO04irlZc0zfhqJIgz1bg9Hha4AkaLWSdUA,177
-docling_core-2.5.0.dist-info/RECORD,,
+docling_core-2.6.0.dist-info/LICENSE,sha256=2M9-6EoQ1sxFztTOkXGAtwUDJvnWaAHdB9BYWVwGkIw,1087
+docling_core-2.6.0.dist-info/METADATA,sha256=LhnsqU5AgndZllazTDXe_acmPWQ6NuMuH_b6-d4K1gM,5519
+docling_core-2.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+docling_core-2.6.0.dist-info/entry_points.txt,sha256=jIxlWv3tnO04irlZc0zfhqJIgz1bg9Hha4AkaLWSdUA,177
+docling_core-2.6.0.dist-info/RECORD,,

{docling_core-2.5.0.dist-info → docling_core-2.6.0.dist-info}/LICENSE RENAMED Viewed

File without changes

{docling_core-2.5.0.dist-info → docling_core-2.6.0.dist-info}/WHEEL RENAMED Viewed

File without changes

{docling_core-2.5.0.dist-info → docling_core-2.6.0.dist-info}/entry_points.txt RENAMED Viewed

File without changes

docling-core 2.5.0__py3-none-any.whl → 2.6.0__py3-none-any.whl

Potentially problematic release.

docling-core 2.5.0py3-none-any.whl → 2.6.0py3-none-any.whl