diff --git a/Cargo.lock b/Cargo.lock index 17edb92dd..6c3ec7325 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -237,6 +237,32 @@ dependencies = [ "slotmap", ] +[[package]] +name = "aws-lc-rs" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3" +dependencies = [ + "aws-lc-sys", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "axum" version = "0.6.20" @@ -392,6 +418,29 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "bindgen" +version = "0.69.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease 0.2.25", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.87", + "which", +] + [[package]] name = "bit_field" version = "0.10.2" @@ -504,6 +553,15 @@ dependencies = [ "shlex", ] +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-expr" version = "0.15.8" @@ -538,6 +596,17 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" version = "4.5.21" @@ -578,6 +647,15 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +[[package]] +name = "cmake" +version = "0.1.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" +dependencies = [ + "cc", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -827,6 +905,12 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "either" version = "1.13.0" @@ -955,6 +1039,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "futures" version = "0.3.31" @@ -1738,6 +1828,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "lebe" version = "0.5.2" @@ -1760,6 +1856,16 @@ dependencies = [ "cc", ] +[[package]] +name = "libloading" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + [[package]] name = "libredox" version = "0.1.3" @@ -1823,7 +1929,7 @@ dependencies = [ "prost", "prost-build", "regex", - "rustls 0.22.4", + "rustls 0.23.19", "thiserror", "tokenizers", "tokio", @@ -1887,7 +1993,7 @@ dependencies = [ "reqwest-middleware", "reqwest-retry", "rustix 0.37.27", - "rustls 0.22.4", + "rustls 0.23.19", "serde", "serde_json", "slotmap", @@ -2821,6 +2927,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prettyplease" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" +dependencies = [ + "proc-macro2", + "syn 2.0.87", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2896,7 +3012,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", + "prettyplease 0.1.25", "prost", "prost-types", "regex", @@ -3326,6 +3442,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc_version" version = "0.4.1" @@ -3376,24 +3498,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls" -version = "0.23.16" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ + "aws-lc-rs", "log", "once_cell", "ring 0.17.8", @@ -3424,6 +3533,7 @@ version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ + "aws-lc-rs", "ring 0.17.8", "rustls-pki-types", "untrusted 0.9.0", @@ -4126,7 +4236,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ - "prettyplease", + "prettyplease 0.1.25", "proc-macro2", "prost-build", "quote", @@ -4476,7 +4586,7 @@ dependencies = [ "log", "native-tls", "once_cell", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", "serde", "serde_json", diff --git a/clients/python/pyproject.toml b/clients/python/pyproject.toml index dc14bef82..f42570759 100644 --- a/clients/python/pyproject.toml +++ b/clients/python/pyproject.toml @@ -16,7 +16,7 @@ repository = "https://github.com/predibase/lorax" [tool.poetry.dependencies] python = "^3.8" pydantic = "> 2, < 3" -aiohttp = "3.10.2" +aiohttp = "3.10.11" huggingface-hub = ">= 0.12, < 1.0" certifi = "2024.7.4" urllib3 = "1.26.19" diff --git a/integration-tests/requirements.txt b/integration-tests/requirements.txt index 2789f5e05..e4a63a1fe 100644 --- a/integration-tests/requirements.txt +++ b/integration-tests/requirements.txt @@ -1,3 +1,3 @@ -requests==2.29.0 +requests==2.32.0 docker==5.0.3 pytest==7.4.0 diff --git a/router/Cargo.toml b/router/Cargo.toml index af817326e..68349b7a2 100644 --- a/router/Cargo.toml +++ b/router/Cargo.toml @@ -64,7 +64,7 @@ async-trait = "0.1.80" minijinja = { version = "2.2.0", features = ["json"] } minijinja-contrib = { version = "2.0.2", features = ["pycompat"] } image = "=0.25.5" -rustls = "0.22.4" +rustls = "0.23.18" webpki = "0.22.2" base64 = "0.22.0" wasm-bindgen = "=0.2.95" diff --git a/router/client/Cargo.toml b/router/client/Cargo.toml index b95985835..ef9093066 100644 --- a/router/client/Cargo.toml +++ b/router/client/Cargo.toml @@ -17,7 +17,7 @@ tower = "^0.4" tracing = "^0.1" regex = "1.5.4" base64 = "0.22.0" -rustls = "0.22.4" +rustls = "0.23.18" webpki = "0.22.2" [build-dependencies] diff --git a/server/pyproject.toml b/server/pyproject.toml index 50b100091..90a5dab0a 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -44,7 +44,7 @@ py-cpuinfo = "^9.0.0" nvidia-ml-py = "^12.555.43" numpy = "<2.0" pillow = "^10.0.0" -aiohttp = "3.10.2" +aiohttp = "3.10.11" [tool.poetry.extras] torch = ["torch"] diff --git a/server/requirements.txt b/server/requirements.txt index 00beee0ba..f4f67f532 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,5 +1,5 @@ aiohappyeyeballs==2.4.0 ; python_version >= "3.9" and python_version < "4.0" -aiohttp==3.10.2 ; python_version >= "3.9" and python_version < "4.0" +aiohttp==3.10.11 ; python_version >= "3.9" and python_version < "4.0" aiosignal==1.3.1 ; python_version >= "3.9" and python_version < "4.0" async-timeout==4.0.3 ; python_version >= "3.9" and python_version < "3.11" attrs==23.2.0 ; python_version >= "3.9" and python_version < "4.0"