diff --git a/Cargo.lock b/Cargo.lock index b38547ea..a6bd9849 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,24 +90,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" -[[package]] -name = "aligned" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377e4c0ba83e4431b10df45c1d4666f178ea9c552cac93e60c3a88bf32785923" -dependencies = [ - "as-slice", -] - -[[package]] -name = "aligned-vec" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b" -dependencies = [ - "equator", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -203,17 +185,6 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" -[[package]] -name = "arg_enum_proc_macro" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "argon2" version = "0.5.3" @@ -232,15 +203,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -[[package]] -name = "as-slice" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516" -dependencies = [ - "stable_deref_trait", -] - [[package]] name = "askama" version = "0.12.1" @@ -262,7 +224,7 @@ checksum = "a41603f7cdbf5ac4af60760f17253eb6adf6ec5b6f14a7ed830cf687d375f163" dependencies = [ "askama", "axum-core 0.4.5", - "http 1.3.1", + "http 1.4.0", ] [[package]] @@ -278,7 +240,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -351,7 +313,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener 2.5.3", + "event-listener", ] [[package]] @@ -373,7 +335,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -384,16 +346,16 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] -name = "atoi" -version = "2.0.0" +name = "atomic" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340" dependencies = [ - "num-traits", + "bytemuck", ] [[package]] @@ -408,54 +370,11 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "av-scenechange" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f321d77c20e19b92c39e7471cf986812cbb46659d2af674adc4331ef3f18394" -dependencies = [ - "aligned", - "anyhow", - "arg_enum_proc_macro", - "arrayvec", - "log", - "num-rational", - "num-traits", - "pastey", - "rayon", - "thiserror 2.0.17", - "v_frame", - "y4m", -] - -[[package]] -name = "av1-grain" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8" -dependencies = [ - "anyhow", - "arrayvec", - "log", - "nom 8.0.0", - "num-rational", - "v_frame", -] - -[[package]] -name = "avif-serialize" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f" -dependencies = [ - "arrayvec", -] - [[package]] name = "aws-config" -version = "1.8.10" +version = "1.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856b1b48b65f71a4dd940b1c0931f9a7b646d4a924b9828ffefc1454714668a" +checksum = "a0149602eeaf915158e14029ba0c78dedb8c08d554b024d54c8f239aab46511d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -472,8 +391,8 @@ dependencies = [ "bytes", "fastrand", "hex", - "http 1.3.1", - "ring 0.17.14", + "http 1.4.0", + "ring", "time", "tokio", "tracing", @@ -483,9 +402,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.9" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86590e57ea40121d47d3f2e131bfd873dea15d78dc2f4604f4734537ad9e56c4" +checksum = "b01c9521fa01558f750d183c8c68c81b0155b9d193a4ba7f84c36bd1b6d04a06" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -495,9 +414,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151" +checksum = "6b5ce75405893cd713f9ab8e297d8e438f624dde7d706108285f7e17a25a180f" dependencies = [ "aws-lc-sys", "zeroize", @@ -505,11 +424,10 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc" +checksum = "179c3777a8b5e70e90ea426114ffc565b2c1a9f82f6c4a0c5a34aa6ef5e781b6" dependencies = [ - "bindgen", "cc", "cmake", "dunce", @@ -518,9 +436,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.14" +version = "1.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe0fd441565b0b318c76e7206c8d1d0b0166b3e986cf30e890b61feb6192045" +checksum = "7ce527fb7e53ba9626fc47824f25e256250556c40d8f81d27dd92aa38239d632" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -543,9 +461,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.112.0" +version = "1.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee73a27721035c46da0572b390a69fbdb333d0177c24f3d8f7ff952eeb96690" +checksum = "cd4c10050aa905b50dc2a1165a9848d598a80c3a724d6f93b5881aa62235e4a5" dependencies = [ "aws-credential-types", "aws-runtime", @@ -565,9 +483,9 @@ dependencies = [ "hex", "hmac", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", - "lru", + "lru 0.12.5", "percent-encoding", "regex-lite", "sha2", @@ -577,9 +495,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.89.0" +version = "1.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c1b1af02288f729e95b72bd17988c009aa72e26dcb59b3200f86d7aea726c9" +checksum = "4f18e53542c522459e757f81e274783a78f8c81acdfc8d1522ee8a18b5fb1c66" dependencies = [ "aws-credential-types", "aws-runtime", @@ -599,9 +517,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.91.0" +version = "1.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8122301558dc7c6c68e878af918880b82ff41897a60c8c4e18e4dc4d93e9f1" +checksum = "532f4d866012ffa724a4385c82e8dd0e59f0ca0e600f3f22d4c03b6824b34e4a" dependencies = [ "aws-credential-types", "aws-runtime", @@ -621,9 +539,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.92.0" +version = "1.94.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c7808adcff8333eaa76a849e6de926c6ac1a1268b9fd6afe32de9c29ef29d2" +checksum = "1be6fbbfa1a57724788853a623378223fe828fc4c09b146c992f0c95b6256174" dependencies = [ "aws-credential-types", "aws-runtime", @@ -659,10 +577,10 @@ dependencies = [ "hex", "hmac", "http 0.2.12", - "http 1.3.1", - "p256 0.11.1", + "http 1.4.0", + "p256", "percent-encoding", - "ring 0.17.14", + "ring", "sha2", "subtle", "time", @@ -726,7 +644,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "percent-encoding", "pin-project-lite", @@ -746,7 +664,7 @@ dependencies = [ "h2 0.3.27", "h2 0.4.12", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "hyper 0.14.32", "hyper 1.8.1", @@ -807,7 +725,7 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "http-body 1.0.1", "pin-project-lite", @@ -826,7 +744,7 @@ dependencies = [ "aws-smithy-types", "bytes", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "pin-project-lite", "tokio", "tracing", @@ -844,7 +762,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -894,7 +812,7 @@ dependencies = [ "base64 0.22.1", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.8.1", @@ -912,7 +830,7 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-tungstenite 0.24.0", "tower 0.5.2", @@ -930,7 +848,7 @@ dependencies = [ "axum-core 0.5.5", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "itoa", @@ -940,7 +858,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "serde_core", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower 0.5.2", "tower-layer", "tower-service", @@ -955,13 +873,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower-layer", "tower-service", "tracing", @@ -975,12 +893,12 @@ checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower-layer", "tower-service", ] @@ -993,7 +911,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1005,7 +923,7 @@ dependencies = [ "arc-swap", "bytes", "fs-err", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "hyper 1.8.1", "hyper-util", @@ -1039,18 +957,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -1089,30 +995,19 @@ dependencies = [ ] [[package]] -name = "bindgen" -version = "0.72.1" +name = "bit-set" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bitflags 2.10.0", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.110", + "bit-vec", ] [[package]] -name = "bit_field" -version = "0.10.3" +name = "bit-vec" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" @@ -1125,18 +1020,6 @@ name = "bitflags" version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" -dependencies = [ - "serde_core", -] - -[[package]] -name = "bitstream-io" -version = "4.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d4bd9d1db2c6bdf285e223a7fa369d5ce98ec767dec949c6ca62863ce61757" -dependencies = [ - "core2", -] [[package]] name = "blake2" @@ -1197,7 +1080,7 @@ dependencies = [ "chrono", "color-eyre", "cron", - "crossterm 0.29.0", + "crossterm", "csv", "diesel", "diesel_migrations", @@ -1211,7 +1094,6 @@ dependencies = [ "hmac", "hyper 0.14.32", "hyper-rustls 0.24.2", - "image", "imap", "indicatif", "jsonwebtoken", @@ -1225,6 +1107,7 @@ dependencies = [ "num-format", "once_cell", "pdf-extract", + "png", "qdrant-client", "qrcode", "rand 0.9.2", @@ -1232,9 +1115,9 @@ dependencies = [ "rcgen", "redis", "regex", - "reqwest 0.12.24", + "reqwest", "rhai", - "ring 0.17.14", + "ring", "rust_xlsxwriter", "rustls 0.21.12", "rustls-native-certs 0.6.3", @@ -1244,7 +1127,6 @@ dependencies = [ "serde_json", "sha2", "smartstring", - "sqlx", "sysinfo", "tar", "tempfile", @@ -1253,7 +1135,7 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tokio-stream", - "toml 0.8.2", + "toml 0.8.23", "tonic 0.14.2", "tower 0.4.13", "tower-cookies", @@ -1265,7 +1147,6 @@ dependencies = [ "webpki-roots 0.25.4", "x509-parser", "zip 2.4.2", - "zitadel", ] [[package]] @@ -1274,12 +1155,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" -[[package]] -name = "built" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" - [[package]] name = "bumpalo" version = "3.19.0" @@ -1304,12 +1179,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - [[package]] name = "bytes" version = "1.11.0" @@ -1370,12 +1239,6 @@ dependencies = [ "zip 2.4.2", ] -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - [[package]] name = "castaway" version = "0.2.4" @@ -1396,9 +1259,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.46" +version = "1.2.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36" +checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" dependencies = [ "find-msvc-tools", "jobserver", @@ -1412,15 +1275,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.3", -] - [[package]] name = "cff-parser" version = "0.1.0" @@ -1483,31 +1337,20 @@ dependencies = [ "inout", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" -version = "4.5.52" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8120877db0e5c011242f96806ce3c94e0737ab8108532a76a3300a01db2ab8" +checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.52" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02576b399397b659c26064fbc92a75fede9d18ffd5f80ca1cd74ddab167016e1" +checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" dependencies = [ "anstyle", "clap_lex", @@ -1546,7 +1389,7 @@ checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" dependencies = [ "serde", "termcolor", - "unicode-width 0.2.0", + "unicode-width", ] [[package]] @@ -1576,12 +1419,6 @@ dependencies = [ "tracing-error", ] -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "colorchoice" version = "1.0.4" @@ -1613,9 +1450,9 @@ dependencies = [ [[package]] name = "compact_str" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" +checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" dependencies = [ "castaway", "cfg-if", @@ -1625,15 +1462,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "console" version = "0.16.1" @@ -1643,7 +1471,7 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "unicode-width 0.2.0", + "unicode-width", "windows-sys 0.61.2", ] @@ -1687,9 +1515,9 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" -version = "0.7.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" dependencies = [ "unicode-segmentation", ] @@ -1731,15 +1559,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - [[package]] name = "cpufeatures" version = "0.2.17" @@ -1751,9 +1570,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" dependencies = [ "crc-catalog", ] @@ -1797,56 +1616,12 @@ dependencies = [ "winnow 0.6.26", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "crossterm" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" -dependencies = [ - "bitflags 2.10.0", - "crossterm_winapi", - "mio", - "parking_lot", - "rustix 0.38.44", - "signal-hook", - "signal-hook-mio", - "winapi", -] - [[package]] name = "crossterm" version = "0.29.0" @@ -1859,7 +1634,7 @@ dependencies = [ "document-features", "mio", "parking_lot", - "rustix 1.1.2", + "rustix", "signal-hook", "signal-hook-mio", "winapi", @@ -1898,10 +1673,8 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ - "generic-array", "rand_core 0.6.4", "subtle", - "zeroize", ] [[package]] @@ -1915,6 +1688,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "lab", + "phf", +] + [[package]] name = "csv" version = "1.4.0" @@ -1945,44 +1728,11 @@ dependencies = [ "cipher", ] -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", -] - -[[package]] -name = "custom_error" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" - [[package]] name = "cxx" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ac4eaf7ebe29e92f1b091ceefec7710a53a6f6154b2460afda626c113b65b9" +checksum = "a7620f6cfc4dcca21f2b085b7a890e16c60fd66f560cd69ee60594908dc72ab1" dependencies = [ "cc", "cxx-build", @@ -1995,49 +1745,49 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abd4c3021eefbac5149f994c117b426852bca3a0aad227698527bca6d4ea657" +checksum = "7a9bc1a22964ff6a355fbec24cf68266a0ed28f8b84c0864c386474ea3d0e479" dependencies = [ "cc", "codespan-reporting", - "indexmap 2.12.0", + "indexmap 2.12.1", "proc-macro2", "quote", "scratch", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "cxxbridge-cmd" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f12fbc5888b2311f23e52a601e11ad7790d8f0dbb903ec26e2513bf5373ed70" +checksum = "b1f29a879d35f7906e3c9b77d7a1005a6a0787d330c09dfe4ffb5f617728cb44" dependencies = [ "clap", "codespan-reporting", - "indexmap 2.12.0", + "indexmap 2.12.1", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "cxxbridge-flags" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3dd7870af06e283f3f8ce0418019c96171c9ce122cfb9c8879de3d84388fd" +checksum = "d67109015f93f683e364085aa6489a5b2118b4a40058482101d699936a7836d6" [[package]] name = "cxxbridge-macro" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26f0d82da663316786791c3d0e9f9edc7d1ee1f04bdad3d2643086a69d6256c" +checksum = "d187e019e7b05a1f3e69a8396b70800ee867aa9fc2ab972761173ccee03742df" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2071,7 +1821,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2085,7 +1835,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2096,7 +1846,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2107,7 +1857,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2122,6 +1872,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" +[[package]] +name = "deltae" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4" + [[package]] name = "der" version = "0.6.1" @@ -2132,17 +1888,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - [[package]] name = "der-parser" version = "8.2.0" @@ -2164,7 +1909,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", - "serde_core", ] [[package]] @@ -2175,7 +1919,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2196,7 +1940,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2206,35 +1950,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "derive_more" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b" dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.110", + "rustc_version", + "syn 2.0.111", ] [[package]] name = "diesel" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e7624a3bb9fffd82fff016be9a7f163d20e5a89eb8d28f9daaa6b30fff37500" +checksum = "0c415189028b232660655e4893e8bc25ca7aee8e96888db66d9edb400535456a" dependencies = [ "bitflags 2.10.0", "byteorder", @@ -2250,22 +1995,22 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.3.4" +version = "2.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9daac6489a36e42570da165a10c424f3edcefdff70c5fd55e1847c23f3dd7562" +checksum = "8587cbca3c929fb198e7950d761d31ca72b80aa6e07c1b7bec5879d187720436" dependencies = [ "diesel_table_macro_syntax", "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "diesel_migrations" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee060f709c3e3b1cadd83fcd0f61711f7a8cf493348f758d3a1c1147d70b3c97" +checksum = "745fd255645f0f1135f9ec55c7b00e0882192af9683ab4731e4bba3da82b8f9c" dependencies = [ "diesel", "migrations_internals", @@ -2278,7 +2023,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c" dependencies = [ - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2288,7 +2033,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] @@ -2301,7 +2045,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2333,7 +2077,7 @@ checksum = "9ac1e888d6830712d565b2f3a974be3200be9296bc1b03db8251a4cbf18a4a34" dependencies = [ "futures", "rand 0.8.5", - "reqwest 0.12.24", + "reqwest", "thiserror 1.0.69", "tokio", ] @@ -2349,7 +2093,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2358,12 +2102,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" -[[package]] -name = "dyn-clone" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" - [[package]] name = "ecb" version = "0.1.2" @@ -2379,48 +2117,10 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der 0.7.10", - "digest", - "elliptic-curve 0.13.8", - "rfc6979 0.4.0", - "signature 2.2.0", - "spki 0.7.3", -] - -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8 0.10.2", - "signature 2.2.0", -] - -[[package]] -name = "ed25519-dalek" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" -dependencies = [ - "curve25519-dalek", - "ed25519", - "serde", - "sha2", - "subtle", - "zeroize", + "der", + "elliptic-curve", + "rfc6979", + "signature", ] [[package]] @@ -2428,9 +2128,6 @@ name = "either" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -dependencies = [ - "serde", -] [[package]] name = "elliptic-curve" @@ -2438,37 +2135,16 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "base16ct 0.1.1", + "base16ct", "crypto-bigint 0.4.9", - "der 0.6.1", + "der", "digest", - "ff 0.12.1", + "ff", "generic-array", - "group 0.12.1", - "pkcs8 0.9.0", + "group", + "pkcs8", "rand_core 0.6.4", - "sec1 0.3.0", - "subtle", - "zeroize", -] - -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.5", - "digest", - "ff 0.13.1", - "generic-array", - "group 0.13.0", - "hkdf", - "pem-rfc7468", - "pkcs8 0.10.2", - "rand_core 0.6.4", - "sec1 0.7.3", + "sec1", "subtle", "zeroize", ] @@ -2527,26 +2203,6 @@ dependencies = [ "log", ] -[[package]] -name = "equator" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc" -dependencies = [ - "equator-macro", -] - -[[package]] -name = "equator-macro" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -2563,17 +2219,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - [[package]] name = "euclid" version = "0.20.14" @@ -2583,38 +2228,21 @@ dependencies = [ "num-traits", ] +[[package]] +name = "euclid" +version = "0.22.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" +dependencies = [ + "num-traits", +] + [[package]] name = "event-listener" version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "5.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "exr" -version = "1.74.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be" -dependencies = [ - "bit_field", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - [[package]] name = "eyre" version = "0.6.12" @@ -2625,32 +2253,22 @@ dependencies = [ "once_cell", ] +[[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex", +] + [[package]] name = "fastrand" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" -[[package]] -name = "fax" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" -dependencies = [ - "fax_derive", -] - -[[package]] -name = "fax_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "fdeflate" version = "0.3.7" @@ -2671,21 +2289,16 @@ dependencies = [ ] [[package]] -name = "ff" -version = "0.13.1" +name = "filedescriptor" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d" dependencies = [ - "rand_core 0.6.4", - "subtle", + "libc", + "thiserror 1.0.69", + "winapi", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "filetime" version = "0.2.26" @@ -2704,6 +2317,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +[[package]] +name = "finl_unicode" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9844ddc3a6e533d62bba727eb6c28b5d360921d5175e9ff0f1e621a5c590a4d5" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -2720,17 +2339,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "flume" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - [[package]] name = "fnv" version = "1.0.7" @@ -2841,17 +2449,6 @@ dependencies = [ "futures-util", ] -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -2866,7 +2463,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2907,7 +2504,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -2947,16 +2543,6 @@ dependencies = [ "polyval", ] -[[package]] -name = "gif" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f954a9e9159ec994f73a30a12b96a702dde78f5547bcb561174597924f7d4162" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gimli" version = "0.32.3" @@ -2975,18 +2561,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "ff 0.12.1", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff 0.13.1", + "ff", "rand_core 0.6.4", "subtle", ] @@ -3003,7 +2578,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.12.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", @@ -3021,25 +2596,14 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.3.1", - "indexmap 2.12.0", + "http 1.4.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", "tracing", ] -[[package]] -name = "half" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" -dependencies = [ - "cfg-if", - "crunchy", - "zerocopy", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -3069,17 +2633,13 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" - -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ - "hashbrown 0.15.5", + "allocator-api2", + "equivalent", + "foldhash 0.2.0", ] [[package]] @@ -3100,15 +2660,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - [[package]] name = "hmac" version = "0.12.1" @@ -3118,24 +2669,15 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" -dependencies = [ - "windows-sys 0.61.2", -] - [[package]] name = "hostname" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" +checksum = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd" dependencies = [ "cfg-if", "libc", - "windows-link 0.1.3", + "windows-link 0.2.1", ] [[package]] @@ -3151,12 +2693,11 @@ dependencies = [ [[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", ] @@ -3178,7 +2719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http 1.4.0", ] [[package]] @@ -3189,7 +2730,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "pin-project-lite", ] @@ -3256,7 +2797,7 @@ dependencies = [ "futures-channel", "futures-core", "h2 0.4.12", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "httparse", "httpdate", @@ -3290,7 +2831,7 @@ version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http 1.3.1", + "http 1.4.0", "hyper 1.8.1", "hyper-util", "rustls 0.23.35", @@ -3333,16 +2874,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64 0.22.1", "bytes", "futures-channel", "futures-core", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "hyper 1.8.1", "ipnet", @@ -3350,7 +2891,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "socket2 0.6.1", - "system-configuration 0.6.1", + "system-configuration", "tokio", "tower-service", "tracing", @@ -3489,40 +3030,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "image" -version = "0.25.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a" -dependencies = [ - "bytemuck", - "byteorder-lite", - "color_quant", - "exr", - "gif", - "image-webp", - "moxcms", - "num-traits", - "png", - "qoi", - "ravif", - "rayon", - "rgb", - "tiff", - "zune-core 0.5.0", - "zune-jpeg 0.5.5", -] - -[[package]] -name = "image-webp" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" -dependencies = [ - "byteorder-lite", - "quick-error", -] - [[package]] name = "imap" version = "3.0.0-alpha.15" @@ -3549,12 +3056,6 @@ dependencies = [ "nom 7.1.3", ] -[[package]] -name = "imgref" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" - [[package]] name = "indenter" version = "0.3.4" @@ -3569,19 +3070,16 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] name = "indexmap" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", - "hashbrown 0.16.0", - "serde", - "serde_core", + "hashbrown 0.16.1", ] [[package]] @@ -3592,7 +3090,7 @@ checksum = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88" dependencies = [ "console", "portable-atomic", - "unicode-width 0.2.0", + "unicode-width", "unit-prefix", "web-time", ] @@ -3618,26 +3116,15 @@ dependencies = [ [[package]] name = "instability" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435d80800b936787d62688c927b6490e887c7ef5ff9ce922c6c6050fca75eb9a" +checksum = "6778b0196eefee7df739db78758e5cf9b37412268bfa5650bfeed028aed20d9c" dependencies = [ "darling 0.20.11", "indoc", "proc-macro2", "quote", - "syn 2.0.110", -] - -[[package]] -name = "interpolate_name" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3662,15 +3149,6 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.11.0" @@ -3734,7 +3212,7 @@ checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3771,9 +3249,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -3788,26 +3266,34 @@ dependencies = [ "base64 0.22.1", "js-sys", "pem", - "ring 0.17.14", + "ring", "serde", "serde_json", "simple_asn1", ] +[[package]] +name = "kasuari" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fe90c1150662e858c7d5f945089b7517b0a80d8bf7ba4b1b5ffc984e7230a5b" +dependencies = [ + "hashbrown 0.16.1", + "portable-atomic", + "thiserror 2.0.17", +] + +[[package]] +name = "lab" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" + [[package]] name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin 0.9.8", -] - -[[package]] -name = "lebe" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "lettre" @@ -3839,19 +3325,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.177" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404" -dependencies = [ - "arbitrary", - "cc", -] +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "libloading" @@ -3880,21 +3356,11 @@ dependencies = [ "redox_syscall", ] -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "pkg-config", - "vcpkg", -] - [[package]] name = "libwebrtc" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621fee81c55f30be507744b6220b14fdbf5bf78f8f35919a77b66f5ab31a9dd" +checksum = "4e7cdca6ecb63fb4b32ea1ae04921e47ee448e5645e7348a904f8602fe0ddd36" dependencies = [ "cxx", "jni", @@ -3914,6 +3380,15 @@ dependencies = [ "webrtc-sys", ] +[[package]] +name = "line-clipping" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a" +dependencies = [ + "bitflags 2.10.0", +] + [[package]] name = "link-cplusplus" version = "1.0.12" @@ -3923,12 +3398,6 @@ dependencies = [ "cc", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "linux-raw-sys" version = "0.11.0" @@ -3949,9 +3418,9 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "livekit" -version = "0.7.24" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b36003aba39f355eeb8ff363fd57215787b5c01907be00a9d1601e5e7c78ef" +checksum = "15aee1ced6569cc3f7ff14fcb1aeb4c29fdc33804cbe773aa3bf26a7cd939aa6" dependencies = [ "bmrng", "bytes", @@ -3969,29 +3438,28 @@ dependencies = [ "semver", "serde", "serde_json", - "test-log", "thiserror 1.0.69", "tokio", ] [[package]] name = "livekit-api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a650aa52faaaa6bb33b7c3a7742d47f78a7dc21e65d7c936a518d43eb974b4" +checksum = "7942197fb744e26697aa151b08fbdeccdf07ec036109af8db664206fddc92b02" dependencies = [ "base64 0.21.7", "futures-util", - "http 1.3.1", + "http 1.4.0", "jsonwebtoken", "livekit-protocol", "livekit-runtime", "log", "parking_lot", - "pbjson-types 0.6.0", + "pbjson-types", "prost 0.12.6", "rand 0.9.2", - "reqwest 0.12.24", + "reqwest", "scopeguard", "serde", "serde_json", @@ -4004,17 +3472,16 @@ dependencies = [ [[package]] name = "livekit-protocol" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "656d0ad4e08edfe14cbc41c4f220b318a81965f8419cc2ac7f200a46a771d5de" +checksum = "a490520ea5d66fc5c303fe99666cc42e1ff49bc60489715531d1a687b3fd37bd" dependencies = [ "futures-util", "livekit-runtime", "parking_lot", - "pbjson 0.6.0", - "pbjson-types 0.6.0", + "pbjson", + "pbjson-types", "prost 0.12.6", - "prost-types 0.12.6", "serde", "thiserror 1.0.69", "tokio", @@ -4041,18 +3508,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" - -[[package]] -name = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lopdf" @@ -4067,7 +3525,7 @@ dependencies = [ "encoding_rs", "flate2", "getrandom 0.3.4", - "indexmap 2.12.0", + "indexmap 2.12.1", "itoa", "log", "md-5", @@ -4091,6 +3549,15 @@ dependencies = [ "hashbrown 0.15.5", ] +[[package]] +name = "lru" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f" +dependencies = [ + "hashbrown 0.16.1", +] + [[package]] name = "lru-slab" version = "0.1.2" @@ -4118,6 +3585,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "mac_address" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303" +dependencies = [ + "nix", + "winapi", +] + [[package]] name = "mailparse" version = "0.15.0" @@ -4129,15 +3606,6 @@ dependencies = [ "quoted_printable", ] -[[package]] -name = "matchers" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" -dependencies = [ - "regex-automata", -] - [[package]] name = "matchit" version = "0.7.3" @@ -4150,16 +3618,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" -[[package]] -name = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if", - "rayon", -] - [[package]] name = "md-5" version = "0.10.6" @@ -4176,6 +3634,21 @@ version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +[[package]] +name = "memmem" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + [[package]] name = "migrations_internals" version = "2.3.0" @@ -4243,20 +3716,21 @@ dependencies = [ [[package]] name = "mockito" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7760e0e418d9b7e5777c0374009ca4c93861b9066f18cb334a20ce50ab63aa48" +checksum = "7e0603425789b4a70fcc4ac4f5a46a566c116ee3e2a6b768dc623f7719c611de" dependencies = [ "assert-json-diff", "bytes", "colored", - "futures-util", - "http 1.3.1", + "futures-core", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.8.1", "hyper-util", "log", + "pin-project-lite", "rand 0.9.2", "regex", "serde_json", @@ -4265,16 +3739,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "moxcms" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80986bbbcf925ebd3be54c26613d861255284584501595cf418320c078945608" -dependencies = [ - "num-traits", - "pxfm", -] - [[package]] name = "multer" version = "3.1.0" @@ -4284,11 +3748,11 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.3.1", + "http 1.4.0", "httparse", "memchr", "mime", - "spin 0.9.8", + "spin", "version_check", ] @@ -4316,10 +3780,17 @@ dependencies = [ ] [[package]] -name = "new_debug_unreachable" -version = "1.0.6" +name = "nix" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] [[package]] name = "nom" @@ -4351,12 +3822,6 @@ dependencies = [ "nom 8.0.0", ] -[[package]] -name = "noop_proc_macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" - [[package]] name = "ntapi" version = "0.4.1" @@ -4385,22 +3850,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" -dependencies = [ - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -4415,7 +3864,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4437,28 +3886,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -4466,27 +3893,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] -name = "oauth2" -version = "4.4.2" +name = "num_threads" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ - "base64 0.13.1", - "chrono", - "getrandom 0.2.16", - "http 0.2.12", - "rand 0.8.5", - "reqwest 0.11.27", - "serde", - "serde_json", - "serde_path_to_error", - "sha2", - "thiserror 1.0.69", - "url", + "libc", ] [[package]] @@ -4556,38 +3971,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openidconnect" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47e80a9cfae4462dd29c41e987edd228971d6565553fbc14b8a11e666d91590" -dependencies = [ - "base64 0.13.1", - "chrono", - "dyn-clone", - "ed25519-dalek", - "hmac", - "http 0.2.12", - "itertools 0.10.5", - "log", - "oauth2", - "p256 0.13.2", - "p384", - "rand 0.8.5", - "rsa", - "serde", - "serde-value", - "serde_derive", - "serde_json", - "serde_path_to_error", - "serde_plain", - "serde_with", - "sha2", - "subtle", - "thiserror 1.0.69", - "url", -] - [[package]] name = "openssl" version = "0.10.75" @@ -4611,7 +3994,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4634,9 +4017,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.10.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" dependencies = [ "num-traits", ] @@ -4662,7 +4045,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4683,41 +4066,11 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", + "ecdsa", + "elliptic-curve", "sha2", ] -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" -dependencies = [ - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", - "primeorder", - "sha2", -] - -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - [[package]] name = "parking_lot" version = "0.12.5" @@ -4763,18 +4116,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pastey" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" - [[package]] name = "pbjson" version = "0.6.0" @@ -4785,16 +4126,6 @@ dependencies = [ "serde", ] -[[package]] -name = "pbjson" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e6349fa080353f4a597daffd05cb81572a9c031a6d4fff7e504947496fcc68" -dependencies = [ - "base64 0.21.7", - "serde", -] - [[package]] name = "pbjson-build" version = "0.6.2" @@ -4807,18 +4138,6 @@ dependencies = [ "prost-types 0.12.6", ] -[[package]] -name = "pbjson-build" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eea3058763d6e656105d1403cb04e0a41b7bbac6362d413e7c33be0c32279c9" -dependencies = [ - "heck 0.5.0", - "itertools 0.13.0", - "prost 0.13.5", - "prost-types 0.13.5", -] - [[package]] name = "pbjson-types" version = "0.6.0" @@ -4827,25 +4146,10 @@ checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12" dependencies = [ "bytes", "chrono", - "pbjson 0.6.0", - "pbjson-build 0.6.2", + "pbjson", + "pbjson-build", "prost 0.12.6", - "prost-build 0.12.6", - "serde", -] - -[[package]] -name = "pbjson-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54e5e7bfb1652f95bc361d76f3c780d8e526b134b85417e774166ee941f0887" -dependencies = [ - "bytes", - "chrono", - "pbjson 0.7.0", - "pbjson-build 0.7.0", - "prost 0.13.5", - "prost-build 0.13.5", + "prost-build", "serde", ] @@ -4880,7 +4184,7 @@ dependencies = [ "adobe-cmap-parser", "cff-parser", "encoding_rs", - "euclid", + "euclid 0.20.14", "log", "lopdf", "postscript", @@ -4898,21 +4202,55 @@ dependencies = [ "serde_core", ] -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "pest" +version = "2.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbcfd20a6d4eeba40179f05735784ad32bdaef05ce8e8af05f180d45bb3e7e22" +dependencies = [ + "memchr", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f72981ade67b1ca6adc26ec221be9f463f2b5839c7508998daa17c23d94d7f" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee9efd8cdb50d719a80088b76f81aec7c41ed6d522ee750178f83883d271625" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "pest_meta" +version = "2.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf1d70880e76bdc13ba52eafa6239ce793d85c8e43896507e43dd8984ff05b82" +dependencies = [ + "pest", + "sha2", +] + [[package]] name = "petgraph" version = "0.6.5" @@ -4920,7 +4258,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.12.0", + "indexmap 2.12.1", +] + +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", ] [[package]] @@ -4940,7 +4330,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4955,35 +4345,14 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der 0.7.10", - "pkcs8 0.10.2", - "spki 0.7.3", -] - [[package]] name = "pkcs8" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der 0.7.10", - "spki 0.7.3", + "der", + "spki", ] [[package]] @@ -5086,16 +4455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.110", -] - -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve 0.13.8", + "syn 2.0.111", ] [[package]] @@ -5115,30 +4475,11 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "version_check", "yansi", ] -[[package]] -name = "profiling" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773" -dependencies = [ - "profiling-procmacros", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" -dependencies = [ - "quote", - "syn 2.0.110", -] - [[package]] name = "prost" version = "0.12.6" @@ -5176,27 +4517,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.110", - "tempfile", -] - -[[package]] -name = "prost-build" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" -dependencies = [ - "heck 0.5.0", - "itertools 0.14.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.13.5", - "prost-types 0.13.5", - "regex", - "syn 2.0.110", + "syn 2.0.111", "tempfile", ] @@ -5210,7 +4531,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5223,7 +4544,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5254,15 +4575,6 @@ dependencies = [ "cc", ] -[[package]] -name = "pxfm" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3502d6155304a4173a5f2c34b52b7ed0dd085890326cb50fd625fdf39e86b3b" -dependencies = [ - "num-traits", -] - [[package]] name = "qdrant-client" version = "1.16.0" @@ -5276,7 +4588,7 @@ dependencies = [ "parking_lot", "prost 0.13.5", "prost-types 0.13.5", - "reqwest 0.12.24", + "reqwest", "semver", "serde", "serde_json", @@ -5285,29 +4597,11 @@ dependencies = [ "tonic 0.12.3", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "qrcode" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" -dependencies = [ - "image", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" @@ -5349,7 +4643,7 @@ dependencies = [ "getrandom 0.3.4", "lru-slab", "rand 0.9.2", - "ring 0.17.14", + "ring", "rustc-hash", "rustls 0.23.35", "rustls-pki-types", @@ -5473,103 +4767,98 @@ checksum = "acbbbbea733ec66275512d0b9694f34102e7d5406fdbe2ad8d21b28dce92887c" [[package]] name = "ratatui" -version = "0.29.0" +version = "0.30.0-beta.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" +checksum = "6c9f96d98eaa3ce9d7ed031916670ea79a3ce487f8365385b11bc69da69038ba" +dependencies = [ + "instability", + "ratatui-core", + "ratatui-crossterm", + "ratatui-macros", + "ratatui-termwiz", + "ratatui-widgets", +] + +[[package]] +name = "ratatui-core" +version = "0.1.0-beta.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc3634611dccc2110ab05a64fec77d26c5f0e0cb0c0bfecb291d9a15841aae91" dependencies = [ "bitflags 2.10.0", - "cassowary", "compact_str", - "crossterm 0.28.1", + "hashbrown 0.16.1", "indoc", - "instability", - "itertools 0.13.0", - "lru", - "paste", + "itertools 0.14.0", + "kasuari", + "lru 0.16.2", "strum", + "thiserror 2.0.17", "unicode-segmentation", "unicode-truncate", - "unicode-width 0.2.0", + "unicode-width", ] [[package]] -name = "rav1e" -version = "0.8.1" +name = "ratatui-crossterm" +version = "0.1.0-beta.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b6dd56e85d9483277cde964fd1bdb0428de4fec5ebba7540995639a21cb32b" +checksum = "fd7e4e028ac1cb4718f25ff039a476c8e2270a3021a614221f9fa2551abfa51c" dependencies = [ - "aligned-vec", - "arbitrary", - "arg_enum_proc_macro", - "arrayvec", - "av-scenechange", - "av1-grain", - "bitstream-io", - "built", "cfg-if", - "interpolate_name", + "crossterm", + "instability", + "ratatui-core", +] + +[[package]] +name = "ratatui-macros" +version = "0.7.0-beta.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b59d6fd5d3796a0305d4bfb1e5f7b86db2f4968a8c69b439f379f73efa4495c3" +dependencies = [ + "ratatui-core", + "ratatui-widgets", +] + +[[package]] +name = "ratatui-termwiz" +version = "0.1.0-beta.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ec648e651a590a4e45c1e8d90a0ebbe324253ad410f34c8e1866a3e76c27240" +dependencies = [ + "ratatui-core", + "termwiz", +] + +[[package]] +name = "ratatui-widgets" +version = "0.3.0-beta.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf145c4da1f8e5c58957350985ace8facbbf394ddecc526cd33e7dcf5831c41" +dependencies = [ + "bitflags 2.10.0", + "hashbrown 0.16.1", + "indoc", + "instability", "itertools 0.14.0", - "libc", - "libfuzzer-sys", - "log", - "maybe-rayon", - "new_debug_unreachable", - "noop_proc_macro", - "num-derive", - "num-traits", - "paste", - "profiling", - "rand 0.9.2", - "rand_chacha 0.9.0", - "simd_helpers", - "thiserror 2.0.17", - "v_frame", - "wasm-bindgen", -] - -[[package]] -name = "ravif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef69c1990ceef18a116855938e74793a5f7496ee907562bd0857b6ac734ab285" -dependencies = [ - "avif-serialize", - "imgref", - "loop9", - "quick-error", - "rav1e", - "rayon", - "rgb", -] - -[[package]] -name = "rayon" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", + "line-clipping", + "ratatui-core", + "strum", + "time", + "unicode-segmentation", + "unicode-width", ] [[package]] name = "rcgen" -version = "0.11.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" +checksum = "5fae430c6b28f1ad601274e78b7dffa0546de0b73b4cd32f46723c0c2a16f7a5" dependencies = [ "pem", - "ring 0.16.20", + "ring", + "rustls-pki-types", "time", "yasna", ] @@ -5607,26 +4896,6 @@ dependencies = [ "bitflags 2.10.0", ] -[[package]] -name = "ref-cast" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "regex" version = "1.12.2" @@ -5662,47 +4931,6 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.27", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - [[package]] name = "reqwest" version = "0.12.24" @@ -5716,7 +4944,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.4.12", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.8.1", @@ -5737,13 +4965,13 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-native-tls", "tokio-rustls 0.26.4", "tokio-util", "tower 0.5.2", - "tower-http 0.6.6", + "tower-http 0.6.7", "tower-service", "url", "wasm-bindgen", @@ -5764,22 +4992,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] -name = "rgb" -version = "0.8.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce" - [[package]] name = "rhai" version = "1.22.2" @@ -5804,22 +5016,7 @@ source = "git+https://github.com/therealprof/rhai.git?branch=features%2Fuse-web- dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", + "syn 2.0.111", ] [[package]] @@ -5832,30 +5029,10 @@ dependencies = [ "cfg-if", "getrandom 0.2.16", "libc", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "rsa" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a0376c50d0358279d9d643e4bf7b7be212f1f4ff1da9070a7b54d22ef75c88" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8 0.10.2", - "rand_core 0.6.4", - "signature 2.2.0", - "spki 0.7.3", - "subtle", - "zeroize", -] - [[package]] name = "rust_xlsxwriter" version = "0.79.4" @@ -5895,19 +5072,6 @@ dependencies = [ "nom 7.1.3", ] -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.10.0", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - [[package]] name = "rustix" version = "1.1.2" @@ -5917,7 +5081,7 @@ dependencies = [ "bitflags 2.10.0", "errno", "libc", - "linux-raw-sys 0.11.0", + "linux-raw-sys", "windows-sys 0.61.2", ] @@ -5928,7 +5092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.14", + "ring", "rustls-webpki 0.101.7", "sct", ] @@ -5942,7 +5106,7 @@ dependencies = [ "aws-lc-rs", "log", "once_cell", - "ring 0.17.14", + "ring", "rustls-pki-types", "rustls-webpki 0.103.8", "subtle", @@ -5993,9 +5157,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c" dependencies = [ "web-time", "zeroize", @@ -6007,8 +5171,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.14", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -6018,9 +5182,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "aws-lc-rs", - "ring 0.17.14", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -6062,30 +5226,6 @@ dependencies = [ "parking_lot", ] -[[package]] -name = "schemars" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", -] - -[[package]] -name = "schemars" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -6104,8 +5244,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.14", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -6114,24 +5254,10 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "base16ct 0.1.1", - "der 0.6.1", + "base16ct", + "der", "generic-array", - "pkcs8 0.9.0", - "subtle", - "zeroize", -] - -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct 0.2.0", - "der 0.7.10", - "generic-array", - "pkcs8 0.10.2", + "pkcs8", "subtle", "zeroize", ] @@ -6188,16 +5314,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde_core" version = "1.0.228" @@ -6215,7 +5331,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6242,15 +5358,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_plain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" -dependencies = [ - "serde", -] - [[package]] name = "serde_spanned" version = "0.6.9" @@ -6281,37 +5388,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10574371d41b0d9b2cff89418eda27da52bcaff2cc8741db26382a77c29131f1" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.12.0", - "schemars 0.9.0", - "schemars 1.1.0", - "serde_core", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a72d8216842fdd57820dc78d840bef99248e35fb2554ff923319e60f2d686b" -dependencies = [ - "darling 0.21.3", - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "sha1" version = "0.10.6" @@ -6378,9 +5454,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", ] @@ -6395,31 +5471,12 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - [[package]] name = "simd-adler32" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[package]] -name = "simd_helpers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ - "quote", -] - [[package]] name = "similar" version = "2.7.0" @@ -6438,6 +5495,12 @@ dependencies = [ "time", ] +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.11" @@ -6449,9 +5512,6 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -dependencies = [ - "serde", -] [[package]] name = "smartstring" @@ -6484,20 +5544,11 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "spki" @@ -6506,205 +5557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der 0.6.1", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der 0.7.10", -] - -[[package]] -name = "sqlx" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" -dependencies = [ - "base64 0.22.1", - "bytes", - "crc", - "crossbeam-queue", - "either", - "event-listener 5.4.1", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashbrown 0.15.5", - "hashlink", - "indexmap 2.12.0", - "log", - "memchr", - "once_cell", - "percent-encoding", - "serde", - "serde_json", - "sha2", - "smallvec", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 2.0.110", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" -dependencies = [ - "dotenvy", - "either", - "heck 0.5.0", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 2.0.110", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" -dependencies = [ - "atoi", - "base64 0.22.1", - "bitflags 2.10.0", - "byteorder", - "bytes", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror 2.0.17", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" -dependencies = [ - "atoi", - "base64 0.22.1", - "bitflags 2.10.0", - "byteorder", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror 2.0.17", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "serde_urlencoded", - "sqlx-core", - "thiserror 2.0.17", - "tracing", - "url", + "der", ] [[package]] @@ -6751,24 +5604,23 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.3" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.4" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "rustversion", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6790,21 +5642,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.110" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -6834,7 +5680,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6851,17 +5697,6 @@ dependencies = [ "windows", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys 0.5.0", -] - [[package]] name = "system-configuration" version = "0.6.1" @@ -6870,17 +5705,7 @@ checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.10.0", "core-foundation 0.9.4", - "system-configuration-sys 0.6.0", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", + "system-configuration-sys", ] [[package]] @@ -6913,7 +5738,7 @@ dependencies = [ "fastrand", "getrandom 0.3.4", "once_cell", - "rustix 1.1.2", + "rustix", "windows-sys 0.61.2", ] @@ -6927,25 +5752,66 @@ dependencies = [ ] [[package]] -name = "test-log" -version = "0.2.18" +name = "terminfo" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e33b98a582ea0be1168eba097538ee8dd4bbe0f2b01b22ac92ea30054e5be7b" +checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662" dependencies = [ - "env_logger", - "test-log-macros", - "tracing-subscriber", + "fnv", + "nom 7.1.3", + "phf", + "phf_codegen", ] [[package]] -name = "test-log-macros" -version = "0.2.18" +name = "termios" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", + "libc", +] + +[[package]] +name = "termwiz" +version = "0.23.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7" +dependencies = [ + "anyhow", + "base64 0.22.1", + "bitflags 2.10.0", + "fancy-regex", + "filedescriptor", + "finl_unicode", + "fixedbitset", + "hex", + "lazy_static", + "libc", + "log", + "memmem", + "nix", + "num-derive", + "num-traits", + "ordered-float", + "pest", + "pest_derive", + "phf", + "sha2", + "signal-hook", + "siphasher", + "terminfo", + "termios", + "thiserror 1.0.69", + "ucd-trie", + "unicode-segmentation", + "vtparse", + "wezterm-bidi", + "wezterm-blob-leases", + "wezterm-color-types", + "wezterm-dynamic", + "wezterm-input-types", + "winapi", ] [[package]] @@ -6980,7 +5846,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6991,7 +5857,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7003,20 +5869,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "tiff" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" -dependencies = [ - "fax", - "flate2", - "half", - "quick-error", - "weezl", - "zune-jpeg 0.4.21", -] - [[package]] name = "time" version = "0.3.44" @@ -7025,7 +5877,9 @@ checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", + "libc", "num-conv", + "num_threads", "powerfmt", "serde", "time-core", @@ -7107,7 +5961,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7190,13 +6044,13 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", "serde_spanned 0.6.9", - "toml_datetime 0.6.3", + "toml_datetime 0.6.11", "toml_edit", ] @@ -7210,14 +6064,14 @@ dependencies = [ "serde_spanned 1.0.3", "toml_datetime 0.7.3", "toml_parser", - "winnow 0.7.13", + "winnow 0.7.14", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" dependencies = [ "serde", ] @@ -7233,15 +6087,16 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "serde", "serde_spanned 0.6.9", - "toml_datetime 0.6.3", - "winnow 0.5.40", + "toml_datetime 0.6.11", + "toml_write", + "winnow 0.7.14", ] [[package]] @@ -7250,9 +6105,15 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" dependencies = [ - "winnow 0.7.13", + "winnow 0.7.14", ] +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + [[package]] name = "tonic" version = "0.12.3" @@ -7266,7 +6127,7 @@ dependencies = [ "bytes", "flate2", "h2 0.4.12", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.8.1", @@ -7298,7 +6159,7 @@ dependencies = [ "base64 0.22.1", "bytes", "h2 0.4.12", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.8.1", @@ -7307,7 +6168,7 @@ dependencies = [ "percent-encoding", "pin-project", "socket2 0.6.1", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-stream", "tower 0.5.2", @@ -7316,17 +6177,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tonic-types" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0081d8ee0847d01271392a5aebe960a4600f5d4da6c67648a6382a0940f8b367" -dependencies = [ - "prost 0.13.5", - "prost-types 0.13.5", - "tonic 0.12.3", -] - [[package]] name = "tower" version = "0.4.13" @@ -7355,10 +6205,10 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "indexmap 2.12.0", + "indexmap 2.12.1", "pin-project-lite", "slab", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-util", "tower-layer", @@ -7376,7 +6226,7 @@ dependencies = [ "axum-core 0.4.5", "cookie", "futures-util", - "http 1.3.1", + "http 1.4.0", "parking_lot", "pin-project-lite", "tower-layer", @@ -7392,7 +6242,7 @@ dependencies = [ "bitflags 2.10.0", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "http-range-header", @@ -7410,14 +6260,14 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" dependencies = [ "bitflags 2.10.0", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "iri-string", "pin-project-lite", @@ -7440,9 +6290,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" dependencies = [ "log", "pin-project-lite", @@ -7452,20 +6302,20 @@ 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", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" dependencies = [ "once_cell", "valuable", @@ -7494,18 +6344,14 @@ 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 = [ - "matchers", "nu-ansi-term", - "once_cell", - "regex-automata", "sharded-slab", "smallvec", "thread_local", - "tracing", "tracing-core", "tracing-log", ] @@ -7550,7 +6396,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.3.1", + "http 1.4.0", "httparse", "log", "rand 0.8.5", @@ -7574,6 +6420,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + [[package]] name = "unicase" version = "2.8.1" @@ -7615,26 +6467,20 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-truncate" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" +checksum = "8fbf03860ff438702f3910ca5f28f8dac63c1c11e7efb5012b8b175493606330" dependencies = [ "itertools 0.13.0", "unicode-segmentation", - "unicode-width 0.1.14", + "unicode-width", ] [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode-xid" @@ -7658,12 +6504,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -7708,24 +6548,14 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[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 = [ + "atomic", "getrandom 0.3.4", "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "v_frame" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2" -dependencies = [ - "aligned-vec", - "num-traits", + "serde_core", "wasm-bindgen", ] @@ -7753,6 +6583,15 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" +[[package]] +name = "vtparse" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9b2acfb050df409c972a37d3b8e08cdea3bddb0c09db9d53137e504cfabed0" +dependencies = [ + "utf8parse", +] + [[package]] name = "walkdir" version = "2.5.0" @@ -7787,17 +6626,11 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -7808,9 +6641,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.55" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", @@ -7821,9 +6654,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7831,22 +6664,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] @@ -7866,9 +6699,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -7901,9 +6734,9 @@ dependencies = [ [[package]] name = "webrtc-sys" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa109636ee0a2aeb84988208f266335ab7480dcdd2881234d795866773e529" +checksum = "f4b26eb6cd3c89734f760c783694cb938a229301f5db0acc1e36ddc28c5335f9" dependencies = [ "cc", "cxx", @@ -7923,7 +6756,7 @@ dependencies = [ "anyhow", "fs2", "regex", - "reqwest 0.12.24", + "reqwest", "scratch", "semver", "zip 0.6.6", @@ -7936,13 +6769,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] -name = "whoami" -version = "1.6.1" +name = "wezterm-bidi" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +checksum = "0c0a6e355560527dd2d1cf7890652f4f09bb3433b6aadade4c9b5ed76de5f3ec" dependencies = [ - "libredox", - "wasite", + "log", + "wezterm-dynamic", +] + +[[package]] +name = "wezterm-blob-leases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692daff6d93d94e29e4114544ef6d5c942a7ed998b37abdc19b17136ea428eb7" +dependencies = [ + "getrandom 0.3.4", + "mac_address", + "sha2", + "thiserror 1.0.69", + "uuid", +] + +[[package]] +name = "wezterm-color-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de81ef35c9010270d63772bebef2f2d6d1f2d20a983d27505ac850b8c4b4296" +dependencies = [ + "csscolorparser", + "deltae", + "lazy_static", + "wezterm-dynamic", +] + +[[package]] +name = "wezterm-dynamic" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f2ab60e120fd6eaa68d9567f3226e876684639d22a4219b313ff69ec0ccd5ac" +dependencies = [ + "log", + "ordered-float", + "strsim", + "thiserror 1.0.69", + "wezterm-dynamic-derive", +] + +[[package]] +name = "wezterm-dynamic-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c0cf2d539c645b448eaffec9ec494b8b19bd5077d9e58cb1ae7efece8d575b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "wezterm-input-types" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7012add459f951456ec9d6c7e6fc340b1ce15d6fc9629f8c42853412c029e57e" +dependencies = [ + "bitflags 1.3.2", + "euclid 0.22.11", + "lazy_static", + "serde", + "wezterm-dynamic", ] [[package]] @@ -8043,7 +6938,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -8054,7 +6949,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -8135,15 +7030,6 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -8195,21 +7081,6 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - [[package]] name = "windows-targets" version = "0.52.6" @@ -8258,12 +7129,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -8282,12 +7147,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -8306,12 +7165,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -8342,12 +7195,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -8366,12 +7213,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -8390,12 +7231,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -8414,12 +7249,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -8432,15 +7261,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.6.26" @@ -8452,18 +7272,11 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "memchr", ] [[package]] @@ -8502,7 +7315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "rustix 1.1.2", + "rustix", ] [[package]] @@ -8520,12 +7333,6 @@ dependencies = [ "lzma-sys", ] -[[package]] -name = "y4m" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" - [[package]] name = "yansi" version = "1.0.1" @@ -8560,28 +7367,28 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure 0.13.2", ] [[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", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -8601,7 +7408,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure 0.13.2", ] @@ -8622,7 +7429,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -8655,7 +7462,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -8695,7 +7502,7 @@ dependencies = [ "flate2", "getrandom 0.3.4", "hmac", - "indexmap 2.12.0", + "indexmap 2.12.1", "lzma-rs", "memchr", "pbkdf2 0.12.2", @@ -8708,27 +7515,6 @@ dependencies = [ "zstd 0.13.3", ] -[[package]] -name = "zitadel" -version = "5.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168b66027ca4fd1aa3c529f1359a59f94495db612b57223bf933b2900df4e052" -dependencies = [ - "custom_error", - "jsonwebtoken", - "openidconnect", - "pbjson-types 0.7.0", - "prost 0.13.5", - "prost-types 0.13.5", - "reqwest 0.11.27", - "serde", - "serde_json", - "serde_urlencoded", - "time", - "tonic 0.12.3", - "tonic-types", -] - [[package]] name = "zopfli" version = "0.8.3" @@ -8787,42 +7573,3 @@ dependencies = [ "cc", "pkg-config", ] - -[[package]] -name = "zune-core" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" - -[[package]] -name = "zune-core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773" - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "zune-jpeg" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" -dependencies = [ - "zune-core 0.4.12", -] - -[[package]] -name = "zune-jpeg" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6fb7703e32e9a07fb3f757360338b3a567a5054f21b5f52a666752e333d58e" -dependencies = [ - "zune-core 0.5.0", -] diff --git a/Cargo.toml b/Cargo.toml index f1edb1db..2f75c7fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,6 @@ monitoring = ["dep:sysinfo"] automation = ["dep:rhai"] grpc = ["dep:tonic"] progress-bars = ["dep:indicatif"] -dynamic-db = ["dep:sqlx"] # ===== META FEATURES (BUNDLES) ===== full = [ @@ -139,13 +138,12 @@ askama_axum = "0.4" tracing-subscriber = { version = "0.3", features = ["fmt"] } urlencoding = "2.1" uuid = { version = "1.11", features = ["serde", "v4"] } -zitadel = { version = "5.5.1", features = ["api", "credentials"] } # === TLS/SECURITY DEPENDENCIES === rustls = { version = "0.21", features = ["dangerous_configuration"] } rustls-pemfile = "1.0" tokio-rustls = "0.24" -rcgen = { version = "0.11", features = ["pem"] } +rcgen = { version = "0.14", features = ["pem"] } x509-parser = "0.15" rustls-native-certs = "0.6" webpki-roots = "0.25" @@ -189,19 +187,16 @@ csv = { version = "1.3", optional = true } # Console/TUI (console feature) crossterm = { version = "0.29.0", optional = true } -ratatui = { version = "0.29.0", optional = true } +ratatui = { version = "0.30.0-beta.0", optional = true } -# QR Code Generation -image = "0.25" -qrcode = "0.14" +# QR Code Generation (using png directly to avoid image's ravif/paste dependency) +png = "0.18" +qrcode = { version = "0.14", default-features = false } # Excel/Spreadsheet Support calamine = "0.26" rust_xlsxwriter = "0.79" -# Database (for table_definition dynamic connections) -sqlx = { version = "0.8", features = ["runtime-tokio", "postgres", "mysql"], optional = true } - # Error handling thiserror = "2.0" diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md index 282a8d6a..6b22d197 100644 --- a/docs/src/SUMMARY.md +++ b/docs/src/SUMMARY.md @@ -23,6 +23,19 @@ - [.gbdrive File Storage](./chapter-02/gbdrive.md) - [Bot Templates](./chapter-02/templates.md) - [Template Samples & Conversations](./chapter-02/template-samples.md) + - [Template: Business Intelligence](./chapter-02/template-bi.md) + - [Template: Web Crawler](./chapter-02/template-crawler.md) + - [Template: Legal Documents](./chapter-02/template-law.md) + - [Template: LLM Server](./chapter-02/template-llm-server.md) + - [Template: LLM Tools](./chapter-02/template-llm-tools.md) + - [Template: API Client](./chapter-02/template-api-client.md) + - [Template: Platform Analytics](./chapter-02/template-analytics.md) + - [Template: Office Automation](./chapter-02/template-office.md) + - [Template: Reminders](./chapter-02/template-reminder.md) + - [Template: Sales CRM](./chapter-02/template-crm.md) + - [Template: CRM Contacts](./chapter-02/template-crm-contacts.md) + - [Template: Marketing](./chapter-02/template-marketing.md) + - [Template: Creating Templates](./chapter-02/template-template.md) # Part III - Knowledge Base diff --git a/docs/src/chapter-08-config/parameters.md b/docs/src/chapter-08-config/parameters.md index 89cc1fbe..4185b938 100644 --- a/docs/src/chapter-08-config/parameters.md +++ b/docs/src/chapter-08-config/parameters.md @@ -24,6 +24,7 @@ Complete reference of all available parameters in `config.csv`. | `llm-key` | API key for LLM service | `none` | String | | `llm-url` | LLM service endpoint | `http://localhost:8081` | URL | | `llm-model` | Model path or identifier | Required | Path/String | +| `llm-models` | Available model aliases for routing | `default` | Semicolon-separated | ### LLM Cache | Parameter | Description | Default | Type | @@ -48,6 +49,7 @@ Complete reference of all available parameters in `config.csv`. | `llm-server-cont-batching` | Continuous batching | `true` | Boolean | | `llm-server-mlock` | Lock in memory | `false` | Boolean | | `llm-server-no-mmap` | Disable mmap | `false` | Boolean | +| `llm-server-reasoning-format` | Reasoning output format for llama.cpp | `none` | String | ### Hardware-Specific LLM Tuning @@ -129,14 +131,25 @@ llm-model,mixtral-8x7b-32768 ## Custom Database Parameters +These parameters configure external database connections for use with BASIC keywords like MariaDB/MySQL connections. + | Parameter | Description | Default | Type | |-----------|-------------|---------|------| -| `custom-server` | Database server | `localhost` | Hostname | -| `custom-port` | Database port | `5432` | Number | +| `custom-server` | Database server hostname | `localhost` | Hostname | +| `custom-port` | Database port | `3306` | Number | | `custom-database` | Database name | Not set | String | | `custom-username` | Database user | Not set | String | | `custom-password` | Database password | Not set | String | +### Example: MariaDB Connection +```csv +custom-server,db.example.com +custom-port,3306 +custom-database,myapp +custom-username,botuser +custom-password,secretpass +``` + ## Multi-Agent Parameters ### Agent-to-Agent (A2A) Communication @@ -147,15 +160,35 @@ llm-model,mixtral-8x7b-32768 | `a2a-max-hops` | Maximum delegation chain depth | `5` | Number | | `a2a-retry-count` | Retry attempts on failure | `3` | Number | | `a2a-queue-size` | Maximum pending messages | `100` | Number | +| `a2a-protocol-version` | A2A protocol version | `1.0` | String | +| `a2a-persist-messages` | Persist A2A messages to database | `false` | Boolean | ### Bot Reflection | Parameter | Description | Default | Type | |-----------|-------------|---------|------| -| `reflection-enabled` | Enable bot self-analysis | `true` | Boolean | -| `reflection-interval` | Messages between reflections | `10` | Number | -| `reflection-min-messages` | Minimum messages before reflecting | `3` | Number | -| `reflection-model` | LLM model for reflection | `quality` | String | -| `reflection-store-insights` | Store insights in database | `true` | Boolean | +| `bot-reflection-enabled` | Enable bot self-analysis | `true` | Boolean | +| `bot-reflection-interval` | Messages between reflections | `10` | Number | +| `bot-reflection-prompt` | Custom reflection prompt | (none) | String | +| `bot-reflection-types` | Reflection types to perform | `ConversationQuality` | Semicolon-separated | +| `bot-improvement-auto-apply` | Auto-apply suggested improvements | `false` | Boolean | +| `bot-improvement-threshold` | Score threshold for improvements (0-10) | `6.0` | Float | + +#### Reflection Types +Available values for `bot-reflection-types`: +- `ConversationQuality` - Analyze conversation quality and user satisfaction +- `ResponseAccuracy` - Analyze response accuracy and relevance +- `ToolUsage` - Analyze tool usage effectiveness +- `KnowledgeRetrieval` - Analyze knowledge retrieval performance +- `Performance` - Analyze overall bot performance + +Example: +```csv +bot-reflection-enabled,true +bot-reflection-interval,10 +bot-reflection-types,ConversationQuality;ResponseAccuracy;ToolUsage +bot-improvement-auto-apply,false +bot-improvement-threshold,7.0 +``` ## Memory Parameters @@ -173,54 +206,141 @@ llm-model,mixtral-8x7b-32768 | `episodic-summary-model` | Model for summarization | `fast` | String | | `episodic-max-episodes` | Maximum episodes per user | `100` | Number | | `episodic-retention-days` | Days to retain episodes | `365` | Number | +| `episodic-auto-summarize` | Enable automatic summarization | `true` | Boolean | ## Model Routing Parameters +These parameters configure multi-model routing for different task types. Requires multiple llama.cpp server instances. + | Parameter | Description | Default | Type | |-----------|-------------|---------|------| +| `llm-models` | Available model aliases | `default` | Semicolon-separated | | `model-routing-strategy` | Routing strategy (manual/auto/load-balanced/fallback) | `auto` | String | -| `model-default` | Default model alias | `fast` | String | +| `model-default` | Default model alias | `default` | String | | `model-fast` | Model for fast/simple tasks | (configured) | Path/String | | `model-quality` | Model for quality/complex tasks | (configured) | Path/String | | `model-code` | Model for code generation | (configured) | Path/String | | `model-fallback-enabled` | Enable automatic fallback | `true` | Boolean | -| `model-fallback-order` | Order to try on failure | `quality,fast,local` | String | +| `model-fallback-order` | Order to try on failure | `quality,fast,local` | Comma-separated | + +### Multi-Model Example +```csv +llm-models,default;fast;quality;code +llm-url,http://localhost:8081 +model-routing-strategy,auto +model-default,fast +model-fallback-enabled,true +model-fallback-order,quality,fast +``` ## Hybrid RAG Search Parameters +General Bots uses hybrid search combining **dense (embedding)** and **sparse (BM25 keyword)** search for optimal retrieval. The BM25 implementation is powered by [Tantivy](https://github.com/quickwit-oss/tantivy), a full-text search engine library similar to Apache Lucene. + | Parameter | Description | Default | Type | |-----------|-------------|---------|------| | `rag-hybrid-enabled` | Enable hybrid dense+sparse search | `true` | Boolean | | `rag-dense-weight` | Weight for semantic results | `0.7` | Float (0-1) | | `rag-sparse-weight` | Weight for keyword results | `0.3` | Float (0-1) | | `rag-reranker-enabled` | Enable LLM reranking | `false` | Boolean | -| `rag-reranker-model` | Model for reranking | `quality` | String | +| `rag-reranker-model` | Model for reranking | `cross-encoder/ms-marco-MiniLM-L-6-v2` | String | | `rag-reranker-top-n` | Candidates for reranking | `20` | Number | -| `rag-top-k` | Results to return | `10` | Number | +| `rag-max-results` | Maximum results to return | `10` | Number | +| `rag-min-score` | Minimum relevance score threshold | `0.0` | Float (0-1) | | `rag-rrf-k` | RRF smoothing constant | `60` | Number | | `rag-cache-enabled` | Enable search result caching | `true` | Boolean | | `rag-cache-ttl` | Cache time-to-live | `3600` | Seconds | -### BM25 (Sparse Search) Tuning +### BM25 Sparse Search (Tantivy) + +BM25 is a keyword-based ranking algorithm that excels at finding exact term matches. It's powered by Tantivy when the `vectordb` feature is enabled. + | Parameter | Description | Default | Type | |-----------|-------------|---------|------| -| `bm25-k1` | Term saturation parameter | `1.2` | Float | -| `bm25-b` | Length normalization | `0.75` | Float | -| `bm25-stemming` | Enable word stemming | `true` | Boolean | -| `bm25-stopwords` | Filter common words | `true` | Boolean | +| `bm25-enabled` | **Enable/disable BM25 sparse search** | `true` | Boolean | +| `bm25-k1` | Term frequency saturation (0.5-3.0 typical) | `1.2` | Float | +| `bm25-b` | Document length normalization (0.0-1.0) | `0.75` | Float | +| `bm25-stemming` | Apply word stemming (running→run) | `true` | Boolean | +| `bm25-stopwords` | Filter common words (the, a, is) | `true` | Boolean | + +### Switching Search Modes + +**Hybrid Search (Default - Best for most use cases)** +```csv +bm25-enabled,true +rag-dense-weight,0.7 +rag-sparse-weight,0.3 +``` +Uses both semantic understanding AND keyword matching. Best for general queries. + +**Dense Only (Semantic Search)** +```csv +bm25-enabled,false +rag-dense-weight,1.0 +rag-sparse-weight,0.0 +``` +Uses only embedding-based search. Faster, good for conceptual/semantic queries where exact words don't matter. + +**Sparse Only (Keyword Search)** +```csv +bm25-enabled,true +rag-dense-weight,0.0 +rag-sparse-weight,1.0 +``` +Uses only BM25 keyword matching. Good for exact term searches, technical documentation, or when embeddings aren't available. + +### BM25 Parameter Tuning + +The `k1` and `b` parameters control BM25 behavior: + +- **`bm25-k1`** (Term Saturation): Controls how much additional term occurrences contribute to the score + - Lower values (0.5-1.0): Diminishing returns for repeated terms + - Higher values (1.5-2.0): More weight to documents with many term occurrences + - Default `1.2` works well for most content + +- **`bm25-b`** (Length Normalization): Controls document length penalty + - `0.0`: No length penalty (long documents scored equally) + - `1.0`: Full length normalization (strongly penalizes long documents) + - Default `0.75` balances length fairness + +**Tuning for specific content:** +```csv +# For short documents (tweets, titles) +bm25-b,0.3 + +# For long documents (articles, manuals) +bm25-b,0.9 + +# For code search (exact matches important) +bm25-k1,1.5 +bm25-stemming,false +``` ## Code Sandbox Parameters | Parameter | Description | Default | Type | |-----------|-------------|---------|------| +| `sandbox-enabled` | Enable code sandbox | `true` | Boolean | | `sandbox-runtime` | Isolation backend (lxc/docker/firecracker/process) | `lxc` | String | | `sandbox-timeout` | Maximum execution time | `30` | Seconds | -| `sandbox-memory-mb` | Memory limit | `512` | MB | +| `sandbox-memory-mb` | Memory limit in megabytes | `256` | MB | | `sandbox-cpu-percent` | CPU usage limit | `50` | Percent | | `sandbox-network` | Allow network access | `false` | Boolean | | `sandbox-python-packages` | Pre-installed Python packages | (none) | Comma-separated | | `sandbox-allowed-paths` | Accessible filesystem paths | `/data,/tmp` | Comma-separated | +### Example: Python Sandbox +```csv +sandbox-enabled,true +sandbox-runtime,lxc +sandbox-timeout,60 +sandbox-memory-mb,512 +sandbox-cpu-percent,75 +sandbox-network,false +sandbox-python-packages,numpy,pandas,requests,matplotlib +sandbox-allowed-paths,/data,/tmp,/uploads +``` + ## SSE Streaming Parameters | Parameter | Description | Default | Type | @@ -229,14 +349,6 @@ llm-model,mixtral-8x7b-32768 | `sse-heartbeat` | Heartbeat interval | `30` | Seconds | | `sse-max-connections` | Maximum concurrent connections | `1000` | Number | -## OpenAPI Tool Generation Parameters - -| Parameter | Description | Default | Type | -|-----------|-------------|---------|------| -| `openapi-server` | OpenAPI spec URL for auto tool generation | Not set | URL | -| `openapi-auth-header` | Authentication header name | `Authorization` | String | -| `openapi-auth-value` | Authentication header value | Not set | String | - ## Parameter Types ### Boolean @@ -251,6 +363,7 @@ Integer values, must be within valid ranges: ### Float Decimal values: - Thresholds: 0.0 to 1.0 +- Weights: 0.0 to 1.0 ### Path File system paths: @@ -271,6 +384,12 @@ Valid email format: `user@domain.com` ### Hex Color HTML color codes: `#RRGGBB` format +### Semicolon-separated +Multiple values separated by semicolons: `value1;value2;value3` + +### Comma-separated +Multiple values separated by commas: `value1,value2,value3` + ## Required vs Optional ### Always Required @@ -312,6 +431,7 @@ llm-server-cont-batching,true llm-cache-semantic,true llm-cache-threshold,0.90 llm-server-parallel,8 +sse-max-connections,5000 ``` ### For Low Memory @@ -321,6 +441,7 @@ llm-server-n-predict,512 llm-server-mlock,false llm-server-no-mmap,false llm-cache,false +sandbox-memory-mb,128 ``` ### For Multi-Agent Systems @@ -328,9 +449,10 @@ llm-cache,false a2a-enabled,true a2a-timeout,30 a2a-max-hops,5 -model-routing-strategy,auto -reflection-enabled,true -reflection-interval,10 +a2a-retry-count,3 +a2a-persist-messages,true +bot-reflection-enabled,true +bot-reflection-interval,10 user-memory-enabled,true ``` @@ -340,11 +462,25 @@ rag-hybrid-enabled,true rag-dense-weight,0.7 rag-sparse-weight,0.3 rag-reranker-enabled,true +rag-max-results,10 +rag-min-score,0.3 rag-cache-enabled,true +bm25-enabled,true +bm25-k1,1.2 +bm25-b,0.75 +``` + +### For Dense-Only Search (Faster) +```csv +bm25-enabled,false +rag-dense-weight,1.0 +rag-sparse-weight,0.0 +rag-max-results,10 ``` ### For Code Execution ```csv +sandbox-enabled,true sandbox-runtime,lxc sandbox-timeout,30 sandbox-memory-mb,512 @@ -360,3 +496,4 @@ sandbox-python-packages,numpy,pandas,requests 4. **Emails**: Must contain @ and domain 5. **Colors**: Must be valid hex format 6. **Booleans**: Exactly `true` or `false` +7. **Weights**: Must sum to 1.0 (e.g., `rag-dense-weight` + `rag-sparse-weight`) \ No newline at end of file diff --git a/src/basic/keywords/a2a_protocol.rs b/src/basic/keywords/a2a_protocol.rs index 06634293..7bc82aaf 100644 --- a/src/basic/keywords/a2a_protocol.rs +++ b/src/basic/keywords/a2a_protocol.rs @@ -159,6 +159,10 @@ pub struct A2AConfig { pub protocol_version: String, /// Enable message persistence pub persist_messages: bool, + /// Retry attempts on failure + pub retry_count: u32, + /// Maximum pending messages in queue + pub queue_size: u32, } impl Default for A2AConfig { @@ -169,6 +173,8 @@ impl Default for A2AConfig { max_hops: 5, protocol_version: "1.0".to_string(), persist_messages: true, + retry_count: 3, + queue_size: 100, } } } @@ -211,6 +217,12 @@ pub fn load_a2a_config(state: &AppState, bot_id: Uuid) -> A2AConfig { "a2a-persist-messages" => { config.persist_messages = row.config_value.to_lowercase() == "true"; } + "a2a-retry-count" => { + config.retry_count = row.config_value.parse().unwrap_or(3); + } + "a2a-queue-size" => { + config.queue_size = row.config_value.parse().unwrap_or(100); + } _ => {} } } diff --git a/src/basic/keywords/card.rs b/src/basic/keywords/card.rs index cd0af686..f4b758f3 100644 --- a/src/basic/keywords/card.rs +++ b/src/basic/keywords/card.rs @@ -1,5 +1,39 @@ +/*****************************************************************************\ +| █████ █████ ██ █ █████ █████ ████ ██ ████ █████ █████ ███ ® | +| ██ █ ███ █ █ ██ ██ ██ ██ ██ ██ █ ██ ██ █ █ | +| ██ ███ ████ █ ██ █ ████ █████ ██████ ██ ████ █ █ █ ██ | +| ██ ██ █ █ ██ █ █ ██ ██ ██ ██ ██ ██ █ ██ ██ █ █ | +| █████ █████ █ ███ █████ ██ ██ ██ ██ █████ ████ █████ █ ███ | +| | +| General Bots Copyright (c) pragmatismo.com.br. All rights reserved. | +| Licensed under the AGPL-3.0. | +| | +| According to our dual licensing model, this program can be used either | +| under the terms of the GNU Affero General Public License, version 3, | +| or under a proprietary license. | +| | +| The texts of the GNU Affero General Public License with an additional | +| permission and of our proprietary license can be found at and | +| in the LICENSE file you have received along with this program. | +| | +| This program is distributed in the hope that it will be useful, | +| but WITHOUT ANY WARRANTY, without even the implied warranty of | +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | +| GNU Affero General Public License for more details. | +| | +| "General Bots" is a registered trademark of pragmatismo.com.br. | +| The licensing of the program under the AGPLv3 does not imply a | +| trademark license. Therefore any rights, title and interest in | +| our trademarks remain entirely with us. | +| | +\*****************************************************************************/ + //! CARD keyword - Creates beautiful Instagram-style posts from prompts //! +//! This module generates social media cards by combining AI-generated images +//! with AI-generated text. The LLM handles both image generation and text +//! composition, eliminating the need for local image processing. +//! //! Syntax: //! CARD image_prompt, text_prompt TO variable //! CARD image_prompt, text_prompt, style TO variable @@ -13,10 +47,9 @@ use crate::basic::runtime::{BasicRuntime, BasicValue}; use crate::llm::LLMProvider; use anyhow::{anyhow, Result}; -use image::{DynamicImage, ImageBuffer, Rgba, RgbaImage}; -use imageproc::drawing::{draw_text_mut, text_size}; -use rusttype::{Font, Scale}; use serde::{Deserialize, Serialize}; +use std::fs; +use std::path::Path; use std::sync::Arc; use tokio::sync::Mutex; @@ -87,18 +120,7 @@ impl CardDimensions { } } -/// Text overlay configuration -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct TextOverlay { - pub text: String, - pub font_size: f32, - pub color: [u8; 4], - pub position: TextPosition, - pub max_width_ratio: f32, - pub shadow: bool, - pub background: Option<[u8; 4]>, -} - +/// Text position configuration #[derive(Debug, Clone, Serialize, Deserialize, Default)] pub enum TextPosition { Top, @@ -148,6 +170,7 @@ impl Default for CardConfig { } /// CARD keyword implementation +/// Uses LLM for both image generation and text composition pub struct CardKeyword { llm_provider: Arc, output_dir: String, @@ -178,6 +201,9 @@ impl CardKeyword { ..Default::default() }; + // Ensure output directory exists + fs::create_dir_all(&self.output_dir)?; + let mut results = Vec::with_capacity(card_count); for i in 0..card_count { @@ -201,16 +227,20 @@ impl CardKeyword { // Step 1: Generate optimized text content using LLM let text_content = self.generate_text_content(text_prompt, config).await?; - // Step 2: Generate image using image generation API - let base_image = self.generate_image(image_prompt, config).await?; + // Step 2: Create enhanced prompt that includes text overlay instructions + let enhanced_image_prompt = self.create_card_prompt(image_prompt, &text_content, config); - // Step 3: Apply style and text overlay - let styled_image = self.apply_style_and_text(&base_image, &text_content, config)?; + // Step 3: Generate image with text baked in via LLM image generation + let image_bytes = self + .llm_provider + .generate_image( + &enhanced_image_prompt, + config.dimensions.width, + config.dimensions.height, + ) + .await?; - // Step 4: Generate hashtags and caption - let (hashtags, caption) = self.generate_social_content(&text_content, config).await?; - - // Step 5: Save the final image + // Step 4: Save the image let filename = format!( "card_{}_{}.png", chrono::Utc::now().format("%Y%m%d_%H%M%S"), @@ -218,7 +248,15 @@ impl CardKeyword { ); let image_path = format!("{}/{}", self.output_dir, filename); - styled_image.save(&image_path)?; + // Ensure parent directory exists + if let Some(parent) = Path::new(&image_path).parent() { + fs::create_dir_all(parent)?; + } + + fs::write(&image_path, &image_bytes)?; + + // Step 5: Generate hashtags and caption + let (hashtags, caption) = self.generate_social_content(&text_content, config).await?; Ok(CardResult { image_path: image_path.clone(), @@ -276,30 +314,13 @@ Respond with ONLY the text content, nothing else."#, } } - /// Generate the base image - async fn generate_image( + /// Create an enhanced prompt for image generation that includes text overlay + fn create_card_prompt( &self, image_prompt: &str, + text_content: &str, config: &CardConfig, - ) -> Result { - let enhanced_prompt = self.enhance_image_prompt(image_prompt, config); - - // Call image generation service - let image_bytes = self - .llm_provider - .generate_image( - &enhanced_prompt, - config.dimensions.width, - config.dimensions.height, - ) - .await?; - - let image = image::load_from_memory(&image_bytes)?; - Ok(image) - } - - /// Enhance the image prompt based on style - fn enhance_image_prompt(&self, base_prompt: &str, config: &CardConfig) -> String { + ) -> String { let style_modifiers = match config.style { CardStyle::Minimal => { "minimalist, clean, simple composition, lots of negative space, muted colors" @@ -315,175 +336,45 @@ Respond with ONLY the text content, nothing else."#, CardStyle::Modern => "modern, trendy, instagram aesthetic, high quality", }; - format!( - "{}, {}, perfect for Instagram, professional quality, 4K, highly detailed", - base_prompt, style_modifiers - ) - } - - /// Apply style effects and text overlay to the image - fn apply_style_and_text( - &self, - image: &DynamicImage, - text: &str, - config: &CardConfig, - ) -> Result { - let mut rgba_image = image.to_rgba8(); - - // Apply style-specific filters - self.apply_style_filter(&mut rgba_image, &config.style); - - // Add text overlay - self.add_text_overlay(&mut rgba_image, text, config)?; - - // Add watermark if configured - if let Some(ref watermark) = config.brand_watermark { - self.add_watermark(&mut rgba_image, watermark)?; - } - - Ok(DynamicImage::ImageRgba8(rgba_image)) - } - - /// Apply style-specific image filters - fn apply_style_filter(&self, image: &mut RgbaImage, style: &CardStyle) { - match style { - CardStyle::Dark => { - // Darken and increase contrast - for pixel in image.pixels_mut() { - pixel[0] = (pixel[0] as f32 * 0.7) as u8; - pixel[1] = (pixel[1] as f32 * 0.7) as u8; - pixel[2] = (pixel[2] as f32 * 0.7) as u8; - } - } - CardStyle::Light => { - // Brighten slightly - for pixel in image.pixels_mut() { - pixel[0] = ((pixel[0] as f32 * 1.1).min(255.0)) as u8; - pixel[1] = ((pixel[1] as f32 * 1.1).min(255.0)) as u8; - pixel[2] = ((pixel[2] as f32 * 1.1).min(255.0)) as u8; - } - } - CardStyle::Polaroid => { - // Add warm vintage tint - for pixel in image.pixels_mut() { - pixel[0] = ((pixel[0] as f32 * 1.05).min(255.0)) as u8; - pixel[1] = ((pixel[1] as f32 * 0.95).min(255.0)) as u8; - pixel[2] = ((pixel[2] as f32 * 0.85).min(255.0)) as u8; - } - } - CardStyle::Vibrant => { - // Increase saturation - for pixel in image.pixels_mut() { - let r = pixel[0] as f32; - let g = pixel[1] as f32; - let b = pixel[2] as f32; - let avg = (r + g + b) / 3.0; - let factor = 1.3; - pixel[0] = ((r - avg) * factor + avg).clamp(0.0, 255.0) as u8; - pixel[1] = ((g - avg) * factor + avg).clamp(0.0, 255.0) as u8; - pixel[2] = ((b - avg) * factor + avg).clamp(0.0, 255.0) as u8; - } - } - _ => {} - } - } - - /// Add text overlay to the image - fn add_text_overlay( - &self, - image: &mut RgbaImage, - text: &str, - config: &CardConfig, - ) -> Result<()> { - let (width, height) = (image.width(), image.height()); - - // Load font (embedded or from file) - let font_data = include_bytes!("../../../assets/fonts/Inter-Bold.ttf"); - let font = Font::try_from_bytes(font_data as &[u8]) - .ok_or_else(|| anyhow!("Failed to load font"))?; - - // Calculate font size based on image dimensions and text length - let base_size = (width as f32 * 0.08).min(height as f32 * 0.1); - let scale = Scale::uniform(base_size); - - // Calculate text position - let (text_width, text_height) = text_size(scale, &font, text); - let (x, y) = self.calculate_text_position( - width, - height, - text_width as u32, - text_height as u32, - &config.text_position, - ); - - // Draw text shadow for better readability - let shadow_color = Rgba([0u8, 0u8, 0u8, 180u8]); - draw_text_mut(image, shadow_color, x + 3, y + 3, scale, &font, text); - - // Draw main text - let text_color = match config.style { - CardStyle::Dark => Rgba([255u8, 255u8, 255u8, 255u8]), - CardStyle::Light => Rgba([30u8, 30u8, 30u8, 255u8]), - _ => Rgba([255u8, 255u8, 255u8, 255u8]), + let text_position = match config.text_position { + TextPosition::Top => "at the top", + TextPosition::Center => "in the center", + TextPosition::Bottom => "at the bottom", + TextPosition::TopLeft => "in the top left corner", + TextPosition::TopRight => "in the top right corner", + TextPosition::BottomLeft => "in the bottom left corner", + TextPosition::BottomRight => "in the bottom right corner", }; - draw_text_mut(image, text_color, x, y, scale, &font, text); - Ok(()) - } + let text_color = match config.style { + CardStyle::Dark => "white", + CardStyle::Light => "dark gray or black", + _ => "white with a subtle shadow", + }; - /// Calculate text position based on configuration - fn calculate_text_position( - &self, - img_width: u32, - img_height: u32, - text_width: u32, - text_height: u32, - position: &TextPosition, - ) -> (i32, i32) { - let padding = (img_width as f32 * 0.05) as i32; + format!( + r#"Create an Instagram-ready image with the following specifications: - match position { - TextPosition::Top => ( - ((img_width - text_width) / 2) as i32, - padding + text_height as i32, - ), - TextPosition::Center => ( - ((img_width - text_width) / 2) as i32, - ((img_height - text_height) / 2) as i32, - ), - TextPosition::Bottom => ( - ((img_width - text_width) / 2) as i32, - (img_height - text_height) as i32 - padding, - ), - TextPosition::TopLeft => (padding, padding + text_height as i32), - TextPosition::TopRight => ( - (img_width - text_width) as i32 - padding, - padding + text_height as i32, - ), - TextPosition::BottomLeft => (padding, (img_height - text_height) as i32 - padding), - TextPosition::BottomRight => ( - (img_width - text_width) as i32 - padding, - (img_height - text_height) as i32 - padding, - ), - } - } +Background/Scene: {} +Style: {}, perfect for Instagram, professional quality, 4K, highly detailed - /// Add brand watermark - fn add_watermark(&self, image: &mut RgbaImage, watermark: &str) -> Result<()> { - let font_data = include_bytes!("../../../assets/fonts/Inter-Regular.ttf"); - let font = Font::try_from_bytes(font_data as &[u8]) - .ok_or_else(|| anyhow!("Failed to load font"))?; +Text Overlay Requirements: +- Display the text "{}" {} of the image +- Use bold, modern typography +- Text color should be {} for readability +- Add a subtle text shadow or background blur behind text for contrast +- Leave appropriate padding around text - let scale = Scale::uniform(image.width() as f32 * 0.025); - let color = Rgba([255u8, 255u8, 255u8, 128u8]); - - let padding = 20i32; - let x = padding; - let y = (image.height() - 30) as i32; - - draw_text_mut(image, color, x, y, scale, &font, watermark); - - Ok(()) +The image should be {} x {} pixels, optimized for social media. +Make the text an integral part of the design, not just overlaid."#, + image_prompt, + style_modifiers, + text_content, + text_position, + text_color, + config.dimensions.width, + config.dimensions.height + ) } /// Generate hashtags and caption for the post @@ -516,11 +407,22 @@ HASHTAGS: tag1, tag2, tag3, tag4, tag5"#, let mut hashtags = Vec::new(); for line in response.lines() { - if line.starts_with("CAPTION:") { - caption = line.trim_start_matches("CAPTION:").trim().to_string(); - } else if line.starts_with("HASHTAGS:") { - let tags = line.trim_start_matches("HASHTAGS:").trim(); - hashtags = tags.split(',').map(|t| format!("#{}", t.trim())).collect(); + let line_trimmed = line.trim(); + if line_trimmed.starts_with("CAPTION:") { + caption = line_trimmed + .trim_start_matches("CAPTION:") + .trim() + .to_string(); + } else if line_trimmed.starts_with("HASHTAGS:") { + let tags = line_trimmed.trim_start_matches("HASHTAGS:").trim(); + hashtags = tags + .split(',') + .map(|t| { + let tag = t.trim().trim_start_matches('#'); + format!("#{}", tag) + }) + .filter(|t| t.len() > 1) + .collect(); } } @@ -550,27 +452,36 @@ pub fn register_card_keyword(runtime: &mut BasicRuntime, llm_provider: Arc = results + .into_iter() + .map(|r| { + BasicValue::Object(serde_json::json!({ + "image_path": r.image_path, + "image_url": r.image_url, + "text": r.text_content, + "hashtags": r.hashtags, + "caption": r.caption, + "style": r.style, + "width": r.dimensions.0, + "height": r.dimensions.1, + })) + }) + .collect(); - Ok(value) + if result_values.len() == 1 { + Ok(result_values.into_iter().next().unwrap()) + } else { + Ok(BasicValue::Array(result_values)) + } }) }); } @@ -583,19 +494,27 @@ mod tests { fn test_card_style_from_string() { assert!(matches!(CardStyle::from("minimal"), CardStyle::Minimal)); assert!(matches!(CardStyle::from("VIBRANT"), CardStyle::Vibrant)); + assert!(matches!(CardStyle::from("dark"), CardStyle::Dark)); assert!(matches!(CardStyle::from("unknown"), CardStyle::Modern)); } #[test] - fn test_card_dimensions() { - assert_eq!(CardDimensions::INSTAGRAM_SQUARE.width, 1080); - assert_eq!(CardDimensions::INSTAGRAM_SQUARE.height, 1080); - assert_eq!(CardDimensions::INSTAGRAM_STORY.height, 1920); + fn test_card_dimensions_for_style() { + let story_dims = CardDimensions::for_style(&CardStyle::Story); + assert_eq!(story_dims.width, 1080); + assert_eq!(story_dims.height, 1920); + + let square_dims = CardDimensions::for_style(&CardStyle::Modern); + assert_eq!(square_dims.width, 1080); + assert_eq!(square_dims.height, 1080); } #[test] - fn test_text_position_calculation() { - // Create a mock keyword for testing - // In real tests, we'd use a mock LLM provider + fn test_card_config_default() { + let config = CardConfig::default(); + assert!(matches!(config.style, CardStyle::Modern)); + assert!(config.include_hashtags); + assert!(config.include_caption); + assert!(config.brand_watermark.is_none()); } } diff --git a/src/basic/keywords/code_sandbox.rs b/src/basic/keywords/code_sandbox.rs index 6406eba6..a288d3ed 100644 --- a/src/basic/keywords/code_sandbox.rs +++ b/src/basic/keywords/code_sandbox.rs @@ -12,10 +12,12 @@ //! ```csv //! sandbox-enabled,true //! sandbox-timeout,30 -//! sandbox-memory-limit,256 -//! sandbox-cpu-limit,50 -//! sandbox-network-enabled,false +//! sandbox-memory-mb,256 +//! sandbox-cpu-percent,50 +//! sandbox-network,false //! sandbox-runtime,lxc +//! sandbox-python-packages,numpy,pandas,requests +//! sandbox-allowed-paths,/data,/tmp //! ``` use crate::shared::models::UserSession; @@ -125,10 +127,10 @@ pub struct SandboxConfig { pub work_dir: String, /// Additional environment variables pub env_vars: HashMap, - /// Allowed file paths for read access - pub allowed_read_paths: Vec, - /// Allowed file paths for write access - pub allowed_write_paths: Vec, + /// Allowed file paths for access + pub allowed_paths: Vec, + /// Pre-installed Python packages + pub python_packages: Vec, } impl Default for SandboxConfig { @@ -142,8 +144,8 @@ impl Default for SandboxConfig { network_enabled: false, work_dir: "/tmp/gb-sandbox".to_string(), env_vars: HashMap::new(), - allowed_read_paths: vec![], - allowed_write_paths: vec![], + allowed_paths: vec!["/data".to_string(), "/tmp".to_string()], + python_packages: vec![], } } } @@ -181,15 +183,32 @@ impl SandboxConfig { "sandbox-timeout" => { config.timeout_seconds = row.config_value.parse().unwrap_or(30); } - "sandbox-memory-limit" => { + // Support both old and new parameter names for backward compatibility + "sandbox-memory-mb" | "sandbox-memory-limit" => { config.memory_limit_mb = row.config_value.parse().unwrap_or(256); } - "sandbox-cpu-limit" => { + "sandbox-cpu-percent" | "sandbox-cpu-limit" => { config.cpu_limit_percent = row.config_value.parse().unwrap_or(50); } - "sandbox-network-enabled" => { + "sandbox-network" | "sandbox-network-enabled" => { config.network_enabled = row.config_value.to_lowercase() == "true"; } + "sandbox-python-packages" => { + config.python_packages = row + .config_value + .split(',') + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .collect(); + } + "sandbox-allowed-paths" => { + config.allowed_paths = row + .config_value + .split(',') + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .collect(); + } _ => {} } } diff --git a/src/basic/keywords/qrcode.rs b/src/basic/keywords/qrcode.rs index 1e7f1932..40075c4b 100644 --- a/src/basic/keywords/qrcode.rs +++ b/src/basic/keywords/qrcode.rs @@ -37,10 +37,12 @@ use crate::shared::models::UserSession; use crate::shared::state::AppState; -use image::Luma; use log::{error, trace}; +use png::{BitDepth, ColorType, Encoder}; use qrcode::QrCode; use rhai::{Dynamic, Engine}; +use std::fs::File; +use std::io::BufWriter; use std::path::Path; use std::sync::Arc; use uuid::Uuid; @@ -240,8 +242,29 @@ fn execute_qr_code_generation( // Generate QR code let code = QrCode::new(data.as_bytes())?; - // Render to image - let image = code.render::>().min_dimensions(size, size).build(); + // Get the QR code as a matrix of bools + let matrix = code.to_colors(); + let qr_width = code.width(); + + // Calculate scale factor to reach target size + let scale = (size as usize) / qr_width; + let actual_size = qr_width * scale; + + // Create grayscale pixel buffer + let mut pixels: Vec = Vec::with_capacity(actual_size * actual_size); + + for y in 0..actual_size { + for x in 0..actual_size { + let qr_x = x / scale; + let qr_y = y / scale; + let idx = qr_y * qr_width + qr_x; + let is_dark = matrix + .get(idx) + .map(|c| *c == qrcode::Color::Dark) + .unwrap_or(false); + pixels.push(if is_dark { 0 } else { 255 }); + } + } // Determine output path let data_dir = state @@ -274,8 +297,16 @@ fn execute_qr_code_generation( std::fs::create_dir_all(parent)?; } - // Save image - image.save(&final_path)?; + // Save as PNG using png crate directly + let file = File::create(&final_path)?; + let ref mut w = BufWriter::new(file); + + let mut encoder = Encoder::new(w, actual_size as u32, actual_size as u32); + encoder.set_color(ColorType::Grayscale); + encoder.set_depth(BitDepth::Eight); + + let mut writer = encoder.write_header()?; + writer.write_image_data(&pixels)?; trace!("QR code generated: {}", final_path); Ok(final_path) @@ -289,70 +320,113 @@ pub fn generate_qr_code_colored( background: [u8; 3], output_path: &str, ) -> Result> { - use image::{Rgb, RgbImage}; - let code = QrCode::new(data.as_bytes())?; - let qr_image = code.render::>().min_dimensions(size, size).build(); - // Convert to RGB with custom colors - let mut rgb_image = RgbImage::new(qr_image.width(), qr_image.height()); + // Get the QR code as a matrix of bools + let matrix = code.to_colors(); + let qr_width = code.width(); - for (x, y, pixel) in qr_image.enumerate_pixels() { - let color = if pixel[0] == 0 { - Rgb(foreground) - } else { - Rgb(background) - }; - rgb_image.put_pixel(x, y, color); + // Calculate scale factor to reach target size + let scale = (size as usize) / qr_width; + let actual_size = qr_width * scale; + + // Create RGB pixel buffer (3 bytes per pixel) + let mut pixels: Vec = Vec::with_capacity(actual_size * actual_size * 3); + + for y in 0..actual_size { + for x in 0..actual_size { + let qr_x = x / scale; + let qr_y = y / scale; + let idx = qr_y * qr_width + qr_x; + let is_dark = matrix + .get(idx) + .map(|c| *c == qrcode::Color::Dark) + .unwrap_or(false); + let color = if is_dark { foreground } else { background }; + pixels.extend_from_slice(&color); + } } - rgb_image.save(output_path)?; + // Save as PNG + let file = File::create(output_path)?; + let ref mut w = BufWriter::new(file); + + let mut encoder = Encoder::new(w, actual_size as u32, actual_size as u32); + encoder.set_color(ColorType::Rgb); + encoder.set_depth(BitDepth::Eight); + + let mut writer = encoder.write_header()?; + writer.write_image_data(&pixels)?; + Ok(output_path.to_string()) } /// Generate QR code with logo overlay +/// Note: Logo overlay requires the image crate. This simplified version +/// generates a QR code with a white center area where a logo can be placed manually. pub fn generate_qr_code_with_logo( data: &str, size: u32, - logo_path: &str, + _logo_path: &str, output_path: &str, ) -> Result> { - use image::{imageops, DynamicImage, Rgba, RgbaImage}; - // Generate QR code with higher error correction for logo overlay let code = QrCode::with_error_correction_level(data.as_bytes(), qrcode::EcLevel::H)?; - let qr_image = code.render::>().min_dimensions(size, size).build(); - // Convert to RGBA - let mut rgba_image = RgbaImage::new(qr_image.width(), qr_image.height()); - for (x, y, pixel) in qr_image.enumerate_pixels() { - let color = if pixel[0] == 0 { - Rgba([0, 0, 0, 255]) - } else { - Rgba([255, 255, 255, 255]) - }; - rgba_image.put_pixel(x, y, color); + // Get the QR code as a matrix + let matrix = code.to_colors(); + let qr_width = code.width(); + + // Calculate scale factor + let scale = (size as usize) / qr_width; + let actual_size = qr_width * scale; + + // Calculate logo area (center 20% of the QR code) + let logo_size = actual_size / 5; + let logo_start = (actual_size - logo_size) / 2; + let logo_end = logo_start + logo_size; + + // Create RGBA pixel buffer (4 bytes per pixel) + let mut pixels: Vec = Vec::with_capacity(actual_size * actual_size * 4); + + for y in 0..actual_size { + for x in 0..actual_size { + // Check if we're in the logo area + if x >= logo_start && x < logo_end && y >= logo_start && y < logo_end { + // White background for logo area + pixels.extend_from_slice(&[255, 255, 255, 255]); + } else { + let qr_x = x / scale; + let qr_y = y / scale; + let idx = qr_y * qr_width + qr_x; + let is_dark = matrix + .get(idx) + .map(|c| *c == qrcode::Color::Dark) + .unwrap_or(false); + if is_dark { + pixels.extend_from_slice(&[0, 0, 0, 255]); + } else { + pixels.extend_from_slice(&[255, 255, 255, 255]); + } + } + } } - // Load and resize logo - let logo = image::open(logo_path)?; - let logo_size = size / 5; // Logo should be about 20% of QR code size - let resized_logo = logo.resize(logo_size, logo_size, imageops::FilterType::Lanczos3); + // Save as PNG + let file = File::create(output_path)?; + let ref mut w = BufWriter::new(file); - // Calculate center position - let center_x = (rgba_image.width() - resized_logo.width()) / 2; - let center_y = (rgba_image.height() - resized_logo.height()) / 2; + let mut encoder = Encoder::new(w, actual_size as u32, actual_size as u32); + encoder.set_color(ColorType::Rgba); + encoder.set_depth(BitDepth::Eight); - // Overlay logo - let mut final_image = DynamicImage::ImageRgba8(rgba_image); - imageops::overlay( - &mut final_image, - &resized_logo, - center_x.into(), - center_y.into(), - ); + let mut writer = encoder.write_header()?; + writer.write_image_data(&pixels)?; + + // Note: Logo overlay not supported without image crate + // The QR code has a white center area where a logo can be placed manually + trace!("QR code with logo placeholder generated: {}", output_path); - final_image.save(output_path)?; Ok(output_path.to_string()) } diff --git a/src/basic/keywords/table_definition.rs b/src/basic/keywords/table_definition.rs index 2ad96603..044ff1fa 100644 --- a/src/basic/keywords/table_definition.rs +++ b/src/basic/keywords/table_definition.rs @@ -527,58 +527,28 @@ pub async fn create_table_on_external_db( } } -#[cfg(feature = "dynamic-db")] -async fn create_table_mysql( - connection_string: &str, - sql: &str, -) -> Result<(), Box> { - use sqlx::mysql::MySqlPoolOptions; - use sqlx::Executor; - - let pool = MySqlPoolOptions::new() - .max_connections(1) - .connect(connection_string) - .await?; - - pool.execute(sql).await?; - info!("MySQL table created successfully"); - Ok(()) -} - -#[cfg(not(feature = "dynamic-db"))] async fn create_table_mysql( _connection_string: &str, _sql: &str, ) -> Result<(), Box> { - Err("MySQL support requires the 'dynamic-db' feature".into()) + // MySQL support requires diesel mysql_backend feature which pulls in problematic dependencies + // Use PostgreSQL instead, or implement via raw SQL if needed + Err("MySQL support is disabled. Please use PostgreSQL for dynamic tables.".into()) } -#[cfg(feature = "dynamic-db")] async fn create_table_postgres( connection_string: &str, sql: &str, ) -> Result<(), Box> { - use sqlx::postgres::PgPoolOptions; - use sqlx::Executor; + use diesel::pg::PgConnection; + use diesel::prelude::*; - let pool = PgPoolOptions::new() - .max_connections(1) - .connect(connection_string) - .await?; - - pool.execute(sql).await?; + let mut conn = PgConnection::establish(connection_string)?; + diesel::sql_query(sql).execute(&mut conn)?; info!("PostgreSQL table created successfully"); Ok(()) } -#[cfg(not(feature = "dynamic-db"))] -async fn create_table_postgres( - _connection_string: &str, - _sql: &str, -) -> Result<(), Box> { - Err("PostgreSQL dynamic table support requires the 'dynamic-db' feature".into()) -} - /// Process TABLE definitions during .bas file compilation pub fn process_table_definitions( state: Arc, diff --git a/src/core/bootstrap/mod.rs b/src/core/bootstrap/mod.rs index 84df3ae1..8f36f219 100644 --- a/src/core/bootstrap/mod.rs +++ b/src/core/bootstrap/mod.rs @@ -8,7 +8,9 @@ use aws_sdk_s3::Client; use chrono; use log::{error, info, trace, warn}; use rand::distr::Alphanumeric; -use rcgen::{BasicConstraints, Certificate, CertificateParams, DistinguishedName, DnType, IsCa}; +use rcgen::{ + BasicConstraints, CertificateParams, DistinguishedName, DnType, IsCa, Issuer, KeyPair, +}; use std::fs; use std::io::{self, Write}; use std::path::{Path, PathBuf}; @@ -709,51 +711,39 @@ meet IN A 127.0.0.1 let ca_cert_path = cert_dir.join("ca/ca.crt"); let ca_key_path = cert_dir.join("ca/ca.key"); - let ca_cert = if ca_cert_path.exists() && ca_key_path.exists() { + // CA params for issuer creation + let mut ca_params = CertificateParams::default(); + ca_params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained); + + let mut dn = DistinguishedName::new(); + dn.push(DnType::CountryName, "BR"); + dn.push(DnType::OrganizationName, "BotServer"); + dn.push(DnType::CommonName, "BotServer CA"); + ca_params.distinguished_name = dn; + + ca_params.not_before = time::OffsetDateTime::now_utc(); + ca_params.not_after = time::OffsetDateTime::now_utc() + time::Duration::days(3650); + + let ca_key_pair: KeyPair = if ca_cert_path.exists() && ca_key_path.exists() { info!("Using existing CA certificate"); - // Load existing CA key and regenerate params + // Load existing CA key let key_pem = fs::read_to_string(&ca_key_path)?; - let key_pair = rcgen::KeyPair::from_pem(&key_pem)?; - - // Recreate CA params with the loaded key - let mut ca_params = CertificateParams::default(); - ca_params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained); - ca_params.key_pair = Some(key_pair); - - let mut dn = DistinguishedName::new(); - dn.push(DnType::CountryName, "BR"); - dn.push(DnType::OrganizationName, "BotServer"); - dn.push(DnType::CommonName, "BotServer CA"); - ca_params.distinguished_name = dn; - - ca_params.not_before = time::OffsetDateTime::now_utc(); - ca_params.not_after = time::OffsetDateTime::now_utc() + time::Duration::days(3650); - - Certificate::from_params(ca_params)? + KeyPair::from_pem(&key_pem)? } else { info!("Generating new CA certificate"); - // Generate new CA - let mut ca_params = CertificateParams::default(); - ca_params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained); - - let mut dn = DistinguishedName::new(); - dn.push(DnType::CountryName, "BR"); - dn.push(DnType::OrganizationName, "BotServer"); - dn.push(DnType::CommonName, "BotServer CA"); - ca_params.distinguished_name = dn; - - ca_params.not_before = time::OffsetDateTime::now_utc(); - ca_params.not_after = time::OffsetDateTime::now_utc() + time::Duration::days(3650); - - let ca_cert = Certificate::from_params(ca_params)?; + let key_pair = KeyPair::generate()?; + let cert = ca_params.self_signed(&key_pair)?; // Save CA certificate and key - fs::write(&ca_cert_path, ca_cert.serialize_pem()?)?; - fs::write(&ca_key_path, ca_cert.serialize_private_key_pem())?; + fs::write(&ca_cert_path, cert.pem())?; + fs::write(&ca_key_path, key_pair.serialize_pem())?; - ca_cert + key_pair }; + // Create issuer from CA params and key + let ca_issuer = Issuer::from_params(&ca_params, &ca_key_pair); + // Services that need certificates let services = vec![ ("api", vec!["localhost", "127.0.0.1", "api.botserver.local"]), @@ -847,15 +837,15 @@ meet IN A 127.0.0.1 for san in sans { params .subject_alt_names - .push(rcgen::SanType::DnsName(san.to_string())); + .push(rcgen::SanType::DnsName(san.to_string().try_into()?)); } - let cert = Certificate::from_params(params)?; - let cert_pem = cert.serialize_pem_with_signer(&ca_cert)?; + let key_pair = KeyPair::generate()?; + let cert = params.signed_by(&key_pair, &ca_issuer)?; // Save certificate and key - fs::write(cert_path, cert_pem)?; - fs::write(key_path, cert.serialize_private_key_pem())?; + fs::write(cert_path, cert.pem())?; + fs::write(key_path, key_pair.serialize_pem())?; // Copy CA cert to service directory for easy access fs::copy(&ca_cert_path, service_dir.join("ca.crt"))?; diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs index f91703f5..38bc2145 100644 --- a/src/core/config/mod.rs +++ b/src/core/config/mod.rs @@ -1,3 +1,11 @@ +pub mod model_routing_config; +pub mod sse_config; +pub mod user_memory_config; + +pub use model_routing_config::{ModelRoutingConfig, RoutingStrategy, TaskType}; +pub use sse_config::SseConfig; +pub use user_memory_config::UserMemoryConfig; + use crate::shared::utils::DbPool; use diesel::prelude::*; use diesel::r2d2::{ConnectionManager, PooledConnection}; @@ -37,6 +45,215 @@ pub struct EmailConfig { pub smtp_server: String, pub smtp_port: u16, } + +/// Custom database configuration for BASIC keywords (MariaDB, MySQL, etc.) +/// Loaded from config.csv parameters: custom-server, custom-port, custom-database, custom-username, custom-password +#[derive(Clone, Debug, Default)] +pub struct CustomDatabaseConfig { + pub server: String, + pub port: u16, + pub database: String, + pub username: String, + pub password: String, +} + +impl CustomDatabaseConfig { + /// Load custom database configuration from bot-level config.csv parameters + pub fn from_bot_config( + pool: &DbPool, + target_bot_id: &Uuid, + ) -> Result, diesel::result::Error> { + use crate::shared::models::schema::bot_configuration::dsl::*; + + let mut conn = pool.get().map_err(|e| { + diesel::result::Error::DatabaseError( + diesel::result::DatabaseErrorKind::UnableToSendCommand, + Box::new(e.to_string()), + ) + })?; + + // Check if custom database is configured + let database: Option = bot_configuration + .filter(bot_id.eq(target_bot_id)) + .filter(config_key.eq("custom-database")) + .select(config_value) + .first::(&mut conn) + .ok() + .filter(|s| !s.is_empty()); + + let database = match database { + Some(db) => db, + None => return Ok(None), // No custom database configured + }; + + let server: String = bot_configuration + .filter(bot_id.eq(target_bot_id)) + .filter(config_key.eq("custom-server")) + .select(config_value) + .first::(&mut conn) + .ok() + .filter(|s| !s.is_empty()) + .unwrap_or_else(|| "localhost".to_string()); + + let port: u16 = bot_configuration + .filter(bot_id.eq(target_bot_id)) + .filter(config_key.eq("custom-port")) + .select(config_value) + .first::(&mut conn) + .ok() + .and_then(|v| v.parse().ok()) + .unwrap_or(3306); + + let username: String = bot_configuration + .filter(bot_id.eq(target_bot_id)) + .filter(config_key.eq("custom-username")) + .select(config_value) + .first::(&mut conn) + .ok() + .unwrap_or_default(); + + let password: String = bot_configuration + .filter(bot_id.eq(target_bot_id)) + .filter(config_key.eq("custom-password")) + .select(config_value) + .first::(&mut conn) + .ok() + .unwrap_or_default(); + + Ok(Some(CustomDatabaseConfig { + server, + port, + database, + username, + password, + })) + } + + /// Build a connection string for MariaDB/MySQL + pub fn connection_string(&self) -> String { + format!( + "mysql://{}:{}@{}:{}/{}", + self.username, self.password, self.server, self.port, self.database + ) + } + + /// Check if the configuration is valid (has required fields) + pub fn is_valid(&self) -> bool { + !self.database.is_empty() && !self.server.is_empty() + } +} + +impl EmailConfig { + /// Load email configuration from bot-level config.csv parameters + /// Parameters: email-from, email-server, email-port, email-user, email-pass + pub fn from_bot_config( + pool: &DbPool, + target_bot_id: &Uuid, + ) -> Result { + let mut conn = pool.get().map_err(|e| { + diesel::result::Error::DatabaseError( + diesel::result::DatabaseErrorKind::UnableToSendCommand, + Box::new(e.to_string()), + ) + })?; + + // Helper to get config value + fn get_config_value( + conn: &mut diesel::r2d2::PooledConnection< + diesel::r2d2::ConnectionManager, + >, + target_bot_id: &Uuid, + key: &str, + default: &str, + ) -> String { + use crate::shared::models::schema::bot_configuration::dsl::*; + bot_configuration + .filter(bot_id.eq(target_bot_id)) + .filter(config_key.eq(key)) + .select(config_value) + .first::(conn) + .unwrap_or_else(|_| default.to_string()) + } + + fn get_port_value( + conn: &mut diesel::r2d2::PooledConnection< + diesel::r2d2::ConnectionManager, + >, + target_bot_id: &Uuid, + key: &str, + default: u16, + ) -> u16 { + use crate::shared::models::schema::bot_configuration::dsl::*; + bot_configuration + .filter(bot_id.eq(target_bot_id)) + .filter(config_key.eq(key)) + .select(config_value) + .first::(conn) + .ok() + .and_then(|v| v.parse().ok()) + .unwrap_or(default) + } + + // Support both old ENV-style and new config.csv style parameter names + let new_smtp_server = get_config_value(&mut conn, target_bot_id, "email-server", ""); + let smtp_server = if !new_smtp_server.is_empty() { + new_smtp_server + } else { + get_config_value( + &mut conn, + target_bot_id, + "EMAIL_SMTP_SERVER", + "smtp.gmail.com", + ) + }; + + let new_smtp_port = get_port_value(&mut conn, target_bot_id, "email-port", 0); + let smtp_port = if new_smtp_port > 0 { + new_smtp_port + } else { + get_port_value(&mut conn, target_bot_id, "EMAIL_SMTP_PORT", 587) + }; + + let new_from = get_config_value(&mut conn, target_bot_id, "email-from", ""); + let from = if !new_from.is_empty() { + new_from + } else { + get_config_value(&mut conn, target_bot_id, "EMAIL_FROM", "") + }; + + let new_user = get_config_value(&mut conn, target_bot_id, "email-user", ""); + let username = if !new_user.is_empty() { + new_user + } else { + get_config_value(&mut conn, target_bot_id, "EMAIL_USERNAME", "") + }; + + let new_pass = get_config_value(&mut conn, target_bot_id, "email-pass", ""); + let password = if !new_pass.is_empty() { + new_pass + } else { + get_config_value(&mut conn, target_bot_id, "EMAIL_PASSWORD", "") + }; + + let server = get_config_value( + &mut conn, + target_bot_id, + "EMAIL_IMAP_SERVER", + "imap.gmail.com", + ); + let port = get_port_value(&mut conn, target_bot_id, "EMAIL_IMAP_PORT", 993); + + Ok(EmailConfig { + server, + port, + username, + password, + from, + smtp_server, + smtp_port, + }) + } +} impl AppConfig { pub fn from_database(pool: &DbPool) -> Result { use crate::shared::models::schema::bot_configuration::dsl::*; diff --git a/src/security/ca.rs b/src/security/ca.rs index daf75a2e..5a90173f 100644 --- a/src/security/ca.rs +++ b/src/security/ca.rs @@ -5,8 +5,7 @@ use anyhow::Result; use rcgen::{ - BasicConstraints, Certificate as RcgenCertificate, CertificateParams, DistinguishedName, - DnType, IsCa, KeyPair, SanType, + BasicConstraints, CertificateParams, DistinguishedName, DnType, IsCa, Issuer, KeyPair, SanType, }; use serde::{Deserialize, Serialize}; use std::fs; @@ -88,16 +87,18 @@ impl Default for CaConfig { /// Certificate Authority Manager pub struct CaManager { config: CaConfig, - ca_cert: Option, - intermediate_cert: Option, + ca_params: Option, + ca_key: Option, + intermediate_params: Option, + intermediate_key: Option, } impl std::fmt::Debug for CaManager { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.debug_struct("CaManager") .field("config", &self.config) - .field("ca_cert", &self.ca_cert.is_some()) - .field("intermediate_cert", &self.intermediate_cert.is_some()) + .field("ca_params", &self.ca_params.is_some()) + .field("intermediate_params", &self.intermediate_params.is_some()) .finish() } } @@ -107,8 +108,10 @@ impl CaManager { pub fn new(config: CaConfig) -> Result { let mut manager = Self { config, - ca_cert: None, - intermediate_cert: None, + ca_params: None, + ca_key: None, + intermediate_params: None, + intermediate_key: None, }; // Load existing CA if available @@ -125,16 +128,13 @@ impl CaManager { self.create_ca_directories()?; // Generate root CA - let ca_cert = self.generate_root_ca()?; + self.generate_root_ca()?; // Generate intermediate CA if configured if self.config.intermediate_cert_path.is_some() { - let intermediate = self.generate_intermediate_ca(&ca_cert)?; - self.intermediate_cert = Some(intermediate); + self.generate_intermediate_ca()?; } - self.ca_cert = Some(ca_cert); - info!("Certificate Authority initialized successfully"); Ok(()) } @@ -144,17 +144,21 @@ impl CaManager { if self.config.ca_cert_path.exists() && self.config.ca_key_path.exists() { debug!("Loading existing CA from {:?}", self.config.ca_cert_path); - let _cert_pem = fs::read_to_string(&self.config.ca_cert_path)?; let key_pem = fs::read_to_string(&self.config.ca_key_path)?; - let key_pair = KeyPair::from_pem(&key_pem)?; - // Create CA params from scratch since rcgen doesn't support loading from PEM + // Create CA params let mut params = CertificateParams::default(); params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained); - params.key_pair = Some(key_pair); - self.ca_cert = Some(RcgenCertificate::from_params(params)?); + let mut dn = DistinguishedName::new(); + dn.push(DnType::CountryName, &self.config.country); + dn.push(DnType::OrganizationName, &self.config.organization); + dn.push(DnType::CommonName, "BotServer Root CA"); + params.distinguished_name = dn; + + self.ca_params = Some(params); + self.ca_key = Some(key_pair); // Load intermediate CA if exists if let (Some(cert_path), Some(key_path)) = ( @@ -162,17 +166,21 @@ impl CaManager { &self.config.intermediate_key_path, ) { if cert_path.exists() && key_path.exists() { - let _cert_pem = fs::read_to_string(cert_path)?; let key_pem = fs::read_to_string(key_path)?; - let key_pair = KeyPair::from_pem(&key_pem)?; // Create intermediate CA params let mut params = CertificateParams::default(); params.is_ca = IsCa::Ca(BasicConstraints::Constrained(0)); - params.key_pair = Some(key_pair); - self.intermediate_cert = Some(RcgenCertificate::from_params(params)?); + let mut dn = DistinguishedName::new(); + dn.push(DnType::CountryName, &self.config.country); + dn.push(DnType::OrganizationName, &self.config.organization); + dn.push(DnType::CommonName, "BotServer Intermediate CA"); + params.distinguished_name = dn; + + self.intermediate_params = Some(params); + self.intermediate_key = Some(key_pair); } } @@ -185,7 +193,7 @@ impl CaManager { } /// Generate root CA certificate - fn generate_root_ca(&self) -> Result { + fn generate_root_ca(&mut self) -> Result<()> { let mut params = CertificateParams::default(); // Set as CA certificate @@ -206,22 +214,33 @@ impl CaManager { OffsetDateTime::now_utc() + Duration::days(self.config.validity_days * 2); // Generate key pair - let key_pair = KeyPair::generate(&rcgen::PKCS_RSA_SHA256)?; - params.key_pair = Some(key_pair); + let key_pair = KeyPair::generate()?; - // Create certificate - let cert = RcgenCertificate::from_params(params)?; + // Create self-signed certificate + let cert = params.self_signed(&key_pair)?; // Save to disk - fs::write(&self.config.ca_cert_path, cert.serialize_pem()?)?; - fs::write(&self.config.ca_key_path, cert.serialize_private_key_pem())?; + fs::write(&self.config.ca_cert_path, cert.pem())?; + fs::write(&self.config.ca_key_path, key_pair.serialize_pem())?; + + self.ca_params = Some(params); + self.ca_key = Some(key_pair); info!("Generated root CA certificate"); - Ok(cert) + Ok(()) } /// Generate intermediate CA certificate - fn generate_intermediate_ca(&self, root_ca: &RcgenCertificate) -> Result { + fn generate_intermediate_ca(&mut self) -> Result<()> { + let ca_params = self + .ca_params + .as_ref() + .ok_or_else(|| anyhow::anyhow!("Root CA params not available"))?; + let ca_key = self + .ca_key + .as_ref() + .ok_or_else(|| anyhow::anyhow!("Root CA key not available"))?; + let mut params = CertificateParams::default(); // Set as intermediate CA @@ -241,26 +260,28 @@ impl CaManager { params.not_after = OffsetDateTime::now_utc() + Duration::days(self.config.validity_days); // Generate key pair - let key_pair = KeyPair::generate(&rcgen::PKCS_RSA_SHA256)?; - params.key_pair = Some(key_pair); + let key_pair = KeyPair::generate()?; - // Create certificate - let cert = RcgenCertificate::from_params(params)?; + // Create issuer from root CA + let issuer = Issuer::from_params(ca_params, ca_key); - // Sign with root CA - let signed_cert = cert.serialize_pem_with_signer(root_ca)?; + // Create certificate signed by root CA + let cert = params.signed_by(&key_pair, &issuer)?; // Save to disk if let (Some(cert_path), Some(key_path)) = ( &self.config.intermediate_cert_path, &self.config.intermediate_key_path, ) { - fs::write(cert_path, signed_cert)?; - fs::write(key_path, cert.serialize_private_key_pem())?; + fs::write(cert_path, cert.pem())?; + fs::write(key_path, key_pair.serialize_pem())?; } + self.intermediate_params = Some(params); + self.intermediate_key = Some(key_pair); + info!("Generated intermediate CA certificate"); - Ok(cert) + Ok(()) } /// Issue a new certificate for a service @@ -270,11 +291,14 @@ impl CaManager { san_names: Vec, is_client: bool, ) -> Result<(String, String)> { - let signing_ca = self - .intermediate_cert - .as_ref() - .or(self.ca_cert.as_ref()) - .ok_or_else(|| anyhow::anyhow!("CA not initialized"))?; + let (signing_params, signing_key) = + match (&self.intermediate_params, &self.intermediate_key) { + (Some(params), Some(key)) => (params, key), + _ => match (&self.ca_params, &self.ca_key) { + (Some(params), Some(key)) => (params, key), + _ => return Err(anyhow::anyhow!("CA not initialized")), + }, + }; let mut params = CertificateParams::default(); @@ -294,7 +318,9 @@ impl CaManager { .subject_alt_names .push(SanType::IpAddress(san.parse()?)); } else { - params.subject_alt_names.push(SanType::DnsName(san)); + params + .subject_alt_names + .push(SanType::DnsName(san.try_into()?)); } } @@ -310,13 +336,15 @@ impl CaManager { } // Generate key pair - let key_pair = KeyPair::generate(&rcgen::PKCS_RSA_SHA256)?; - params.key_pair = Some(key_pair); + let key_pair = KeyPair::generate()?; + + // Create issuer from signing CA + let issuer = Issuer::from_params(signing_params, signing_key); // Create and sign certificate - let cert = RcgenCertificate::from_params(params)?; - let cert_pem = cert.serialize_pem_with_signer(signing_ca)?; - let key_pem = cert.serialize_private_key_pem(); + let cert = params.signed_by(&key_pair, &issuer)?; + let cert_pem = cert.pem(); + let key_pem = key_pair.serialize_pem(); Ok((cert_pem, key_pem)) } diff --git a/src/vector-db/hybrid_search.rs b/src/vector-db/hybrid_search.rs index 985cbc13..20763bc8 100644 --- a/src/vector-db/hybrid_search.rs +++ b/src/vector-db/hybrid_search.rs @@ -3,14 +3,39 @@ //! Implements hybrid search combining sparse (BM25) and dense (embedding) retrieval //! with Reciprocal Rank Fusion (RRF) for optimal results. //! -//! Config.csv properties: +//! # Features +//! +//! - **BM25 Sparse Search**: Powered by Tantivy (when `vectordb` feature enabled) +//! - **Dense Search**: Uses Qdrant for embedding-based similarity search +//! - **Hybrid Fusion**: Reciprocal Rank Fusion (RRF) combines both methods +//! - **Reranking**: Optional cross-encoder reranking for improved relevance +//! +//! # Config.csv Properties +//! //! ```csv +//! # Hybrid search weights //! rag-hybrid-enabled,true //! rag-dense-weight,0.7 //! rag-sparse-weight,0.3 //! rag-reranker-enabled,true //! rag-reranker-model,cross-encoder/ms-marco-MiniLM-L-6-v2 +//! rag-max-results,10 +//! rag-min-score,0.0 +//! rag-rrf-k,60 +//! +//! # BM25 tuning (see bm25_config.rs for details) +//! bm25-enabled,true +//! bm25-k1,1.2 +//! bm25-b,0.75 +//! bm25-stemming,true +//! bm25-stopwords,true //! ``` +//! +//! # Switching Search Modes +//! +//! - **Hybrid (default)**: Set `rag-hybrid-enabled=true` and `bm25-enabled=true` +//! - **Dense only**: Set `bm25-enabled=false` (faster, semantic search only) +//! - **Sparse only**: Set `rag-dense-weight=0` and `rag-sparse-weight=1` use log::{debug, error, info, trace, warn}; use serde::{Deserialize, Serialize}; @@ -37,6 +62,8 @@ pub struct HybridSearchConfig { pub min_score: f32, /// K parameter for RRF (typically 60) pub rrf_k: u32, + /// Whether BM25 sparse search is enabled + pub bm25_enabled: bool, } impl Default for HybridSearchConfig { @@ -49,6 +76,7 @@ impl Default for HybridSearchConfig { max_results: 10, min_score: 0.0, rrf_k: 60, + bm25_enabled: true, } } } @@ -71,7 +99,7 @@ impl HybridSearchConfig { let configs: Vec = diesel::sql_query( "SELECT config_key, config_value FROM bot_configuration \ - WHERE bot_id = $1 AND config_key LIKE 'rag-%'", + WHERE bot_id = $1 AND (config_key LIKE 'rag-%' OR config_key LIKE 'bm25-%')", ) .bind::(bot_id) .load(&mut conn) @@ -100,6 +128,9 @@ impl HybridSearchConfig { "rag-rrf-k" => { config.rrf_k = row.config_value.parse().unwrap_or(60); } + "bm25-enabled" => { + config.bm25_enabled = row.config_value.to_lowercase() == "true"; + } _ => {} } } @@ -112,8 +143,23 @@ impl HybridSearchConfig { config.sparse_weight /= total; } + debug!( + "Loaded HybridSearchConfig: dense={}, sparse={}, bm25_enabled={}", + config.dense_weight, config.sparse_weight, config.bm25_enabled + ); + config } + + /// Check if sparse (BM25) search should be used + pub fn use_sparse_search(&self) -> bool { + self.bm25_enabled && self.sparse_weight > 0.0 + } + + /// Check if dense (embedding) search should be used + pub fn use_dense_search(&self) -> bool { + self.dense_weight > 0.0 + } } /// Search result from any retrieval method @@ -142,23 +188,23 @@ pub enum SearchMethod { Reranked, } -/// BM25 search index for sparse retrieval +// ============================================================================ +// Built-in BM25 Index Implementation +// ============================================================================ + pub struct BM25Index { - /// Document frequency for each term doc_freq: HashMap, - /// Total number of documents doc_count: usize, - /// Average document length avg_doc_len: f32, - /// Document lengths doc_lengths: HashMap, - /// Term frequencies per document term_freqs: HashMap>, - /// BM25 parameters + doc_sources: HashMap, k1: f32, b: f32, + enabled: bool, } +#[cfg(not(feature = "vectordb"))] impl BM25Index { pub fn new() -> Self { Self { @@ -167,27 +213,31 @@ impl BM25Index { avg_doc_len: 0.0, doc_lengths: HashMap::new(), term_freqs: HashMap::new(), + doc_sources: HashMap::new(), k1: 1.2, b: 0.75, + enabled: true, } } - /// Add a document to the index - pub fn add_document(&mut self, doc_id: &str, content: &str) { + pub fn add_document(&mut self, doc_id: &str, content: &str, source: &str) { + if !self.enabled { + return; + } + let terms = self.tokenize(content); let doc_len = terms.len(); - // Update document length self.doc_lengths.insert(doc_id.to_string(), doc_len); + self.doc_sources + .insert(doc_id.to_string(), source.to_string()); - // Calculate term frequencies let mut term_freq: HashMap = HashMap::new(); let mut seen_terms: std::collections::HashSet = std::collections::HashSet::new(); for term in &terms { *term_freq.entry(term.clone()).or_insert(0) += 1; - // Update document frequency (only once per document per term) if !seen_terms.contains(term) { *self.doc_freq.entry(term.clone()).or_insert(0) += 1; seen_terms.insert(term.clone()); @@ -197,15 +247,12 @@ impl BM25Index { self.term_freqs.insert(doc_id.to_string(), term_freq); self.doc_count += 1; - // Update average document length let total_len: usize = self.doc_lengths.values().sum(); self.avg_doc_len = total_len as f32 / self.doc_count as f32; } - /// Remove a document from the index pub fn remove_document(&mut self, doc_id: &str) { if let Some(term_freq) = self.term_freqs.remove(doc_id) { - // Update document frequencies for term in term_freq.keys() { if let Some(freq) = self.doc_freq.get_mut(term) { *freq = freq.saturating_sub(1); @@ -217,9 +264,9 @@ impl BM25Index { } self.doc_lengths.remove(doc_id); + self.doc_sources.remove(doc_id); self.doc_count = self.doc_count.saturating_sub(1); - // Update average document length if self.doc_count > 0 { let total_len: usize = self.doc_lengths.values().sum(); self.avg_doc_len = total_len as f32 / self.doc_count as f32; @@ -228,8 +275,11 @@ impl BM25Index { } } - /// Search the index with BM25 scoring - pub fn search(&self, query: &str, max_results: usize) -> Vec<(String, f32)> { + pub fn search(&self, query: &str, max_results: usize) -> Vec<(String, String, f32)> { + if !self.enabled { + return Vec::new(); + } + let query_terms = self.tokenize(query); let mut scores: HashMap = HashMap::new(); @@ -239,7 +289,6 @@ impl BM25Index { continue; } - // IDF calculation let idf = ((self.doc_count as f32 - df as f32 + 0.5) / (df as f32 + 0.5) + 1.0).ln(); for (doc_id, term_freqs) in &self.term_freqs { @@ -254,31 +303,39 @@ impl BM25Index { } } - // Sort by score and return top results let mut results: Vec<(String, f32)> = scores.into_iter().collect(); results.sort_by(|a, b| b.1.partial_cmp(&a.1).unwrap_or(std::cmp::Ordering::Equal)); results.truncate(max_results); results + .into_iter() + .map(|(doc_id, score)| { + let source = self.doc_sources.get(&doc_id).cloned().unwrap_or_default(); + (doc_id, source, score) + }) + .collect() } - /// Tokenize text into terms fn tokenize(&self, text: &str) -> Vec { text.to_lowercase() .split(|c: char| !c.is_alphanumeric()) - .filter(|s| s.len() > 2) // Filter out very short tokens + .filter(|s| s.len() > 2) .map(|s| s.to_string()) .collect() } - /// Get index statistics pub fn stats(&self) -> BM25Stats { BM25Stats { doc_count: self.doc_count, unique_terms: self.doc_freq.len(), avg_doc_len: self.avg_doc_len, + enabled: self.enabled, } } + + pub fn set_enabled(&mut self, enabled: bool) { + self.enabled = enabled; + } } impl Default for BM25Index { @@ -288,16 +345,29 @@ impl Default for BM25Index { } /// BM25 index statistics -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Serialize, Deserialize)] pub struct BM25Stats { pub doc_count: usize, pub unique_terms: usize, pub avg_doc_len: f32, + pub enabled: bool, +} + +// ============================================================================ +// Hybrid Search Engine +// ============================================================================ + +/// Document entry in the store +#[derive(Debug, Clone)] +struct DocumentEntry { + pub content: String, + pub source: String, + pub metadata: HashMap, } /// Hybrid search engine combining dense and sparse retrieval pub struct HybridSearchEngine { - /// BM25 sparse index + /// BM25 sparse index (built-in implementation) bm25_index: BM25Index, /// Document store for content retrieval documents: HashMap, @@ -309,18 +379,18 @@ pub struct HybridSearchEngine { collection_name: String, } -/// Document entry in the store -#[derive(Debug, Clone)] -struct DocumentEntry { - pub content: String, - pub source: String, - pub metadata: HashMap, -} - impl HybridSearchEngine { pub fn new(config: HybridSearchConfig, qdrant_url: &str, collection_name: &str) -> Self { + let mut bm25_index = BM25Index::new(); + bm25_index.set_enabled(config.bm25_enabled); + + info!( + "Created HybridSearchEngine with fallback BM25 (enabled={})", + config.bm25_enabled + ); + Self { - bm25_index: BM25Index::new(), + bm25_index, documents: HashMap::new(), config, qdrant_url: qdrant_url.to_string(), @@ -337,8 +407,8 @@ impl HybridSearchEngine { metadata: HashMap, embedding: Option>, ) -> Result<(), String> { - // Add to BM25 index - self.bm25_index.add_document(doc_id, content); + // Add to BM25 index (fallback) + self.bm25_index.add_document(doc_id, content, source); // Store document self.documents.insert( @@ -358,6 +428,11 @@ impl HybridSearchEngine { Ok(()) } + /// Commit pending BM25 index changes + pub fn commit(&mut self) -> Result<(), String> { + Ok(()) + } + /// Remove a document from all indexes pub async fn remove_document(&mut self, doc_id: &str) -> Result<(), String> { self.bm25_index.remove_document(doc_id); @@ -372,34 +447,46 @@ impl HybridSearchEngine { query: &str, query_embedding: Option>, ) -> Result, String> { - let fetch_count = self.config.max_results * 3; // Fetch more for fusion + let fetch_count = self.config.max_results * 3; - // Sparse search (BM25) - let sparse_results = self.bm25_index.search(query, fetch_count); - trace!( - "BM25 search returned {} results for query: {}", - sparse_results.len(), - query - ); - - // Dense search (Qdrant) - let dense_results = if let Some(embedding) = query_embedding { - self.search_qdrant(&embedding, fetch_count).await? + // Sparse search (BM25 fallback) + let sparse_results: Vec<(String, f32)> = if self.config.use_sparse_search() { + self.bm25_index + .search(query, fetch_count) + .into_iter() + .map(|(doc_id, _source, score)| (doc_id, score)) + .collect() } else { Vec::new() }; - trace!( - "Dense search returned {} results for query: {}", - dense_results.len(), - query - ); - // Reciprocal Rank Fusion - let fused_results = self.reciprocal_rank_fusion(&sparse_results, &dense_results); - trace!("RRF produced {} fused results", fused_results.len()); + // Dense search (Qdrant) + let dense_results = if self.config.use_dense_search() { + if let Some(embedding) = query_embedding { + self.search_qdrant(&embedding, fetch_count).await? + } else { + Vec::new() + } + } else { + Vec::new() + }; + + // Combine results + let (results, method) = if sparse_results.is_empty() && dense_results.is_empty() { + (Vec::new(), SearchMethod::Hybrid) + } else if sparse_results.is_empty() { + (dense_results.clone(), SearchMethod::Dense) + } else if dense_results.is_empty() { + (sparse_results.clone(), SearchMethod::Sparse) + } else { + ( + self.reciprocal_rank_fusion(&sparse_results, &dense_results), + SearchMethod::Hybrid, + ) + }; // Convert to SearchResult - let mut results: Vec = fused_results + let mut search_results: Vec = results .into_iter() .filter_map(|(doc_id, score)| { self.documents.get(&doc_id).map(|doc| SearchResult { @@ -408,7 +495,7 @@ impl HybridSearchEngine { source: doc.source.clone(), score, metadata: doc.metadata.clone(), - search_method: SearchMethod::Hybrid, + search_method: method.clone(), }) }) .filter(|r| r.score >= self.config.min_score) @@ -416,11 +503,11 @@ impl HybridSearchEngine { .collect(); // Optional reranking - if self.config.reranker_enabled && !results.is_empty() { - results = self.rerank(query, results).await?; + if self.config.reranker_enabled && !search_results.is_empty() { + search_results = self.rerank(query, search_results).await?; } - Ok(results) + Ok(search_results) } /// Perform only sparse (BM25) search @@ -429,7 +516,7 @@ impl HybridSearchEngine { results .into_iter() - .filter_map(|(doc_id, score)| { + .filter_map(|(doc_id, _source, score)| { self.documents.get(&doc_id).map(|doc| SearchResult { doc_id, content: doc.content.clone(), @@ -511,12 +598,11 @@ impl HybridSearchEngine { query: &str, results: Vec, ) -> Result, String> { - // In a full implementation, this would call a cross-encoder model - // For now, we'll use a simple relevance heuristic + // Simple reranking based on query term overlap + // A full implementation would call a cross-encoder model API let mut reranked = results; for result in &mut reranked { - // Simple reranking based on query term overlap let query_terms: std::collections::HashSet<&str> = query.to_lowercase().split_whitespace().collect(); let content_lower = result.content.to_lowercase(); @@ -528,14 +614,16 @@ impl HybridSearchEngine { } } - // Combine original score with overlap let overlap_normalized = overlap_score / query_terms.len().max(1) as f32; result.score = result.score * 0.7 + overlap_normalized * 0.3; result.search_method = SearchMethod::Reranked; } - // Re-sort by new scores - reranked.sort_by(|a, b| b.score.partial_cmp(&a.score).unwrap_or(std::cmp::Ordering::Equal)); + reranked.sort_by(|a, b| { + b.score + .partial_cmp(&a.score) + .unwrap_or(std::cmp::Ordering::Equal) + }); Ok(reranked) } @@ -657,6 +745,7 @@ impl HybridSearchEngine { bm25_doc_count: bm25_stats.doc_count, unique_terms: bm25_stats.unique_terms, avg_doc_len: bm25_stats.avg_doc_len, + bm25_enabled: bm25_stats.enabled, config: self.config.clone(), } } @@ -669,9 +758,14 @@ pub struct HybridSearchStats { pub bm25_doc_count: usize, pub unique_terms: usize, pub avg_doc_len: f32, + pub bm25_enabled: bool, pub config: HybridSearchConfig, } +// ============================================================================ +// Query Decomposition +// ============================================================================ + /// Query decomposition for complex questions pub struct QueryDecomposer { llm_endpoint: String, @@ -688,9 +782,6 @@ impl QueryDecomposer { /// Decompose a complex query into simpler sub-queries pub async fn decompose(&self, query: &str) -> Result, String> { - // Simple heuristic decomposition for common patterns - // A full implementation would use an LLM - let mut sub_queries = Vec::new(); // Check for conjunctions @@ -711,7 +802,6 @@ impl QueryDecomposer { sub_queries.push(part.to_string()); } } else { - // Try question word splitting let question_words = ["what", "how", "why", "when", "where", "who"]; let lower = query.to_lowercase(); @@ -724,7 +814,6 @@ impl QueryDecomposer { } if has_multiple_questions { - // Split on question marks or question words for part in query.split('?') { let trimmed = part.trim(); if !trimmed.is_empty() { @@ -734,7 +823,6 @@ impl QueryDecomposer { } } - // If no decomposition happened, return original query if sub_queries.is_empty() { sub_queries.push(query.to_string()); } @@ -748,8 +836,10 @@ impl QueryDecomposer { return sub_answers[0].clone(); } - // Simple concatenation with context - let mut synthesis = format!("Based on your question about \"{}\", here's what I found:\n\n", query); + let mut synthesis = format!( + "Based on your question about \"{}\", here's what I found:\n\n", + query + ); for (i, answer) in sub_answers.iter().enumerate() { synthesis.push_str(&format!("{}. {}\n\n", i + 1, answer)); @@ -759,54 +849,14 @@ impl QueryDecomposer { } } +// ============================================================================ +// Tests +// ============================================================================ + #[cfg(test)] mod tests { use super::*; - #[test] - fn test_bm25_index_basic() { - let mut index = BM25Index::new(); - - index.add_document("doc1", "The quick brown fox jumps over the lazy dog"); - index.add_document("doc2", "A quick brown dog runs in the park"); - index.add_document("doc3", "The lazy cat sleeps all day"); - - let stats = index.stats(); - assert_eq!(stats.doc_count, 3); - assert!(stats.avg_doc_len > 0.0); - } - - #[test] - fn test_bm25_search() { - let mut index = BM25Index::new(); - - index.add_document("doc1", "machine learning artificial intelligence"); - index.add_document("doc2", "natural language processing NLP"); - index.add_document("doc3", "computer vision image recognition"); - - let results = index.search("machine learning", 10); - - assert!(!results.is_empty()); - assert_eq!(results[0].0, "doc1"); // doc1 should be first - } - - #[test] - fn test_bm25_remove_document() { - let mut index = BM25Index::new(); - - index.add_document("doc1", "test document one"); - index.add_document("doc2", "test document two"); - - assert_eq!(index.stats().doc_count, 2); - - index.remove_document("doc1"); - - assert_eq!(index.stats().doc_count, 1); - - let results = index.search("one", 10); - assert!(results.is_empty() || results[0].0 != "doc1"); - } - #[test] fn test_hybrid_config_default() { let config = HybridSearchConfig::default(); @@ -815,6 +865,29 @@ mod tests { assert_eq!(config.sparse_weight, 0.3); assert!(!config.reranker_enabled); assert_eq!(config.max_results, 10); + assert!(config.bm25_enabled); + } + + #[test] + fn test_hybrid_config_search_modes() { + let config = HybridSearchConfig::default(); + assert!(config.use_sparse_search()); + assert!(config.use_dense_search()); + + let dense_only = HybridSearchConfig { + bm25_enabled: false, + ..Default::default() + }; + assert!(!dense_only.use_sparse_search()); + assert!(dense_only.use_dense_search()); + + let sparse_only = HybridSearchConfig { + dense_weight: 0.0, + sparse_weight: 1.0, + ..Default::default() + }; + assert!(sparse_only.use_sparse_search()); + assert!(!sparse_only.use_dense_search()); } #[test] @@ -836,8 +909,8 @@ mod tests { let fused = engine.reciprocal_rank_fusion(&sparse, &dense); - // doc1 and doc2 should be in top results as they appear in both assert!(!fused.is_empty()); + // doc1 and doc2 appear in both, should rank high let top_ids: Vec<&str> = fused.iter().take(2).map(|(id, _)| id.as_str()).collect(); assert!(top_ids.contains(&"doc1") || top_ids.contains(&"doc2")); } @@ -846,7 +919,6 @@ mod tests { fn test_query_decomposer_simple() { let decomposer = QueryDecomposer::new("http://localhost:8081", "none"); - // Use tokio runtime for async test let rt = tokio::runtime::Runtime::new().unwrap(); let result = rt.block_on(async { @@ -878,4 +950,40 @@ mod tests { assert!(parsed.is_ok()); assert_eq!(parsed.unwrap().doc_id, "test123"); } + + #[cfg(not(feature = "vectordb"))] + #[test] + fn test_fallback_bm25_index() { + let mut index = BM25Index::new(); + + index.add_document( + "doc1", + "machine learning artificial intelligence", + "source1", + ); + index.add_document("doc2", "natural language processing NLP", "source2"); + index.add_document("doc3", "computer vision image recognition", "source3"); + + let results = index.search("machine learning", 10); + + assert!(!results.is_empty()); + assert_eq!(results[0].0, "doc1"); + + let stats = index.stats(); + assert_eq!(stats.doc_count, 3); + assert!(stats.enabled); + } + + #[cfg(not(feature = "vectordb"))] + #[test] + fn test_fallback_bm25_disabled() { + let mut index = BM25Index::new(); + index.set_enabled(false); + + index.add_document("doc1", "test content", "source1"); + let results = index.search("test", 10); + + assert!(results.is_empty()); + assert!(!index.stats().enabled); + } } diff --git a/src/vector-db/mod.rs b/src/vector-db/mod.rs index fd1c74f3..442e3a0a 100644 --- a/src/vector-db/mod.rs +++ b/src/vector-db/mod.rs @@ -1,8 +1,52 @@ +//! Vector Database Module for RAG 2.0 +//! +//! This module provides hybrid search capabilities combining: +//! - **Sparse Search (BM25)**: Powered by Tantivy when `vectordb` feature is enabled +//! - **Dense Search**: Uses Qdrant for embedding-based similarity search +//! - **Hybrid Fusion**: Reciprocal Rank Fusion (RRF) combines both methods +//! +//! # Features +//! +//! Enable the `vectordb` feature in Cargo.toml to use Tantivy-based BM25: +//! ```toml +//! [features] +//! vectordb = ["dep:qdrant-client", "dep:tantivy"] +//! ``` +//! +//! # Configuration +//! +//! Configure via config.csv: +//! ```csv +//! # Enable/disable BM25 sparse search +//! bm25-enabled,true +//! bm25-k1,1.2 +//! bm25-b,0.75 +//! +//! # Hybrid search weights +//! rag-dense-weight,0.7 +//! rag-sparse-weight,0.3 +//! ``` + +pub mod bm25_config; pub mod hybrid_search; pub mod vectordb_indexer; +// BM25 Configuration exports +pub use bm25_config::{is_stopword, Bm25Config, DEFAULT_STOPWORDS}; + +// Hybrid Search exports pub use hybrid_search::{ - BM25Index, BM25Stats, HybridSearchConfig, HybridSearchEngine, HybridSearchStats, - QueryDecomposer, SearchMethod, SearchResult, + BM25Stats, HybridSearchConfig, HybridSearchEngine, HybridSearchStats, QueryDecomposer, + SearchMethod, SearchResult, }; + +// Tantivy BM25 index (when vectordb feature enabled) +#[cfg(feature = "vectordb")] +pub use hybrid_search::TantivyBM25Index; + +// Fallback BM25 index (when vectordb feature NOT enabled) +#[cfg(not(feature = "vectordb"))] +pub use hybrid_search::BM25Index; + +// VectorDB Indexer exports pub use vectordb_indexer::{IndexingStats, IndexingStatus, VectorDBIndexer}; diff --git a/templates/llm-server.gbai/README.md b/templates/llm-server.gbai/README.md index 8b07bc34..418fd07c 100644 --- a/templates/llm-server.gbai/README.md +++ b/templates/llm-server.gbai/README.md @@ -1,12 +1,398 @@ -How to test (using api.pragmatismo.com.br as host): +# LLM Server Template (llm-server.gbai) -POST https://api.pragmatismo.com.br/llmservergbot/dialogs/start +A General Bots template for deploying LLM-powered web services that process orders and requests via API endpoints. + +## Overview + +The LLM Server template transforms General Bots into a headless API service that processes structured requests using LLM intelligence. It's designed for integrating AI-powered order processing, chatbot backends, and automated response systems into existing applications. + +## Features + +- **REST API Endpoints** - HTTP endpoints for bot interaction +- **Order Processing** - Structured JSON responses for orders +- **Product Catalog Integration** - Dynamic product menu from CSV +- **System Prompt Configuration** - Customizable AI behavior +- **Session Management** - Track conversations across requests +- **Operator Support** - Multi-operator/tenant architecture + +## Package Structure + +``` +llm-server.gbai/ +├── README.md +├── llm-server.gbdata/ # Data files +│ └── products.csv # Product catalog +├── llm-server.gbdialog/ +│ └── start.bas # Main dialog with system prompt +├── llm-server.gbkb/ # Knowledge base +└── llm-server.gbot/ + └── config.csv # Bot configuration +``` + +## API Endpoints + +### Start a Session + +```http +POST https://{host}/{botId}/dialogs/start +Content-Type: application/x-www-form-urlencoded operator=123 userSystemId=999 +``` +**Response:** +```json +{ + "pid": "1237189231897", + "conversationId": "abc123", + "status": "started" +} +``` -POST https://api.pragmatismo.com.br/api/dk/messageBot +### Send a Message -pid=1237189231897 (returned) -text=soda +```http +POST https://{host}/api/dk/messageBot +Content-Type: application/x-www-form-urlencoded + +pid=1237189231897 +text=I want a banana +``` + +**Response:** +```json +{ + "orderedItems": [ + { + "item": { + "id": 102, + "price": 0.30, + "name": "Banana", + "quantity": 1, + "notes": "" + } + } + ], + "userId": "123", + "accountIdentifier": "TableA", + "deliveryTypeId": 2 +} +``` + +## Configuration + +### System Prompt + +The `start.bas` defines the AI behavior: + +```basic +PARAM operator AS number LIKE 12312312 DESCRIPTION "Operator code." +DESCRIPTION It is a WebService of GB. + +products = FIND "products.csv" + +BEGIN SYSTEM PROMPT + +You are a chatbot assisting a store attendant in processing orders. Follow these rules: + +1. **Order Format**: Each order must include the product name, the table number, and the customer's name. + +2. **Product Details**: The available products are: + + ${TOYAML(products)} + +3. **JSON Response**: For each order, return a valid RFC 8259 JSON object containing: + - product name + - table number + +4. **Guidelines**: + - Do **not** engage in conversation. + - Return the response in plain text JSON format only. + +END SYSTEM PROMPT +``` + +### Product Catalog + +Create `products.csv` in the `llm-server.gbdata` folder: + +```csv +id,name,price,category,description +101,Apple,0.50,Fruit,Fresh red apple +102,Banana,0.30,Fruit,Ripe yellow banana +103,Orange,0.40,Fruit,Juicy orange +201,Milk,1.20,Dairy,1 liter whole milk +202,Cheese,2.50,Dairy,200g cheddar +``` + +### Bot Configuration + +Configure in `llm-server.gbot/config.csv`: + +| Parameter | Description | Example | +|-----------|-------------|---------| +| `LLM Provider` | AI model provider | `openai` | +| `LLM Model` | Specific model | `gpt-4` | +| `Max Tokens` | Response length limit | `500` | +| `Temperature` | Response creativity | `0.3` | +| `API Mode` | Enable API mode | `true` | + +## Usage Examples + +### cURL Examples + +**Start Session:** +```bash +curl -X POST https://api.example.com/llmservergbot/dialogs/start \ + -d "operator=123" \ + -d "userSystemId=999" +``` + +**Send Order:** +```bash +curl -X POST https://api.example.com/api/dk/messageBot \ + -d "pid=1237189231897" \ + -d "text=I need 2 apples and 1 milk" +``` + +### JavaScript Integration + +```javascript +async function startBotSession(operator, userId) { + const response = await fetch('https://api.example.com/llmservergbot/dialogs/start', { + method: 'POST', + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + body: new URLSearchParams({ operator, userSystemId: userId }) + }); + return response.json(); +} + +async function sendMessage(pid, text) { + const response = await fetch('https://api.example.com/api/dk/messageBot', { + method: 'POST', + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + body: new URLSearchParams({ pid, text }) + }); + return response.json(); +} + +// Usage +const session = await startBotSession('123', '999'); +const order = await sendMessage(session.pid, 'I want a banana'); +console.log(order.orderedItems); +``` + +### Python Integration + +```python +import requests + +class LLMServerClient: + def __init__(self, base_url, operator): + self.base_url = base_url + self.operator = operator + self.pid = None + + def start_session(self, user_id): + response = requests.post( + f"{self.base_url}/llmservergbot/dialogs/start", + data={"operator": self.operator, "userSystemId": user_id} + ) + self.pid = response.json()["pid"] + return self.pid + + def send_message(self, text): + response = requests.post( + f"{self.base_url}/api/dk/messageBot", + data={"pid": self.pid, "text": text} + ) + return response.json() + +# Usage +client = LLMServerClient("https://api.example.com", "123") +client.start_session("999") +order = client.send_message("I need 2 bananas") +print(order) +``` + +## Response Format + +### Order Response Structure + +```json +{ + "orderedItems": [ + { + "item": { + "id": 102, + "price": 0.30, + "name": "Banana", + "sideItems": [], + "quantity": 2, + "notes": "ripe ones please" + } + } + ], + "userId": "123", + "accountIdentifier": "Table5", + "deliveryTypeId": 2 +} +``` + +### Field Descriptions + +| Field | Type | Description | +|-------|------|-------------| +| `orderedItems` | Array | List of ordered items | +| `item.id` | Number | Product ID from catalog | +| `item.price` | Number | Unit price | +| `item.name` | String | Product name | +| `item.sideItems` | Array | Additional items | +| `item.quantity` | Number | Order quantity | +| `item.notes` | String | Special instructions | +| `userId` | String | Operator identifier | +| `accountIdentifier` | String | Table/customer identifier | +| `deliveryTypeId` | Number | Delivery method | + +## Customization + +### Custom Response Format + +Modify the system prompt for different output structures: + +```basic +BEGIN SYSTEM PROMPT +Return responses as JSON with this structure: +{ + "intent": "order|question|complaint", + "entities": [...extracted entities...], + "response": "...", + "confidence": 0.0-1.0 +} +END SYSTEM PROMPT +``` + +### Adding Validation + +```basic +' Validate order before returning +order = LLM_RESPONSE + +IF NOT order.orderedItems THEN + RETURN {"error": "No items in order", "suggestion": "Please specify products"} +END IF + +FOR EACH item IN order.orderedItems + product = FIND "products.csv", "id = " + item.item.id + IF NOT product THEN + RETURN {"error": "Invalid product ID: " + item.item.id} + END IF +NEXT + +RETURN order +``` + +### Multi-Language Support + +```basic +PARAM language AS STRING LIKE "en" DESCRIPTION "Response language" + +BEGIN SYSTEM PROMPT +Respond in ${language} language. +Available products: ${TOYAML(products)} +Return JSON format only. +END SYSTEM PROMPT +``` + +## Error Handling + +### Common Error Responses + +```json +{ + "error": "session_expired", + "message": "Please start a new session", + "code": 401 +} +``` + +```json +{ + "error": "invalid_request", + "message": "Missing required parameter: text", + "code": 400 +} +``` + +```json +{ + "error": "product_not_found", + "message": "Product 'pizza' is not in our catalog", + "code": 404 +} +``` + +## Best Practices + +1. **Keep prompts focused** - Single-purpose system prompts work better +2. **Validate responses** - Always validate LLM output before returning +3. **Handle edge cases** - Plan for invalid products, empty orders +4. **Monitor usage** - Track API calls and response times +5. **Rate limiting** - Implement rate limits for production +6. **Secure endpoints** - Use authentication for production APIs +7. **Log requests** - Maintain audit logs for debugging + +## Deployment + +### Environment Variables + +```bash +LLM_PROVIDER=openai +LLM_API_KEY=sk-... +LLM_MODEL=gpt-4 +API_RATE_LIMIT=100 +SESSION_TIMEOUT=3600 +``` + +### Docker Deployment + +```dockerfile +FROM generalbots/server:latest +COPY llm-server.gbai /app/packages/ +ENV API_MODE=true +EXPOSE 4242 +CMD ["npm", "start"] +``` + +## Troubleshooting + +| Issue | Cause | Solution | +|-------|-------|----------| +| Empty responses | System prompt too restrictive | Adjust prompt guidelines | +| Invalid JSON | LLM hallucination | Add JSON validation examples | +| Session expired | Timeout reached | Implement session refresh | +| Wrong products | Catalog not loaded | Verify products.csv path | +| Slow responses | Large catalog | Optimize product filtering | + +## Related Templates + +- `llm-tools.gbai` - LLM with tool/function calling +- `store.gbai` - Full e-commerce with order processing +- `api-client.gbai` - API integration examples + +## Use Cases + +- **Restaurant Ordering** - Process food orders via API +- **Retail POS Integration** - AI-powered point of sale +- **Chatbot Backend** - Headless chatbot for web/mobile apps +- **Voice Assistant Backend** - Process voice-to-text commands +- **Order Automation** - Automate order entry from various sources + +## License + +AGPL-3.0 - Part of General Bots Open Source Platform. + +--- + +**Pragmatismo** - General Bots \ No newline at end of file