diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index f667e2ac0aa4..8690c2289623 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -5,6 +5,7 @@ # build-system poetry-core, + setuptools, # dependencies jsonref, @@ -28,18 +29,19 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.31.2"; + version = "2.43.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-O0GfEoWImDjehCPb8erBdY2gYalj2im8rxdJKEsbUs4="; + hash = "sha256-c9TaX4INfTfR3ZpmXbOteHr2R2jAbVzvMk8tO1XV4Nc="; }; build-system = [ poetry-core + setuptools ]; dependencies = [ @@ -59,7 +61,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pillow" - "typer" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix index 16b6122db933..166ae7e7c5bc 100644 --- a/pkgs/development/python-modules/docling-ibm-models/default.nix +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -15,6 +14,7 @@ opencv-python-headless, pillow, pydantic, + rtree, safetensors, torch, torchvision, @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "docling-ibm-models"; - version = "3.4.4"; + version = "3.8.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-ibm-models"; tag = "v${version}"; - hash = "sha256-a2y4vXgALPRtLhdH0Tqqht1gpdcfa1Gv4puthKDMk7U="; + hash = "sha256-Yogg71CXQTdF5OUbdbma1rQxtLudTLjyOIFe2LS9CpI="; }; build-system = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { opencv-python-headless pillow pydantic + rtree safetensors torch torchvision diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix index d0c27dd14a5a..07c5e977dcf3 100644 --- a/pkgs/development/python-modules/docling-serve/default.nix +++ b/pkgs/development/python-modules/docling-serve/default.nix @@ -13,6 +13,7 @@ uvicorn, websockets, tesserocr, + typer, rapidocr-onnxruntime, onnxruntime, torch, @@ -28,14 +29,14 @@ buildPythonPackage rec { pname = "docling-serve"; - version = "0.11.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-serve"; tag = "v${version}"; - hash = "sha256-dPCD7Ovc6Xiga+gYOwg0mJIIhHywVOyxKIAFF5XUsYw="; + hash = "sha256-R8W/FXKj2wLJOcjwIsna/2wFOLGM80Qr3WlYPJTTSNU="; }; postPatch = '' @@ -53,7 +54,7 @@ buildPythonPackage rec { ]; pythonRemoveDeps = [ - "mlx-vlm" # not yet avainable on nixpkgs + "mlx-vlm" # not yet available on nixpkgs ]; dependencies = @@ -63,6 +64,7 @@ buildPythonPackage rec { httpx pydantic-settings python-multipart + typer uvicorn websockets ] diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix index e8d7bd7654bf..42e4900744da 100644 --- a/pkgs/development/python-modules/docling/default.nix +++ b/pkgs/development/python-modules/docling/default.nix @@ -52,14 +52,14 @@ buildPythonPackage rec { pname = "docling"; - version = "2.31.2"; + version = "2.41.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling"; tag = "v${version}"; - hash = "sha256-a2PZORT4Umf6AI3yEDDcUD0tm22Ahzm7Dwij/5ZUjNs="; + hash = "sha256-GD052HCqBLs+KUkOUOVdlXxS6+PD2pthGtz+zdQ6QnM="; }; build-system = [ @@ -102,7 +102,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pillow" - "typer" ]; optional-dependencies = { @@ -160,10 +159,14 @@ buildPythonPackage rec { "test_convert_stream" "test_compare_legacy_output" "test_ocr_coverage_threshold" + "test_formula_conversion_with_page_range" # requires network access "test_page_range" "test_parser_backends" + "test_confidence" + "test_e2e_webp_conversions" + "test_asr_pipeline_conversion" # AssertionError: pred_itxt==true_itxt "test_e2e_valid_csv_conversions"