From e725a84af5d079e413f6c6f125b6c1698a080668 Mon Sep 17 00:00:00 2001 From: Fedir Zadniprovskyi Date: Tue, 16 Jul 2024 07:08:47 -0700 Subject: [PATCH] deps: update Fixes #36 --- Taskfile.yaml | 13 +++++--- flake.nix | 1 + overrides.txt | 0 pyproject.toml | 6 ++-- requirements-all.txt | 28 ++++++++--------- requirements-dev.txt | 42 ++++++++++++------------- requirements.txt | 73 ++++++++++++++++++++++++-------------------- 7 files changed, 85 insertions(+), 78 deletions(-) create mode 100644 overrides.txt diff --git a/Taskfile.yaml b/Taskfile.yaml index 5a417adb..4a508e07 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -12,13 +12,18 @@ tasks: sources: - Dockerfile.* - faster_whisper_server/*.py - compile: + pip-compile: cmds: - - uv pip compile --output-file requirements.txt pyproject.toml - - uv pip compile --extra dev --output-file requirements-dev.txt pyproject.toml - - uv pip compile --all-extras --output-file requirements-all.txt pyproject.toml + - uv pip compile --override overrides.txt pyproject.toml {{.CLI_ARGS}} > requirements.txt + - uv pip compile --override overrides.txt --extra dev pyproject.toml {{.CLI_ARGS}} > requirements-dev.txt + - uv pip compile --override overrides.txt --all-extras pyproject.toml {{.CLI_ARGS}} > requirements-all.txt sources: - pyproject.toml + pip-sync: + cmds: + - uv pip sync requirements-all.txt + sources: + - requirements-all.txt create-multi-arch-builder: docker buildx create --name main --driver=docker-container docker-build: cmds: diff --git a/flake.nix b/flake.nix index 3933c842..8d19f256 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,7 @@ uv ]; shellHook = '' + source .venv/bin/activate export LD_LIBRARY_PATH=${pkgs.stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${pkgs.zlib}/lib:$LD_LIBRARY_PATH source .env diff --git a/overrides.txt b/overrides.txt new file mode 100644 index 00000000..e69de29b diff --git a/pyproject.toml b/pyproject.toml index ac121ccc..9a17f098 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,11 +14,13 @@ dependencies = [ "httpx-sse", "httpx", "gradio", + "openai" ] [project.optional-dependencies] -dev = ["ruff", "pytest", "pytest-xdist", "openai"] -other = ["youtube-dl@git+https://github.com/ytdl-org/youtube-dl.git", "aider-chat"] +dev = ["ruff", "pytest", "pytest-xdist"] + +other = ["youtube-dl @ git+https://github.com/ytdl-org/youtube-dl.git@37cea84f775129ad715b9bcd617251c831fcc980", "aider-chat==0.39.0"] # https://docs.astral.sh/ruff/configuration/ [tool.ruff] diff --git a/requirements-all.txt b/requirements-all.txt index 0c01e667..ecb0775d 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --all-extras --output-file requirements-all.txt pyproject.toml +# uv pip compile --override overrides.txt --all-extras pyproject.toml aider-chat==0.39.0 # via faster-whisper-server (pyproject.toml) aiofiles==23.2.1 @@ -95,7 +95,7 @@ email-validator==2.2.0 # via fastapi execnet==2.1.1 # via pytest-xdist -fastapi==0.111.0 +fastapi==0.111.1 # via # faster-whisper-server (pyproject.toml) # gradio @@ -113,7 +113,7 @@ flake8==7.1.0 # via aider-chat flatbuffers==24.3.25 # via onnxruntime -fonttools==4.53.0 +fonttools==4.53.1 # via matplotlib frozenlist==1.4.1 # via @@ -166,9 +166,9 @@ googleapis-common-protos==1.63.1 # aider-chat # google-api-core # grpcio-status -gradio==4.37.2 +gradio==4.38.1 # via faster-whisper-server (pyproject.toml) -gradio-client==1.0.2 +gradio-client==1.1.0 # via gradio greenlet==3.0.3 # via @@ -266,7 +266,7 @@ markupsafe==2.1.5 # aider-chat # gradio # jinja2 -matplotlib==3.9.0 +matplotlib==3.9.1 # via gradio mccabe==0.7.0 # via @@ -300,17 +300,15 @@ numpy==1.26.4 # pydeck # scipy # streamlit -onnxruntime==1.18.0 +onnxruntime==1.18.1 # via faster-whisper openai==1.34.0 # via # faster-whisper-server (pyproject.toml) # aider-chat # litellm -orjson==3.10.5 - # via - # fastapi - # gradio +orjson==3.10.6 + # via gradio packaging==24.1 # via # aider-chat @@ -486,7 +484,7 @@ rsa==4.9 # via # aider-chat # google-auth -ruff==0.5.0 +ruff==0.5.2 # via # faster-whisper-server (pyproject.toml) # gradio @@ -494,7 +492,7 @@ scipy==1.13.1 # via aider-chat semantic-version==2.10.0 # via gradio -setuptools==70.2.0 +setuptools==70.3.0 # via ctranslate2 shellingham==1.5.4 # via typer @@ -526,7 +524,7 @@ starlette==0.37.2 # via fastapi streamlit==1.35.0 # via aider-chat -sympy==1.12.1 +sympy==1.13.0 # via onnxruntime tenacity==8.3.0 # via @@ -591,8 +589,6 @@ tzdata==2024.1 # via # aider-chat # pandas -ujson==5.10.0 - # via fastapi uritemplate==4.1.1 # via # aider-chat diff --git a/requirements-dev.txt b/requirements-dev.txt index 8a07cb9f..4a3fe8c8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --extra dev --output-file requirements-dev.txt pyproject.toml +# uv pip compile --override overrides.txt --extra dev pyproject.toml aiofiles==23.2.1 # via gradio altair==5.3.0 @@ -18,7 +18,7 @@ attrs==23.2.0 # referencing av==12.2.0 # via faster-whisper -certifi==2024.6.2 +certifi==2024.7.4 # via # httpcore # httpx @@ -47,7 +47,7 @@ email-validator==2.2.0 # via fastapi execnet==2.1.1 # via pytest-xdist -fastapi==0.111.0 +fastapi==0.111.1 # via # faster-whisper-server (pyproject.toml) # gradio @@ -61,15 +61,15 @@ filelock==3.15.4 # via huggingface-hub flatbuffers==24.3.25 # via onnxruntime -fonttools==4.53.0 +fonttools==4.53.1 # via matplotlib fsspec==2024.6.1 # via # gradio-client # huggingface-hub -gradio==4.37.2 +gradio==4.38.1 # via faster-whisper-server (pyproject.toml) -gradio-client==1.0.2 +gradio-client==1.1.0 # via gradio h11==0.14.0 # via @@ -88,7 +88,7 @@ httpx==0.27.0 # openai httpx-sse==0.4.0 # via faster-whisper-server (pyproject.toml) -huggingface-hub==0.23.4 +huggingface-hub==0.23.5 # via # faster-whisper-server (pyproject.toml) # faster-whisper @@ -112,7 +112,7 @@ jinja2==3.1.4 # altair # fastapi # gradio -jsonschema==4.22.0 +jsonschema==4.23.0 # via altair jsonschema-specifications==2023.12.1 # via jsonschema @@ -124,7 +124,7 @@ markupsafe==2.1.5 # via # gradio # jinja2 -matplotlib==3.9.0 +matplotlib==3.9.1 # via gradio mdurl==0.1.2 # via markdown-it-py @@ -140,14 +140,12 @@ numpy==1.26.4 # matplotlib # onnxruntime # pandas -onnxruntime==1.18.0 +onnxruntime==1.18.1 # via faster-whisper -openai==1.35.9 +openai==1.35.14 # via faster-whisper-server (pyproject.toml) -orjson==3.10.5 - # via - # fastapi - # gradio +orjson==3.10.6 + # via gradio packaging==24.1 # via # altair @@ -171,14 +169,14 @@ protobuf==5.27.2 # via onnxruntime pycparser==2.22 # via cffi -pydantic==2.8.0 +pydantic==2.8.2 # via # faster-whisper-server (pyproject.toml) # fastapi # gradio # openai # pydantic-settings -pydantic-core==2.20.0 +pydantic-core==2.20.1 # via pydantic pydantic-settings==2.3.4 # via faster-whisper-server (pyproject.toml) @@ -223,17 +221,17 @@ requests==2.32.3 # via huggingface-hub rich==13.7.1 # via typer -rpds-py==0.18.1 +rpds-py==0.19.0 # via # jsonschema # referencing -ruff==0.5.0 +ruff==0.5.2 # via # faster-whisper-server (pyproject.toml) # gradio semantic-version==2.10.0 # via gradio -setuptools==70.2.0 +setuptools==70.3.0 # via ctranslate2 shellingham==1.5.4 # via typer @@ -248,7 +246,7 @@ soundfile==0.12.1 # via faster-whisper-server (pyproject.toml) starlette==0.37.2 # via fastapi -sympy==1.12.1 +sympy==1.13.0 # via onnxruntime tokenizers==0.19.1 # via faster-whisper @@ -276,8 +274,6 @@ typing-extensions==4.12.2 # typer tzdata==2024.1 # via pandas -ujson==5.10.0 - # via fastapi urllib3==2.2.2 # via # gradio diff --git a/requirements.txt b/requirements.txt index 77c185c5..39cb9687 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --output-file requirements.txt pyproject.toml +# uv pip compile --override overrides.txt pyproject.toml aiofiles==23.2.1 # via gradio altair==5.3.0 @@ -9,15 +9,16 @@ annotated-types==0.7.0 anyio==4.4.0 # via # httpx + # openai # starlette # watchfiles attrs==23.2.0 # via # jsonschema # referencing -av==12.1.0 +av==12.2.0 # via faster-whisper -certifi==2024.6.2 +certifi==2024.7.4 # via # httpcore # httpx @@ -34,15 +35,17 @@ coloredlogs==15.0.1 # via onnxruntime contourpy==1.2.1 # via matplotlib -ctranslate2==4.2.1 +ctranslate2==4.3.1 # via faster-whisper cycler==0.12.1 # via matplotlib +distro==1.9.0 + # via openai dnspython==2.6.1 # via email-validator -email-validator==2.1.1 +email-validator==2.2.0 # via fastapi -fastapi==0.111.0 +fastapi==0.111.1 # via # faster-whisper-server (pyproject.toml) # gradio @@ -52,19 +55,19 @@ faster-whisper==1.0.3 # via faster-whisper-server (pyproject.toml) ffmpy==0.3.2 # via gradio -filelock==3.15.1 +filelock==3.15.4 # via huggingface-hub flatbuffers==24.3.25 # via onnxruntime -fonttools==4.53.0 +fonttools==4.53.1 # via matplotlib -fsspec==2024.6.0 +fsspec==2024.6.1 # via # gradio-client # huggingface-hub -gradio==4.36.1 +gradio==4.38.1 # via faster-whisper-server (pyproject.toml) -gradio-client==1.0.1 +gradio-client==1.1.0 # via gradio h11==0.14.0 # via @@ -80,9 +83,10 @@ httpx==0.27.0 # fastapi # gradio # gradio-client + # openai httpx-sse==0.4.0 # via faster-whisper-server (pyproject.toml) -huggingface-hub==0.23.4 +huggingface-hub==0.23.5 # via # faster-whisper-server (pyproject.toml) # faster-whisper @@ -104,7 +108,7 @@ jinja2==3.1.4 # altair # fastapi # gradio -jsonschema==4.22.0 +jsonschema==4.23.0 # via altair jsonschema-specifications==2023.12.1 # via jsonschema @@ -116,7 +120,7 @@ markupsafe==2.1.5 # via # gradio # jinja2 -matplotlib==3.9.0 +matplotlib==3.9.1 # via gradio mdurl==0.1.2 # via markdown-it-py @@ -132,12 +136,12 @@ numpy==1.26.4 # matplotlib # onnxruntime # pandas -onnxruntime==1.18.0 +onnxruntime==1.18.1 # via faster-whisper -orjson==3.10.3 - # via - # fastapi - # gradio +openai==1.35.14 + # via faster-whisper-server (pyproject.toml) +orjson==3.10.6 + # via gradio packaging==24.1 # via # altair @@ -150,23 +154,24 @@ pandas==2.2.2 # via # altair # gradio -pillow==10.3.0 +pillow==10.4.0 # via # gradio # matplotlib -protobuf==4.25.3 +protobuf==5.27.2 # via onnxruntime pycparser==2.22 # via cffi -pydantic==2.7.4 +pydantic==2.8.2 # via # faster-whisper-server (pyproject.toml) # fastapi # gradio + # openai # pydantic-settings -pydantic-core==2.18.4 +pydantic-core==2.20.1 # via pydantic -pydantic-settings==2.2.1 +pydantic-settings==2.3.4 # via faster-whisper-server (pyproject.toml) pydub==0.25.1 # via gradio @@ -203,15 +208,15 @@ requests==2.32.3 # via huggingface-hub rich==13.7.1 # via typer -rpds-py==0.18.1 +rpds-py==0.19.0 # via # jsonschema # referencing -ruff==0.4.10 +ruff==0.5.2 # via gradio semantic-version==2.10.0 # via gradio -setuptools==70.0.0 +setuptools==70.3.0 # via ctranslate2 shellingham==1.5.4 # via typer @@ -221,11 +226,12 @@ sniffio==1.3.1 # via # anyio # httpx + # openai soundfile==0.12.1 # via faster-whisper-server (pyproject.toml) starlette==0.37.2 # via fastapi -sympy==1.12.1 +sympy==1.13.0 # via onnxruntime tokenizers==0.19.1 # via faster-whisper @@ -234,7 +240,9 @@ tomlkit==0.12.0 toolz==0.12.1 # via altair tqdm==4.66.4 - # via huggingface-hub + # via + # huggingface-hub + # openai typer==0.12.3 # via # fastapi-cli @@ -245,18 +253,17 @@ typing-extensions==4.12.2 # gradio # gradio-client # huggingface-hub + # openai # pydantic # pydantic-core # typer tzdata==2024.1 # via pandas -ujson==5.10.0 - # via fastapi -urllib3==2.2.1 +urllib3==2.2.2 # via # gradio # requests -uvicorn==0.29.0 +uvicorn==0.30.1 # via # faster-whisper-server (pyproject.toml) # fastapi