diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 3b98b62..618c8ef 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -27,6 +27,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "ahash" version = "0.8.11" @@ -220,6 +231,52 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "askama" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b79091df18a97caea757e28cd2d5fda49c6cd4bd01ddffd7ff01ace0c0ad2c28" +dependencies = [ + "askama_derive", + "askama_escape", + "humansize", + "num-traits", + "percent-encoding", + "serde", + "serde_json", +] + +[[package]] +name = "askama_derive" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83" +dependencies = [ + "askama_parser", + "basic-toml", + "mime", + "mime_guess", + "proc-macro2", + "quote", + "serde", + "syn 2.0.61", +] + +[[package]] +name = "askama_escape" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" + +[[package]] +name = "askama_parser" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0" +dependencies = [ + "nom", +] + [[package]] name = "async-broadcast" version = "0.5.1" @@ -504,6 +561,15 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + [[package]] name = "bincode" version = "1.3.3" @@ -530,7 +596,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.61", "which", @@ -648,9 +714,9 @@ checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" @@ -687,6 +753,27 @@ dependencies = [ "serde", ] +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cairo-rs" version = "0.15.12" @@ -714,7 +801,7 @@ dependencies = [ [[package]] name = "candle-core" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +source = "git+https://github.com/EricLBuehler/candle.git?rev=2386e4e#2386e4e4683f31530ab6d02e7516dfffe683331a" dependencies = [ "byteorder", "candle-metal-kernels", @@ -730,13 +817,13 @@ dependencies = [ "safetensors", "thiserror", "yoke", - "zip", + "zip 1.1.4", ] [[package]] name = "candle-metal-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +source = "git+https://github.com/EricLBuehler/candle.git?rev=2386e4e#2386e4e4683f31530ab6d02e7516dfffe683331a" dependencies = [ "metal", "once_cell", @@ -747,7 +834,7 @@ dependencies = [ [[package]] name = "candle-nn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +source = "git+https://github.com/EricLBuehler/candle.git?rev=2386e4e#2386e4e4683f31530ab6d02e7516dfffe683331a" dependencies = [ "candle-core", "candle-metal-kernels", @@ -803,7 +890,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] @@ -866,6 +953,16 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clang-sys" version = "1.7.0" @@ -1025,6 +1122,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "convert_case" version = "0.4.0" @@ -1305,6 +1408,27 @@ dependencies = [ "syn 2.0.61", ] +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa 1.0.10", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + [[package]] name = "ct2rs" version = "0.7.3" @@ -1574,6 +1698,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + [[package]] name = "defmac" version = "0.1.3" @@ -1690,6 +1820,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs" version = "5.0.1" @@ -1797,6 +1936,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "dyn-stack" version = "0.10.0" @@ -1896,6 +2041,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.8" @@ -3013,6 +3168,15 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +[[package]] +name = "humansize" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" +dependencies = [ + "libm", +] + [[package]] name = "hyper" version = "0.14.28" @@ -3286,6 +3450,15 @@ dependencies = [ "cfb", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -3626,6 +3799,12 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.21" @@ -3700,11 +3879,22 @@ dependencies = [ "tokio", "unicode-segmentation", "urlencoding", + "uuid 1.10.0", "vosk", "whisper-rs", "xcap", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "mac" version = "0.1.1" @@ -3819,9 +4009,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3898,6 +4088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e136ef580d7955019ab0a407b68d77c292a9976907e217900f3f76bc8f6dc1a4" dependencies = [ "serde", + "serde_json", ] [[package]] @@ -3940,8 +4131,8 @@ dependencies = [ [[package]] name = "mistralrs" -version = "0.1.18" -source = "git+https://github.com/EricLBuehler/mistral.rs.git?tag=v0.1.18#0728b33c5b7d7c5ce5c1ef0ef663e7a68e2acc67" +version = "0.2.5" +source = "git+https://github.com/EricLBuehler/mistral.rs.git?tag=v0.2.5#e64a71a16e28f55f396490d5bc40cf1ca4187c13" dependencies = [ "anyhow", "candle-core", @@ -3949,25 +4140,29 @@ dependencies = [ "image 0.25.1", "indexmap 2.2.6", "mistralrs-core", + "serde", "serde_json", "tokio", ] [[package]] name = "mistralrs-core" -version = "0.1.18" -source = "git+https://github.com/EricLBuehler/mistral.rs.git?tag=v0.1.18#0728b33c5b7d7c5ce5c1ef0ef663e7a68e2acc67" +version = "0.2.5" +source = "git+https://github.com/EricLBuehler/mistral.rs.git?tag=v0.2.5#e64a71a16e28f55f396490d5bc40cf1ca4187c13" dependencies = [ "akin", "anyhow", "async-trait", + "base64 0.22.1", "buildstructor", "bytemuck", + "bytemuck_derive", "candle-core", "candle-nn", "cfgrammar", "chrono", "clap", + "csv", "derive-new", "derive_more", "dirs", @@ -3983,18 +4178,22 @@ dependencies = [ "lrtable", "minijinja", "minijinja-contrib", + "mistralrs-quant", "mistralrs-vision", "once_cell", + "plotly", "radix_trie", "rand 0.8.5", "rand_isaac", - "range-checked", "rayon", "regex-automata 0.4.6", - "rustc-hash", + "reqwest 0.12.5", + "rustc-hash 2.0.0", + "schemars", "serde", "serde_json", "strum", + "sysinfo", "thiserror", "tokenizers", "tokio", @@ -4003,14 +4202,30 @@ dependencies = [ "tqdm", "tracing", "tracing-subscriber", + "uuid 1.10.0", "variantly", "vob", ] +[[package]] +name = "mistralrs-quant" +version = "0.2.5" +source = "git+https://github.com/EricLBuehler/mistral.rs.git?tag=v0.2.5#e64a71a16e28f55f396490d5bc40cf1ca4187c13" +dependencies = [ + "candle-core", + "candle-nn", + "half", + "lazy_static", + "paste", + "rayon", + "serde", + "tracing", +] + [[package]] name = "mistralrs-vision" -version = "0.1.18" -source = "git+https://github.com/EricLBuehler/mistral.rs.git?tag=v0.1.18#0728b33c5b7d7c5ce5c1ef0ef663e7a68e2acc67" +version = "0.2.5" +source = "git+https://github.com/EricLBuehler/mistral.rs.git?tag=v0.2.5#e64a71a16e28f55f396490d5bc40cf1ca4187c13" dependencies = [ "candle-core", "image 0.25.1", @@ -4640,9 +4855,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -4650,6 +4865,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -4893,6 +5118,51 @@ dependencies = [ "time", ] +[[package]] +name = "plotly" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b8fd16c14ce31e4d48a31970530c2e3152b965e8567469e292712af7c9536f" +dependencies = [ + "askama", + "dyn-clone", + "erased-serde", + "once_cell", + "plotly_derive", + "plotly_kaleido", + "rand 0.8.5", + "serde", + "serde_json", + "serde_repr", + "serde_with", +] + +[[package]] +name = "plotly_derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7817cbbd497db67dc5d21206fd0f4cab0cd6974b6fd2791f012c5455245b0e65" +dependencies = [ + "darling 0.20.8", + "proc-macro2", + "quote", + "syn 2.0.61", +] + +[[package]] +name = "plotly_kaleido" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c9281a5f475d6310a4dcac16ea838c726f84923774910fb708931295c3612ee" +dependencies = [ + "base64 0.22.1", + "directories", + "dunce", + "serde", + "serde_json", + "zip 2.1.1", +] + [[package]] name = "png" version = "0.17.13" @@ -5226,11 +5496,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "range-checked" -version = "0.1.0" -source = "git+https://github.com/EricLBuehler/range-checked.git#655349cc093fcd4965f35b25de394a24ff4b0c7b" - [[package]] name = "rav1e" version = "0.7.1" @@ -5448,6 +5713,7 @@ dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2 0.4.6", @@ -5579,6 +5845,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.2.3" @@ -5736,6 +6008,30 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.61", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -5894,6 +6190,17 @@ dependencies = [ "syn 2.0.61", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "serde_json" version = "1.0.114" @@ -6671,9 +6978,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.10" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if", "core-foundation-sys", @@ -6772,7 +7079,7 @@ dependencies = [ "serde", "tao-macros", "unicode-segmentation", - "uuid 1.8.0", + "uuid 1.10.0", "windows 0.39.0", "windows-implement", "x11-dl", @@ -6859,7 +7166,7 @@ dependencies = [ "thiserror", "tokio", "url", - "uuid 1.8.0", + "uuid 1.10.0", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6906,7 +7213,7 @@ dependencies = [ "tauri-utils", "thiserror", "time", - "uuid 1.8.0", + "uuid 1.10.0", "walkdir", ] @@ -6970,7 +7277,7 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "uuid 1.8.0", + "uuid 1.10.0", "webview2-com", "windows 0.39.0", ] @@ -6989,7 +7296,7 @@ dependencies = [ "raw-window-handle", "tauri-runtime", "tauri-utils", - "uuid 1.8.0", + "uuid 1.10.0", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -7497,6 +7804,12 @@ dependencies = [ "syn 2.0.61", ] +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + [[package]] name = "typenum" version = "1.17.0" @@ -7644,9 +7957,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.12", ] @@ -8853,6 +9166,20 @@ name = "zeroize" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] [[package]] name = "zip" @@ -8869,6 +9196,77 @@ dependencies = [ "thiserror", ] +[[package]] +name = "zip" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd56a4d5921bc2f99947ac5b3abe5f510b1be7376fdc5e9fce4a23c6a93e87c" +dependencies = [ + "aes", + "arbitrary", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "deflate64", + "displaydoc", + "flate2", + "hmac", + "indexmap 2.2.6", + "lzma-rs", + "memchr", + "pbkdf2", + "rand 0.8.5", + "sha1 0.10.6", + "thiserror", + "time", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] + [[package]] name = "zune-core" version = "0.4.12" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index bc82380..8073c9f 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -44,9 +44,11 @@ objc = "0.2" objc-foundation = "0.1" objc_id = "0.1" ct2rs = { version = "0.7.3", features = ["accelerate"] } -mistralrs = { git = "https://github.com/EricLBuehler/mistral.rs.git", tag = "v0.1.18", features = [ +mistralrs = { git = "https://github.com/EricLBuehler/mistral.rs.git", tag = "v0.2.5", features = [ "metal", ] } +# mistralrsの要求がtauriの要求と競合するため、tauriの要求を上書きする +uuid = "=1.10.0" [target.'cfg(target_arch = "x86_64")'.dependencies] whisper-rs = { version = "0.11.1", features = ["metal"] } diff --git a/src-tauri/src/module/translation_ja_high.rs b/src-tauri/src/module/translation_ja_high.rs index 4290f06..c2180b7 100644 --- a/src-tauri/src/module/translation_ja_high.rs +++ b/src-tauri/src/module/translation_ja_high.rs @@ -3,9 +3,7 @@ use super::{sqlite::Sqlite, transcriber::Transcriber}; use crossbeam_channel::Receiver; use hound::SampleFormat; use mistralrs::{ - Constraint, ModelDType, Device, DeviceMapMetadata, GGUFLoaderBuilder, GGUFSpecificConfig, MistralRs, - MistralRsBuilder, NormalRequest, Request, RequestMessage, Response, SamplingParams, - SchedulerMethod, TokenSource, + Constraint, DefaultSchedulerMethod, Device, DeviceMapMetadata, GGUFLoaderBuilder, MistralRs, MistralRsBuilder, ModelDType, NormalRequest, Request, RequestMessage, Response, SamplingParams, SchedulerConfig, TokenSource }; use samplerate_rs::{convert, ConverterType}; use std::sync::{Arc, Mutex}; @@ -35,12 +33,12 @@ impl TranslationJaHigh { .to_string_lossy() .to_string(); let loader = GGUFLoaderBuilder::new( - GGUFSpecificConfig { repeat_last_n: 64 }, Some(format!("{}/chat_templates_llama2.json", model_path)), None, model_path, "aixsatoshi-Honyaku-13b-Q4_0.gguf".to_string(), // "aixsatoshi-Honyaku-13b-IQ4_XS.gguf".to_string(), + None, ) .build(); let pipeline = tokio::task::block_in_place(|| { @@ -52,6 +50,7 @@ impl TranslationJaHigh { false, DeviceMapMetadata::dummy(), None, + None, ) }) .unwrap(); @@ -62,7 +61,9 @@ impl TranslationJaHigh { ctx: Transcriber::build(app_handle_clone, "large-translate-to-en".to_string()), translator: MistralRsBuilder::new( pipeline, - SchedulerMethod::Fixed(5.try_into().unwrap()), + SchedulerConfig::DefaultScheduler { + method: DefaultSchedulerMethod::Fixed(5.try_into().unwrap()), + }, ) .build(), speaker_language, @@ -186,8 +187,10 @@ impl TranslationJaHigh { constraint: Constraint::None, suffix: None, adapters: None, + tools: None, + tool_choice: None, }); - self.translator.get_sender().blocking_send(request).unwrap(); + self.translator.get_sender().unwrap().blocking_send(request).unwrap(); let mut translated; let response = rx.blocking_recv().unwrap(); match response {