docling-ibm-models 0.1.0__tar.gz → 1.0.0__tar.gz

{docling_ibm_models-0.1.0 → docling_ibm_models-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: docling-ibm-models
-Version: 0.1.0
+Version: 1.0.0
 Summary: This package contains the AI models used by the Docling PDF conversion package
 License: MIT
 Keywords: docling,convert,document,pdf,layout model,segmentation,table structure,table former
@@ -27,22 +27,21 @@ Requires-Dist: numpy (>=1.24.4,<2.0.0)
 Requires-Dist: onnxruntime (>=1.16.2,<2.0.0)
 Requires-Dist: opencv-python (>=4.9.0.80,<5.0.0.0) ; sys_platform != "linux"
 Requires-Dist: opencv-python-headless (>=4.9.0.80,<5.0.0.0) ; sys_platform == "linux"
-Requires-Dist: torch @ https://download.pytorch.org/whl/cpu/torch-2.2.2%2Bcpu-cp311-cp311-linux_x86_64.whl ; python_version == "3.11" and platform_machine == "x86_64" and sys_platform == "linux"
-Requires-Dist: torch @ https://download.pytorch.org/whl/cpu/torch-2.2.2%2Bcpu-cp312-cp312-linux_x86_64.whl ; python_version == "3.12" and platform_machine == "x86_64" and sys_platform == "linux"
-Requires-Dist: torch @ https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_10_9_x86_64.whl ; python_version == "3.11" and platform_machine == "x86_64" and sys_platform == "darwin"
-Requires-Dist: torch @ https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_11_0_arm64.whl ; python_version == "3.11" and platform_machine == "arm64" and sys_platform == "darwin"
-Requires-Dist: torch @ https://download.pytorch.org/whl/cpu/torch-2.2.2-cp312-none-macosx_10_9_x86_64.whl ; python_version == "3.12" and platform_machine == "x86_64" and sys_platform == "darwin"
-Requires-Dist: torch @ https://download.pytorch.org/whl/cpu/torch-2.2.2-cp312-none-macosx_11_0_arm64.whl ; python_version == "3.12" and platform_machine == "arm64" and sys_platform == "darwin"
-Requires-Dist: torchvision @ https://download.pytorch.org/whl/cpu/torchvision-0.17.2%2Bcpu-cp311-cp311-linux_x86_64.whl ; python_version == "3.11" and platform_machine == "x86_64" and sys_platform == "linux"
-Requires-Dist: torchvision @ https://download.pytorch.org/whl/cpu/torchvision-0.17.2%2Bcpu-cp312-cp312-linux_x86_64.whl ; python_version == "3.12" and platform_machine == "x86_64" and sys_platform == "linux"
-Requires-Dist: torchvision @ https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_10_13_x86_64.whl ; python_version == "3.11" and platform_machine == "x86_64" and sys_platform == "darwin"
-Requires-Dist: torchvision @ https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_11_0_arm64.whl ; python_version == "3.11" and platform_machine == "arm64" and sys_platform == "darwin"
-Requires-Dist: torchvision @ https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp312-cp312-macosx_10_13_x86_64.whl ; python_version == "3.12" and platform_machine == "x86_64" and sys_platform == "darwin"
-Requires-Dist: torchvision @ https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp312-cp312-macosx_11_0_arm64.whl ; python_version == "3.12" and platform_machine == "arm64" and sys_platform == "darwin"
+Requires-Dist: torch (==2.2.2)
+Requires-Dist: torchvision (==0.17.2)
 Requires-Dist: tqdm (>=4.64.0,<5.0.0)
 Description-Content-Type: text/markdown
 
-# Docling-models
+[![PyPI version](https://img.shields.io/pypi/v/docling-ibm-models)](https://pypi.org/project/docling-ibm-models/)
+![Python](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue)
+[![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
+[![Models on Hugging Face](https://img.shields.io/badge/%F0%9F%A4%97%20Hugging%20Face-Model-blue)](https://huggingface.co/ds4sd/docling-models/)
+[![License MIT](https://img.shields.io/github/license/ds4sd/deepsearch-toolkit)](https://opensource.org/licenses/MIT)
+
+# Docling IBM models
 
 AI modules to support the Dockling PDF document conversion project.
 
@@ -51,7 +50,7 @@ AI modules to support the Dockling PDF document conversion project.
 
 
 ## Installation Instructions
- 
+
 ### MacOS / Linux
 
 To install `poetry` locally, use either `pip` or `homebrew`.
@@ -59,8 +58,8 @@ To install `poetry` locally, use either `pip` or `homebrew`.
 To install `poetry` on a docker container, do the following:
 ```
 ENV POETRY_NO_INTERACTION=1 \
-    POETRY_VIRTUALENVS_CREATE=false 
-  
+    POETRY_VIRTUALENVS_CREATE=false
+
 # Install poetry
 RUN curl -sSL 'https://install.python-poetry.org' > install-poetry.py \
     && python install-poetry.py \
@@ -68,7 +67,7 @@ RUN curl -sSL 'https://install.python-poetry.org' > install-poetry.py \
     && rm install-poetry.py
 ```
 
-To install and run the package, simply set up a poetry environment 
+To install and run the package, simply set up a poetry environment
 
 ```
 poetry env use $(which python3.11)
@@ -115,7 +114,7 @@ Example configuration can be seen inside test `tests/test_tf_predictor.py`
 These are the main sections of the configuration file:
 
 - `dataset`: The directory for prepared data and the parameters used during the data loading.
-- `model`: The type, name and hyperparameters of the model. Also the directory to save/load the 
+- `model`: The type, name and hyperparameters of the model. Also the directory to save/load the
   trained checkpoint files.
 - `train`: Parameters for the training of the model.
 - `predict`: Parameters for the evaluation of the model.
@@ -141,7 +140,7 @@ First download the model weights (see above), then run:
 ./devtools/check_code.sh
 ```
 
-This will also generate prediction and matching visualizations that can be found here: 
+This will also generate prediction and matching visualizations that can be found here:
 `tests\test_data\viz\`
 
 Visualization outlines:

{docling_ibm_models-0.1.0 → docling_ibm_models-1.0.0}/README.md

@@ -1,4 +1,13 @@
-# Docling-models
+[![PyPI version](https://img.shields.io/pypi/v/docling-ibm-models)](https://pypi.org/project/docling-ibm-models/)
+![Python](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue)
+[![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
+[![Models on Hugging Face](https://img.shields.io/badge/%F0%9F%A4%97%20Hugging%20Face-Model-blue)](https://huggingface.co/ds4sd/docling-models/)
+[![License MIT](https://img.shields.io/github/license/ds4sd/deepsearch-toolkit)](https://opensource.org/licenses/MIT)
+
+# Docling IBM models
 
 AI modules to support the Dockling PDF document conversion project.
 
@@ -7,7 +16,7 @@ AI modules to support the Dockling PDF document conversion project.
 
 
 ## Installation Instructions
- 
+
 ### MacOS / Linux
 
 To install `poetry` locally, use either `pip` or `homebrew`.
@@ -15,8 +24,8 @@ To install `poetry` locally, use either `pip` or `homebrew`.
 To install `poetry` on a docker container, do the following:
 ```
 ENV POETRY_NO_INTERACTION=1 \
-    POETRY_VIRTUALENVS_CREATE=false 
-  
+    POETRY_VIRTUALENVS_CREATE=false
+
 # Install poetry
 RUN curl -sSL 'https://install.python-poetry.org' > install-poetry.py \
     && python install-poetry.py \
@@ -24,7 +33,7 @@ RUN curl -sSL 'https://install.python-poetry.org' > install-poetry.py \
     && rm install-poetry.py
 ```
 
-To install and run the package, simply set up a poetry environment 
+To install and run the package, simply set up a poetry environment
 
 ```
 poetry env use $(which python3.11)
@@ -71,7 +80,7 @@ Example configuration can be seen inside test `tests/test_tf_predictor.py`
 These are the main sections of the configuration file:
 
 - `dataset`: The directory for prepared data and the parameters used during the data loading.
-- `model`: The type, name and hyperparameters of the model. Also the directory to save/load the 
+- `model`: The type, name and hyperparameters of the model. Also the directory to save/load the
   trained checkpoint files.
 - `train`: Parameters for the training of the model.
 - `predict`: Parameters for the evaluation of the model.
@@ -97,7 +106,7 @@ First download the model weights (see above), then run:
 ./devtools/check_code.sh
 ```
 
-This will also generate prediction and matching visualizations that can be found here: 
+This will also generate prediction and matching visualizations that can be found here:
 `tests\test_data\viz\`
 
 Visualization outlines:

{docling_ibm_models-0.1.0 → docling_ibm_models-1.0.0}/docling_ibm_models/tableformer/data_management/tf_predictor.py

@@ -177,7 +177,7 @@ class TFPredictor:
         self._model_type = self._config["model"]["type"]
         # Added import here to avoid loading turbotransformer library unnecessarily
         if self._model_type == "TableModel04_rs":
-            from docling_ibm_models.tableformer.models.table04_rs.tablemodel04_rs import (  # noqa: F401
+            from docling_ibm_models.tableformer.models.table04_rs.tablemodel04_rs import (  # noqa
                 TableModel04_rs,
             )
         for candidate in BaseModel.__subclasses__():
@@ -437,10 +437,10 @@ class TFPredictor:
                 for pdf_cell in pdf_cells:
                     if pdf_cell["id"] == docling_item["cell_id"]:
                         text_cell_bbox = {
-                            "b": pdf_cell["bbox"][1],
+                            "b": pdf_cell["bbox"][3],
                             "l": pdf_cell["bbox"][0],
                             "r": pdf_cell["bbox"][2],
-                            "t": pdf_cell["bbox"][3],
+                            "t": pdf_cell["bbox"][1],
                             "token": pdf_cell["text"],
                         }
                         tf_cells_map[cell_key]["text_cell_bboxes"].append(
@@ -468,10 +468,10 @@ class TFPredictor:
                 for pdf_cell in pdf_cells:
                     if pdf_cell["id"] == docling_item["cell_id"]:
                         text_cell_bbox = {
-                            "b": pdf_cell["bbox"][1],
+                            "b": pdf_cell["bbox"][3],
                             "l": pdf_cell["bbox"][0],
                             "r": pdf_cell["bbox"][2],
-                            "t": pdf_cell["bbox"][3],
+                            "t": pdf_cell["bbox"][1],
                             "token": pdf_cell["text"],
                         }
                         tf_cells_map[cell_key]["text_cell_bboxes"].append(

docling_ibm_models-1.0.0/pyproject.toml

@@ -0,0 +1,79 @@
+[tool.poetry]
+name = "docling-ibm-models"
+version = "1.0.0"  # DO NOT EDIT, updated automatically
+description = "This package contains the AI models used by the Docling PDF conversion package"
+authors = ["Nikos Livathinos <nli@zurich.ibm.com>", "Maxim Lysak <mly@zurich.ibm.com>", "Ahmed Nassar <ahn@zurich.ibm.com>", "Christoph Auer <cau@zurich.ibm.com>", "Michele Dolfi <dol@zurich.ibm.com>", "Peter Staar <taa@zurich.ibm.com>"]
+license = "MIT"
+readme = "README.md"
+keywords= ["docling", "convert", "document", "pdf", "layout model", "segmentation", "table structure", "table former"]
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: MacOS :: MacOS X",
+    "Operating System :: POSIX :: Linux",
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Topic :: Scientific/Engineering :: Artificial Intelligence",
+    "Programming Language :: Python :: 3"
+]
+packages = [
+    { include = "docling_ibm_models" },
+]
+
+[tool.poetry.dependencies]
+python = "^3.11"
+torch = "2.2.2"
+torchvision = "0.17.2"
+onnxruntime = "^1.16.2"
+numpy = "^1.24.4"
+lxml = "^4.9.1"
+jsonlines = "^3.1.0"
+Pillow = "^10.0.0"
+tqdm = "^4.64.0"
+apted = "^1.0.3"
+Distance = "^0.1.3"
+mean_average_precision = "^2021.4.26.0"
+opencv-python-headless = { version = "^4.9.0.80", markers = 'sys_platform=="linux"'}
+opencv-python = { version = "^4.9.0.80", markers = 'sys_platform!="linux"'}
+
+[tool.poetry.dev-dependencies]
+black = {extras = ["jupyter"], version = "^24.4.2"}
+pytest = "^7.2.2"
+pre-commit = "^3.7.1"
+mypy = "^1.10.1"
+isort = "^5.10.1"
+python-semantic-release = "^7.32.2"
+flake8 = "^6.0.0"
+pyproject-flake8 = "^6.0.0"
+pytest-xdist = "^3.3.1"
+pytest-flake8 = "^1.1.0"
+types-requests = "^2.31.0.2"
+flake8-pyproject = "^1.2.3"
+pylint = "^2.17.5"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.black]
+line-length = 88
+target-version = ["py311"]
+include = '\.pyi?$'
+
+[tool.isort]
+profile = "black"
+line_length = 88
+py_version=311
+
+[tool.semantic_release]
+# for default values check:
+# https://github.com/python-semantic-release/python-semantic-release/blob/v7.32.2/semantic_release/defaults.cfg
+
+version_source = "tag_only"
+branch = "main"
+
+# configure types which should trigger minor and patch version bumps respectively
+# (note that they must be a subset of the configured allowed types):
+parser_angular_allowed_types = "build,chore,ci,docs,feat,fix,perf,style,refactor,test"
+parser_angular_minor_types = "feat"
+parser_angular_patch_types = "fix,perf"

docling_ibm_models-0.1.0/pyproject.toml

@@ -1,82 +0,0 @@
-[tool.poetry]
-name = "docling-ibm-models"
-version = "0.1.0"
-description = "This package contains the AI models used by the Docling PDF conversion package"
-authors = ["Nikos Livathinos <nli@zurich.ibm.com>", "Maxim Lysak <mly@zurich.ibm.com>", "Ahmed Nassar <ahn@zurich.ibm.com>", "Christoph Auer <cau@zurich.ibm.com>", "Michele Dolfi <dol@zurich.ibm.com>", "Peter Staar <taa@zurich.ibm.com>"]
-license = "MIT"
-readme = "README.md"
-keywords= ["docling", "convert", "document", "pdf", "layout model", "segmentation", "table structure", "table former"]
-classifiers = [
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: MacOS :: MacOS X",
-    "Operating System :: POSIX :: Linux",
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
-    "Intended Audience :: Science/Research",
-    "Topic :: Scientific/Engineering :: Artificial Intelligence",
-    "Programming Language :: Python :: 3"
-]
-packages = [
-    { include = "docling_ibm_models" },
-]
-
-[tool.poetry.dependencies]
-python = "^3.11"
-torch = [
-    # {markers = 'platform_machine=="x86_64" and sys_platform=="linux"', url="https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp311-cp311-linux_x86_64.whl"},  # WITH CUDA SUPPORT
-    {markers = 'python_version == "3.11" and platform_machine=="x86_64" and sys_platform=="linux"', url="https://download.pytorch.org/whl/cpu/torch-2.2.2%2Bcpu-cp311-cp311-linux_x86_64.whl"},
-    {markers = 'python_version == "3.11" and platform_machine=="x86_64" and sys_platform=="darwin"', url="https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_10_9_x86_64.whl"},
-    {markers = 'python_version == "3.11" and platform_machine=="arm64" and sys_platform=="darwin"', url="https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_11_0_arm64.whl"},
-    {markers = 'python_version == "3.12" and platform_machine=="x86_64" and sys_platform=="linux"', url="https://download.pytorch.org/whl/cpu/torch-2.2.2%2Bcpu-cp312-cp312-linux_x86_64.whl"},
-    {markers = 'python_version == "3.12" and platform_machine=="x86_64" and sys_platform=="darwin"', url="https://download.pytorch.org/whl/cpu/torch-2.2.2-cp312-none-macosx_10_9_x86_64.whl"},
-    {markers = 'python_version == "3.12" and platform_machine=="arm64" and sys_platform=="darwin"', url="https://download.pytorch.org/whl/cpu/torch-2.2.2-cp312-none-macosx_11_0_arm64.whl"}
-]
-torchvision = [
-    # {markers = 'platform_machine=="x86_64" and sys_platform=="linux"', url="https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp311-cp311-linux_x86_64.whl"},  # WITH CUDA SUPPORT
-    {markers = 'python_version == "3.11" and platform_machine=="x86_64" and sys_platform=="linux"', url="https://download.pytorch.org/whl/cpu/torchvision-0.17.2%2Bcpu-cp311-cp311-linux_x86_64.whl"},
-    {markers = 'python_version == "3.11" and platform_machine=="x86_64" and sys_platform=="darwin"', url="https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_10_13_x86_64.whl"},
-    {markers = 'python_version == "3.11" and platform_machine=="arm64" and sys_platform=="darwin"', url="https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_11_0_arm64.whl"},
-    {markers = 'python_version == "3.12" and platform_machine=="x86_64" and sys_platform=="linux"', url="https://download.pytorch.org/whl/cpu/torchvision-0.17.2%2Bcpu-cp312-cp312-linux_x86_64.whl"},
-    {markers = 'python_version == "3.12" and platform_machine=="x86_64" and sys_platform=="darwin"', url="https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp312-cp312-macosx_10_13_x86_64.whl"},
-    {markers = 'python_version == "3.12" and platform_machine=="arm64" and sys_platform=="darwin"', url="https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp312-cp312-macosx_11_0_arm64.whl"}
-]
-onnxruntime = "^1.16.2"
-numpy = "^1.24.4"
-lxml = "^4.9.1"
-jsonlines = "^3.1.0"
-Pillow = "^10.0.0"
-tqdm = "^4.64.0"
-apted = "^1.0.3"
-Distance = "^0.1.3"
-mean_average_precision = "^2021.4.26.0"
-opencv-python-headless = { version = "^4.9.0.80", markers = 'sys_platform=="linux"'}
-opencv-python = { version = "^4.9.0.80", markers = 'sys_platform!="linux"'}
-
-[tool.poetry.dev-dependencies]
-black = {extras = ["jupyter"], version = "^24.4.2"}
-pytest = "^7.2.2"
-pre-commit = "^3.7.1"
-mypy = "^1.10.1"
-isort = "^5.10.1"
-python-semantic-release = "^7.32.2"
-flake8 = "^6.0.0"
-pyproject-flake8 = "^6.0.0"
-pytest-xdist = "^3.3.1"
-pytest-flake8 = "^1.1.0"
-types-requests = "^2.31.0.2"
-flake8-pyproject = "^1.2.3"
-pylint = "^2.17.5"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.black]
-line-length = 88
-target-version = ["py311"]
-include = '\.pyi?$'
-
-[tool.isort]
-profile = "black"
-line_length = 88
-py_version=311