diff --git a/.env b/.env index 252fd54..0240126 100644 --- a/.env +++ b/.env @@ -7,4 +7,4 @@ DATABASE_PATH3=Enter-path-3-here DATABASE_NAME3=Enter-name-3-here TEXT_EMBEDDING_URL=http://localhost:8080/vectors -IMAGE_EMBEDDING_URL=http://localhost:8080/vectors_img \ No newline at end of file +IMAGE_EMBEDDING_URL=http://localhost:8080/vectors_img diff --git a/Cargo.lock b/Cargo.lock index 8df08f1..e5bc60d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -58,6 +58,17 @@ dependencies = [ "uuid", ] +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -72,9 +83,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" dependencies = [ "axum-core", "bytes", @@ -124,9 +135,9 @@ dependencies = [ [[package]] name = "axum-test" -version = "18.1.0" +version = "18.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680e88effaafbb28675074f29cda0e984c984bed5eb513085c17caf7de564225" +checksum = "3290e73c56c5cc4701cdd7d46b9ced1b4bd61c7e9f9c769a9e9e87ff617d75d2" dependencies = [ "anyhow", "axum", @@ -163,7 +174,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -204,11 +215,11 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.71.1" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "cexpr", "clang-sys", "itertools 0.13.0", @@ -228,27 +239,27 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "bytesize" -version = "2.1.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5c434ae3cf0089ca203e9019ebe529c47ff45cefe8af7c85ecb734ef541822f" +checksum = "6bd91ee7b2422bcb158d90ef4d14f75ef67f340943fc4149891dcce8f8b972a3" [[package]] name = "bzip2-sys" @@ -277,10 +288,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.27" +version = "1.2.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -297,9 +309,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "chrono" @@ -312,7 +324,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -398,7 +410,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "crossterm_winapi", "libc", "mio 0.8.11", @@ -428,9 +440,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", ] @@ -496,9 +508,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "erased-serde" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "259d404d09818dec19332e31d94558aeb442fea04c817006456c24b5460bbd4b" +checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3" dependencies = [ "serde", "serde_core", @@ -507,24 +519,25 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "expect-json" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7519e78573c950576b89eb4f4fe82aedf3a80639245afa07e3ee3d199dcdb29e" +checksum = "422e7906e79941e5ac58c64dfd2da03e6ae3de62227f87606fbbe125d91080f9" dependencies = [ "chrono", "email_address", "expect-json-macros", "num", + "regex", "serde", "serde_json", "thiserror", @@ -534,9 +547,9 @@ dependencies = [ [[package]] name = "expect-json-macros" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bf7f5979e98460a0eb412665514594f68f366a32b85fa8d7ffb65bb1edee6a0" +checksum = "e6b515b7f10f1e61bfd938522e9884509b82060af2016153f5b3d6f44d6da89c" dependencies = [ "proc-macro2", "quote", @@ -559,6 +572,18 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "find-msvc-tools" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" + +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + [[package]] name = "fnv" version = "1.0.7" @@ -653,19 +678,19 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasip2", ] [[package]] @@ -676,9 +701,32 @@ checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "grpc_server" +version = "0.1.0" +dependencies = [ + "api", + "defs", + "dotenv", + "index", + "prost", + "prost-types", + "storage", + "tempfile", + "tokio", + "tokio-stream", + "tonic", + "tonic-build", + "tonic-prost", + "tonic-prost-build", + "tracing", + "tracing-subscriber", + "uuid", +] [[package]] name = "h2" @@ -724,12 +772,11 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -789,9 +836,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -826,6 +873,19 @@ dependencies = [ "tower-service", ] +[[package]] +name = "hyper-timeout" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -844,9 +904,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64", "bytes", @@ -894,9 +954,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -907,9 +967,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -920,11 +980,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -935,42 +994,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -1032,17 +1087,6 @@ dependencies = [ "rustversion", ] -[[package]] -name = "io-uring" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" -dependencies = [ - "bitflags 2.9.1", - "cfg-if", - "libc", -] - [[package]] name = "ipnet" version = "2.11.0" @@ -1077,6 +1121,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.15" @@ -1085,19 +1138,19 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jobserver" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.81" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -1117,18 +1170,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.174" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "libloading" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets 0.53.2", + "windows-link", ] [[package]] @@ -1149,9 +1202,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.22" +version = "1.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7" dependencies = [ "cc", "pkg-config", @@ -1160,15 +1213,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" @@ -1181,9 +1234,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru" @@ -1212,9 +1265,9 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "mime" @@ -1255,21 +1308,27 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] [[package]] name = "mio" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.59.0", + "wasi", + "windows-sys 0.61.2", ] +[[package]] +name = "multimap" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" + [[package]] name = "native-tls" version = "0.2.14" @@ -1299,11 +1358,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.1" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1406,7 +1465,7 @@ version = "0.10.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "cfg-if", "foreign-types", "libc", @@ -1470,7 +1529,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1491,6 +1550,36 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "petgraph" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "pin-project" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "pin-project-lite" version = "0.2.16" @@ -1511,9 +1600,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "potential_utf" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -1545,9 +1634,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.34" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", "syn", @@ -1555,18 +1644,92 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] +[[package]] +name = "prost" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1" +dependencies = [ + "heck", + "itertools 0.14.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "pulldown-cmark", + "pulldown-cmark-to-cmark", + "regex", + "syn", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" +dependencies = [ + "anyhow", + "itertools 0.14.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72" +dependencies = [ + "prost", +] + +[[package]] +name = "pulldown-cmark" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0" +dependencies = [ + "bitflags 2.10.0", + "memchr", + "unicase", +] + +[[package]] +name = "pulldown-cmark-to-cmark" +version = "21.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8246feae3db61428fd0bb94285c690b460e4517d83152377543ca802357785f1" +dependencies = [ + "pulldown-cmark", +] + [[package]] name = "quote" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -1603,7 +1766,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", ] [[package]] @@ -1612,7 +1775,7 @@ version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "cassowary", "compact_str", "crossterm", @@ -1632,14 +1795,14 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -1649,9 +1812,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -1660,15 +1823,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.25" +version = "0.12.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a" +checksum = "3b4c14b2d9afca6a60277086b0cc6a6ae0b568f6f7916c943a8cdc79f8be240f" dependencies = [ "base64", "bytes", @@ -1775,15 +1938,15 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustix" -version = "1.0.7" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1801,9 +1964,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c" +checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" dependencies = [ "zeroize", ] @@ -1852,7 +2015,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "core-foundation", "core-foundation-sys", "libc", @@ -1977,9 +2140,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.6" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" dependencies = [ "libc", ] @@ -1998,12 +2161,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -2070,9 +2233,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.106" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -2105,7 +2268,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "core-foundation", "system-configuration-sys", ] @@ -2127,10 +2290,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2195,9 +2358,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -2205,29 +2368,26 @@ dependencies = [ [[package]] name = "tokio" -version = "1.47.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc", - "mio 1.0.4", + "mio 1.1.1", "parking_lot", "pin-project-lite", "signal-hook-registry", - "slab", "socket2", "tokio-macros", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", @@ -2254,6 +2414,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-stream" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.17" @@ -2267,6 +2438,74 @@ dependencies = [ "tokio", ] +[[package]] +name = "tonic" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203" +dependencies = [ + "async-trait", + "axum", + "base64", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "socket2", + "sync_wrapper", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40aaccc9f9eccf2cd82ebc111adc13030d23e887244bc9cfa5d1d636049de3" +dependencies = [ + "prettyplease", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tonic-prost" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67" +dependencies = [ + "bytes", + "prost", + "tonic", +] + +[[package]] +name = "tonic-prost-build" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a16cba4043dc3ff43fcb3f96b4c5c154c64cbd18ca8dce2ab2c6a451d058a2" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "prost-types", + "quote", + "syn", + "tempfile", + "tonic-build", +] + [[package]] name = "tower" version = "0.5.2" @@ -2275,9 +2514,12 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", + "indexmap", "pin-project-lite", + "slab", "sync_wrapper", "tokio", + "tokio-util", "tower-layer", "tower-service", "tracing", @@ -2289,7 +2531,7 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "bytes", "futures-util", "http", @@ -2315,9 +2557,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -2327,9 +2569,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", @@ -2338,9 +2580,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -2369,9 +2611,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -2446,9 +2688,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-segmentation" @@ -2499,13 +2741,13 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.18.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "js-sys", - "serde", + "serde_core", "wasm-bindgen", ] @@ -2543,19 +2785,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.104" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -2564,25 +2806,11 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - [[package]] name = "wasm-bindgen-futures" -version = "0.4.54" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", @@ -2593,9 +2821,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.104" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2603,31 +2831,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.104" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.104" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.81" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -2663,9 +2891,9 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] @@ -2690,12 +2918,6 @@ dependencies = [ "syn", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -2704,22 +2926,13 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-registry" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" -dependencies = [ - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-result" -version = "0.3.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ - "windows-link 0.1.3", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] @@ -2728,16 +2941,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -2746,7 +2950,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -2767,22 +2971,13 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.2", + "windows-targets 0.53.5", ] [[package]] @@ -2791,7 +2986,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -2827,18 +3022,19 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.2" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" 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", + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -2855,9 +3051,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -2873,9 +3069,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -2891,9 +3087,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -2903,9 +3099,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -2921,9 +3117,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -2939,9 +3135,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -2957,9 +3153,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -2975,24 +3171,21 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.9.1", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "yansi" @@ -3002,11 +3195,10 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -3014,9 +3206,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", @@ -3026,18 +3218,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", @@ -3073,9 +3265,9 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -3084,9 +3276,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -3095,9 +3287,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", @@ -3106,11 +3298,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.15+zstd.1.5.7" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ - "bindgen 0.71.1", + "bindgen 0.72.1", "cc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 83aaa9a..5825d64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ members = [ "crates/server", "crates/http_server", "crates/tui", + "crates/grpc_server", ] # You can define shared dependencies for all crates here diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs index 3657f58..85966ca 100644 --- a/crates/api/src/lib.rs +++ b/crates/api/src/lib.rs @@ -25,15 +25,27 @@ fn generate_point_id() -> PointId { pub struct VectorDb { storage: Arc, index: Arc>, // Using a RwLock instead of Mutex to improve concurrency + dimension: usize, } impl VectorDb { - fn _new(storage: Arc, index: Arc>) -> Self { - Self { storage, index } + fn _new( + storage: Arc, + index: Arc>, + dimension: usize, + ) -> Self { + Self { + storage, + index, + dimension, + } } //TODO: Make this an atomic operation pub fn insert(&self, vector: DenseVector, payload: Payload) -> Result { + if vector.len() != self.dimension { + return Err(DbError::DimensionMismatch); + } // Generate a new point id let point_id = generate_point_id(); self.storage @@ -50,13 +62,13 @@ impl VectorDb { } //TODO: Make this an atomic operation - pub fn delete(&self, id: PointId) -> Result<(), DbError> { + pub fn delete(&self, id: PointId) -> Result { // Remove from storage self.storage.delete_point(id)?; // Remove from index let mut index = self.index.write().map_err(|_| DbError::LockError)?; - index.delete(id)?; - Ok(()) + let point_found = index.delete(id)?; + Ok(point_found) } pub fn get(&self, id: PointId) -> Result, DbError> { @@ -144,7 +156,7 @@ pub fn init_api(config: DbConfig) -> Result { }; // Init the db - let db = VectorDb::_new(storage, index); + let db = VectorDb::_new(storage, index, config.dimension); // populate the current index with vectors from the storage db.build_index()?; @@ -198,6 +210,25 @@ mod tests { assert_eq!(point.payload.as_ref().unwrap().content, "Test content"); } + #[test] + fn test_dimension_mismatch() { + let db = create_test_db(); + let v1 = vec![1.0, 2.0, 3.0]; + let v2 = vec![1.0, 2.0]; + let payload = defs::Payload { + content_type: ContentType::Text, + content: "tester".to_string(), + }; + + let res1 = db.insert(v1, payload.clone()); + assert!(res1.is_ok()); + + // Insert vector of dimension 2 != 3 + let res2 = db.insert(v2, payload); + assert!(res2.is_err()); + assert_eq!(res2.unwrap_err(), DbError::DimensionMismatch); + } + #[test] fn test_delete() { let db = create_test_db(); @@ -210,6 +241,12 @@ mod tests { // Insert a point let id = db.insert(vector, payload).unwrap(); + // try deleting a point that does not exist + let found = db.delete(Uuid::new_v4()); + assert!(found.is_ok()); + assert!(!found.unwrap()); + + // delete the point assert!(db.get(id).unwrap().is_some()); db.delete(id).unwrap(); assert!(db.get(id).unwrap().is_none()); diff --git a/crates/defs/src/error.rs b/crates/defs/src/error.rs index 0a04550..3cbdac9 100644 --- a/crates/defs/src/error.rs +++ b/crates/defs/src/error.rs @@ -1,5 +1,5 @@ use std::io; -#[derive(Debug)] +#[derive(Debug, PartialEq, Eq)] pub enum DbError { ParseError, StorageError(String), @@ -7,6 +7,7 @@ pub enum DbError { DeserializationError, IndexError(String), LockError, + DimensionMismatch, } #[derive(Debug)] @@ -20,3 +21,11 @@ pub enum AppError { DbError(DbError), ServerError(ServerError), } + +impl std::fmt::Display for DbError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{:?}", self) + } +} + +impl std::error::Error for DbError {} diff --git a/crates/grpc_server/.sample.env b/crates/grpc_server/.sample.env new file mode 100644 index 0000000..85c9030 --- /dev/null +++ b/crates/grpc_server/.sample.env @@ -0,0 +1,9 @@ +GRPC_SERVER_ROOT_PASSWORD=123 # required +GRPC_SERVER_DIMENSION=3 # required + +GRPC_SERVER_HOST=127.0.0.1 # defaults to 127.0.0.1 aka localhost +GRPC_SERVER_PORT=8080 # defaults to 8080 +GRPC_SERVER_STORAGE_TYPE=inmemory # (inmemory/rocksdb) defaults to 'inmemory' +GRPC_SERVER_INDEX_TYPE=flat # defaults to flat +GRPC_SERVER_DATA_PATH=data # defaults to a temporary directory +GRPC_SERVER_LOGGING=true # defaults to true diff --git a/crates/grpc_server/Cargo.toml b/crates/grpc_server/Cargo.toml new file mode 100644 index 0000000..8b2030c --- /dev/null +++ b/crates/grpc_server/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "grpc_server" +version = "0.1.0" +edition = "2024" + +[dependencies] +prost = "0.14.1" +tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] } +tonic = "0.14.2" +tonic-prost-build = "0.14.2" + +api = { path = "../api" } +storage = { path = "../storage" } +index = { path = "../index" } +defs = { path = "../defs" } + +tonic-prost = "0.14.2" +prost-types = "0.14.1" +dotenv = "0.15.0" +tempfile = "3.23.0" +tracing = "0.1.41" +tracing-subscriber = "0.3.20" +tokio-stream = "0.1.17" +uuid.workspace = true + +[build-dependencies] +tonic-build = "0.14.2" +tonic-prost-build = "0.14.2" diff --git a/crates/grpc_server/README.md b/crates/grpc_server/README.md new file mode 100644 index 0000000..a3c36ed --- /dev/null +++ b/crates/grpc_server/README.md @@ -0,0 +1,32 @@ +### Build + +Clone the repository and run `cargo build --bin grpc_server` to build the binary of the gRPC server crate. + +You can than then start the gRPC server by running: + +```bash +cargo run --bin grpc_server +``` + +### Configuration + +Use the [.sample.env](.sample.env) shown below as a reference to set your environment variables in a `.env` file. + +```bash +GRPC_SERVER_ROOT_PASSWORD=123 # required +GRPC_SERVER_DIMENSION=3 # required + +GRPC_SERVER_HOST=localhost # defaults to 127.0.0.1 aka localhost +GRPC_SERVER_PORT=8080 # defaults to 8080 +GRPC_SERVER_STORAGE_TYPE=inmemory # (inmemory/rocksdb) defaults to 'inmemory' +GRPC_SERVER_INDEX_TYPE=flat # defaults to flat +GRPC_SERVER_DATA_PATH=data # defaults to a temporary directory +GRPC_SERVER_LOGGING=true # defaults to true + + +``` + + +### Testing + +The [vector-db.proto](proto/vector-db.proto) can be imported into any gRPC client. diff --git a/crates/grpc_server/build.rs b/crates/grpc_server/build.rs new file mode 100644 index 0000000..8290b86 --- /dev/null +++ b/crates/grpc_server/build.rs @@ -0,0 +1,4 @@ +fn main() -> Result<(), Box> { + tonic_prost_build::compile_protos("proto/vector-db.proto")?; + Ok(()) +} diff --git a/crates/grpc_server/proto/vector-db.proto b/crates/grpc_server/proto/vector-db.proto new file mode 100644 index 0000000..b3834e9 --- /dev/null +++ b/crates/grpc_server/proto/vector-db.proto @@ -0,0 +1,73 @@ +syntax = "proto3"; + +package vectordb; + +import "google/protobuf/empty.proto"; + +message UUID { + string value = 1; +} + +service VectorDB { + //Insert a vector with a payload and return the assigned PointID + rpc InsertVector(InsertVectorRequest) returns (PointID) {} + + //Delete a vector by its PointID + rpc DeletePoint(PointID) returns (google.protobuf.Empty) {} + + //Get a vector and its payload by PointID + rpc GetPoint(PointID) returns (Point) {} + + //Search for the k nearest vectors to a target vector given a distance function + rpc SearchPoints(SearchRequest) returns (SearchResponse) {} +} + + +message InsertVectorRequest { + DenseVector vector = 1; + Payload payload = 2; +} + + +message SearchRequest { + DenseVector query_vector = 1; + Similarity similarity = 2; + uint64 limit = 3; +} + + +message SearchResponse { + repeated PointID result_point_ids = 1; +} + +message DenseVector { + repeated float values = 1; +} + +message Point { + PointID id = 1; + Payload payload = 2; + DenseVector vector = 3; +} + +message PointID { + UUID id = 1; +} + +enum Similarity{ + Euclidean = 0; + Manhattan = 1; + Hamming = 2; + Cosine = 3; +} + +enum ContentType { + Image = 0; + Text = 1; +} + +message Payload { + ContentType content_type = 1; + string content = 2; +} + diff --git a/crates/grpc_server/src/config.rs b/crates/grpc_server/src/config.rs new file mode 100644 index 0000000..6d9137c --- /dev/null +++ b/crates/grpc_server/src/config.rs @@ -0,0 +1,125 @@ +use crate::constants::{ + self, DEFAULT_PORT, ENV_DATA_PATH, ENV_DIMENSION, ENV_INDEX_TYPE, ENV_LOGGING, ENV_PORT, + ENV_ROOT_PASSWORD, ENV_STORAGE_TYPE, +}; +use crate::errors; +use api; +use dotenv::dotenv; +use index::IndexType; +use std::net::SocketAddr; +use std::path::PathBuf; +use std::{env, fs}; +use storage; +use tempfile::tempdir; +use tracing::{Level, event}; + +pub struct GRPCServerConfig { + pub addr: SocketAddr, + pub root_password: String, + pub db_config: api::DbConfig, + pub logging: bool, +} + +impl GRPCServerConfig { + pub fn load_config() -> Result> { + dotenv().ok(); + + // fetch server host; default to localhost if not defined + let host = env::var(constants::ENV_HOST) + .inspect_err(|_| { + event!(Level::WARN, "Host not defined, defaulting to 'localhost'"); + }) + .unwrap_or("127.0.0.1".to_string()); + + // fetch server port; default to 8080 if not defined + let port: u32 = env::var(ENV_PORT) + .inspect_err(|_| { + event!( + Level::WARN, + "Port not defined, defaulting to {}", + DEFAULT_PORT + ); + }) + .unwrap_or(DEFAULT_PORT.to_string()) + .parse() + .unwrap_or(DEFAULT_PORT.parse::().unwrap()); + + // fetch server root password; return err if not defined + let root_password = env::var(ENV_ROOT_PASSWORD).map_err(|_| { + errors::ConfigError::MissingRequiredEnvVar(ENV_ROOT_PASSWORD.to_string()) + })?; + + // fetch server storage type + let storage_type_str = env::var(ENV_STORAGE_TYPE) + .inspect_err(|_| { + event!( + Level::WARN, + "Storage Type not defined, defaulting to InMemory" + ) + }) + .unwrap_or_default(); + let storage_type = match storage_type_str.as_str() { + "inmemory" => storage::StorageType::InMemory, + "rocksdb" => storage::StorageType::RocksDb, + _ => storage::StorageType::InMemory, // default to InMemory if not specified + }; + + // fetch server index type + let index_type_str = env::var(ENV_INDEX_TYPE) + .inspect_err(|_| event!(Level::WARN, "Index Type not defined, defaulting to flat")) + .unwrap_or("flat".to_string()) + .to_lowercase(); + let index_type = match index_type_str.as_str() { + "flat" => IndexType::Flat, + "kdtree" => IndexType::KDTree, + "hnsw" => IndexType::HNSW, + _ => IndexType::Flat, // default to Flat if not specified + }; + + // fetch dimension size + let dimension: usize = env::var(ENV_DIMENSION) + .map_err(|_| errors::ConfigError::MissingRequiredEnvVar(ENV_DIMENSION.to_string()))? + .parse() + .map_err(|_| errors::ConfigError::InvalidDimension)?; + + // fetch data path; create tempdir if not specified + let data_path: PathBuf; + if let Ok(data_path_str) = env::var(ENV_DATA_PATH) { + data_path = PathBuf::from(data_path_str); + fs::create_dir_all(&data_path).map_err(|_| errors::ConfigError::InvalidDataPath)?; + } else { + let tempbuf = tempdir().unwrap().path().to_path_buf().join("vectordb"); + fs::create_dir_all(&tempbuf)?; + event!( + Level::WARN, + "Data Path not specified, using temporary directory: {:?}", + tempbuf.clone() + ); + data_path = tempbuf; + } + + // create db config for api + let db_config = api::DbConfig { + storage_type, + index_type, + data_path, + dimension, + }; + + // create socket address for grpc server + let addr: SocketAddr = format!("{}:{}", host, port).parse()?; + + // check if logging is enabled + let mut logging: bool = true; // default to logging enabled + if let Ok(logging_str) = env::var(ENV_LOGGING) { + logging = logging_str.parse().unwrap_or(true); + } + + Ok(GRPCServerConfig { + addr, + root_password, + db_config, + logging, + }) + } +} diff --git a/crates/grpc_server/src/constants.rs b/crates/grpc_server/src/constants.rs new file mode 100644 index 0000000..f68f18d --- /dev/null +++ b/crates/grpc_server/src/constants.rs @@ -0,0 +1,15 @@ +use defs::Similarity; +use defs::Similarity::{Cosine, Euclidean, Hamming, Manhattan}; +pub const ENV_HOST: &str = "GRPC_SERVER_HOST"; +pub const ENV_PORT: &str = "GRPC_SERVER_PORT"; +pub const ENV_ROOT_PASSWORD: &str = "GRPC_SERVER_ROOT_PASSWORD"; +pub const ENV_STORAGE_TYPE: &str = "GRPC_SERVER_STORAGE_TYPE"; +pub const ENV_INDEX_TYPE: &str = "GRPC_SERVER_INDEX_TYPE"; +pub const ENV_DIMENSION: &str = "GRPC_SERVER_DIMENSION"; +pub const ENV_DATA_PATH: &str = "GRPC_SERVER_DATA_PATH"; +pub const ENV_LOGGING: &str = "GRPC_SERVER_LOGGING"; + +pub const DEFAULT_PORT: &str = "8080"; + +pub const SIMILARITY_PROTOBUFF_MAP: [Similarity; 4] = [Euclidean, Manhattan, Hamming, Cosine]; +pub const AUTHORIZATION_HEADER_KEY: &str = "authorization"; diff --git a/crates/grpc_server/src/errors.rs b/crates/grpc_server/src/errors.rs new file mode 100644 index 0000000..c7342bb --- /dev/null +++ b/crates/grpc_server/src/errors.rs @@ -0,0 +1,14 @@ +#[derive(Debug)] +pub enum ConfigError { + MissingRequiredEnvVar(String), + InvalidDimension, + InvalidDataPath, +} + +impl std::error::Error for ConfigError {} + +impl std::fmt::Display for ConfigError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{:?}", self) + } +} diff --git a/crates/grpc_server/src/interceptors.rs b/crates/grpc_server/src/interceptors.rs new file mode 100644 index 0000000..0b760f6 --- /dev/null +++ b/crates/grpc_server/src/interceptors.rs @@ -0,0 +1,36 @@ +use tonic::{Status, service::Interceptor}; +use tracing::{Level, event}; + +use crate::constants::AUTHORIZATION_HEADER_KEY; + +#[derive(Clone)] +pub struct AuthInterceptor { + root_password: String, +} + +impl Interceptor for AuthInterceptor { + fn call(&mut self, req: tonic::Request<()>) -> Result, Status> { + let auth_token = match req.metadata().get(AUTHORIZATION_HEADER_KEY) { + Some(t) => t, + None => return Err(Status::unauthenticated("Invalid credentials")), + }; + if auth_token + .to_str() + .unwrap_or_default() + .strip_prefix("Bearer ") + .unwrap_or_default() + == self.root_password + { + Ok(req) + } else { + event!(Level::WARN, "Unauthorized Request"); + Err(Status::unauthenticated("Invalid credentials")) + } + } +} + +impl AuthInterceptor { + pub fn new(root_password: String) -> AuthInterceptor { + AuthInterceptor { root_password } + } +} diff --git a/crates/grpc_server/src/lib.rs b/crates/grpc_server/src/lib.rs new file mode 100644 index 0000000..a14557d --- /dev/null +++ b/crates/grpc_server/src/lib.rs @@ -0,0 +1,9 @@ +pub mod config; +pub mod constants; +pub mod errors; +pub mod interceptors; +pub mod service; +pub mod utils; + +#[cfg(test)] +pub mod tests; diff --git a/crates/grpc_server/src/main.rs b/crates/grpc_server/src/main.rs new file mode 100644 index 0000000..83db6dd --- /dev/null +++ b/crates/grpc_server/src/main.rs @@ -0,0 +1,30 @@ +use grpc_server::config::GRPCServerConfig; +use grpc_server::service::{VectorDBService, run_server}; +use grpc_server::utils::ServerEndpoint; +use std::panic; + +#[tokio::main] +async fn main() -> Result<(), Box> { + tracing_subscriber::fmt::init(); + + // load config from environment from environment variables + let config = GRPCServerConfig::load_config() + .inspect_err(|err| panic!("Failed to load config: {}", err)) + .unwrap(); + + let vector_db_api = api::init_api(config.db_config) + .inspect_err(|err| panic!("Failed to Init API: {:?}", err)) + .unwrap(); + + let vector_db_service = VectorDBService { + vector_db: vector_db_api, + logging: config.logging, + }; + run_server( + vector_db_service, + ServerEndpoint::Address(config.addr), + config.root_password, + ) + .await?; + Ok(()) +} diff --git a/crates/grpc_server/src/service.rs b/crates/grpc_server/src/service.rs new file mode 100644 index 0000000..9eeea96 --- /dev/null +++ b/crates/grpc_server/src/service.rs @@ -0,0 +1,197 @@ +use std::str::FromStr; + +use crate::interceptors; +use crate::service::vectordb::{ContentType, Uuid}; +use crate::utils::log_rpc; +use crate::{constants::SIMILARITY_PROTOBUFF_MAP, utils::ServerEndpoint}; +use defs::Payload; +use tonic::{Request, Response, Status, service::InterceptorLayer, transport::Server}; +use tracing::{Level, event}; +use uuid::Uuid as UuidCrate; +use vectordb::{ + DenseVector, InsertVectorRequest, Point, PointId, SearchRequest, SearchResponse, + vector_db_server::{VectorDb, VectorDbServer}, +}; + +pub mod vectordb { + tonic::include_proto!("vectordb"); +} + +pub struct VectorDBService { + pub vector_db: api::VectorDb, + pub logging: bool, +} + +#[tonic::async_trait] +impl VectorDb for VectorDBService { + async fn insert_vector( + &self, + request: Request, + ) -> Result, Status> { + log_rpc("insert_vector", self.logging); + + let inner_request = request.into_inner(); + + let dense_vector = inner_request.vector; + if dense_vector.is_none() { + return Err(Status::invalid_argument("dense_vector is empty")); + } + + // TODO: Implement payload handling once its defined + // fetch payload and default to empty struct otherwise + + let payload = inner_request.payload.unwrap_or_default(); + let payload_content = payload.content; + let payload_type = + match ContentType::try_from(payload.content_type).unwrap_or(ContentType::Text) { + ContentType::Text => defs::ContentType::Text, + ContentType::Image => defs::ContentType::Image, + }; + + let point_id = self.vector_db.insert( + dense_vector.unwrap().values, + Payload { + content_type: payload_type, + content: payload_content, + }, + ); + + let res = + point_id.map_err(|e| Status::internal(format!("failed to insert vector: {:?}", e)))?; + + Ok(Response::new(PointId { + id: Some(Uuid { + value: res.to_string(), + }), + })) + } + + async fn get_point(&self, request: Request) -> Result, Status> { + log_rpc("get_point", self.logging); + + let inner_request = request.into_inner(); + + let point_id = inner_request.id.unwrap_or_default().value; + let point_opt = self + .vector_db + .get(UuidCrate::from_str(&point_id).unwrap()) + .map_err(|e| Status::aborted(format!("point not found {:?}", e)))?; + + // return error if not found + let point = point_opt.ok_or(Status::not_found(format!("point not found: {}", point_id)))?; + + Ok(Response::new(Point { + id: Some(PointId { + id: Some(Uuid { + value: point.id.to_string(), + }), + }), + vector: Some(DenseVector { + values: point.vector.unwrap_or_default(), + }), + payload: None, + })) + } + + async fn search_points( + &self, + request: Request, + ) -> Result, Status> { + log_rpc("search_points", self.logging); + + let search_request = request.into_inner(); + + // extract request arguments + let query_vect = search_request + .query_vector + .ok_or(Status::invalid_argument("Invalid query_vector"))?; + let similarity = SIMILARITY_PROTOBUFF_MAP + .get(search_request.similarity as usize) + .ok_or(Status::invalid_argument("Invalid similarity"))?; + let limit = search_request.limit; + + if limit == 0 { + return Err(Status::invalid_argument("Limit must be greater than zero")); + } + + let result_point_ids = self + .vector_db + .search(query_vect.values, *similarity, limit as usize) + .map_err(|_| Status::internal("Internal server error"))?; + + // create a mapped vector of PointIds + let result = result_point_ids + .into_iter() + .map(|id| PointId { + id: Some(Uuid { + value: id.to_string(), + }), + }) + .collect(); + + Ok(Response::new(SearchResponse { + result_point_ids: result, + })) + } + + async fn delete_point(&self, request: Request) -> Result, Status> { + log_rpc("delete_point", self.logging); + + let point_id = request.into_inner().id.unwrap_or_default().value; + + match self + .vector_db + .delete(UuidCrate::from_str(&point_id).unwrap()) + { + Ok(found) => { + if found { + Ok(Response::new(())) + } else { + Err(Status::not_found("Point not found")) + } + } + Err(_) => Err(Status::internal("Error deleting point")), + } + } +} + +pub async fn run_server( + vector_db_service: VectorDBService, + endpoint: ServerEndpoint, + root_password: String, +) -> Result<(), Box> { + event!(Level::INFO, "Starting gRPC server at: {:?}", endpoint); + + let auth_interceptor = interceptors::AuthInterceptor::new(root_password); + + let router = Server::builder() + .layer(InterceptorLayer::new(auth_interceptor)) + .add_service(VectorDbServer::new(vector_db_service)); + + match endpoint { + ServerEndpoint::Address(addr) => { + router.serve(addr).await.map_err(|err| { + event!( + Level::ERROR, + "Failed to start gRPC server with address: {:?}", + err + ); + Status::internal(format!("Failed to start server with address: {}", err)) + })?; + } + ServerEndpoint::Listener(listener) => { + router + .serve_with_incoming(tokio_stream::wrappers::TcpListenerStream::new(listener)) + .await + .map_err(|err| { + event!( + Level::ERROR, + "Failed to start gRPC server with listener: {:?}", + err + ); + Status::internal(format!("Failed to start server with listener: {}", err)) + })?; + } + } + Ok(()) +} diff --git a/crates/grpc_server/src/tests.rs b/crates/grpc_server/src/tests.rs new file mode 100644 index 0000000..820a4ea --- /dev/null +++ b/crates/grpc_server/src/tests.rs @@ -0,0 +1,253 @@ +use crate::config::GRPCServerConfig; +use crate::constants::AUTHORIZATION_HEADER_KEY; +use crate::service::vectordb::vector_db_client::VectorDbClient; +use crate::service::vectordb::{DenseVector, InsertVectorRequest, Payload, PointId, SearchRequest}; +use crate::service::{VectorDBService, run_server}; +use crate::utils::ServerEndpoint; +use api; +use api::DbConfig; +use index::IndexType; +use std::net::SocketAddr; +use storage::StorageType; +use tempfile::tempdir; +use tokio; +use tonic::transport::Channel; + +// Inspired from https://github.com/hyperium/tonic/discussions/924#discussioncomment-9854088 + +const TEST_AUTH_BEARER_TOKEN: &str = "123"; + +fn append_test_auth_header(request: &mut tonic::Request, token: &str) { + let auth_value = format!("Bearer {}", token); + request + .metadata_mut() + .insert(AUTHORIZATION_HEADER_KEY, auth_value.parse().unwrap()); +} + +async fn start_test_server() -> Result> { + // using a temporary directory for db datapath + let temp_dir = tempdir().unwrap(); + + let db_config = DbConfig { + storage_type: StorageType::RocksDb, + index_type: IndexType::Flat, + data_path: temp_dir.path().to_path_buf(), + dimension: 3, + }; + + let config = GRPCServerConfig { + addr: "127.0.0.1:0".parse()?, + root_password: TEST_AUTH_BEARER_TOKEN.to_string(), + logging: false, + db_config, + }; + + let vector_db_api = api::init_api(config.db_config)?; + + let vector_db_service = VectorDBService { + vector_db: vector_db_api, + logging: config.logging, + }; + + let listener = tokio::net::TcpListener::bind(config.addr).await?; + let listener_addr = listener.local_addr()?; + + tokio::spawn(async move { + let _ = run_server( + vector_db_service, + ServerEndpoint::Listener(listener), + config.root_password, + ) + .await + .inspect_err(|err| panic!("Could not start test server : {:?}", err)); + }); + + Ok(listener_addr) +} + +async fn create_test_client( + server_addr: SocketAddr, +) -> Result, Box> { + let channel = Channel::from_shared(format!("http://{}", server_addr)) + .unwrap() + .connect() + .await?; + Ok(VectorDbClient::new(channel)) +} + +#[tokio::test] +async fn test_grpc_server_start() { + let server_addr = start_test_server().await.unwrap(); + let mut client = create_test_client(server_addr).await.unwrap(); + + // insert a test vector + let test_vec = vec![1.0, 2.0, 3.0]; + + let mut request = tonic::Request::new(InsertVectorRequest { + vector: Some(DenseVector { + values: test_vec.clone(), + }), + payload: Some(Payload::default()), + }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + + let status = client.insert_vector(request).await.is_ok(); + assert!(status); +} + +#[tokio::test] +async fn test_insert_vector_rpc() { + let server_addr = start_test_server().await.unwrap(); + let mut client = create_test_client(server_addr).await.unwrap(); + + // insert a test vector + let test_vec = vec![1.0, 2.0, 3.0]; + + let mut request = tonic::Request::new(InsertVectorRequest { + vector: Some(DenseVector { + values: test_vec.clone(), + }), + payload: Some(Payload::default()), + }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + + let resp = client.insert_vector(request).await; + + // check if request is successful + assert!(resp.is_ok()); + + // check if the vector is actually present in the database + let mut request = tonic::Request::new(PointId { + id: resp.unwrap().into_inner().id, + }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + let resp = client.get_point(request).await; + + // check if request is successful + assert!(resp.is_ok()); + let point = resp.unwrap().into_inner(); + assert_eq!(point.vector.unwrap().values, test_vec); + + // insert a new vector with mismatched dimensions + let mut request = tonic::Request::new(InsertVectorRequest { + vector: Some(DenseVector { + values: vec![1.0, 2.0], + }), + payload: Some(Payload::default()), + }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + + let resp = client.insert_vector(request).await; + + // request must fail + assert!(resp.is_err()); +} + +#[tokio::test] +async fn test_delete_vector_rpc() { + let server_addr = start_test_server().await.unwrap(); + let mut client = create_test_client(server_addr).await.unwrap(); + + // insert a test vector + let test_vec = vec![1.0, 2.0, 3.0]; + let mut request = tonic::Request::new(InsertVectorRequest { + vector: Some(DenseVector { + values: test_vec.clone(), + }), + payload: Some(Payload::default()), + }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + + let resp = client.insert_vector(request).await; + + // check if request is successful + assert!(resp.is_ok()); + let point = resp.unwrap().into_inner(); + + // delete the vector + let mut request = tonic::Request::new(PointId { + id: point.id.clone(), + }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + + let resp = client.delete_point(request).await; + + // check if request is successful + assert!(resp.is_ok()); + + // verify that the vector is deleted + let mut request = tonic::Request::new(PointId { id: point.id }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + + let resp = client.get_point(request).await; + + // request must fail since the vector is deleted + assert!(resp.is_err()); +} + +#[tokio::test] +async fn test_search_vector_rpc() { + let server_addr = start_test_server().await.unwrap(); + let mut client = create_test_client(server_addr).await.unwrap(); + + // insert a test vector + let test_vec = vec![1.0, 2.0, 3.0]; + let mut request = tonic::Request::new(InsertVectorRequest { + vector: Some(DenseVector { + values: test_vec.clone(), + }), + payload: Some(Payload::default()), + }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + + let resp = client.insert_vector(request).await; + + // check if request is successful + assert!(resp.is_ok()); + let point = resp.unwrap().into_inner(); + + let query_vec = vec![2.0, 2.0, 2.0]; + + // search for the vector + let mut request = tonic::Request::new(SearchRequest { + query_vector: Some(DenseVector { + values: query_vec.clone(), + }), + similarity: 0, // euclidean distance + limit: 1, + }); + append_test_auth_header(&mut request, TEST_AUTH_BEARER_TOKEN); + + let resp = client.search_points(request).await; + + // check if request is successful + assert!(resp.is_ok()); + let result = resp.unwrap().into_inner(); + + // 1 vector has to be returned + assert_eq!(result.result_point_ids.len(), 1); + + // check if the returned point id matches the inserted point id + assert_eq!(result.result_point_ids[0], PointId { id: point.id }); +} + +#[tokio::test] +async fn test_unauthorized_rpc() { + let server_addr = start_test_server().await.unwrap(); + let mut client = create_test_client(server_addr).await.unwrap(); + + // insert a test vector + let test_vec = vec![1.0, 2.0, 3.0]; + let mut request = tonic::Request::new(InsertVectorRequest { + vector: Some(DenseVector { + values: test_vec.clone(), + }), + payload: Some(Payload::default()), + }); + + append_test_auth_header(&mut request, "43121"); + let resp = client.insert_vector(request).await; + + // request must fail + assert!(resp.is_err()); +} diff --git a/crates/grpc_server/src/utils.rs b/crates/grpc_server/src/utils.rs new file mode 100644 index 0000000..2a609cf --- /dev/null +++ b/crates/grpc_server/src/utils.rs @@ -0,0 +1,18 @@ +use std::net::SocketAddr; + +use tokio::net::TcpListener; +use tracing; + +#[inline(always)] +pub fn log_rpc(rpc: &str, logging: bool) { + if logging { + tracing::event!(tracing::Level::INFO, "{} RPC called", rpc); + } +} + +// Either socket address or a premade listener +#[derive(Debug)] +pub enum ServerEndpoint { + Address(SocketAddr), + Listener(TcpListener), +} diff --git a/crates/http_server/src/handler.rs b/crates/http_server/src/handler.rs index 668e7a6..8b94008 100644 --- a/crates/http_server/src/handler.rs +++ b/crates/http_server/src/handler.rs @@ -15,7 +15,7 @@ pub struct InsertRequest { pub payload: Payload, } -#[derive(Serialize)] +#[derive(Serialize, Deserialize)] pub struct InsertResponse { pub point_id: PointId, } diff --git a/crates/http_server/src/main.rs b/crates/http_server/src/main.rs index edfb6b3..62d39e2 100644 --- a/crates/http_server/src/main.rs +++ b/crates/http_server/src/main.rs @@ -104,22 +104,26 @@ mod tests { async fn test_all_routes() { let server = setup_test_server(); // 1 Insert a point - let point_id = 1; let insert_response = server .post("/points") - .json(&json!({"vector": [0.1, 0.2], "payload": {}})) + .json( + &json!({"vector": [0.1, 0.2], "payload": {"content_type": "Image", "content": "tester"}}), + ) .await; assert_eq!(insert_response.status_code(), StatusCode::CREATED); println!("Insert Test passed"); + let insert_result: handler::InsertResponse = insert_response.json(); + let point_id = insert_result.point_id; + // 2 Get the point back let get_response = server.get(&format!("/points/{}", point_id)).await; get_response.assert_status_ok(); let point: Point = get_response.json(); - assert_eq!(point.id, point_id); + let expected_vec: DenseVector = vec![0.1, 0.2]; assert_eq!(point.vector.unwrap(), expected_vec); - println!("Retrival Test passed"); + println!("Retrieval Test passed"); println!("Deletion Test passed"); @@ -136,7 +140,7 @@ mod tests { println!("{:?}", search_response); let search_results: SearchResponse = search_response.json(); assert_eq!(search_results.results.len(), 1); - assert_eq!(search_results.results[0], point_id); + assert_eq!(search_results.results[0].to_string(), point_id.to_string()); println!("Search Test passed"); // 4 Delete the point diff --git a/crates/index/src/flat.rs b/crates/index/src/flat.rs index 3ede81b..0739f01 100644 --- a/crates/index/src/flat.rs +++ b/crates/index/src/flat.rs @@ -240,7 +240,7 @@ mod tests { index .insert(IndexedVector { id: id1, - vector: vec![1.0, 0.0, 1.0, 0.0], + vector: vec![1.0, 0.0, 1.0, 1.0], }) .unwrap(); index diff --git a/crates/tui/src/app/database.rs b/crates/tui/src/app/database.rs index 849bca7..3542b6f 100644 --- a/crates/tui/src/app/database.rs +++ b/crates/tui/src/app/database.rs @@ -57,10 +57,10 @@ impl DatabaseManager { self.selected_database = Some((name, path)); Ok(()) } - Err(e) => Err(io::Error::new( - io::ErrorKind::Other, - format!("Failed to create database: {:?}", e), - )), + Err(err) => Err(io::Error::other(format!( + "Failed to create database: {:?}", + err + ))), } } @@ -88,10 +88,10 @@ impl DatabaseManager { self.selected_database = Some((name, path)); Ok(()) } - Err(e) => Err(io::Error::new( - io::ErrorKind::Other, - format!("Failed to open database: {:?}", e), - )), + Err(err) => Err(io::Error::other(format!( + "Failed to open database: {:?}", + err + ))), } } diff --git a/crates/tui/src/app/events.rs b/crates/tui/src/app/events.rs index 97b1122..481f044 100644 --- a/crates/tui/src/app/events.rs +++ b/crates/tui/src/app/events.rs @@ -269,7 +269,7 @@ fn execute_modal_action(app: &mut App) -> io::Result<()> { if let Some(db) = &app.database.api_db { match db.get(id).map_err(to_io)? { Some(_) => match db.delete(id).map_err(to_io) { - Ok(()) => app.modal.show_success(format!("Deleted vector id={id}")), + Ok(_found) => app.modal.show_success(format!("Deleted vector id={id}")), Err(e) => app.modal.show_failure(format!("DB error: {e}")), }, None => app diff --git a/crates/tui/src/app/state.rs b/crates/tui/src/app/state.rs index 12668f7..d502fd3 100644 --- a/crates/tui/src/app/state.rs +++ b/crates/tui/src/app/state.rs @@ -27,6 +27,7 @@ pub enum ModalType { ImageEmbedding, } +#[allow(dead_code)] #[derive(Debug, Clone)] pub struct VectorListItem { pub id: Uuid,