fixed merge conflictsa

Signed-off-by: Peter Staar <taa@zurich.ibm.com>
This commit is contained in:
Peter Staar 2024-09-10 15:49:28 +02:00
commit c014239de8
3 changed files with 773 additions and 790 deletions

View File

@ -2,7 +2,7 @@ import copy
import random
from deepsearch_glm.nlp_utils import init_nlp_model
from deepsearch_glm.utils.ds_utils import to_legacy_document_format
from deepsearch_glm.utils.doc_utils import to_legacy_document_format
from deepsearch_glm.utils.load_pretrained_models import load_pretrained_nlp_models
from docling_core.types import BaseText
from docling_core.types import Document as DsDocument

1555
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -25,18 +25,18 @@ python = "^3.10"
pydantic = "^2.0.0"
docling-core = "^1.2.0"
docling-ibm-models = "^1.1.7"
deepsearch-glm = "^0.19.1"
deepsearch-glm = "^0.21.0"
filetype = "^1.2.0"
pypdfium2 = "^4.30.0"
pydantic-settings = "^2.3.0"
huggingface_hub = ">=0.23,<1"
requests = "^2.32.3"
easyocr = "^1.7"
docling-parse = "^1.1.3"
docling-parse = "^1.2.0"
certifi = ">=2024.7.4"
rtree = "^1.3.0"
scipy = "^1.14.1"
pyarrow = "^17.0.0"
pyarrow = "^16.1.0"
[tool.poetry.group.dev.dependencies]
black = {extras = ["jupyter"], version = "^24.4.2"}