Skip to content

GitLab

"tests/vscode:/vscode.git/clone" did not exist on "3ff5fa1360eb501dd6617b29fc665ea2e740ef73"
Unverified Commit 4ab47617 authored by Graham King's avatar Graham King Committed by GitHub
Browse files

chore(engines): Upgrade mistralrs to 0.6.0 (#1767)

parent 7a353e61
Hide whitespace changes
Inline Side-by-side
Showing with 701 additions and 259 deletions
Cargo.lock
View file @ 4ab47617
...@@ -27,6 +27,19 @@ version = "2.0.0" ...@@ -27,6 +27,19 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "ahash"
version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if 1.0.0",
"getrandom 0.3.2",
"once_cell",
"version_check",
"zerocopy",
]
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "1.1.3" version = "1.1.3"
...@@ -51,6 +64,12 @@ dependencies = [ ...@@ -51,6 +64,12 @@ dependencies = [
"equator", "equator",
] ]
[[package]]
name = "allocator-api2"
version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
[[package]] [[package]]
name = "android-tzdata" name = "android-tzdata"
version = "0.1.1" version = "0.1.1"
...@@ -122,6 +141,12 @@ version = "1.0.98" ...@@ -122,6 +141,12 @@ version = "1.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
[[package]]
name = "apodize"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fca387cdc0a1f9c7a7c26556d584aa2d07fc529843082e4861003cde4ab914ed"
[[package]] [[package]]
name = "arbitrary" name = "arbitrary"
version = "1.4.1" version = "1.4.1"
...@@ -637,6 +662,20 @@ dependencies = [ ...@@ -637,6 +662,20 @@ dependencies = [
"generic-array", "generic-array",
] ]
[[package]]
name = "bm25"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1036029224bd72581186b629168952596c4964686dcdd59bccd810a7be1f5843"
dependencies = [
"cached",
"deunicode",
"fxhash",
"rust-stemmers",
"stop-words",
"unicode-segmentation",
]
[[package]] [[package]]
name = "bs62" name = "bs62"
version = "0.1.4" version = "0.1.4"
...@@ -672,9 +711,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" ...@@ -672,9 +711,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
[[package]] [[package]]
name = "bytemuck" name = "bytemuck"
version = "1.22.0" version = "1.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
dependencies = [ dependencies = [
"bytemuck_derive", "bytemuck_derive",
] ]
...@@ -711,13 +750,46 @@ dependencies = [ ...@@ -711,13 +750,46 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "cached"
version = "0.55.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0839c297f8783316fcca9d90344424e968395413f0662a5481f79c6648bbc14"
dependencies = [
"ahash",
"cached_proc_macro",
"cached_proc_macro_types",
"hashbrown 0.14.5",
"once_cell",
"thiserror 2.0.12",
"web-time",
]
[[package]]
name = "cached_proc_macro"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "673992d934f0711b68ebb3e1b79cdc4be31634b37c98f26867ced0438ca5c603"
dependencies = [
"darling 0.20.11",
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "cached_proc_macro_types"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
[[package]] [[package]]
name = "candle-core" name = "candle-core"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/EricLBuehler/candle.git?rev=cb2d8f5#cb2d8f59b4fbe1f69ef998233c40a87033a05b0d" source = "git+https://github.com/EricLBuehler/candle.git?rev=98c0436e#98c0436eaf55ea91fb34fd3aa96f557990a5ba40"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"candle-kernels 0.8.0", "candle-kernels",
"candle-metal-kernels", "candle-metal-kernels",
"cudarc 0.13.9", "cudarc 0.13.9",
"float8", "float8",
...@@ -743,8 +815,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -743,8 +815,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06ccf5ee3532e66868516d9b315f73aec9f34ea1a37ae98514534d458915dbf1" checksum = "06ccf5ee3532e66868516d9b315f73aec9f34ea1a37ae98514534d458915dbf1"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"candle-kernels 0.8.4",
"cudarc 0.13.9",
"gemm 0.17.1", "gemm 0.17.1",
"half", "half",
"memmap2", "memmap2",
...@@ -756,7 +826,6 @@ dependencies = [ ...@@ -756,7 +826,6 @@ dependencies = [
"safetensors", "safetensors",
"thiserror 1.0.69", "thiserror 1.0.69",
"ug", "ug",
"ug-cuda",
"yoke", "yoke",
"zip", "zip",
] ]
...@@ -764,16 +833,7 @@ dependencies = [ ...@@ -764,16 +833,7 @@ dependencies = [
[[package]] [[package]]
name = "candle-kernels" name = "candle-kernels"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/EricLBuehler/candle.git?rev=cb2d8f5#cb2d8f59b4fbe1f69ef998233c40a87033a05b0d" source = "git+https://github.com/EricLBuehler/candle.git?rev=98c0436e#98c0436eaf55ea91fb34fd3aa96f557990a5ba40"
dependencies = [
"bindgen_cuda 0.1.5",
]
[[package]]
name = "candle-kernels"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a10885bd902fad1b8518ba2b22369aaed88a3d94e123533ad3ca73db33b1c8ca"
dependencies = [ dependencies = [
"bindgen_cuda 0.1.5", "bindgen_cuda 0.1.5",
] ]
...@@ -781,7 +841,7 @@ dependencies = [ ...@@ -781,7 +841,7 @@ dependencies = [
[[package]] [[package]]
name = "candle-metal-kernels" name = "candle-metal-kernels"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/EricLBuehler/candle.git?rev=cb2d8f5#cb2d8f59b4fbe1f69ef998233c40a87033a05b0d" source = "git+https://github.com/EricLBuehler/candle.git?rev=98c0436e#98c0436eaf55ea91fb34fd3aa96f557990a5ba40"
dependencies = [ dependencies = [
"metal", "metal",
"once_cell", "once_cell",
...@@ -792,7 +852,7 @@ dependencies = [ ...@@ -792,7 +852,7 @@ dependencies = [
[[package]] [[package]]
name = "candle-nn" name = "candle-nn"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/EricLBuehler/candle.git?rev=cb2d8f5#cb2d8f59b4fbe1f69ef998233c40a87033a05b0d" source = "git+https://github.com/EricLBuehler/candle.git?rev=98c0436e#98c0436eaf55ea91fb34fd3aa96f557990a5ba40"
dependencies = [ dependencies = [
"candle-core 0.8.0", "candle-core 0.8.0",
"candle-metal-kernels", "candle-metal-kernels",
...@@ -888,9 +948,9 @@ dependencies = [ ...@@ -888,9 +948,9 @@ dependencies = [
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.40" version = "0.4.41"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
dependencies = [ dependencies = [
"android-tzdata", "android-tzdata",
"iana-time-zone", "iana-time-zone",
...@@ -914,9 +974,9 @@ dependencies = [ ...@@ -914,9 +974,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.37" version = "4.5.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
...@@ -924,9 +984,9 @@ dependencies = [ ...@@ -924,9 +984,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.37" version = "4.5.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
...@@ -937,9 +997,9 @@ dependencies = [ ...@@ -937,9 +997,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "4.5.32" version = "4.5.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
dependencies = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
...@@ -1431,20 +1491,46 @@ dependencies = [ ...@@ -1431,20 +1491,46 @@ dependencies = [
"syn 2.0.100", "syn 2.0.100",
] ]
[[package]]
name = "derive_more"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
dependencies = [
"derive_more-impl",
]
[[package]]
name = "derive_more-impl"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]] [[package]]
name = "derivre" name = "derivre"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a605f30e6a1460a323cc4de7bc62dea81df1d9d67eb92194d3a983a8a9601c4" checksum = "786c7c65c4ef0c7deb05de3005e01991612a8f09fe0844fc0969c68b90468ba8"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytemuck", "bytemuck",
"bytemuck_derive", "bytemuck_derive",
"hashbrown 0.15.2", "hashbrown 0.15.4",
"regex-syntax 0.8.5", "regex-syntax 0.8.5",
"strum 0.27.1", "strum",
] ]
[[package]]
name = "deunicode"
version = "1.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
[[package]] [[package]]
name = "dialoguer" name = "dialoguer"
version = "0.11.0" version = "0.11.0"
...@@ -1493,7 +1579,16 @@ version = "5.0.1" ...@@ -1493,7 +1579,16 @@ version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
dependencies = [ dependencies = [
"dirs-sys", "dirs-sys 0.4.1",
]
[[package]]
name = "dirs"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
dependencies = [
"dirs-sys 0.5.0",
] ]
[[package]] [[package]]
...@@ -1504,10 +1599,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" ...@@ -1504,10 +1599,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [ dependencies = [
"libc", "libc",
"option-ext", "option-ext",
"redox_users", "redox_users 0.4.6",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "dirs-sys"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
dependencies = [
"libc",
"option-ext",
"redox_users 0.5.0",
"windows-sys 0.59.0",
]
[[package]] [[package]]
name = "displaydoc" name = "displaydoc"
version = "0.2.5" version = "0.2.5"
...@@ -1585,7 +1692,6 @@ dependencies = [ ...@@ -1585,7 +1692,6 @@ dependencies = [
"async-openai", "async-openai",
"async-stream", "async-stream",
"async-trait", "async-trait",
"candle-core 0.8.4",
"dynamo-llm", "dynamo-llm",
"dynamo-runtime", "dynamo-runtime",
"either", "either",
...@@ -1652,7 +1758,7 @@ dependencies = [ ...@@ -1652,7 +1758,7 @@ dependencies = [
"sentencepiece", "sentencepiece",
"serde", "serde",
"serde_json", "serde_json",
"strum 0.27.1", "strum",
"tempfile", "tempfile",
"thiserror 2.0.12", "thiserror 2.0.12",
"tokenizers", "tokenizers",
...@@ -1664,7 +1770,7 @@ dependencies = [ ...@@ -1664,7 +1770,7 @@ dependencies = [
"tracing", "tracing",
"unicode-segmentation", "unicode-segmentation",
"url", "url",
"uuid 1.16.0", "uuid 1.17.0",
"validator", "validator",
"xxhash-rust", "xxhash-rust",
"zeromq", "zeromq",
...@@ -1694,7 +1800,7 @@ dependencies = [ ...@@ -1694,7 +1800,7 @@ dependencies = [
"tokio-util", "tokio-util",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"uuid 1.16.0", "uuid 1.17.0",
"vergen-gitcl", "vergen-gitcl",
] ]
...@@ -1742,7 +1848,7 @@ dependencies = [ ...@@ -1742,7 +1848,7 @@ dependencies = [
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"url", "url",
"uuid 1.16.0", "uuid 1.17.0",
"validator", "validator",
"xxhash-rust", "xxhash-rust",
] ]
...@@ -1999,6 +2105,12 @@ dependencies = [ ...@@ -1999,6 +2105,12 @@ dependencies = [
"zune-inflate", "zune-inflate",
] ]
[[package]]
name = "extended"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
[[package]] [[package]]
name = "fancy-regex" name = "fancy-regex"
version = "0.14.0" version = "0.14.0"
...@@ -2092,6 +2204,12 @@ version = "1.0.7" ...@@ -2092,6 +2204,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]] [[package]]
name = "foreign-types" name = "foreign-types"
version = "0.5.0" version = "0.5.0"
...@@ -2654,12 +2772,21 @@ name = "hashbrown" ...@@ -2654,12 +2772,21 @@ name = "hashbrown"
version = "0.14.5" version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
"ahash",
"allocator-api2",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.15.2" version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash",
]
[[package]] [[package]]
name = "heck" name = "heck"
...@@ -2685,7 +2812,7 @@ version = "0.4.2" ...@@ -2685,7 +2812,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc03dcb0b0a83ae3f3363ec811014ae669f083e4e499c66602f447c4828737a1" checksum = "cc03dcb0b0a83ae3f3363ec811014ae669f083e4e499c66602f447c4828737a1"
dependencies = [ dependencies = [
"dirs", "dirs 5.0.1",
"futures", "futures",
"http 1.3.1", "http 1.3.1",
"indicatif", "indicatif",
...@@ -2711,6 +2838,12 @@ dependencies = [ ...@@ -2711,6 +2838,12 @@ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]]
name = "hound"
version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
[[package]] [[package]]
name = "html2text" name = "html2text"
version = "0.14.4" version = "0.14.4"
...@@ -2893,7 +3026,7 @@ dependencies = [ ...@@ -2893,7 +3026,7 @@ dependencies = [
"tokio", "tokio",
"tokio-rustls", "tokio-rustls",
"tower-service", "tower-service",
"webpki-roots", "webpki-roots 0.26.8",
] ]
[[package]] [[package]]
...@@ -2911,22 +3044,28 @@ dependencies = [ ...@@ -2911,22 +3044,28 @@ dependencies = [
[[package]] [[package]]
name = "hyper-util" name = "hyper-util"
version = "0.1.11" version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2" checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
dependencies = [ dependencies = [
"base64 0.22.1",
"bytes", "bytes",
"futures-channel", "futures-channel",
"futures-core",
"futures-util", "futures-util",
"http 1.3.1", "http 1.3.1",
"http-body 1.0.1", "http-body 1.0.1",
"hyper 1.6.0", "hyper 1.6.0",
"ipnet",
"libc", "libc",
"percent-encoding",
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"system-configuration",
"tokio", "tokio",
"tower-service", "tower-service",
"tracing", "tracing",
"windows-registry",
] ]
[[package]] [[package]]
...@@ -3145,7 +3284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -3145,7 +3284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown 0.15.2", "hashbrown 0.15.4",
"serde", "serde",
] ]
...@@ -3210,6 +3349,17 @@ dependencies = [ ...@@ -3210,6 +3349,17 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "io-uring"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
dependencies = [
"bitflags 2.9.0",
"cfg-if 1.0.0",
"libc",
]
[[package]] [[package]]
name = "iovec" name = "iovec"
version = "0.1.4" version = "0.1.4"
...@@ -3225,6 +3375,16 @@ version = "2.11.0" ...@@ -3225,6 +3375,16 @@ version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
[[package]]
name = "iri-string"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
dependencies = [
"memchr",
"serde",
]
[[package]] [[package]]
name = "is_terminal_polyfill" name = "is_terminal_polyfill"
version = "1.70.1" version = "1.70.1"
...@@ -3394,7 +3554,7 @@ dependencies = [ ...@@ -3394,7 +3554,7 @@ dependencies = [
"tokio-stream", "tokio-stream",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"uuid 1.16.0", "uuid 1.17.0",
] ]
[[package]] [[package]]
...@@ -3476,9 +3636,8 @@ dependencies = [ ...@@ -3476,9 +3636,8 @@ dependencies = [
[[package]] [[package]]
name = "llguidance" name = "llguidance"
version = "0.7.19" version = "0.7.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/guidance-ai/llguidance.git?rev=2ce5ab8#2ce5ab8196f16dd8beba5a3d874eb1ab74e0268c"
checksum = "20c50686e6724ff55e184447dbc775b94f28f64e5061882b75c84b12b9c1d613"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"derivre", "derivre",
...@@ -3486,7 +3645,7 @@ dependencies = [ ...@@ -3486,7 +3645,7 @@ dependencies = [
"regex-syntax 0.8.5", "regex-syntax 0.8.5",
"serde", "serde",
"serde_json", "serde_json",
"toktrie 0.7.19", "toktrie 0.7.29",
] ]
[[package]] [[package]]
...@@ -3518,9 +3677,9 @@ dependencies = [ ...@@ -3518,9 +3677,9 @@ dependencies = [
[[package]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.12" version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"scopeguard", "scopeguard",
...@@ -3818,8 +3977,8 @@ dependencies = [ ...@@ -3818,8 +3977,8 @@ dependencies = [
[[package]] [[package]]
name = "mistralrs" name = "mistralrs"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/EricLBuehler/mistral.rs.git?rev=ebd50e35e#ebd50e35efacb082462b757fb448d4ab54473775" source = "git+https://github.com/EricLBuehler/mistral.rs.git#d38a7e198469eb88e883e36d153437c1fb326315"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"candle-core 0.8.0", "candle-core 0.8.0",
...@@ -3835,19 +3994,34 @@ dependencies = [ ...@@ -3835,19 +3994,34 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"tokio", "tokio",
"walkdir",
]
[[package]]
name = "mistralrs-audio"
version = "0.6.0"
source = "git+https://github.com/EricLBuehler/mistral.rs.git#d38a7e198469eb88e883e36d153437c1fb326315"
dependencies = [
"anyhow",
"apodize",
"hound",
"symphonia",
] ]
[[package]] [[package]]
name = "mistralrs-core" name = "mistralrs-core"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/EricLBuehler/mistral.rs.git?rev=ebd50e35e#ebd50e35efacb082462b757fb448d4ab54473775" source = "git+https://github.com/EricLBuehler/mistral.rs.git#d38a7e198469eb88e883e36d153437c1fb326315"
dependencies = [ dependencies = [
"ahash",
"akin", "akin",
"anyhow", "anyhow",
"apodize",
"as-any", "as-any",
"async-trait", "async-trait",
"base64 0.22.1", "base64 0.22.1",
"bindgen_cuda 0.1.5", "bindgen_cuda 0.1.6",
"bm25",
"bytemuck", "bytemuck",
"bytemuck_derive", "bytemuck_derive",
"candle-core 0.8.0", "candle-core 0.8.0",
...@@ -3857,31 +4031,39 @@ dependencies = [ ...@@ -3857,31 +4031,39 @@ dependencies = [
"clap", "clap",
"csv", "csv",
"derive-new", "derive-new",
"derive_more", "derive_more 2.0.1",
"dirs", "dirs 6.0.0",
"either", "either",
"float8", "float8",
"futures", "futures",
"galil-seiferas", "galil-seiferas",
"half", "half",
"hashbrown 0.15.4",
"hf-hub", "hf-hub",
"hound",
"html2text", "html2text",
"http 1.3.1",
"image", "image",
"indexmap 2.9.0", "indexmap 2.9.0",
"indicatif", "indicatif",
"interprocess", "interprocess",
"itertools 0.13.0", "itertools 0.14.0",
"libc",
"llguidance", "llguidance",
"lrtable", "lrtable",
"metal", "metal",
"minijinja", "minijinja",
"minijinja-contrib", "minijinja-contrib",
"mistralrs-audio",
"mistralrs-mcp",
"mistralrs-paged-attn", "mistralrs-paged-attn",
"mistralrs-quant", "mistralrs-quant",
"mistralrs-vision", "mistralrs-vision",
"num-traits",
"objc", "objc",
"once_cell", "once_cell",
"ordered-float", "ordered-float",
"parking_lot",
"radix_trie", "radix_trie",
"rand 0.9.1", "rand 0.9.1",
"rand_isaac", "rand_isaac",
...@@ -3889,7 +4071,10 @@ dependencies = [ ...@@ -3889,7 +4071,10 @@ dependencies = [
"regex", "regex",
"regex-automata 0.4.9", "regex-automata 0.4.9",
"reqwest", "reqwest",
"rubato",
"rust-mcp-schema",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"rustfft",
"safetensors", "safetensors",
"schemars", "schemars",
"scraper", "scraper",
...@@ -3898,27 +4083,49 @@ dependencies = [ ...@@ -3898,27 +4083,49 @@ dependencies = [
"serde_json", "serde_json",
"serde_plain", "serde_plain",
"serde_yaml", "serde_yaml",
"strum 0.26.3", "strum",
"symphonia",
"sysinfo", "sysinfo",
"thiserror 1.0.69", "thiserror 2.0.12",
"tokenizers", "tokenizers",
"tokio", "tokio",
"tokio-rayon", "tokio-rayon",
"toktrie_hf_tokenizers 0.7.19", "tokio-tungstenite",
"toktrie_hf_tokenizers 0.7.29",
"toml", "toml",
"tqdm", "tqdm",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"urlencoding", "urlencoding",
"uuid 1.16.0", "uuid 1.17.0",
"variantly", "variantly",
"vob", "vob",
] ]
[[package]]
name = "mistralrs-mcp"
version = "0.6.0"
source = "git+https://github.com/EricLBuehler/mistral.rs.git#d38a7e198469eb88e883e36d153437c1fb326315"
dependencies = [
"anyhow",
"async-trait",
"futures-util",
"http 1.3.1",
"reqwest",
"rust-mcp-schema",
"serde",
"serde_json",
"tokio",
"tokio-tungstenite",
"tracing",
"utoipa",
"uuid 1.17.0",
]
[[package]] [[package]]
name = "mistralrs-paged-attn" name = "mistralrs-paged-attn"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/EricLBuehler/mistral.rs.git?rev=ebd50e35e#ebd50e35efacb082462b757fb448d4ab54473775" source = "git+https://github.com/EricLBuehler/mistral.rs.git#d38a7e198469eb88e883e36d153437c1fb326315"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bindgen_cuda 0.1.6", "bindgen_cuda 0.1.6",
...@@ -3927,15 +4134,15 @@ dependencies = [ ...@@ -3927,15 +4134,15 @@ dependencies = [
"half", "half",
"metal", "metal",
"once_cell", "once_cell",
"thiserror 1.0.69", "thiserror 2.0.12",
] ]
[[package]] [[package]]
name = "mistralrs-quant" name = "mistralrs-quant"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/EricLBuehler/mistral.rs.git?rev=ebd50e35e#ebd50e35efacb082462b757fb448d4ab54473775" source = "git+https://github.com/EricLBuehler/mistral.rs.git#d38a7e198469eb88e883e36d153437c1fb326315"
dependencies = [ dependencies = [
"bindgen_cuda 0.1.5", "bindgen_cuda 0.1.6",
"byteorder", "byteorder",
"candle-core 0.8.0", "candle-core 0.8.0",
"candle-nn", "candle-nn",
...@@ -3952,15 +4159,16 @@ dependencies = [ ...@@ -3952,15 +4159,16 @@ dependencies = [
"safetensors", "safetensors",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.12",
"tokio",
"tracing", "tracing",
"yoke", "yoke",
] ]
[[package]] [[package]]
name = "mistralrs-vision" name = "mistralrs-vision"
version = "0.5.0" version = "0.6.0"
source = "git+https://github.com/EricLBuehler/mistral.rs.git?rev=ebd50e35e#ebd50e35efacb082462b757fb448d4ab54473775" source = "git+https://github.com/EricLBuehler/mistral.rs.git#d38a7e198469eb88e883e36d153437c1fb326315"
dependencies = [ dependencies = [
"candle-core 0.8.0", "candle-core 0.8.0",
"image", "image",
...@@ -4441,9 +4649,9 @@ dependencies = [ ...@@ -4441,9 +4649,9 @@ dependencies = [
[[package]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.12.3" version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
dependencies = [ dependencies = [
"lock_api", "lock_api",
"parking_lot_core", "parking_lot_core",
...@@ -4451,9 +4659,9 @@ dependencies = [ ...@@ -4451,9 +4659,9 @@ dependencies = [
[[package]] [[package]]
name = "parking_lot_core" name = "parking_lot_core"
version = "0.9.10" version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
...@@ -4720,6 +4928,15 @@ dependencies = [ ...@@ -4720,6 +4928,15 @@ dependencies = [
"syn 2.0.100", "syn 2.0.100",
] ]
[[package]]
name = "primal-check"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08"
dependencies = [
"num-integer",
]
[[package]] [[package]]
name = "proc-macro-crate" name = "proc-macro-crate"
version = "3.3.0" version = "3.3.0"
...@@ -5171,6 +5388,15 @@ dependencies = [ ...@@ -5171,6 +5388,15 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "realfft"
version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f821338fddb99d089116342c46e9f1fbf3828dba077674613e734e01d6ea8677"
dependencies = [
"rustfft",
]
[[package]] [[package]]
name = "reborrow" name = "reborrow"
version = "0.5.5" version = "0.5.5"
...@@ -5203,6 +5429,17 @@ dependencies = [ ...@@ -5203,6 +5429,17 @@ dependencies = [
"thiserror 1.0.69", "thiserror 1.0.69",
] ]
[[package]]
name = "redox_users"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
dependencies = [
"getrandom 0.2.16",
"libredox",
"thiserror 2.0.12",
]
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.11.1" version = "1.11.1"
...@@ -5255,9 +5492,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" ...@@ -5255,9 +5492,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
[[package]] [[package]]
name = "reqwest" name = "reqwest"
version = "0.12.15" version = "0.12.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"bytes", "bytes",
...@@ -5272,36 +5509,32 @@ dependencies = [ ...@@ -5272,36 +5509,32 @@ dependencies = [
"hyper 1.6.0", "hyper 1.6.0",
"hyper-rustls", "hyper-rustls",
"hyper-util", "hyper-util",
"ipnet",
"js-sys", "js-sys",
"log", "log",
"mime", "mime",
"mime_guess", "mime_guess",
"once_cell",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"quinn", "quinn",
"rustls", "rustls",
"rustls-native-certs 0.8.1", "rustls-native-certs 0.8.1",
"rustls-pemfile",
"rustls-pki-types", "rustls-pki-types",
"serde", "serde",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"sync_wrapper 1.0.2", "sync_wrapper 1.0.2",
"system-configuration",
"tokio", "tokio",
"tokio-rustls", "tokio-rustls",
"tokio-util", "tokio-util",
"tower 0.5.2", "tower 0.5.2",
"tower-http",
"tower-service", "tower-service",
"url", "url",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"wasm-streams", "wasm-streams",
"web-sys", "web-sys",
"webpki-roots", "webpki-roots 1.0.1",
"windows-registry",
] ]
[[package]] [[package]]
...@@ -5440,6 +5673,38 @@ dependencies = [ ...@@ -5440,6 +5673,38 @@ dependencies = [
"syn 2.0.100", "syn 2.0.100",
] ]
[[package]]
name = "rubato"
version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5258099699851cfd0082aeb645feb9c084d9a5e1f1b8d5372086b989fc5e56a1"
dependencies = [
"num-complex",
"num-integer",
"num-traits",
"realfft",
]
[[package]]
name = "rust-mcp-schema"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69c8c97bf79c576f8dc582be9f6c9825ed91bd921aac65bd7990992257727e39"
dependencies = [
"serde",
"serde_json",
]
[[package]]
name = "rust-stemmers"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
dependencies = [
"serde",
"serde_derive",
]
[[package]] [[package]]
name = "rustc-demangle" name = "rustc-demangle"
version = "0.1.24" version = "0.1.24"
...@@ -5467,6 +5732,20 @@ dependencies = [ ...@@ -5467,6 +5732,20 @@ dependencies = [
"semver", "semver",
] ]
[[package]]
name = "rustfft"
version = "6.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6f140db74548f7c9d7cce60912c9ac414e74df5e718dc947d514b051b42f3f4"
dependencies = [
"num-complex",
"num-integer",
"num-traits",
"primal-check",
"strength_reduce",
"transpose",
]
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.38.44" version = "0.38.44"
...@@ -5723,7 +6002,7 @@ checksum = "fd568a4c9bb598e291a08244a5c1f5a8a6650bee243b5b0f8dbb3d9cc1d87fe8" ...@@ -5723,7 +6002,7 @@ checksum = "fd568a4c9bb598e291a08244a5c1f5a8a6650bee243b5b0f8dbb3d9cc1d87fe8"
dependencies = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"cssparser", "cssparser",
"derive_more", "derive_more 0.99.20",
"fxhash", "fxhash",
"log", "log",
"new_debug_unreachable", "new_debug_unreachable",
...@@ -5872,9 +6151,9 @@ dependencies = [ ...@@ -5872,9 +6151,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_spanned" name = "serde_spanned"
version = "0.6.8" version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
dependencies = [ dependencies = [
"serde", "serde",
] ]
...@@ -5914,10 +6193,10 @@ dependencies = [ ...@@ -5914,10 +6193,10 @@ dependencies = [
] ]
[[package]] [[package]]
name = "sha2" name = "sha1"
version = "0.10.8" version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"cpufeatures", "cpufeatures",
...@@ -5925,8 +6204,19 @@ dependencies = [ ...@@ -5925,8 +6204,19 @@ dependencies = [
] ]
[[package]] [[package]]
name = "sharded-slab" name = "sha2"
version = "0.1.7" version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"digest",
]
[[package]]
name = "sharded-slab"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
dependencies = [ dependencies = [
...@@ -6091,6 +6381,21 @@ version = "1.2.0" ...@@ -6091,6 +6381,21 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "stop-words"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c6a86be9f7fa4559b7339669e72026eb437f5e9c5a85c207fe1033079033a17"
dependencies = [
"serde_json",
]
[[package]]
name = "strength_reduce"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
[[package]] [[package]]
name = "string_cache" name = "string_cache"
version = "0.8.9" version = "0.8.9"
...@@ -6128,35 +6433,13 @@ version = "0.11.1" ...@@ -6128,35 +6433,13 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
dependencies = [
"strum_macros 0.26.4",
]
[[package]] [[package]]
name = "strum" name = "strum"
version = "0.27.1" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
dependencies = [ dependencies = [
"strum_macros 0.27.1", "strum_macros",
]
[[package]]
name = "strum_macros"
version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.100",
] ]
[[package]] [[package]]
...@@ -6178,6 +6461,141 @@ version = "2.6.1" ...@@ -6178,6 +6461,141 @@ version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "symphonia"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
dependencies = [
"lazy_static",
"symphonia-bundle-flac",
"symphonia-bundle-mp3",
"symphonia-codec-pcm",
"symphonia-codec-vorbis",
"symphonia-core",
"symphonia-format-isomp4",
"symphonia-format-ogg",
"symphonia-format-riff",
"symphonia-metadata",
]
[[package]]
name = "symphonia-bundle-flac"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72e34f34298a7308d4397a6c7fbf5b84c5d491231ce3dd379707ba673ab3bd97"
dependencies = [
"log",
"symphonia-core",
"symphonia-metadata",
"symphonia-utils-xiph",
]
[[package]]
name = "symphonia-bundle-mp3"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4"
dependencies = [
"lazy_static",
"log",
"symphonia-core",
"symphonia-metadata",
]
[[package]]
name = "symphonia-codec-pcm"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f395a67057c2ebc5e84d7bb1be71cce1a7ba99f64e0f0f0e303a03f79116f89b"
dependencies = [
"log",
"symphonia-core",
]
[[package]]
name = "symphonia-codec-vorbis"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30"
dependencies = [
"log",
"symphonia-core",
"symphonia-utils-xiph",
]
[[package]]
name = "symphonia-core"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3"
dependencies = [
"arrayvec",
"bitflags 1.3.2",
"bytemuck",
"lazy_static",
"log",
]
[[package]]
name = "symphonia-format-isomp4"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abfdf178d697e50ce1e5d9b982ba1b94c47218e03ec35022d9f0e071a16dc844"
dependencies = [
"encoding_rs",
"log",
"symphonia-core",
"symphonia-metadata",
"symphonia-utils-xiph",
]
[[package]]
name = "symphonia-format-ogg"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931"
dependencies = [
"log",
"symphonia-core",
"symphonia-metadata",
"symphonia-utils-xiph",
]
[[package]]
name = "symphonia-format-riff"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05f7be232f962f937f4b7115cbe62c330929345434c834359425e043bfd15f50"
dependencies = [
"extended",
"log",
"symphonia-core",
"symphonia-metadata",
]
[[package]]
name = "symphonia-metadata"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c"
dependencies = [
"encoding_rs",
"lazy_static",
"log",
"symphonia-core",
]
[[package]]
name = "symphonia-utils-xiph"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe"
dependencies = [
"symphonia-core",
"symphonia-metadata",
]
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.109" version = "1.0.109"
...@@ -6503,6 +6921,7 @@ dependencies = [ ...@@ -6503,6 +6921,7 @@ dependencies = [
"aho-corasick", "aho-corasick",
"derive_builder", "derive_builder",
"esaxx-rs", "esaxx-rs",
"fancy-regex",
"getrandom 0.2.16", "getrandom 0.2.16",
"hf-hub", "hf-hub",
"indicatif", "indicatif",
...@@ -6529,17 +6948,19 @@ dependencies = [ ...@@ -6529,17 +6948,19 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.44.2" version = "1.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" checksum = "1140bb80481756a8cbe10541f37433b459c5aa1e727b4c020fbfebdc25bf3ec4"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
"io-uring",
"libc", "libc",
"mio 1.0.3", "mio 1.0.3",
"parking_lot", "parking_lot",
"pin-project-lite", "pin-project-lite",
"signal-hook-registry", "signal-hook-registry",
"slab",
"socket2", "socket2",
"tokio-macros", "tokio-macros",
"windows-sys 0.52.0", "windows-sys 0.52.0",
...@@ -6587,6 +7008,18 @@ dependencies = [ ...@@ -6587,6 +7008,18 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "tokio-tungstenite"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
dependencies = [
"futures-util",
"log",
"tokio",
"tungstenite",
]
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.7.15" version = "0.7.15"
...@@ -6619,7 +7052,7 @@ dependencies = [ ...@@ -6619,7 +7052,7 @@ dependencies = [
"tokio", "tokio",
"tokio-rustls", "tokio-rustls",
"tokio-util", "tokio-util",
"webpki-roots", "webpki-roots 0.26.8",
] ]
[[package]] [[package]]
...@@ -6637,9 +7070,8 @@ dependencies = [ ...@@ -6637,9 +7070,8 @@ dependencies = [
[[package]] [[package]]
name = "toktrie" name = "toktrie"
version = "0.7.19" version = "0.7.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/guidance-ai/llguidance.git?rev=2ce5ab8#2ce5ab8196f16dd8beba5a3d874eb1ab74e0268c"
checksum = "69200397314cd578aa0623a5161342c44877ac2ebcea1e9d20e2f65120e81e8d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytemuck", "bytemuck",
...@@ -6664,23 +7096,22 @@ dependencies = [ ...@@ -6664,23 +7096,22 @@ dependencies = [
[[package]] [[package]]
name = "toktrie_hf_tokenizers" name = "toktrie_hf_tokenizers"
version = "0.7.19" version = "0.7.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/guidance-ai/llguidance.git?rev=2ce5ab8#2ce5ab8196f16dd8beba5a3d874eb1ab74e0268c"
checksum = "f4c03d846b7e3cd072e955583da31732076eed2f7be6881d7605fd4c3e5a8247"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
"serde", "serde",
"serde_json", "serde_json",
"tokenizers", "tokenizers",
"toktrie 0.7.19", "toktrie 0.7.29",
] ]
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.8.21" version = "0.8.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "900f6c86a685850b1bc9f6223b20125115ee3f31e01207d81655bbcc0aea9231" checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
dependencies = [ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
...@@ -6690,18 +7121,18 @@ dependencies = [ ...@@ -6690,18 +7121,18 @@ dependencies = [
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "0.6.9" version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
dependencies = [ dependencies = [
"serde", "serde",
] ]
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.22.25" version = "0.22.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10558ed0bd2a1562e630926a2d1f0b98c827da99fabd3fe20920a59642504485" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
dependencies = [ dependencies = [
"indexmap 2.9.0", "indexmap 2.9.0",
"serde", "serde",
...@@ -6713,9 +7144,9 @@ dependencies = [ ...@@ -6713,9 +7144,9 @@ dependencies = [
[[package]] [[package]]
name = "toml_write" name = "toml_write"
version = "0.1.0" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28391a4201ba7eb1984cfeb6862c0b3ea2cfe23332298967c749dddc0d6cd976" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
[[package]] [[package]]
name = "tonic" name = "tonic"
...@@ -6799,6 +7230,24 @@ dependencies = [ ...@@ -6799,6 +7230,24 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "tower-http"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
dependencies = [
"bitflags 2.9.0",
"bytes",
"futures-util",
"http 1.3.1",
"http-body 1.0.1",
"iri-string",
"pin-project-lite",
"tower 0.5.2",
"tower-layer",
"tower-service",
]
[[package]] [[package]]
name = "tower-layer" name = "tower-layer"
version = "0.3.3" version = "0.3.3"
...@@ -6898,6 +7347,16 @@ dependencies = [ ...@@ -6898,6 +7347,16 @@ dependencies = [
"tracing-serde", "tracing-serde",
] ]
[[package]]
name = "transpose"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e"
dependencies = [
"num-integer",
"strength_reduce",
]
[[package]] [[package]]
name = "try-lock" name = "try-lock"
version = "0.2.5" version = "0.2.5"
...@@ -6915,6 +7374,24 @@ dependencies = [ ...@@ -6915,6 +7374,24 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "tungstenite"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
dependencies = [
"byteorder",
"bytes",
"data-encoding",
"http 1.3.1",
"httparse",
"log",
"rand 0.8.5",
"sha1",
"thiserror 1.0.69",
"utf-8",
]
[[package]] [[package]]
name = "typeid" name = "typeid"
version = "1.0.3" version = "1.0.3"
...@@ -6954,19 +7431,6 @@ dependencies = [ ...@@ -6954,19 +7431,6 @@ dependencies = [
"yoke", "yoke",
] ]
[[package]]
name = "ug-cuda"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50758486d7941f8b0a636ba7e29455c07071f41590beac1fd307ec893e8db69a"
dependencies = [
"cudarc 0.13.9",
"half",
"serde",
"thiserror 1.0.69",
"ug",
]
[[package]] [[package]]
name = "unarray" name = "unarray"
version = "0.1.4" version = "0.1.4"
...@@ -7061,7 +7525,7 @@ dependencies = [ ...@@ -7061,7 +7525,7 @@ dependencies = [
"serde_json", "serde_json",
"socks", "socks",
"url", "url",
"webpki-roots", "webpki-roots 0.26.8",
] ]
[[package]] [[package]]
...@@ -7106,6 +7570,29 @@ version = "0.2.2" ...@@ -7106,6 +7570,29 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "utoipa"
version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fcc29c80c21c31608227e0912b2d7fddba57ad76b606890627ba8ee7964e993"
dependencies = [
"indexmap 2.9.0",
"serde",
"serde_json",
"utoipa-gen",
]
[[package]]
name = "utoipa-gen"
version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d79d08d92ab8af4c5e8a6da20c47ae3f61a0f1dabc1997cdf2d082b757ca08b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "0.8.2" version = "0.8.2"
...@@ -7117,12 +7604,14 @@ dependencies = [ ...@@ -7117,12 +7604,14 @@ dependencies = [
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.16.0" version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
dependencies = [ dependencies = [
"getrandom 0.3.2", "getrandom 0.3.2",
"js-sys",
"serde", "serde",
"wasm-bindgen",
] ]
[[package]] [[package]]
...@@ -7402,6 +7891,15 @@ dependencies = [ ...@@ -7402,6 +7891,15 @@ dependencies = [
"rustls-pki-types", "rustls-pki-types",
] ]
[[package]]
name = "webpki-roots"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8782dd5a41a24eed3a4f40b606249b3e236ca61adf1f25ea4d45c73de122b502"
dependencies = [
"rustls-pki-types",
]
[[package]] [[package]]
name = "weezl" name = "weezl"
version = "0.1.8" version = "0.1.8"
...@@ -7498,7 +7996,7 @@ dependencies = [ ...@@ -7498,7 +7996,7 @@ dependencies = [
"windows-interface", "windows-interface",
"windows-link", "windows-link",
"windows-result", "windows-result",
"windows-strings 0.4.0", "windows-strings",
] ]
[[package]] [[package]]
...@@ -7531,38 +8029,29 @@ checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" ...@@ -7531,38 +8029,29 @@ checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
[[package]] [[package]]
name = "windows-registry" name = "windows-registry"
version = "0.4.0" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
dependencies = [ dependencies = [
"windows-link",
"windows-result", "windows-result",
"windows-strings 0.3.1", "windows-strings",
"windows-targets 0.53.0",
] ]
[[package]] [[package]]
name = "windows-result" name = "windows-result"
version = "0.3.2" version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
dependencies = [
"windows-link",
]
[[package]]
name = "windows-strings"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
dependencies = [ dependencies = [
"windows-link", "windows-link",
] ]
[[package]] [[package]]
name = "windows-strings" name = "windows-strings"
version = "0.4.0" version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
dependencies = [ dependencies = [
"windows-link", "windows-link",
] ]
...@@ -7618,29 +8107,13 @@ dependencies = [ ...@@ -7618,29 +8107,13 @@ dependencies = [
"windows_aarch64_gnullvm 0.52.6", "windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6", "windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6", "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm 0.52.6", "windows_i686_gnullvm",
"windows_i686_msvc 0.52.6", "windows_i686_msvc 0.52.6",
"windows_x86_64_gnu 0.52.6", "windows_x86_64_gnu 0.52.6",
"windows_x86_64_gnullvm 0.52.6", "windows_x86_64_gnullvm 0.52.6",
"windows_x86_64_msvc 0.52.6", "windows_x86_64_msvc 0.52.6",
] ]
[[package]]
name = "windows-targets"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
dependencies = [
"windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0",
"windows_i686_gnu 0.53.0",
"windows_i686_gnullvm 0.53.0",
"windows_i686_msvc 0.53.0",
"windows_x86_64_gnu 0.53.0",
"windows_x86_64_gnullvm 0.53.0",
"windows_x86_64_msvc 0.53.0",
]
[[package]] [[package]]
name = "windows_aarch64_gnullvm" name = "windows_aarch64_gnullvm"
version = "0.48.5" version = "0.48.5"
...@@ -7653,12 +8126,6 @@ version = "0.52.6" ...@@ -7653,12 +8126,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
[[package]] [[package]]
name = "windows_aarch64_msvc" name = "windows_aarch64_msvc"
version = "0.48.5" version = "0.48.5"
...@@ -7671,12 +8138,6 @@ version = "0.52.6" ...@@ -7671,12 +8138,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_aarch64_msvc"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
[[package]] [[package]]
name = "windows_i686_gnu" name = "windows_i686_gnu"
version = "0.48.5" version = "0.48.5"
...@@ -7689,24 +8150,12 @@ version = "0.52.6" ...@@ -7689,24 +8150,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnu"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
[[package]] [[package]]
name = "windows_i686_gnullvm" name = "windows_i686_gnullvm"
version = "0.52.6" version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_gnullvm"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
[[package]] [[package]]
name = "windows_i686_msvc" name = "windows_i686_msvc"
version = "0.48.5" version = "0.48.5"
...@@ -7719,12 +8168,6 @@ version = "0.52.6" ...@@ -7719,12 +8168,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_i686_msvc"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
[[package]] [[package]]
name = "windows_x86_64_gnu" name = "windows_x86_64_gnu"
version = "0.48.5" version = "0.48.5"
...@@ -7737,12 +8180,6 @@ version = "0.52.6" ...@@ -7737,12 +8180,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnu"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
[[package]] [[package]]
name = "windows_x86_64_gnullvm" name = "windows_x86_64_gnullvm"
version = "0.48.5" version = "0.48.5"
...@@ -7755,12 +8192,6 @@ version = "0.52.6" ...@@ -7755,12 +8192,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
[[package]] [[package]]
name = "windows_x86_64_msvc" name = "windows_x86_64_msvc"
version = "0.48.5" version = "0.48.5"
...@@ -7773,17 +8204,11 @@ version = "0.52.6" ...@@ -7773,17 +8204,11 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "windows_x86_64_msvc"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.7.7" version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
...@@ -7926,7 +8351,7 @@ dependencies = [ ...@@ -7926,7 +8351,7 @@ dependencies = [
"thiserror 1.0.69", "thiserror 1.0.69",
"tokio", "tokio",
"tokio-util", "tokio-util",
"uuid 1.16.0", "uuid 1.17.0",
] ]
[[package]] [[package]]
......
Cargo.toml
View file @ 4ab47617
...@@ -76,7 +76,7 @@ tokio-util = { version = "0.7", features = ["codec", "net"] } ...@@ -76,7 +76,7 @@ tokio-util = { version = "0.7", features = ["codec", "net"] }
tracing = { version = "0.1" } tracing = { version = "0.1" }
tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time", "json"] } tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time", "json"] }
validator = { version = "0.20.0", features = ["derive"] } validator = { version = "0.20.0", features = ["derive"] }
uuid = { version = "1", features = ["v4", "serde"] } uuid = { version = "1.17", features = ["v4", "serde"] }
url = {version = "2.5", features = ["serde"]} url = {version = "2.5", features = ["serde"]}
xxhash-rust = { version = "0.8", features = ["xxh3", "const_xxh3"] } xxhash-rust = { version = "0.8", features = ["xxh3", "const_xxh3"] }
......
deny.toml
View file @ 4ab47617
...@@ -30,7 +30,9 @@ allow = [ ...@@ -30,7 +30,9 @@ allow = [
"OpenSSL", "OpenSSL",
"Unicode-3.0", "Unicode-3.0",
"BSL-1.0", "BSL-1.0",
"MPL-2.0" "MPL-2.0",
"CDLA-Permissive-2.0",
"Zlib"
] ]
# TODO exceptions # TODO exceptions
......
lib/bindings/python/Cargo.lock
View file @ 4ab47617
...@@ -5133,12 +5133,14 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" ...@@ -5133,12 +5133,14 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.16.0" version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
dependencies = [ dependencies = [
"getrandom 0.3.2", "getrandom 0.3.2",
"js-sys",
"serde", "serde",
"wasm-bindgen",
] ]
[[package]] [[package]]
......
lib/engines/mistralrs/Cargo.toml
View file @ 4ab47617
...@@ -26,7 +26,7 @@ keywords.workspace = true ...@@ -26,7 +26,7 @@ keywords.workspace = true
[features] [features]
default = [] default = []
cuda = ["mistralrs/cuda", "candle-core/cuda"] cuda = ["mistralrs/cuda"]
metal = ["mistralrs/metal"] metal = ["mistralrs/metal"]
[dependencies] [dependencies]
...@@ -37,10 +37,9 @@ anyhow = { workspace = true } ...@@ -37,10 +37,9 @@ anyhow = { workspace = true }
async-openai = { workspace = true } async-openai = { workspace = true }
async-stream = { workspace = true } async-stream = { workspace = true }
async-trait = { workspace = true } async-trait = { workspace = true }
candle-core = { version = "0.8.0" }
either = { workspace = true } either = { workspace = true }
indexmap = { version = "2.6" } indexmap = { version = "2.9.0", features = ["serde"] }
mistralrs = { git = "https://github.com/EricLBuehler/mistral.rs.git", rev = "ebd50e35e" } mistralrs = { git = "https://github.com/EricLBuehler/mistral.rs.git", version = "0.6.0" }
serde_json = { workspace = true } serde_json = { workspace = true }
tokio = { workspace = true } tokio = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
lib/engines/mistralrs/src/lib.rs
View file @ 4ab47617
...@@ -13,8 +13,8 @@ use mistralrs::{ ...@@ -13,8 +13,8 @@ use mistralrs::{
AutoDeviceMapParams, Constraint, DefaultSchedulerMethod, Device, DeviceMapSetting, AutoDeviceMapParams, Constraint, DefaultSchedulerMethod, Device, DeviceMapSetting,
GGUFLoaderBuilder, GGUFSpecificConfig, IsqType, MemoryGpuConfig, MistralRs, MistralRsBuilder, GGUFLoaderBuilder, GGUFSpecificConfig, IsqType, MemoryGpuConfig, MistralRs, MistralRsBuilder,
ModelDType, NormalLoaderBuilder, NormalRequest, NormalSpecificConfig, PagedAttentionConfig, ModelDType, NormalLoaderBuilder, NormalRequest, NormalSpecificConfig, PagedAttentionConfig,
Request, RequestMessage, ResponseOk, SamplingParams, SchedulerConfig, StopTokens, TokenSource, PagedCacheType, Request, RequestMessage, ResponseOk, SamplingParams, SchedulerConfig,
VisionLoaderBuilder, VisionLoaderType, VisionSpecificConfig, StopTokens, TokenSource, VisionLoaderBuilder, VisionLoaderType, VisionSpecificConfig,
}; };
use tokio::sync::mpsc::channel; use tokio::sync::mpsc::channel;
...@@ -66,6 +66,7 @@ fn best_device() -> pipeline_error::Result<Device> { ...@@ -66,6 +66,7 @@ fn best_device() -> pipeline_error::Result<Device> {
struct MistralRsEngine { struct MistralRsEngine {
mistralrs: Arc<MistralRs>, mistralrs: Arc<MistralRs>,
context_length: usize, context_length: usize,
display_name: String,
} }
impl MistralRsEngine { impl MistralRsEngine {
...@@ -114,7 +115,7 @@ impl MistralRsEngine { ...@@ -114,7 +115,7 @@ impl MistralRsEngine {
Some(model_path.display().to_string()), Some(model_path.display().to_string()),
jinja_explicit, jinja_explicit,
) )
.build(vlt) .build(Some(vlt))
} else { } else {
// Load from a HF repo dir // Load from a HF repo dir
NormalLoaderBuilder::new( NormalLoaderBuilder::new(
...@@ -140,6 +141,7 @@ impl MistralRsEngine { ...@@ -140,6 +141,7 @@ impl MistralRsEngine {
None, // Block size, default 32 None, // Block size, default 32
4096, // CPU memory in MiB 4096, // CPU memory in MiB
MemoryGpuConfig::ContextSize(max_seq_len), MemoryGpuConfig::ContextSize(max_seq_len),
PagedCacheType::Auto,
)?) )?)
} else { } else {
None None
...@@ -203,8 +205,9 @@ impl MistralRsEngine { ...@@ -203,8 +205,9 @@ impl MistralRsEngine {
) )
.with_prefix_cache_n(16); .with_prefix_cache_n(16);
let engine = MistralRsEngine { let engine = MistralRsEngine {
mistralrs: builder.build(), mistralrs: builder.build().await,
context_length: max_seq_len, context_length: max_seq_len,
display_name: display_name.to_string(),
}; };
// skip the id used for dummy run https://github.com/EricLBuehler/mistral.rs/issues/1218 // skip the id used for dummy run https://github.com/EricLBuehler/mistral.rs/issues/1218
...@@ -213,8 +216,9 @@ impl MistralRsEngine { ...@@ -213,8 +216,9 @@ impl MistralRsEngine {
// Perform warmup request // Perform warmup request
let (tx, mut rx) = channel(1); let (tx, mut rx) = channel(1);
let request_id = engine.mistralrs.next_request_id(); let request_id = engine.mistralrs.next_request_id();
let warmup_request = Request::Normal(NormalRequest { let warmup_request = Request::Normal(Box::new(NormalRequest {
id: request_id, id: request_id,
model_id: Some(display_name.to_string()),
messages: RequestMessage::Chat { messages: RequestMessage::Chat {
messages: vec![IndexMap::from([ messages: vec![IndexMap::from([
("role".to_string(), Either::Left("user".to_string())), ("role".to_string(), Either::Left("user".to_string())),
...@@ -236,10 +240,10 @@ impl MistralRsEngine { ...@@ -236,10 +240,10 @@ impl MistralRsEngine {
logits_processors: None, logits_processors: None,
return_raw_logits: false, return_raw_logits: false,
web_search_options: None, web_search_options: None,
}); }));
// Send warmup request and consume response // Send warmup request and consume response
if let Ok(sender) = engine.mistralrs.get_sender() { if let Ok(sender) = engine.mistralrs.get_sender(None) {
if let Ok(()) = sender.send(warmup_request).await { if let Ok(()) = sender.send(warmup_request).await {
if let Some(response) = rx.recv().await { if let Some(response) = rx.recv().await {
match response.as_result() { match response.as_result() {
...@@ -339,8 +343,9 @@ impl ...@@ -339,8 +343,9 @@ impl
dry_params: det.dry_params, dry_params: det.dry_params,
}; };
let request_id = self.mistralrs.next_request_id(); let request_id = self.mistralrs.next_request_id();
let mistralrs_request = Request::Normal(NormalRequest { let mistralrs_request = Request::Normal(Box::new(NormalRequest {
id: request_id, id: request_id,
model_id: Some(self.display_name.clone()),
messages: RequestMessage::Chat { messages: RequestMessage::Chat {
messages, messages,
enable_thinking: None, enable_thinking: None,
...@@ -356,9 +361,12 @@ impl ...@@ -356,9 +361,12 @@ impl
logits_processors: None, logits_processors: None,
return_raw_logits: false, return_raw_logits: false,
web_search_options: None, web_search_options: None,
}); }));
self.mistralrs.get_sender()?.send(mistralrs_request).await?; self.mistralrs
.get_sender(None)?
.send(mistralrs_request)
.await?;
let output = stream! { let output = stream! {
while let Some(response) = rx.recv().await { while let Some(response) = rx.recv().await {
...@@ -536,8 +544,9 @@ impl ...@@ -536,8 +544,9 @@ impl
}; };
let request_id = self.mistralrs.next_request_id(); let request_id = self.mistralrs.next_request_id();
let mistralrs_request = Request::Normal(NormalRequest { let mistralrs_request = Request::Normal(Box::new(NormalRequest {
id: request_id, id: request_id,
model_id: Some(self.display_name.clone()),
messages, messages,
sampling_params, sampling_params,
response: tx, response: tx,
...@@ -550,9 +559,12 @@ impl ...@@ -550,9 +559,12 @@ impl
logits_processors: None, logits_processors: None,
return_raw_logits: false, return_raw_logits: false,
web_search_options: None, web_search_options: None,
}); }));
self.mistralrs.get_sender()?.send(mistralrs_request).await?; self.mistralrs
.get_sender(None)?
.send(mistralrs_request)
.await?;
let output = stream! { let output = stream! {
while let Some(response) = rx.recv().await { while let Some(response) = rx.recv().await {
......
lib/runtime/examples/Cargo.lock
View file @ 4ab47617
...@@ -2951,12 +2951,14 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" ...@@ -2951,12 +2951,14 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.16.0" version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
dependencies = [ dependencies = [
"getrandom 0.3.2", "getrandom 0.3.2",
"js-sys",
"serde", "serde",
"wasm-bindgen",
] ]
[[package]] [[package]]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment