From 0d415c830712003ac0ffd42d053d5198b9066d60 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 1 Apr 2025 00:21:53 +0200 Subject: [PATCH 1/2] python312Packages.huggingface-hub: add optional-dependencies --- .../huggingface-hub/default.nix | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index c3344fa45ca2..33d2245a9806 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,6 +14,27 @@ requests, tqdm, typing-extensions, + + # optional-dependencies + # cli + inquirerpy, + # inference + aiohttp, + # torch + torch, + safetensors, + # hf_transfer + hf-transfer, + # fastai + toml, + fastai, + fastcore, + # tensorflow + tensorflow, + pydot, + graphviz, + # tensorflow-testing + keras, }: buildPythonPackage rec { @@ -40,6 +61,42 @@ buildPythonPackage rec { typing-extensions ]; + optional-dependencies = { + all = [ + + ]; + cli = [ + inquirerpy + ]; + inference = [ + aiohttp + ]; + torch = [ + torch + safetensors + ] ++ safetensors.optional-dependencies.torch; + hf_transfer = [ + hf-transfer + ]; + fastai = [ + toml + fastai + fastcore + ]; + tensorflow = [ + tensorflow + pydot + graphviz + ]; + tensorflow-testing = [ + tensorflow + keras + ]; + hf_xet = [ + # hf-xet + ]; + }; + # Tests require network access. doCheck = false; From 39484caf3fd9c08f2220b83a12da31980191b35a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 31 Mar 2025 14:23:41 +0200 Subject: [PATCH 2/2] python312Packages.kserve: 0.14.1 -> 0.15.0 Diff: https://github.com/kserve/kserve/compare/refs/tags/v0.14.1...v0.15.0 Changelog: https://github.com/kserve/kserve/releases/tag/v0.15.0 --- .../python-modules/kserve/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 8ba8618faa8e..b0e06d8497e5 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -11,6 +11,7 @@ # dependencies cloudevents, fastapi, + grpc-interceptor, grpcio, httpx, kubernetes, @@ -28,6 +29,7 @@ huggingface-hub, asgi-logger, ray, + vllm, prometheus-client, protobuf, @@ -51,14 +53,14 @@ buildPythonPackage rec { pname = "kserve"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "kserve"; repo = "kserve"; tag = "v${version}"; - hash = "sha256-VwuUXANjshV4fN0i54Fs0zubHY81UtQcCV14JwMpXwA="; + hash = "sha256-J2VFMHwhHpvtsywv3ixuVzpuDwq8y9w4heedYYWVBmM="; }; sourceRoot = "${src.name}/python/kserve"; @@ -81,6 +83,7 @@ buildPythonPackage rec { dependencies = [ cloudevents fastapi + grpc-interceptor grpcio httpx kubernetes @@ -108,9 +111,12 @@ buildPythonPackage rec { huggingface-hub google-cloud-storage requests - ]; + ] ++ huggingface-hub.optional-dependencies.hf_transfer; logging = [ asgi-logger ]; ray = [ ray ]; + llm = [ + # vllm (broken) + ]; }; nativeCheckInputs = [ @@ -146,6 +152,12 @@ buildPythonPackage rec { disabledTestPaths = [ # Looks for a config file at the root of the repository "test/test_inference_service_client.py" + + # Require broken vllm + "test/test_dataplane.py" + "test/test_model_repository.py" + "test/test_openai_completion.py" + "test/test_openai_embedding.py" ]; disabledTests =