diff --git a/server/pyproject.toml b/server/pyproject.toml index 3879ef40..5489b19d 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -9,6 +9,8 @@ authors = [ {name = "Nicolas Patry", email = "nicolas@huggingface.co"}, ] dependencies = [ + # Remove explicit click dependency once typer/click are compatible again. + "click<8.2.0", "einops>=0.8.0", "grpc-interceptor>=0.15.4", "grpcio>=1.67.0", diff --git a/server/requirements_cuda.txt b/server/requirements_cuda.txt index e9acf4c6..a70d893b 100644 --- a/server/requirements_cuda.txt +++ b/server/requirements_cuda.txt @@ -27,8 +27,10 @@ certifi==2025.4.26 # via requests charset-normalizer==3.4.2 # via requests -click==8.2.0 - # via typer +click==8.1.8 + # via + # text-generation-server (pyproject.toml) + # typer cloudpickle==3.1.1 # via outlines compressed-tensors==0.9.4 diff --git a/server/requirements_gen.txt b/server/requirements_gen.txt index 1f310185..0cee5d6c 100644 --- a/server/requirements_gen.txt +++ b/server/requirements_gen.txt @@ -4,8 +4,10 @@ certifi==2025.4.26 # via requests charset-normalizer==3.4.2 # via requests -click==8.2.0 - # via typer +click==8.1.8 + # via + # text-generation-server (pyproject.toml) + # typer deprecated==1.2.18 # via # opentelemetry-api diff --git a/server/requirements_intel.txt b/server/requirements_intel.txt index b97bf4df..0cad583c 100644 --- a/server/requirements_intel.txt +++ b/server/requirements_intel.txt @@ -25,8 +25,10 @@ certifi==2025.4.26 # via requests charset-normalizer==3.4.2 # via requests -click==8.2.0 - # via typer +click==8.1.8 + # via + # text-generation-server (pyproject.toml) + # typer cloudpickle==3.1.1 # via outlines compressed-tensors==0.9.4 diff --git a/server/requirements_rocm.txt b/server/requirements_rocm.txt index a6458adb..1f71c8e6 100644 --- a/server/requirements_rocm.txt +++ b/server/requirements_rocm.txt @@ -25,8 +25,10 @@ certifi==2025.4.26 # via requests charset-normalizer==3.4.2 # via requests -click==8.2.0 - # via typer +click==8.1.8 + # via + # text-generation-server (pyproject.toml) + # typer cloudpickle==3.1.1 # via outlines compressed-tensors==0.9.4 diff --git a/server/uv.lock b/server/uv.lock index 4fb8bc97..7e6f194a 100644 --- a/server/uv.lock +++ b/server/uv.lock @@ -293,42 +293,14 @@ wheels = [ name = "click" version = "8.1.8" source = { registry = "https://pypi.org/simple" } -resolution-markers = [ - "(python_full_version < '3.10' and platform_machine != 'aarch64' and sys_platform == 'linux') or (python_full_version < '3.10' and sys_platform == 'win32')", - "python_full_version < '3.10' and platform_machine == 'aarch64' and sys_platform == 'linux'", - "python_full_version < '3.10' and sys_platform != 'linux' and sys_platform != 'win32'", -] dependencies = [ - { name = "colorama", marker = "python_full_version < '3.10' and sys_platform == 'win32'" }, + { name = "colorama", marker = "sys_platform == 'win32'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a", size = 226593 } wheels = [ { url = "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2", size = 98188 }, ] -[[package]] -name = "click" -version = "8.2.0" -source = { registry = "https://pypi.org/simple" } -resolution-markers = [ - "(python_full_version >= '3.12' and platform_machine != 'aarch64' and sys_platform == 'linux') or (python_full_version >= '3.12' and sys_platform == 'win32')", - "python_full_version >= '3.12' and platform_machine == 'aarch64' and sys_platform == 'linux'", - "python_full_version >= '3.12' and sys_platform != 'linux' and sys_platform != 'win32'", - "(python_full_version == '3.11.*' and platform_machine != 'aarch64' and sys_platform == 'linux') or (python_full_version == '3.11.*' and sys_platform == 'win32')", - "python_full_version == '3.11.*' and platform_machine == 'aarch64' and sys_platform == 'linux'", - "python_full_version == '3.11.*' and sys_platform != 'linux' and sys_platform != 'win32'", - "(python_full_version == '3.10.*' and platform_machine != 'aarch64' and sys_platform == 'linux') or (python_full_version == '3.10.*' and sys_platform == 'win32')", - "python_full_version == '3.10.*' and platform_machine == 'aarch64' and sys_platform == 'linux'", - "python_full_version == '3.10.*' and sys_platform != 'linux' and sys_platform != 'win32'", -] -dependencies = [ - { name = "colorama", marker = "python_full_version >= '3.10' and sys_platform == 'win32'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/cd/0f/62ca20172d4f87d93cf89665fbaedcd560ac48b465bd1d92bfc7ea6b0a41/click-8.2.0.tar.gz", hash = "sha256:f5452aeddd9988eefa20f90f05ab66f17fce1ee2a36907fd30b05bbb5953814d", size = 235857 } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a2/58/1f37bf81e3c689cc74ffa42102fa8915b59085f54a6e4a80bc6265c0f6bf/click-8.2.0-py3-none-any.whl", hash = "sha256:6b303f0b2aa85f1cb4e5303078fadcbcd4e476f114fab9b5007005711839325c", size = 102156 }, -] - [[package]] name = "cloudpickle" version = "3.1.1" @@ -2646,6 +2618,7 @@ name = "text-generation-server" version = "2.0.5.dev0" source = { editable = "." } dependencies = [ + { name = "click" }, { name = "einops" }, { name = "grpc-interceptor" }, { name = "grpcio" }, @@ -2715,6 +2688,7 @@ torch = [ requires-dist = [ { name = "accelerate", marker = "extra == 'accelerate'", specifier = ">=1.2.1,<2" }, { name = "bitsandbytes", marker = "extra == 'bnb'", specifier = ">=0.45.0" }, + { name = "click", specifier = "<8.2.0" }, { name = "compressed-tensors", marker = "extra == 'compressed-tensors'", specifier = ">=0.9.0" }, { name = "datasets", marker = "extra == 'quantize'", specifier = ">=2.21,<3" }, { name = "einops", specifier = ">=0.8.0" }, @@ -3054,8 +3028,7 @@ name = "typer" version = "0.15.3" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "click", version = "8.1.8", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, - { name = "click", version = "8.2.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" }, + { name = "click" }, { name = "rich" }, { name = "shellingham" }, { name = "typing-extensions" },