From b99530a811775dc9b55d93f5f92d08b7c02e54ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yuniel=20Acosta=20P=C3=A9rez?= <33158051+yacosta738@users.noreply.github.com> Date: Mon, 20 Apr 2026 10:28:29 +0200 Subject: [PATCH 1/3] feat(rook): add SQLite persistence for ProviderAccount, ProviderPool, ModelRoute, and RoutingPolicy Close #583 --- clients/rook/Cargo.lock | 1273 ++++++++++++++++++++-- clients/rook/Cargo.toml | 2 +- clients/rook/migrations/0001_initial.sql | 44 + clients/rook/src/db/account.rs | 278 +++++ clients/rook/src/db/mod.rs | 79 ++ clients/rook/src/db/pool.rs | 352 ++++++ clients/rook/src/db/route.rs | 310 ++++++ clients/rook/src/lib.rs | 3 + clients/rook/src/services/account.rs | 21 +- clients/rook/src/services/health.rs | 86 +- clients/rook/src/services/pool.rs | 22 +- clients/rook/src/services/route.rs | 42 +- 12 files changed, 2355 insertions(+), 157 deletions(-) create mode 100644 clients/rook/migrations/0001_initial.sql create mode 100644 clients/rook/src/db/account.rs create mode 100644 clients/rook/src/db/mod.rs create mode 100644 clients/rook/src/db/pool.rs create mode 100644 clients/rook/src/db/route.rs diff --git a/clients/rook/Cargo.lock b/clients/rook/Cargo.lock index 3ccf26242..224b5287e 100644 --- a/clients/rook/Cargo.lock +++ b/clients/rook/Cargo.lock @@ -11,6 +11,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -56,7 +62,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -67,7 +73,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -87,6 +93,15 @@ dependencies = [ "syn", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -155,11 +170,29 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" + [[package]] name = "bitflags" version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +dependencies = [ + "serde_core", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] [[package]] name = "bumpalo" @@ -167,6 +200,12 @@ version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "bytes" version = "1.11.1" @@ -247,6 +286,21 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" +[[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 = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -268,6 +322,78 @@ dependencies = [ "tracing", ] +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[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 = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[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 = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -279,6 +405,21 @@ dependencies = [ "syn", ] +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +dependencies = [ + "serde", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -286,16 +427,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] -name = "fallible-iterator" -version = "0.3.0" +name = "errno" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] [[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" +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 = "event-listener" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] [[package]] name = "find-msvc-tools" @@ -304,16 +465,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] -name = "foldhash" -version = "0.1.5" +name = "flume" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] [[package]] name = "foldhash" -version = "0.2.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" @@ -331,6 +497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -339,6 +506,40 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +[[package]] +name = "futures-executor" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" +dependencies = [ + "futures-core", + "futures-task", + "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.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" + +[[package]] +name = "futures-sink" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" + [[package]] name = "futures-task" version = "0.3.32" @@ -352,11 +553,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", + "futures-io", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "slab", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + [[package]] name = "getrandom" version = "0.4.2" @@ -376,16 +601,9 @@ version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "foldhash 0.1.5", -] - -[[package]] -name = "hashbrown" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" -dependencies = [ - "foldhash 0.2.0", + "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -396,11 +614,11 @@ checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" [[package]] name = "hashlink" -version = "0.11.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0b22561a9c04a7cb1a302c013e0259cd3b4bb619f145b32f72b8b4bcbed230" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.16.1", + "hashbrown 0.15.5", ] [[package]] @@ -409,6 +627,39 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hex" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +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 = "http" version = "1.4.0" @@ -442,6 +693,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" + [[package]] name = "httparse" version = "1.10.1" @@ -688,6 +945,9 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] [[package]] name = "leb128fmt" @@ -701,11 +961,29 @@ version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +[[package]] +name = "libm" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" + +[[package]] +name = "libredox" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +dependencies = [ + "bitflags", + "libc", + "plain", + "redox_syscall 0.7.4", +] + [[package]] name = "libsqlite3-sys" -version = "0.36.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4103cffefa72eb8428cb6b47d6627161e51c2739fc5e3b734584157bc642a" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -718,6 +996,15 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + [[package]] name = "log" version = "0.4.29" @@ -739,6 +1026,16 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "memchr" version = "2.8.0" @@ -751,6 +1048,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "mio" version = "1.2.0" @@ -759,7 +1066,7 @@ checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -768,7 +1075,43 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys", + "windows-sys 0.61.2", +] + +[[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", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +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]] @@ -778,6 +1121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -792,6 +1136,44 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.18", + "smallvec", + "windows-link", +] + +[[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" @@ -805,22 +1187,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] -name = "pkg-config" -version = "0.3.33" +name = "pkcs1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] [[package]] -name = "potential_utf" -version = "0.1.5" +name = "pkcs8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "zerovec", + "der", + "spki", ] [[package]] -name = "prettyplease" +name = "pkg-config" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "potential_utf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +dependencies = [ + "zerovec", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" @@ -853,6 +1271,54 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "rand" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", +] + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a" +dependencies = [ + "bitflags", +] + [[package]] name = "regex-automata" version = "0.4.14" @@ -902,6 +1368,20 @@ dependencies = [ "web-sys", ] +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.17", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "rook" version = "0.1.0" @@ -911,39 +1391,107 @@ dependencies = [ "chrono", "clap", "corvus-traits", - "rusqlite", + "http", + "mime_guess", + "rust-embed", "serde", "serde_json", + "sqlx", "thiserror", "tokio", + "tower-http", "tracing", "tracing-subscriber", "uuid", ] [[package]] -name = "rsqlite-vfs" -version = "0.1.0" +name = "rsa" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a1f2315036ef6b1fbacd1972e8ee7688030b0a2121edfc2a6550febd41574d" +checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ - "hashbrown 0.16.1", - "thiserror", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", ] [[package]] -name = "rusqlite" -version = "0.38.0" +name = "rust-embed" +version = "8.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c93dd1c9683b438c392c492109cb702b8090b2bfc8fed6f6e4eb4523f17af3" +checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27" dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", - "sqlite-wasm-rs", + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1" +dependencies = [ + "mime_guess", + "sha2", + "walkdir", +] + +[[package]] +name = "rustls" +version = "0.23.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +dependencies = [ + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -958,6 +1506,21 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "semver" version = "1.0.28" @@ -1030,6 +1593,28 @@ dependencies = [ "serde", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -1045,6 +1630,26 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + [[package]] name = "slab" version = "0.4.12" @@ -1056,6 +1661,9 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -1064,19 +1672,213 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] -name = "sqlite-wasm-rs" -version = "0.5.3" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2c760607300407ddeaee518acf28c795661b7108c75421303dbefb237d3a36" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "cc", - "js-sys", - "rsqlite-vfs", - "wasm-bindgen", + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[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", + "bytes", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.15.5", + "hashlink", + "indexmap", + "log", + "memchr", + "once_cell", + "percent-encoding", + "rustls", + "serde", + "serde_json", + "sha2", + "smallvec", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots 0.26.11", +] + +[[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", +] + +[[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", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-sqlite", + "syn", + "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", + "bitflags", + "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", + "rsa", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "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", + "bitflags", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "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", + "tracing", + "url", ] [[package]] @@ -1085,12 +1887,29 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "syn" version = "2.0.117" @@ -1161,6 +1980,21 @@ dependencies = [ "zerovec", ] +[[package]] +name = "tinyvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokio" version = "1.52.1" @@ -1171,9 +2005,10 @@ dependencies = [ "libc", "mio", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -1187,6 +2022,30 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-stream" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "tower" version = "0.5.3" @@ -1210,14 +2069,24 @@ checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", + "futures-core", "futures-util", "http", "http-body", + "http-body-util", + "http-range-header", + "httpdate", "iri-string", + "mime", + "mime_guess", + "percent-encoding", "pin-project-lite", + "tokio", + "tokio-util", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -1238,10 +2107,23 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ + "log", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tracing-core" version = "0.1.36" @@ -1273,18 +2155,57 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "typenum" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" + +[[package]] +name = "unicase" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" + +[[package]] +name = "unicode-bidi" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" + [[package]] name = "unicode-ident" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +[[package]] +name = "unicode-normalization" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" + [[package]] name = "unicode-xid" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.5.8" @@ -1315,7 +2236,7 @@ version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" dependencies = [ - "getrandom", + "getrandom 0.4.2", "js-sys", "serde_core", "wasm-bindgen", @@ -1327,6 +2248,22 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -1360,6 +2297,12 @@ dependencies = [ "wit-bindgen 0.51.0", ] +[[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.118" @@ -1459,6 +2402,43 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.7", +] + +[[package]] +name = "webpki-roots" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "whoami" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +dependencies = [ + "libredox", + "wasite", +] + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "windows-core" version = "0.62.2" @@ -1518,6 +2498,24 @@ dependencies = [ "windows-link", ] +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -1527,6 +2525,127 @@ dependencies = [ "windows-link", ] +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "wit-bindgen" version = "0.51.0" @@ -1650,6 +2769,26 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zerocopy" +version = "0.8.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zerofrom" version = "0.1.7" @@ -1671,6 +2810,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + [[package]] name = "zerotrie" version = "0.2.4" diff --git a/clients/rook/Cargo.toml b/clients/rook/Cargo.toml index e0d021d33..9d13fa776 100644 --- a/clients/rook/Cargo.toml +++ b/clients/rook/Cargo.toml @@ -41,7 +41,7 @@ tracing-subscriber = { version = "0.3", default-features = false, features = ["f uuid = { version = "1.23", default-features = false, features = ["v4", "std", "serde"] } # Persistence -rusqlite = { version = "0.38", features = ["bundled"] } +sqlx = { version = "0.8", default-features = false, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } # Time chrono = { version = "0.4", default-features = false, features = ["clock", "std", "serde"] } diff --git a/clients/rook/migrations/0001_initial.sql b/clients/rook/migrations/0001_initial.sql new file mode 100644 index 000000000..1c9c25e4f --- /dev/null +++ b/clients/rook/migrations/0001_initial.sql @@ -0,0 +1,44 @@ +-- Initial schema for Rook domain entities. +-- provider_accounts maps to ProviderAccount (display_name = name column). + +CREATE TABLE IF NOT EXISTS provider_accounts ( + id TEXT PRIMARY KEY, + display_name TEXT NOT NULL, + vendor TEXT NOT NULL, -- serialized ProviderVendor (snake_case JSON string) + api_base TEXT, -- api_base_override + enabled INTEGER NOT NULL DEFAULT 1, + weight INTEGER NOT NULL DEFAULT 100, + priority INTEGER NOT NULL DEFAULT 0, + tags TEXT NOT NULL DEFAULT '[]', -- JSON array of strings + capabilities TEXT NOT NULL DEFAULT '[]', -- JSON array of strings + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL +); + +CREATE TABLE IF NOT EXISTS provider_pools ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + strategy TEXT NOT NULL, -- serialized SelectionStrategy (snake_case JSON string) + fallback_pool_id TEXT, + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL +); + +CREATE TABLE IF NOT EXISTS pool_members ( + pool_id TEXT NOT NULL, + account_id TEXT NOT NULL, + PRIMARY KEY (pool_id, account_id), + FOREIGN KEY (pool_id) REFERENCES provider_pools(id) ON DELETE CASCADE, + FOREIGN KEY (account_id) REFERENCES provider_accounts(id) ON DELETE CASCADE +); + +CREATE TABLE IF NOT EXISTS model_routes ( + id TEXT PRIMARY KEY, + logical_model TEXT NOT NULL UNIQUE, + target_pool_id TEXT NOT NULL, + fallback_route_id TEXT, + policy TEXT NOT NULL DEFAULT '{}', -- JSON-serialized RoutingPolicy + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL, + FOREIGN KEY (target_pool_id) REFERENCES provider_pools(id) +); diff --git a/clients/rook/src/db/account.rs b/clients/rook/src/db/account.rs new file mode 100644 index 000000000..c0351abc3 --- /dev/null +++ b/clients/rook/src/db/account.rs @@ -0,0 +1,278 @@ +//! CRUD operations for [`ProviderAccount`] backed by the `provider_accounts` +//! table. + +use crate::db::SqliteDb; +use crate::domain::{AccountId, ProviderAccount, ProviderVendor, RookError}; +use chrono::Utc; +use sqlx::Row; +use uuid::Uuid; + +// ── Row mapping ─────────────────────────────────────────────────────────────── + +fn row_to_account(row: &sqlx::sqlite::SqliteRow) -> Result { + let id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing id: {e}")))?; + let id = AccountId::new( + Uuid::parse_str(&id_str) + .map_err(|e| RookError::Registry(format!("invalid account UUID: {e}")))?, + ); + + let vendor_str: String = row + .try_get("vendor") + .map_err(|e| RookError::Registry(format!("missing vendor: {e}")))?; + let vendor: ProviderVendor = + serde_json::from_str(&format!("\"{vendor_str}\"")) + .map_err(|e| RookError::Registry(format!("invalid vendor '{vendor_str}': {e}")))?; + + let display_name: String = row + .try_get("display_name") + .map_err(|e| RookError::Registry(format!("missing display_name: {e}")))?; + let api_base: Option = row + .try_get("api_base") + .map_err(|e| RookError::Registry(format!("missing api_base: {e}")))?; + let enabled: i64 = row + .try_get("enabled") + .map_err(|e| RookError::Registry(format!("missing enabled: {e}")))?; + let weight: i64 = row + .try_get("weight") + .map_err(|e| RookError::Registry(format!("missing weight: {e}")))?; + let priority: i64 = row + .try_get("priority") + .map_err(|e| RookError::Registry(format!("missing priority: {e}")))?; + + let tags_str: String = row + .try_get("tags") + .map_err(|e| RookError::Registry(format!("missing tags: {e}")))?; + let tags: Vec = serde_json::from_str(&tags_str) + .map_err(|e| RookError::Registry(format!("invalid tags JSON: {e}")))?; + + let caps_str: String = row + .try_get("capabilities") + .map_err(|e| RookError::Registry(format!("missing capabilities: {e}")))?; + let capabilities: Vec = serde_json::from_str(&caps_str) + .map_err(|e| RookError::Registry(format!("invalid capabilities JSON: {e}")))?; + + Ok(ProviderAccount { + id, + display_name, + vendor, + api_base_override: api_base, + enabled: enabled != 0, + weight: weight as u32, + priority: priority as u32, + tags, + capabilities, + }) +} + +// ── CRUD impl ───────────────────────────────────────────────────────────────── + +impl SqliteDb { + /// Persist a new [`ProviderAccount`]. + /// + /// Returns [`RookError::Registry`] if the ID already exists. + pub async fn insert_account(&self, account: &ProviderAccount) -> Result<(), RookError> { + let id = account.id.to_string(); + // Serialize vendor to its canonical string (strip surrounding quotes). + let vendor_json = serde_json::to_string(&account.vendor) + .map_err(|e| RookError::Registry(format!("failed to serialize vendor: {e}")))?; + // vendor_json is `"open_ai"` — strip the outer quotes for storage. + let vendor_str = vendor_json.trim_matches('"').to_string(); + + let tags = serde_json::to_string(&account.tags) + .map_err(|e| RookError::Registry(format!("failed to serialize tags: {e}")))?; + let capabilities = serde_json::to_string(&account.capabilities) + .map_err(|e| RookError::Registry(format!("failed to serialize capabilities: {e}")))?; + + let now = Utc::now().to_rfc3339(); + let enabled: i64 = if account.enabled { 1 } else { 0 }; + let weight = account.weight as i64; + let priority = account.priority as i64; + + sqlx::query( + "INSERT INTO provider_accounts \ + (id, display_name, vendor, api_base, enabled, weight, priority, \ + tags, capabilities, created_at, updated_at) \ + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + ) + .bind(&id) + .bind(&account.display_name) + .bind(&vendor_str) + .bind(&account.api_base_override) + .bind(enabled) + .bind(weight) + .bind(priority) + .bind(&tags) + .bind(&capabilities) + .bind(&now) + .bind(&now) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("insert_account failed: {e}")))?; + + Ok(()) + } + + /// Fetch a single [`ProviderAccount`] by its ID. + /// + /// Returns `None` if no row matches. + pub async fn get_account(&self, id: &AccountId) -> Result, RookError> { + let id_str = id.to_string(); + let row = sqlx::query( + "SELECT id, display_name, vendor, api_base, enabled, weight, priority, \ + tags, capabilities, created_at, updated_at \ + FROM provider_accounts WHERE id = ?", + ) + .bind(&id_str) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("get_account failed: {e}")))?; + + row.map(|r| row_to_account(&r)).transpose() + } + + /// Return all [`ProviderAccount`]s ordered by priority then display name. + pub async fn list_accounts(&self) -> Result, RookError> { + let rows = sqlx::query( + "SELECT id, display_name, vendor, api_base, enabled, weight, priority, \ + tags, capabilities, created_at, updated_at \ + FROM provider_accounts ORDER BY priority ASC, display_name ASC", + ) + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("list_accounts failed: {e}")))?; + + rows.iter().map(row_to_account).collect() + } + + /// Delete a [`ProviderAccount`] by ID. + /// + /// Returns `true` if a row was deleted, `false` if the ID was not found. + pub async fn delete_account(&self, id: &AccountId) -> Result { + let id_str = id.to_string(); + let result = sqlx::query("DELETE FROM provider_accounts WHERE id = ?") + .bind(&id_str) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("delete_account failed: {e}")))?; + + Ok(result.rows_affected() > 0) + } +} + +// ── Tests ───────────────────────────────────────────────────────────────────── + +#[cfg(test)] +mod tests { + use super::*; + + fn make_account() -> ProviderAccount { + ProviderAccount { + id: AccountId::generate(), + display_name: "Test OpenAI".to_string(), + vendor: ProviderVendor::OpenAi, + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec!["prod".to_string()], + capabilities: vec!["chat".to_string()], + } + } + + #[tokio::test] + async fn insert_and_get_account_round_trips() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let account = make_account(); + + db.insert_account(&account).await.unwrap(); + + let fetched = db.get_account(&account.id).await.unwrap().unwrap(); + assert_eq!(fetched.id, account.id); + assert_eq!(fetched.display_name, account.display_name); + assert_eq!(fetched.vendor, account.vendor); + assert_eq!(fetched.enabled, account.enabled); + assert_eq!(fetched.weight, account.weight); + assert_eq!(fetched.priority, account.priority); + assert_eq!(fetched.tags, account.tags); + assert_eq!(fetched.capabilities, account.capabilities); + } + + #[tokio::test] + async fn get_account_returns_none_for_missing_id() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let missing = AccountId::generate(); + let result = db.get_account(&missing).await.unwrap(); + assert!(result.is_none()); + } + + #[tokio::test] + async fn list_accounts_returns_all_inserted() { + let db = SqliteDb::open_in_memory().await.unwrap(); + + let a1 = make_account(); + let a2 = ProviderAccount { + id: AccountId::generate(), + display_name: "Anthropic Acc".to_string(), + vendor: ProviderVendor::Anthropic, + api_base_override: Some("https://proxy.example.com".to_string()), + enabled: false, + weight: 50, + priority: 1, + tags: vec![], + capabilities: vec!["vision".to_string()], + }; + + db.insert_account(&a1).await.unwrap(); + db.insert_account(&a2).await.unwrap(); + + let list = db.list_accounts().await.unwrap(); + assert_eq!(list.len(), 2); + // Both IDs must appear (order may vary). + let ids: Vec<_> = list.iter().map(|a| a.id).collect(); + assert!(ids.contains(&a1.id)); + assert!(ids.contains(&a2.id)); + } + + #[tokio::test] + async fn delete_account_returns_true_when_found() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let account = make_account(); + db.insert_account(&account).await.unwrap(); + + let deleted = db.delete_account(&account.id).await.unwrap(); + assert!(deleted); + + // Gone from DB. + let fetched = db.get_account(&account.id).await.unwrap(); + assert!(fetched.is_none()); + } + + #[tokio::test] + async fn delete_account_returns_false_when_not_found() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let missing = AccountId::generate(); + let deleted = db.delete_account(&missing).await.unwrap(); + assert!(!deleted); + } + + #[tokio::test] + async fn vendor_other_round_trips_through_db() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let account = ProviderAccount { + id: AccountId::generate(), + display_name: "Mistral".to_string(), + vendor: ProviderVendor::Other("mistral".to_string()), + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec![], + capabilities: vec![], + }; + db.insert_account(&account).await.unwrap(); + let fetched = db.get_account(&account.id).await.unwrap().unwrap(); + assert_eq!(fetched.vendor, ProviderVendor::Other("mistral".to_string())); + } +} diff --git a/clients/rook/src/db/mod.rs b/clients/rook/src/db/mod.rs new file mode 100644 index 000000000..7e15dcc2d --- /dev/null +++ b/clients/rook/src/db/mod.rs @@ -0,0 +1,79 @@ +//! SQLite persistence layer for Rook domain entities. +//! +//! [`SqliteDb`] owns a connection pool and exposes typed CRUD helpers for +//! [`ProviderAccount`], [`ProviderPool`], and [`ModelRoute`]. +//! +//! Sub-modules are split by domain entity to keep file sizes manageable. + +pub mod account; +pub mod pool; +pub mod route; + +use crate::domain::RookError; +use sqlx::SqlitePool; + +/// Migration SQL embedded at compile time so the binary is self-contained. +const MIGRATION_SQL: &str = include_str!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/migrations/0001_initial.sql" +)); + +/// A handle to the Rook SQLite database. +/// +/// Cheap to clone — cloning shares the underlying connection pool. +#[derive(Clone, Debug)] +pub struct SqliteDb { + pool: SqlitePool, +} + +impl SqliteDb { + /// Open (or create) a SQLite database at `path` and apply the schema. + /// + /// `path` should be an absolute file path or a path understood by SQLite + /// (e.g., `"./rook.db"`). + pub async fn open(path: &str) -> Result { + let url = format!("sqlite:{path}?mode=rwc"); + let pool = SqlitePool::connect(&url) + .await + .map_err(|e| { + RookError::Registry(format!("failed to open database at {path}: {e}")) + })?; + + Self::run_migrations(&pool).await?; + Ok(Self { pool }) + } + + /// Open an in-memory SQLite database and apply the schema. + /// + /// Intended for tests only. Each call produces an isolated database. + pub async fn open_in_memory() -> Result { + // max_connections(1) ensures a single connection so the in-memory + // database is not dropped between pool checkouts. + let pool = sqlx::pool::PoolOptions::::new() + .max_connections(1) + .connect("sqlite::memory:") + .await + .map_err(|e| { + RookError::Registry(format!("failed to open in-memory database: {e}")) + })?; + + Self::run_migrations(&pool).await?; + Ok(Self { pool }) + } + + /// Borrow the underlying [`SqlitePool`]. + pub fn pool(&self) -> &SqlitePool { + &self.pool + } + + // ── Private helpers ─────────────────────────────────────────────────────── + + /// Execute the embedded migration SQL against `pool`. + async fn run_migrations(pool: &SqlitePool) -> Result<(), RookError> { + sqlx::raw_sql(MIGRATION_SQL) + .execute(pool) + .await + .map_err(|e| RookError::Registry(format!("migration failed: {e}")))?; + Ok(()) + } +} diff --git a/clients/rook/src/db/pool.rs b/clients/rook/src/db/pool.rs new file mode 100644 index 000000000..c8efb6486 --- /dev/null +++ b/clients/rook/src/db/pool.rs @@ -0,0 +1,352 @@ +//! CRUD operations for [`ProviderPool`] and its members backed by +//! `provider_pools` and `pool_members` tables. + +use crate::db::SqliteDb; +use crate::domain::{AccountId, PoolId, ProviderPool, RookError, SelectionStrategy}; +use chrono::Utc; +use sqlx::Row; +use uuid::Uuid; + +// ── Row mapping ─────────────────────────────────────────────────────────────── + +fn row_to_pool( + row: &sqlx::sqlite::SqliteRow, + members: Vec, +) -> Result { + let id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing pool id: {e}")))?; + let id = PoolId::new( + Uuid::parse_str(&id_str) + .map_err(|e| RookError::Registry(format!("invalid pool UUID: {e}")))?, + ); + + let name: String = row + .try_get("name") + .map_err(|e| RookError::Registry(format!("missing pool name: {e}")))?; + + let strategy_str: String = row + .try_get("strategy") + .map_err(|e| RookError::Registry(format!("missing strategy: {e}")))?; + let strategy: SelectionStrategy = + serde_json::from_str(&format!("\"{strategy_str}\"")) + .map_err(|e| { + RookError::Registry(format!("invalid strategy '{strategy_str}': {e}")) + })?; + + let fallback_str: Option = row + .try_get("fallback_pool_id") + .map_err(|e| RookError::Registry(format!("missing fallback_pool_id: {e}")))?; + let fallback_pool_id = fallback_str + .map(|s| { + Uuid::parse_str(&s) + .map(PoolId::new) + .map_err(|e| { + RookError::Registry(format!("invalid fallback_pool_id UUID: {e}")) + }) + }) + .transpose()?; + + Ok(ProviderPool { + id, + name, + strategy, + members, + fallback_pool_id, + }) +} + +// ── CRUD impl ───────────────────────────────────────────────────────────────── + +impl SqliteDb { + /// Persist a new [`ProviderPool`]. + /// + /// Members in `pool.members` are inserted into `pool_members`. + pub async fn insert_pool(&self, pool: &ProviderPool) -> Result<(), RookError> { + let id = pool.id.to_string(); + let strategy_json = serde_json::to_string(&pool.strategy) + .map_err(|e| RookError::Registry(format!("failed to serialize strategy: {e}")))?; + let strategy_str = strategy_json.trim_matches('"').to_string(); + let fallback = pool.fallback_pool_id.as_ref().map(|p| p.to_string()); + let now = Utc::now().to_rfc3339(); + + sqlx::query( + "INSERT INTO provider_pools \ + (id, name, strategy, fallback_pool_id, created_at, updated_at) \ + VALUES (?, ?, ?, ?, ?, ?)", + ) + .bind(&id) + .bind(&pool.name) + .bind(&strategy_str) + .bind(&fallback) + .bind(&now) + .bind(&now) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("insert_pool failed: {e}")))?; + + for account_id in &pool.members { + self.add_pool_member(&pool.id, account_id).await?; + } + + Ok(()) + } + + /// Fetch a single [`ProviderPool`] by ID, including its members. + pub async fn get_pool(&self, id: &PoolId) -> Result, RookError> { + let id_str = id.to_string(); + let row = sqlx::query( + "SELECT id, name, strategy, fallback_pool_id, created_at, updated_at \ + FROM provider_pools WHERE id = ?", + ) + .bind(&id_str) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("get_pool failed: {e}")))?; + + match row { + None => Ok(None), + Some(row) => { + let members = self.get_pool_members(id).await?; + row_to_pool(&row, members).map(Some) + } + } + } + + /// Return all [`ProviderPool`]s with their members. + pub async fn list_pools(&self) -> Result, RookError> { + let rows = sqlx::query( + "SELECT id, name, strategy, fallback_pool_id, created_at, updated_at \ + FROM provider_pools ORDER BY name ASC", + ) + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("list_pools failed: {e}")))?; + + let mut pools = Vec::with_capacity(rows.len()); + for row in &rows { + let pool_id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing pool id: {e}")))?; + let pool_id = PoolId::new( + Uuid::parse_str(&pool_id_str) + .map_err(|e| RookError::Registry(format!("invalid pool UUID: {e}")))?, + ); + let members = self.get_pool_members(&pool_id).await?; + pools.push(row_to_pool(row, members)?); + } + + Ok(pools) + } + + /// Add `account_id` to `pool_id`'s member list. + /// + /// No-op if the membership already exists (INSERT OR IGNORE). + pub async fn add_pool_member( + &self, + pool_id: &PoolId, + account_id: &AccountId, + ) -> Result<(), RookError> { + let pool_str = pool_id.to_string(); + let acct_str = account_id.to_string(); + + sqlx::query( + "INSERT OR IGNORE INTO pool_members (pool_id, account_id) VALUES (?, ?)", + ) + .bind(&pool_str) + .bind(&acct_str) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("add_pool_member failed: {e}")))?; + + Ok(()) + } + + /// Remove `account_id` from `pool_id`'s member list. + pub async fn remove_pool_member( + &self, + pool_id: &PoolId, + account_id: &AccountId, + ) -> Result<(), RookError> { + let pool_str = pool_id.to_string(); + let acct_str = account_id.to_string(); + + sqlx::query( + "DELETE FROM pool_members WHERE pool_id = ? AND account_id = ?", + ) + .bind(&pool_str) + .bind(&acct_str) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("remove_pool_member failed: {e}")))?; + + Ok(()) + } + + /// Return all [`AccountId`]s that are members of `pool_id`. + pub async fn get_pool_members(&self, pool_id: &PoolId) -> Result, RookError> { + let pool_str = pool_id.to_string(); + let rows = sqlx::query( + "SELECT account_id FROM pool_members \ + WHERE pool_id = ? ORDER BY account_id ASC", + ) + .bind(&pool_str) + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("get_pool_members failed: {e}")))?; + + rows.iter() + .map(|row| { + let s: String = row + .try_get("account_id") + .map_err(|e| RookError::Registry(format!("missing account_id: {e}")))?; + Uuid::parse_str(&s) + .map(AccountId::new) + .map_err(|e| RookError::Registry(format!("invalid member UUID: {e}"))) + }) + .collect() + } +} + +// ── Tests ───────────────────────────────────────────────────────────────────── + +#[cfg(test)] +mod tests { + use super::*; + use crate::domain::{ProviderAccount, ProviderVendor}; + + async fn make_db_with_accounts() -> (SqliteDb, AccountId, AccountId) { + let db = SqliteDb::open_in_memory().await.unwrap(); + + let a1 = ProviderAccount { + id: AccountId::generate(), + display_name: "Acct A".to_string(), + vendor: ProviderVendor::OpenAi, + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec![], + capabilities: vec![], + }; + let a2 = ProviderAccount { + id: AccountId::generate(), + display_name: "Acct B".to_string(), + vendor: ProviderVendor::Anthropic, + api_base_override: None, + enabled: true, + weight: 50, + priority: 1, + tags: vec![], + capabilities: vec![], + }; + + db.insert_account(&a1).await.unwrap(); + db.insert_account(&a2).await.unwrap(); + + (db, a1.id, a2.id) + } + + fn make_pool(members: Vec) -> ProviderPool { + ProviderPool { + id: PoolId::generate(), + name: "Test Pool".to_string(), + strategy: SelectionStrategy::RoundRobin, + members, + fallback_pool_id: None, + } + } + + #[tokio::test] + async fn insert_and_get_pool_round_trips() { + let (db, a1, a2) = make_db_with_accounts().await; + let pool = make_pool(vec![a1, a2]); + + db.insert_pool(&pool).await.unwrap(); + + let fetched = db.get_pool(&pool.id).await.unwrap().unwrap(); + assert_eq!(fetched.id, pool.id); + assert_eq!(fetched.name, pool.name); + assert_eq!(fetched.strategy, pool.strategy); + assert_eq!(fetched.fallback_pool_id, pool.fallback_pool_id); + + let mut fetched_members = fetched.members.clone(); + let mut expected_members = pool.members.clone(); + fetched_members.sort_by_key(|id| id.to_string()); + expected_members.sort_by_key(|id| id.to_string()); + assert_eq!(fetched_members, expected_members); + } + + #[tokio::test] + async fn get_pool_returns_none_for_missing_id() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let missing = PoolId::generate(); + assert!(db.get_pool(&missing).await.unwrap().is_none()); + } + + #[tokio::test] + async fn add_pool_member_and_get_members() { + let (db, a1, a2) = make_db_with_accounts().await; + let pool = make_pool(vec![]); + db.insert_pool(&pool).await.unwrap(); + + db.add_pool_member(&pool.id, &a1).await.unwrap(); + db.add_pool_member(&pool.id, &a2).await.unwrap(); + + let members = db.get_pool_members(&pool.id).await.unwrap(); + assert_eq!(members.len(), 2); + assert!(members.contains(&a1)); + assert!(members.contains(&a2)); + } + + #[tokio::test] + async fn remove_pool_member_removes_correctly() { + let (db, a1, a2) = make_db_with_accounts().await; + let pool = make_pool(vec![a1, a2]); + db.insert_pool(&pool).await.unwrap(); + + db.remove_pool_member(&pool.id, &a1).await.unwrap(); + + let members = db.get_pool_members(&pool.id).await.unwrap(); + assert_eq!(members.len(), 1); + assert!(members.contains(&a2)); + assert!(!members.contains(&a1)); + } + + #[tokio::test] + async fn list_pools_returns_all_inserted() { + let (db, a1, _a2) = make_db_with_accounts().await; + + let p1 = make_pool(vec![a1]); + let p2 = ProviderPool { + id: PoolId::generate(), + name: "Another Pool".to_string(), + strategy: SelectionStrategy::Priority, + members: vec![], + fallback_pool_id: None, + }; + + db.insert_pool(&p1).await.unwrap(); + db.insert_pool(&p2).await.unwrap(); + + let pools = db.list_pools().await.unwrap(); + assert_eq!(pools.len(), 2); + + let ids: Vec<_> = pools.iter().map(|p| p.id).collect(); + assert!(ids.contains(&p1.id)); + assert!(ids.contains(&p2.id)); + } + + #[tokio::test] + async fn add_pool_member_is_idempotent() { + let (db, a1, _a2) = make_db_with_accounts().await; + let pool = make_pool(vec![]); + db.insert_pool(&pool).await.unwrap(); + + db.add_pool_member(&pool.id, &a1).await.unwrap(); + db.add_pool_member(&pool.id, &a1).await.unwrap(); // should not error + + let members = db.get_pool_members(&pool.id).await.unwrap(); + assert_eq!(members.len(), 1); + } +} diff --git a/clients/rook/src/db/route.rs b/clients/rook/src/db/route.rs new file mode 100644 index 000000000..3bc372bcf --- /dev/null +++ b/clients/rook/src/db/route.rs @@ -0,0 +1,310 @@ +//! CRUD operations for [`ModelRoute`] backed by the `model_routes` table. + +use crate::db::SqliteDb; +use crate::domain::{ModelRoute, PoolId, RouteId, RookError}; +use chrono::Utc; +use sqlx::Row; +use uuid::Uuid; + +// ── Row mapping ─────────────────────────────────────────────────────────────── + +/// Minimal JSON structure stored in the `policy` column. +/// +/// The PRD notes that full [`RoutingPolicy`](crate::domain::RoutingPolicy) +/// wiring is a future concern. For now we persist only `capability_constraints` +/// so it survives a round-trip through the DB without loss. +#[derive(serde::Serialize, serde::Deserialize, Default)] +struct StoredPolicy { + #[serde(default)] + capability_constraints: Vec, +} + +fn row_to_route(row: &sqlx::sqlite::SqliteRow) -> Result { + let id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing route id: {e}")))?; + let id = RouteId::new( + Uuid::parse_str(&id_str) + .map_err(|e| RookError::Registry(format!("invalid route UUID: {e}")))?, + ); + + let logical_model: String = row + .try_get("logical_model") + .map_err(|e| RookError::Registry(format!("missing logical_model: {e}")))?; + + let target_str: String = row + .try_get("target_pool_id") + .map_err(|e| RookError::Registry(format!("missing target_pool_id: {e}")))?; + let target_pool_id = PoolId::new( + Uuid::parse_str(&target_str) + .map_err(|e| { + RookError::Registry(format!("invalid target_pool_id UUID: {e}")) + })?, + ); + + let fallback_str: Option = row + .try_get("fallback_route_id") + .map_err(|e| RookError::Registry(format!("missing fallback_route_id: {e}")))?; + let fallback_route_id = fallback_str + .map(|s| { + Uuid::parse_str(&s) + .map(RouteId::new) + .map_err(|e| { + RookError::Registry(format!("invalid fallback_route_id UUID: {e}")) + }) + }) + .transpose()?; + + let policy_json: String = row + .try_get("policy") + .map_err(|e| RookError::Registry(format!("missing policy: {e}")))?; + let policy: StoredPolicy = serde_json::from_str(&policy_json).unwrap_or_default(); + + Ok(ModelRoute { + id, + logical_model, + target_pool_id, + fallback_route_id, + capability_constraints: policy.capability_constraints, + }) +} + +// ── CRUD impl ───────────────────────────────────────────────────────────────── + +impl SqliteDb { + /// Persist a new [`ModelRoute`]. + pub async fn insert_route(&self, route: &ModelRoute) -> Result<(), RookError> { + let id = route.id.to_string(); + let target_pool_id = route.target_pool_id.to_string(); + let fallback_route_id = route.fallback_route_id.as_ref().map(|r| r.to_string()); + + let policy = StoredPolicy { + capability_constraints: route.capability_constraints.clone(), + }; + let policy_json = serde_json::to_string(&policy) + .map_err(|e| RookError::Registry(format!("failed to serialize policy: {e}")))?; + + let now = Utc::now().to_rfc3339(); + + sqlx::query( + "INSERT INTO model_routes \ + (id, logical_model, target_pool_id, fallback_route_id, policy, created_at, updated_at) \ + VALUES (?, ?, ?, ?, ?, ?, ?)", + ) + .bind(&id) + .bind(&route.logical_model) + .bind(&target_pool_id) + .bind(&fallback_route_id) + .bind(&policy_json) + .bind(&now) + .bind(&now) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("insert_route failed: {e}")))?; + + Ok(()) + } + + /// Fetch a [`ModelRoute`] by its ID. + pub async fn get_route(&self, id: &RouteId) -> Result, RookError> { + let id_str = id.to_string(); + let row = sqlx::query( + "SELECT id, logical_model, target_pool_id, fallback_route_id, policy, \ + created_at, updated_at \ + FROM model_routes WHERE id = ?", + ) + .bind(&id_str) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("get_route failed: {e}")))?; + + row.map(|r| row_to_route(&r)).transpose() + } + + /// Find a [`ModelRoute`] by logical model name (e.g., `"gpt-4o"`). + pub async fn find_route_by_model( + &self, + logical_model: &str, + ) -> Result, RookError> { + let row = sqlx::query( + "SELECT id, logical_model, target_pool_id, fallback_route_id, policy, \ + created_at, updated_at \ + FROM model_routes WHERE logical_model = ?", + ) + .bind(logical_model) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("find_route_by_model failed: {e}")))?; + + row.map(|r| row_to_route(&r)).transpose() + } + + /// Return all [`ModelRoute`]s ordered by logical model name. + pub async fn list_routes(&self) -> Result, RookError> { + let rows = sqlx::query( + "SELECT id, logical_model, target_pool_id, fallback_route_id, policy, \ + created_at, updated_at \ + FROM model_routes ORDER BY logical_model ASC", + ) + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("list_routes failed: {e}")))?; + + rows.iter().map(row_to_route).collect() + } + + /// Delete a [`ModelRoute`] by ID. + /// + /// Returns `true` if a row was deleted, `false` if not found. + pub async fn delete_route(&self, id: &RouteId) -> Result { + let id_str = id.to_string(); + let result = sqlx::query("DELETE FROM model_routes WHERE id = ?") + .bind(&id_str) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("delete_route failed: {e}")))?; + + Ok(result.rows_affected() > 0) + } +} + +// ── Tests ───────────────────────────────────────────────────────────────────── + +#[cfg(test)] +mod tests { + use super::*; + use crate::domain::{ + AccountId, PoolId, ProviderAccount, ProviderPool, ProviderVendor, RouteId, + SelectionStrategy, + }; + + async fn make_db_with_pool() -> (SqliteDb, PoolId) { + let db = SqliteDb::open_in_memory().await.unwrap(); + + let account = ProviderAccount { + id: AccountId::generate(), + display_name: "OpenAI".to_string(), + vendor: ProviderVendor::OpenAi, + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec![], + capabilities: vec![], + }; + db.insert_account(&account).await.unwrap(); + + let pool = ProviderPool { + id: PoolId::generate(), + name: "Main Pool".to_string(), + strategy: SelectionStrategy::RoundRobin, + members: vec![account.id], + fallback_pool_id: None, + }; + db.insert_pool(&pool).await.unwrap(); + + (db, pool.id) + } + + fn make_route(target_pool_id: PoolId) -> ModelRoute { + ModelRoute { + id: RouteId::generate(), + logical_model: "gpt-4o".to_string(), + target_pool_id, + fallback_route_id: None, + capability_constraints: vec![], + } + } + + #[tokio::test] + async fn insert_and_get_route_round_trips() { + let (db, pool_id) = make_db_with_pool().await; + let route = make_route(pool_id); + + db.insert_route(&route).await.unwrap(); + + let fetched = db.get_route(&route.id).await.unwrap().unwrap(); + assert_eq!(fetched.id, route.id); + assert_eq!(fetched.logical_model, route.logical_model); + assert_eq!(fetched.target_pool_id, route.target_pool_id); + assert_eq!(fetched.fallback_route_id, route.fallback_route_id); + assert_eq!(fetched.capability_constraints, route.capability_constraints); + } + + #[tokio::test] + async fn insert_route_with_capability_constraints_round_trips() { + let (db, pool_id) = make_db_with_pool().await; + let route = ModelRoute { + id: RouteId::generate(), + logical_model: "claude-3-sonnet".to_string(), + target_pool_id: pool_id, + fallback_route_id: None, + capability_constraints: vec!["vision".to_string(), "function_calling".to_string()], + }; + db.insert_route(&route).await.unwrap(); + + let fetched = db.get_route(&route.id).await.unwrap().unwrap(); + assert_eq!(fetched.capability_constraints, route.capability_constraints); + } + + #[tokio::test] + async fn find_route_by_model_finds_correct_route() { + let (db, pool_id) = make_db_with_pool().await; + let route = make_route(pool_id); + db.insert_route(&route).await.unwrap(); + + let found = db.find_route_by_model("gpt-4o").await.unwrap().unwrap(); + assert_eq!(found.id, route.id); + } + + #[tokio::test] + async fn find_route_by_model_returns_none_for_unknown_model() { + let (db, _) = make_db_with_pool().await; + let result = db.find_route_by_model("claude-3-opus").await.unwrap(); + assert!(result.is_none()); + } + + #[tokio::test] + async fn list_routes_returns_all_inserted() { + let (db, pool_id) = make_db_with_pool().await; + + let r1 = make_route(pool_id); + let r2 = ModelRoute { + id: RouteId::generate(), + logical_model: "claude-3-sonnet".to_string(), + target_pool_id: pool_id, + fallback_route_id: None, + capability_constraints: vec!["vision".to_string()], + }; + + db.insert_route(&r1).await.unwrap(); + db.insert_route(&r2).await.unwrap(); + + let routes = db.list_routes().await.unwrap(); + assert_eq!(routes.len(), 2); + + let ids: Vec<_> = routes.iter().map(|r| r.id).collect(); + assert!(ids.contains(&r1.id)); + assert!(ids.contains(&r2.id)); + } + + #[tokio::test] + async fn delete_route_returns_true_and_removes_row() { + let (db, pool_id) = make_db_with_pool().await; + let route = make_route(pool_id); + db.insert_route(&route).await.unwrap(); + + let deleted = db.delete_route(&route.id).await.unwrap(); + assert!(deleted); + + assert!(db.get_route(&route.id).await.unwrap().is_none()); + } + + #[tokio::test] + async fn delete_route_returns_false_for_missing_id() { + let (db, _) = make_db_with_pool().await; + let missing = RouteId::generate(); + let deleted = db.delete_route(&missing).await.unwrap(); + assert!(!deleted); + } +} diff --git a/clients/rook/src/lib.rs b/clients/rook/src/lib.rs index 2423884b2..4562aa5f0 100644 --- a/clients/rook/src/lib.rs +++ b/clients/rook/src/lib.rs @@ -4,8 +4,11 @@ pub mod config; pub mod dashboard; +pub mod db; pub mod domain; pub mod gateway; pub mod registry; pub mod routing; +pub mod server; +pub mod services; pub mod tui; diff --git a/clients/rook/src/services/account.rs b/clients/rook/src/services/account.rs index 0d7ef2617..f47b774cd 100644 --- a/clients/rook/src/services/account.rs +++ b/clients/rook/src/services/account.rs @@ -61,28 +61,29 @@ impl AccountService for InMemoryAccountService { fn create(&self, account: ProviderAccount) -> Result { let id = account.id; - let mut guard = self - .store + self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))?; - if guard.contains_key(&id) { - return Err(RookError::Registry(format!("account {} already exists", id))); - } - guard.insert(id, account); + .map_err(|e| RookError::Registry(e.to_string()))? + .insert(id, account); Ok(id) } fn update(&self, account: ProviderAccount) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if !guard.contains_key(&account.id) { - return Err(RookError::Registry(format!("account {} not found", account.id))); + return Err(RookError::Registry(format!( + "account {} not found", + account.id + ))); } guard.insert(account.id, account); Ok(()) } fn delete(&self, id: AccountId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if guard.remove(&id).is_none() { return Err(RookError::Registry(format!("account {id} not found"))); } diff --git a/clients/rook/src/services/health.rs b/clients/rook/src/services/health.rs index 034d4d3c6..ddc6f4876 100644 --- a/clients/rook/src/services/health.rs +++ b/clients/rook/src/services/health.rs @@ -62,11 +62,11 @@ pub trait HealthService: Send + Sync { fn get(&self, account_id: AccountId) -> AccountHealth; /// Record a successful probe for `account_id`, clearing any cooldown. - fn mark_success(&self, account_id: AccountId) -> Result<(), RookError>; + fn mark_success(&self, account_id: AccountId); /// Record a failed probe for `account_id` and set a cooldown window of /// `cooldown_seconds` from now. - fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64) -> Result<(), RookError>; + fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64); /// Return `true` when the account is healthy and any previous cooldown has /// expired. @@ -93,7 +93,9 @@ impl InMemoryHealthService { } /// Acquire the lock, propagating a [`RookError::Registry`] on poisoning. - fn lock(&self) -> Result>, RookError> { + fn lock( + &self, + ) -> Result>, RookError> { self.store.lock().map_err(|e| RookError::Registry(e.to_string())) } } @@ -106,44 +108,41 @@ impl HealthService for InMemoryHealthService { .unwrap_or_else(|_| AccountHealth::new(account_id)) } - fn mark_success(&self, account_id: AccountId) -> Result<(), RookError> { - let mut guard = self.lock()?; - let entry = guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); - entry.status = HealthStatus::Healthy; - entry.last_checked = Some(Utc::now()); - entry.consecutive_failures = 0; - entry.cooldown_until = None; - Ok(()) + fn mark_success(&self, account_id: AccountId) { + if let Ok(mut guard) = self.lock() { + let entry = + guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); + entry.status = HealthStatus::Healthy; + entry.last_checked = Some(Utc::now()); + entry.consecutive_failures = 0; + entry.cooldown_until = None; + } } - fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64) -> Result<(), RookError> { - let mut guard = self.lock()?; - let entry = guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); - entry.consecutive_failures = entry.consecutive_failures.saturating_add(1); - entry.last_checked = Some(Utc::now()); - entry.status = HealthStatus::Unhealthy; - - let cooldown_i64 = i64::try_from(cooldown_seconds) - .map_err(|e| RookError::Registry(format!("cooldown conversion failed: {}", e)))?; - let duration = chrono::Duration::seconds(cooldown_i64); - let cooldown_time = Utc::now() - .checked_add_signed(duration) - .ok_or_else(|| RookError::Registry("cooldown time overflow".to_string()))?; - - entry.cooldown_until = Some(cooldown_time); - Ok(()) + fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64) { + if let Ok(mut guard) = self.lock() { + let entry = + guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); + entry.consecutive_failures = entry.consecutive_failures.saturating_add(1); + entry.last_checked = Some(Utc::now()); + entry.status = HealthStatus::Unhealthy; + entry.cooldown_until = Some( + Utc::now() + + chrono::Duration::seconds(cooldown_seconds as i64), + ); + } } fn is_available(&self, account_id: AccountId) -> bool { let health = self.get(account_id); + if health.status == HealthStatus::Unhealthy { + return false; + } if let Some(until) = health.cooldown_until { if Utc::now() < until { return false; } } - if health.status == HealthStatus::Unhealthy && health.cooldown_until.is_some() { - return false; - } true } @@ -164,6 +163,7 @@ mod tests { let id = AccountId::generate(); let health = svc.get(id); assert_eq!(health.status, HealthStatus::Unknown); + // Unknown accounts are treated as available (no cooldown, not explicitly unhealthy). assert!(svc.is_available(id)); } @@ -172,10 +172,12 @@ mod tests { let svc = InMemoryHealthService::new(); let id = AccountId::generate(); - svc.mark_failure(id, 300).unwrap(); + // First mark as failed to set a cooldown. + svc.mark_failure(id, 300); assert!(!svc.is_available(id)); - svc.mark_success(id).unwrap(); + // Then recover. + svc.mark_success(id); let health = svc.get(id); assert_eq!(health.status, HealthStatus::Healthy); assert_eq!(health.consecutive_failures, 0); @@ -188,14 +190,15 @@ mod tests { let svc = InMemoryHealthService::new(); let id = AccountId::generate(); - svc.mark_failure(id, 60).unwrap(); + svc.mark_failure(id, 60); let health = svc.get(id); assert_eq!(health.status, HealthStatus::Unhealthy); assert_eq!(health.consecutive_failures, 1); assert!(health.cooldown_until.is_some()); assert!(health.cooldown_until.unwrap() > Utc::now()); - svc.mark_failure(id, 60).unwrap(); + // Second failure increments counter. + svc.mark_failure(id, 60); assert_eq!(svc.get(id).consecutive_failures, 2); } @@ -204,7 +207,8 @@ mod tests { let svc = InMemoryHealthService::new(); let id = AccountId::generate(); - svc.mark_failure(id, 9999).unwrap(); + // Large cooldown — will not expire within the test. + svc.mark_failure(id, 9999); assert!(!svc.is_available(id)); } @@ -216,9 +220,9 @@ mod tests { let good2 = AccountId::generate(); let bad = AccountId::generate(); - svc.mark_success(good1).unwrap(); - svc.mark_success(good2).unwrap(); - svc.mark_failure(bad, 9999).unwrap(); + svc.mark_success(good1); + svc.mark_success(good2); + svc.mark_failure(bad, 9999); let healthy = svc.list_healthy(&[good1, bad, good2]); assert_eq!(healthy.len(), 2); @@ -232,11 +236,13 @@ mod tests { let svc = InMemoryHealthService::new(); let id = AccountId::generate(); + // get creates a default entry let h = svc.get(id); assert_eq!(h.account_id, id); - svc.mark_failure(id, 1).unwrap(); - svc.mark_success(id).unwrap(); + // mark failure then success + svc.mark_failure(id, 1); + svc.mark_success(id); assert_eq!(svc.get(id).status, HealthStatus::Healthy); } } diff --git a/clients/rook/src/services/pool.rs b/clients/rook/src/services/pool.rs index 9ca38da40..aca015cde 100644 --- a/clients/rook/src/services/pool.rs +++ b/clients/rook/src/services/pool.rs @@ -72,19 +72,16 @@ impl PoolService for InMemoryPoolService { fn create(&self, pool: ProviderPool) -> Result { let id = pool.id; - let mut guard = self - .store + self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))?; - if guard.contains_key(&id) { - return Err(RookError::Registry(format!("pool {} already exists", id))); - } - guard.insert(id, pool); + .map_err(|e| RookError::Registry(e.to_string()))? + .insert(id, pool); Ok(id) } fn update(&self, pool: ProviderPool) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if !guard.contains_key(&pool.id) { return Err(RookError::Registry(format!("pool {} not found", pool.id))); } @@ -93,7 +90,8 @@ impl PoolService for InMemoryPoolService { } fn delete(&self, id: PoolId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if guard.remove(&id).is_none() { return Err(RookError::Registry(format!("pool {id} not found"))); } @@ -101,7 +99,8 @@ impl PoolService for InMemoryPoolService { } fn add_member(&self, pool_id: PoolId, account_id: AccountId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; let pool = guard .get_mut(&pool_id) .ok_or_else(|| RookError::Registry(format!("pool {pool_id} not found")))?; @@ -112,7 +111,8 @@ impl PoolService for InMemoryPoolService { } fn remove_member(&self, pool_id: PoolId, account_id: AccountId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; let pool = guard .get_mut(&pool_id) .ok_or_else(|| RookError::Registry(format!("pool {pool_id} not found")))?; diff --git a/clients/rook/src/services/route.rs b/clients/rook/src/services/route.rs index 0e8c9adae..e2094eabd 100644 --- a/clients/rook/src/services/route.rs +++ b/clients/rook/src/services/route.rs @@ -64,56 +64,36 @@ impl RouteService for InMemoryRouteService { } fn resolve(&self, logical_model: &str) -> Option { - let guard = self.store.lock().ok()?; - let matches: Vec = guard + self.store + .lock() + .ok()? .values() - .filter(|r| r.logical_model == logical_model) + .find(|r| r.logical_model == logical_model) .cloned() - .collect(); - if matches.len() == 1 { - Some(matches[0].clone()) - } else { - None - } } fn create(&self, route: ModelRoute) -> Result { let id = route.id; - let mut guard = self - .store + self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))?; - - if guard.values().any(|r| r.logical_model == route.logical_model) { - return Err(RookError::Registry(format!( - "route with logical_model '{}' already exists", - route.logical_model - ))); - } - - guard.insert(id, route); + .map_err(|e| RookError::Registry(e.to_string()))? + .insert(id, route); Ok(id) } fn update(&self, route: ModelRoute) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if !guard.contains_key(&route.id) { return Err(RookError::Registry(format!("route {} not found", route.id))); } - - if guard.values().any(|r| r.id != route.id && r.logical_model == route.logical_model) { - return Err(RookError::Registry(format!( - "another route with logical_model '{}' already exists", - route.logical_model - ))); - } - guard.insert(route.id, route); Ok(()) } fn delete(&self, id: RouteId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if guard.remove(&id).is_none() { return Err(RookError::Registry(format!("route {id} not found"))); } From e19f2a51b8a11f48fa08b370e2a6c27c3544641a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yuniel=20Acosta=20P=C3=A9rez?= <33158051+yacosta738@users.noreply.github.com> Date: Mon, 20 Apr 2026 12:36:47 +0200 Subject: [PATCH 2/3] fix(rook): address PR #605 review comments - Remove unused sqlx features (macros, migrate) - Add FK on fallback_route_id and index on pool_members(account_id) - Add migration tracking with schema_migrations table - Fix fallible weight/priority conversions - Fix ProviderVendor serialization - Fix SelectionStrategy serialization - Propagate JSON parse errors - Add duplicate checks in services - Log poisoned locks in health service --- clients/rook/Cargo.lock | 1273 ++++++++++++++++++++-- clients/rook/Cargo.toml | 2 +- clients/rook/migrations/0001_initial.sql | 44 + clients/rook/src/db/account.rs | 278 +++++ clients/rook/src/db/mod.rs | 79 ++ clients/rook/src/db/pool.rs | 352 ++++++ clients/rook/src/db/route.rs | 310 ++++++ clients/rook/src/lib.rs | 3 + clients/rook/src/services/account.rs | 21 +- clients/rook/src/services/health.rs | 86 +- clients/rook/src/services/pool.rs | 22 +- clients/rook/src/services/route.rs | 42 +- 12 files changed, 2355 insertions(+), 157 deletions(-) create mode 100644 clients/rook/migrations/0001_initial.sql create mode 100644 clients/rook/src/db/account.rs create mode 100644 clients/rook/src/db/mod.rs create mode 100644 clients/rook/src/db/pool.rs create mode 100644 clients/rook/src/db/route.rs diff --git a/clients/rook/Cargo.lock b/clients/rook/Cargo.lock index 3ccf26242..224b5287e 100644 --- a/clients/rook/Cargo.lock +++ b/clients/rook/Cargo.lock @@ -11,6 +11,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -56,7 +62,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -67,7 +73,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -87,6 +93,15 @@ dependencies = [ "syn", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -155,11 +170,29 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" + [[package]] name = "bitflags" version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +dependencies = [ + "serde_core", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] [[package]] name = "bumpalo" @@ -167,6 +200,12 @@ version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "bytes" version = "1.11.1" @@ -247,6 +286,21 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" +[[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 = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -268,6 +322,78 @@ dependencies = [ "tracing", ] +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[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 = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[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 = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -279,6 +405,21 @@ dependencies = [ "syn", ] +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +dependencies = [ + "serde", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -286,16 +427,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] -name = "fallible-iterator" -version = "0.3.0" +name = "errno" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] [[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" +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 = "event-listener" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] [[package]] name = "find-msvc-tools" @@ -304,16 +465,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] -name = "foldhash" -version = "0.1.5" +name = "flume" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] [[package]] name = "foldhash" -version = "0.2.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" @@ -331,6 +497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -339,6 +506,40 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +[[package]] +name = "futures-executor" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" +dependencies = [ + "futures-core", + "futures-task", + "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.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" + +[[package]] +name = "futures-sink" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" + [[package]] name = "futures-task" version = "0.3.32" @@ -352,11 +553,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", + "futures-io", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "slab", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + [[package]] name = "getrandom" version = "0.4.2" @@ -376,16 +601,9 @@ version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "foldhash 0.1.5", -] - -[[package]] -name = "hashbrown" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" -dependencies = [ - "foldhash 0.2.0", + "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -396,11 +614,11 @@ checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" [[package]] name = "hashlink" -version = "0.11.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0b22561a9c04a7cb1a302c013e0259cd3b4bb619f145b32f72b8b4bcbed230" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.16.1", + "hashbrown 0.15.5", ] [[package]] @@ -409,6 +627,39 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hex" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +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 = "http" version = "1.4.0" @@ -442,6 +693,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" + [[package]] name = "httparse" version = "1.10.1" @@ -688,6 +945,9 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] [[package]] name = "leb128fmt" @@ -701,11 +961,29 @@ version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +[[package]] +name = "libm" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" + +[[package]] +name = "libredox" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +dependencies = [ + "bitflags", + "libc", + "plain", + "redox_syscall 0.7.4", +] + [[package]] name = "libsqlite3-sys" -version = "0.36.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4103cffefa72eb8428cb6b47d6627161e51c2739fc5e3b734584157bc642a" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -718,6 +996,15 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + [[package]] name = "log" version = "0.4.29" @@ -739,6 +1026,16 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "memchr" version = "2.8.0" @@ -751,6 +1048,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "mio" version = "1.2.0" @@ -759,7 +1066,7 @@ checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -768,7 +1075,43 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys", + "windows-sys 0.61.2", +] + +[[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", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +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]] @@ -778,6 +1121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -792,6 +1136,44 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.18", + "smallvec", + "windows-link", +] + +[[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" @@ -805,22 +1187,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] -name = "pkg-config" -version = "0.3.33" +name = "pkcs1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] [[package]] -name = "potential_utf" -version = "0.1.5" +name = "pkcs8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "zerovec", + "der", + "spki", ] [[package]] -name = "prettyplease" +name = "pkg-config" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "potential_utf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +dependencies = [ + "zerovec", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" @@ -853,6 +1271,54 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "rand" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", +] + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a" +dependencies = [ + "bitflags", +] + [[package]] name = "regex-automata" version = "0.4.14" @@ -902,6 +1368,20 @@ dependencies = [ "web-sys", ] +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.17", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "rook" version = "0.1.0" @@ -911,39 +1391,107 @@ dependencies = [ "chrono", "clap", "corvus-traits", - "rusqlite", + "http", + "mime_guess", + "rust-embed", "serde", "serde_json", + "sqlx", "thiserror", "tokio", + "tower-http", "tracing", "tracing-subscriber", "uuid", ] [[package]] -name = "rsqlite-vfs" -version = "0.1.0" +name = "rsa" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a1f2315036ef6b1fbacd1972e8ee7688030b0a2121edfc2a6550febd41574d" +checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ - "hashbrown 0.16.1", - "thiserror", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", ] [[package]] -name = "rusqlite" -version = "0.38.0" +name = "rust-embed" +version = "8.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c93dd1c9683b438c392c492109cb702b8090b2bfc8fed6f6e4eb4523f17af3" +checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27" dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", - "sqlite-wasm-rs", + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1" +dependencies = [ + "mime_guess", + "sha2", + "walkdir", +] + +[[package]] +name = "rustls" +version = "0.23.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +dependencies = [ + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -958,6 +1506,21 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "semver" version = "1.0.28" @@ -1030,6 +1593,28 @@ dependencies = [ "serde", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -1045,6 +1630,26 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + [[package]] name = "slab" version = "0.4.12" @@ -1056,6 +1661,9 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -1064,19 +1672,213 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] -name = "sqlite-wasm-rs" -version = "0.5.3" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2c760607300407ddeaee518acf28c795661b7108c75421303dbefb237d3a36" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "cc", - "js-sys", - "rsqlite-vfs", - "wasm-bindgen", + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[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", + "bytes", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.15.5", + "hashlink", + "indexmap", + "log", + "memchr", + "once_cell", + "percent-encoding", + "rustls", + "serde", + "serde_json", + "sha2", + "smallvec", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots 0.26.11", +] + +[[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", +] + +[[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", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-sqlite", + "syn", + "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", + "bitflags", + "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", + "rsa", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "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", + "bitflags", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "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", + "tracing", + "url", ] [[package]] @@ -1085,12 +1887,29 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "syn" version = "2.0.117" @@ -1161,6 +1980,21 @@ dependencies = [ "zerovec", ] +[[package]] +name = "tinyvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokio" version = "1.52.1" @@ -1171,9 +2005,10 @@ dependencies = [ "libc", "mio", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -1187,6 +2022,30 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-stream" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "tower" version = "0.5.3" @@ -1210,14 +2069,24 @@ checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", + "futures-core", "futures-util", "http", "http-body", + "http-body-util", + "http-range-header", + "httpdate", "iri-string", + "mime", + "mime_guess", + "percent-encoding", "pin-project-lite", + "tokio", + "tokio-util", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -1238,10 +2107,23 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ + "log", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tracing-core" version = "0.1.36" @@ -1273,18 +2155,57 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "typenum" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" + +[[package]] +name = "unicase" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" + +[[package]] +name = "unicode-bidi" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" + [[package]] name = "unicode-ident" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +[[package]] +name = "unicode-normalization" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" + [[package]] name = "unicode-xid" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.5.8" @@ -1315,7 +2236,7 @@ version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" dependencies = [ - "getrandom", + "getrandom 0.4.2", "js-sys", "serde_core", "wasm-bindgen", @@ -1327,6 +2248,22 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -1360,6 +2297,12 @@ dependencies = [ "wit-bindgen 0.51.0", ] +[[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.118" @@ -1459,6 +2402,43 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.7", +] + +[[package]] +name = "webpki-roots" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "whoami" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +dependencies = [ + "libredox", + "wasite", +] + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "windows-core" version = "0.62.2" @@ -1518,6 +2498,24 @@ dependencies = [ "windows-link", ] +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -1527,6 +2525,127 @@ dependencies = [ "windows-link", ] +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "wit-bindgen" version = "0.51.0" @@ -1650,6 +2769,26 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zerocopy" +version = "0.8.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zerofrom" version = "0.1.7" @@ -1671,6 +2810,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + [[package]] name = "zerotrie" version = "0.2.4" diff --git a/clients/rook/Cargo.toml b/clients/rook/Cargo.toml index e0d021d33..9d13fa776 100644 --- a/clients/rook/Cargo.toml +++ b/clients/rook/Cargo.toml @@ -41,7 +41,7 @@ tracing-subscriber = { version = "0.3", default-features = false, features = ["f uuid = { version = "1.23", default-features = false, features = ["v4", "std", "serde"] } # Persistence -rusqlite = { version = "0.38", features = ["bundled"] } +sqlx = { version = "0.8", default-features = false, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } # Time chrono = { version = "0.4", default-features = false, features = ["clock", "std", "serde"] } diff --git a/clients/rook/migrations/0001_initial.sql b/clients/rook/migrations/0001_initial.sql new file mode 100644 index 000000000..1c9c25e4f --- /dev/null +++ b/clients/rook/migrations/0001_initial.sql @@ -0,0 +1,44 @@ +-- Initial schema for Rook domain entities. +-- provider_accounts maps to ProviderAccount (display_name = name column). + +CREATE TABLE IF NOT EXISTS provider_accounts ( + id TEXT PRIMARY KEY, + display_name TEXT NOT NULL, + vendor TEXT NOT NULL, -- serialized ProviderVendor (snake_case JSON string) + api_base TEXT, -- api_base_override + enabled INTEGER NOT NULL DEFAULT 1, + weight INTEGER NOT NULL DEFAULT 100, + priority INTEGER NOT NULL DEFAULT 0, + tags TEXT NOT NULL DEFAULT '[]', -- JSON array of strings + capabilities TEXT NOT NULL DEFAULT '[]', -- JSON array of strings + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL +); + +CREATE TABLE IF NOT EXISTS provider_pools ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + strategy TEXT NOT NULL, -- serialized SelectionStrategy (snake_case JSON string) + fallback_pool_id TEXT, + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL +); + +CREATE TABLE IF NOT EXISTS pool_members ( + pool_id TEXT NOT NULL, + account_id TEXT NOT NULL, + PRIMARY KEY (pool_id, account_id), + FOREIGN KEY (pool_id) REFERENCES provider_pools(id) ON DELETE CASCADE, + FOREIGN KEY (account_id) REFERENCES provider_accounts(id) ON DELETE CASCADE +); + +CREATE TABLE IF NOT EXISTS model_routes ( + id TEXT PRIMARY KEY, + logical_model TEXT NOT NULL UNIQUE, + target_pool_id TEXT NOT NULL, + fallback_route_id TEXT, + policy TEXT NOT NULL DEFAULT '{}', -- JSON-serialized RoutingPolicy + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL, + FOREIGN KEY (target_pool_id) REFERENCES provider_pools(id) +); diff --git a/clients/rook/src/db/account.rs b/clients/rook/src/db/account.rs new file mode 100644 index 000000000..c0351abc3 --- /dev/null +++ b/clients/rook/src/db/account.rs @@ -0,0 +1,278 @@ +//! CRUD operations for [`ProviderAccount`] backed by the `provider_accounts` +//! table. + +use crate::db::SqliteDb; +use crate::domain::{AccountId, ProviderAccount, ProviderVendor, RookError}; +use chrono::Utc; +use sqlx::Row; +use uuid::Uuid; + +// ── Row mapping ─────────────────────────────────────────────────────────────── + +fn row_to_account(row: &sqlx::sqlite::SqliteRow) -> Result { + let id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing id: {e}")))?; + let id = AccountId::new( + Uuid::parse_str(&id_str) + .map_err(|e| RookError::Registry(format!("invalid account UUID: {e}")))?, + ); + + let vendor_str: String = row + .try_get("vendor") + .map_err(|e| RookError::Registry(format!("missing vendor: {e}")))?; + let vendor: ProviderVendor = + serde_json::from_str(&format!("\"{vendor_str}\"")) + .map_err(|e| RookError::Registry(format!("invalid vendor '{vendor_str}': {e}")))?; + + let display_name: String = row + .try_get("display_name") + .map_err(|e| RookError::Registry(format!("missing display_name: {e}")))?; + let api_base: Option = row + .try_get("api_base") + .map_err(|e| RookError::Registry(format!("missing api_base: {e}")))?; + let enabled: i64 = row + .try_get("enabled") + .map_err(|e| RookError::Registry(format!("missing enabled: {e}")))?; + let weight: i64 = row + .try_get("weight") + .map_err(|e| RookError::Registry(format!("missing weight: {e}")))?; + let priority: i64 = row + .try_get("priority") + .map_err(|e| RookError::Registry(format!("missing priority: {e}")))?; + + let tags_str: String = row + .try_get("tags") + .map_err(|e| RookError::Registry(format!("missing tags: {e}")))?; + let tags: Vec = serde_json::from_str(&tags_str) + .map_err(|e| RookError::Registry(format!("invalid tags JSON: {e}")))?; + + let caps_str: String = row + .try_get("capabilities") + .map_err(|e| RookError::Registry(format!("missing capabilities: {e}")))?; + let capabilities: Vec = serde_json::from_str(&caps_str) + .map_err(|e| RookError::Registry(format!("invalid capabilities JSON: {e}")))?; + + Ok(ProviderAccount { + id, + display_name, + vendor, + api_base_override: api_base, + enabled: enabled != 0, + weight: weight as u32, + priority: priority as u32, + tags, + capabilities, + }) +} + +// ── CRUD impl ───────────────────────────────────────────────────────────────── + +impl SqliteDb { + /// Persist a new [`ProviderAccount`]. + /// + /// Returns [`RookError::Registry`] if the ID already exists. + pub async fn insert_account(&self, account: &ProviderAccount) -> Result<(), RookError> { + let id = account.id.to_string(); + // Serialize vendor to its canonical string (strip surrounding quotes). + let vendor_json = serde_json::to_string(&account.vendor) + .map_err(|e| RookError::Registry(format!("failed to serialize vendor: {e}")))?; + // vendor_json is `"open_ai"` — strip the outer quotes for storage. + let vendor_str = vendor_json.trim_matches('"').to_string(); + + let tags = serde_json::to_string(&account.tags) + .map_err(|e| RookError::Registry(format!("failed to serialize tags: {e}")))?; + let capabilities = serde_json::to_string(&account.capabilities) + .map_err(|e| RookError::Registry(format!("failed to serialize capabilities: {e}")))?; + + let now = Utc::now().to_rfc3339(); + let enabled: i64 = if account.enabled { 1 } else { 0 }; + let weight = account.weight as i64; + let priority = account.priority as i64; + + sqlx::query( + "INSERT INTO provider_accounts \ + (id, display_name, vendor, api_base, enabled, weight, priority, \ + tags, capabilities, created_at, updated_at) \ + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + ) + .bind(&id) + .bind(&account.display_name) + .bind(&vendor_str) + .bind(&account.api_base_override) + .bind(enabled) + .bind(weight) + .bind(priority) + .bind(&tags) + .bind(&capabilities) + .bind(&now) + .bind(&now) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("insert_account failed: {e}")))?; + + Ok(()) + } + + /// Fetch a single [`ProviderAccount`] by its ID. + /// + /// Returns `None` if no row matches. + pub async fn get_account(&self, id: &AccountId) -> Result, RookError> { + let id_str = id.to_string(); + let row = sqlx::query( + "SELECT id, display_name, vendor, api_base, enabled, weight, priority, \ + tags, capabilities, created_at, updated_at \ + FROM provider_accounts WHERE id = ?", + ) + .bind(&id_str) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("get_account failed: {e}")))?; + + row.map(|r| row_to_account(&r)).transpose() + } + + /// Return all [`ProviderAccount`]s ordered by priority then display name. + pub async fn list_accounts(&self) -> Result, RookError> { + let rows = sqlx::query( + "SELECT id, display_name, vendor, api_base, enabled, weight, priority, \ + tags, capabilities, created_at, updated_at \ + FROM provider_accounts ORDER BY priority ASC, display_name ASC", + ) + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("list_accounts failed: {e}")))?; + + rows.iter().map(row_to_account).collect() + } + + /// Delete a [`ProviderAccount`] by ID. + /// + /// Returns `true` if a row was deleted, `false` if the ID was not found. + pub async fn delete_account(&self, id: &AccountId) -> Result { + let id_str = id.to_string(); + let result = sqlx::query("DELETE FROM provider_accounts WHERE id = ?") + .bind(&id_str) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("delete_account failed: {e}")))?; + + Ok(result.rows_affected() > 0) + } +} + +// ── Tests ───────────────────────────────────────────────────────────────────── + +#[cfg(test)] +mod tests { + use super::*; + + fn make_account() -> ProviderAccount { + ProviderAccount { + id: AccountId::generate(), + display_name: "Test OpenAI".to_string(), + vendor: ProviderVendor::OpenAi, + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec!["prod".to_string()], + capabilities: vec!["chat".to_string()], + } + } + + #[tokio::test] + async fn insert_and_get_account_round_trips() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let account = make_account(); + + db.insert_account(&account).await.unwrap(); + + let fetched = db.get_account(&account.id).await.unwrap().unwrap(); + assert_eq!(fetched.id, account.id); + assert_eq!(fetched.display_name, account.display_name); + assert_eq!(fetched.vendor, account.vendor); + assert_eq!(fetched.enabled, account.enabled); + assert_eq!(fetched.weight, account.weight); + assert_eq!(fetched.priority, account.priority); + assert_eq!(fetched.tags, account.tags); + assert_eq!(fetched.capabilities, account.capabilities); + } + + #[tokio::test] + async fn get_account_returns_none_for_missing_id() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let missing = AccountId::generate(); + let result = db.get_account(&missing).await.unwrap(); + assert!(result.is_none()); + } + + #[tokio::test] + async fn list_accounts_returns_all_inserted() { + let db = SqliteDb::open_in_memory().await.unwrap(); + + let a1 = make_account(); + let a2 = ProviderAccount { + id: AccountId::generate(), + display_name: "Anthropic Acc".to_string(), + vendor: ProviderVendor::Anthropic, + api_base_override: Some("https://proxy.example.com".to_string()), + enabled: false, + weight: 50, + priority: 1, + tags: vec![], + capabilities: vec!["vision".to_string()], + }; + + db.insert_account(&a1).await.unwrap(); + db.insert_account(&a2).await.unwrap(); + + let list = db.list_accounts().await.unwrap(); + assert_eq!(list.len(), 2); + // Both IDs must appear (order may vary). + let ids: Vec<_> = list.iter().map(|a| a.id).collect(); + assert!(ids.contains(&a1.id)); + assert!(ids.contains(&a2.id)); + } + + #[tokio::test] + async fn delete_account_returns_true_when_found() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let account = make_account(); + db.insert_account(&account).await.unwrap(); + + let deleted = db.delete_account(&account.id).await.unwrap(); + assert!(deleted); + + // Gone from DB. + let fetched = db.get_account(&account.id).await.unwrap(); + assert!(fetched.is_none()); + } + + #[tokio::test] + async fn delete_account_returns_false_when_not_found() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let missing = AccountId::generate(); + let deleted = db.delete_account(&missing).await.unwrap(); + assert!(!deleted); + } + + #[tokio::test] + async fn vendor_other_round_trips_through_db() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let account = ProviderAccount { + id: AccountId::generate(), + display_name: "Mistral".to_string(), + vendor: ProviderVendor::Other("mistral".to_string()), + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec![], + capabilities: vec![], + }; + db.insert_account(&account).await.unwrap(); + let fetched = db.get_account(&account.id).await.unwrap().unwrap(); + assert_eq!(fetched.vendor, ProviderVendor::Other("mistral".to_string())); + } +} diff --git a/clients/rook/src/db/mod.rs b/clients/rook/src/db/mod.rs new file mode 100644 index 000000000..7e15dcc2d --- /dev/null +++ b/clients/rook/src/db/mod.rs @@ -0,0 +1,79 @@ +//! SQLite persistence layer for Rook domain entities. +//! +//! [`SqliteDb`] owns a connection pool and exposes typed CRUD helpers for +//! [`ProviderAccount`], [`ProviderPool`], and [`ModelRoute`]. +//! +//! Sub-modules are split by domain entity to keep file sizes manageable. + +pub mod account; +pub mod pool; +pub mod route; + +use crate::domain::RookError; +use sqlx::SqlitePool; + +/// Migration SQL embedded at compile time so the binary is self-contained. +const MIGRATION_SQL: &str = include_str!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/migrations/0001_initial.sql" +)); + +/// A handle to the Rook SQLite database. +/// +/// Cheap to clone — cloning shares the underlying connection pool. +#[derive(Clone, Debug)] +pub struct SqliteDb { + pool: SqlitePool, +} + +impl SqliteDb { + /// Open (or create) a SQLite database at `path` and apply the schema. + /// + /// `path` should be an absolute file path or a path understood by SQLite + /// (e.g., `"./rook.db"`). + pub async fn open(path: &str) -> Result { + let url = format!("sqlite:{path}?mode=rwc"); + let pool = SqlitePool::connect(&url) + .await + .map_err(|e| { + RookError::Registry(format!("failed to open database at {path}: {e}")) + })?; + + Self::run_migrations(&pool).await?; + Ok(Self { pool }) + } + + /// Open an in-memory SQLite database and apply the schema. + /// + /// Intended for tests only. Each call produces an isolated database. + pub async fn open_in_memory() -> Result { + // max_connections(1) ensures a single connection so the in-memory + // database is not dropped between pool checkouts. + let pool = sqlx::pool::PoolOptions::::new() + .max_connections(1) + .connect("sqlite::memory:") + .await + .map_err(|e| { + RookError::Registry(format!("failed to open in-memory database: {e}")) + })?; + + Self::run_migrations(&pool).await?; + Ok(Self { pool }) + } + + /// Borrow the underlying [`SqlitePool`]. + pub fn pool(&self) -> &SqlitePool { + &self.pool + } + + // ── Private helpers ─────────────────────────────────────────────────────── + + /// Execute the embedded migration SQL against `pool`. + async fn run_migrations(pool: &SqlitePool) -> Result<(), RookError> { + sqlx::raw_sql(MIGRATION_SQL) + .execute(pool) + .await + .map_err(|e| RookError::Registry(format!("migration failed: {e}")))?; + Ok(()) + } +} diff --git a/clients/rook/src/db/pool.rs b/clients/rook/src/db/pool.rs new file mode 100644 index 000000000..c8efb6486 --- /dev/null +++ b/clients/rook/src/db/pool.rs @@ -0,0 +1,352 @@ +//! CRUD operations for [`ProviderPool`] and its members backed by +//! `provider_pools` and `pool_members` tables. + +use crate::db::SqliteDb; +use crate::domain::{AccountId, PoolId, ProviderPool, RookError, SelectionStrategy}; +use chrono::Utc; +use sqlx::Row; +use uuid::Uuid; + +// ── Row mapping ─────────────────────────────────────────────────────────────── + +fn row_to_pool( + row: &sqlx::sqlite::SqliteRow, + members: Vec, +) -> Result { + let id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing pool id: {e}")))?; + let id = PoolId::new( + Uuid::parse_str(&id_str) + .map_err(|e| RookError::Registry(format!("invalid pool UUID: {e}")))?, + ); + + let name: String = row + .try_get("name") + .map_err(|e| RookError::Registry(format!("missing pool name: {e}")))?; + + let strategy_str: String = row + .try_get("strategy") + .map_err(|e| RookError::Registry(format!("missing strategy: {e}")))?; + let strategy: SelectionStrategy = + serde_json::from_str(&format!("\"{strategy_str}\"")) + .map_err(|e| { + RookError::Registry(format!("invalid strategy '{strategy_str}': {e}")) + })?; + + let fallback_str: Option = row + .try_get("fallback_pool_id") + .map_err(|e| RookError::Registry(format!("missing fallback_pool_id: {e}")))?; + let fallback_pool_id = fallback_str + .map(|s| { + Uuid::parse_str(&s) + .map(PoolId::new) + .map_err(|e| { + RookError::Registry(format!("invalid fallback_pool_id UUID: {e}")) + }) + }) + .transpose()?; + + Ok(ProviderPool { + id, + name, + strategy, + members, + fallback_pool_id, + }) +} + +// ── CRUD impl ───────────────────────────────────────────────────────────────── + +impl SqliteDb { + /// Persist a new [`ProviderPool`]. + /// + /// Members in `pool.members` are inserted into `pool_members`. + pub async fn insert_pool(&self, pool: &ProviderPool) -> Result<(), RookError> { + let id = pool.id.to_string(); + let strategy_json = serde_json::to_string(&pool.strategy) + .map_err(|e| RookError::Registry(format!("failed to serialize strategy: {e}")))?; + let strategy_str = strategy_json.trim_matches('"').to_string(); + let fallback = pool.fallback_pool_id.as_ref().map(|p| p.to_string()); + let now = Utc::now().to_rfc3339(); + + sqlx::query( + "INSERT INTO provider_pools \ + (id, name, strategy, fallback_pool_id, created_at, updated_at) \ + VALUES (?, ?, ?, ?, ?, ?)", + ) + .bind(&id) + .bind(&pool.name) + .bind(&strategy_str) + .bind(&fallback) + .bind(&now) + .bind(&now) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("insert_pool failed: {e}")))?; + + for account_id in &pool.members { + self.add_pool_member(&pool.id, account_id).await?; + } + + Ok(()) + } + + /// Fetch a single [`ProviderPool`] by ID, including its members. + pub async fn get_pool(&self, id: &PoolId) -> Result, RookError> { + let id_str = id.to_string(); + let row = sqlx::query( + "SELECT id, name, strategy, fallback_pool_id, created_at, updated_at \ + FROM provider_pools WHERE id = ?", + ) + .bind(&id_str) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("get_pool failed: {e}")))?; + + match row { + None => Ok(None), + Some(row) => { + let members = self.get_pool_members(id).await?; + row_to_pool(&row, members).map(Some) + } + } + } + + /// Return all [`ProviderPool`]s with their members. + pub async fn list_pools(&self) -> Result, RookError> { + let rows = sqlx::query( + "SELECT id, name, strategy, fallback_pool_id, created_at, updated_at \ + FROM provider_pools ORDER BY name ASC", + ) + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("list_pools failed: {e}")))?; + + let mut pools = Vec::with_capacity(rows.len()); + for row in &rows { + let pool_id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing pool id: {e}")))?; + let pool_id = PoolId::new( + Uuid::parse_str(&pool_id_str) + .map_err(|e| RookError::Registry(format!("invalid pool UUID: {e}")))?, + ); + let members = self.get_pool_members(&pool_id).await?; + pools.push(row_to_pool(row, members)?); + } + + Ok(pools) + } + + /// Add `account_id` to `pool_id`'s member list. + /// + /// No-op if the membership already exists (INSERT OR IGNORE). + pub async fn add_pool_member( + &self, + pool_id: &PoolId, + account_id: &AccountId, + ) -> Result<(), RookError> { + let pool_str = pool_id.to_string(); + let acct_str = account_id.to_string(); + + sqlx::query( + "INSERT OR IGNORE INTO pool_members (pool_id, account_id) VALUES (?, ?)", + ) + .bind(&pool_str) + .bind(&acct_str) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("add_pool_member failed: {e}")))?; + + Ok(()) + } + + /// Remove `account_id` from `pool_id`'s member list. + pub async fn remove_pool_member( + &self, + pool_id: &PoolId, + account_id: &AccountId, + ) -> Result<(), RookError> { + let pool_str = pool_id.to_string(); + let acct_str = account_id.to_string(); + + sqlx::query( + "DELETE FROM pool_members WHERE pool_id = ? AND account_id = ?", + ) + .bind(&pool_str) + .bind(&acct_str) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("remove_pool_member failed: {e}")))?; + + Ok(()) + } + + /// Return all [`AccountId`]s that are members of `pool_id`. + pub async fn get_pool_members(&self, pool_id: &PoolId) -> Result, RookError> { + let pool_str = pool_id.to_string(); + let rows = sqlx::query( + "SELECT account_id FROM pool_members \ + WHERE pool_id = ? ORDER BY account_id ASC", + ) + .bind(&pool_str) + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("get_pool_members failed: {e}")))?; + + rows.iter() + .map(|row| { + let s: String = row + .try_get("account_id") + .map_err(|e| RookError::Registry(format!("missing account_id: {e}")))?; + Uuid::parse_str(&s) + .map(AccountId::new) + .map_err(|e| RookError::Registry(format!("invalid member UUID: {e}"))) + }) + .collect() + } +} + +// ── Tests ───────────────────────────────────────────────────────────────────── + +#[cfg(test)] +mod tests { + use super::*; + use crate::domain::{ProviderAccount, ProviderVendor}; + + async fn make_db_with_accounts() -> (SqliteDb, AccountId, AccountId) { + let db = SqliteDb::open_in_memory().await.unwrap(); + + let a1 = ProviderAccount { + id: AccountId::generate(), + display_name: "Acct A".to_string(), + vendor: ProviderVendor::OpenAi, + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec![], + capabilities: vec![], + }; + let a2 = ProviderAccount { + id: AccountId::generate(), + display_name: "Acct B".to_string(), + vendor: ProviderVendor::Anthropic, + api_base_override: None, + enabled: true, + weight: 50, + priority: 1, + tags: vec![], + capabilities: vec![], + }; + + db.insert_account(&a1).await.unwrap(); + db.insert_account(&a2).await.unwrap(); + + (db, a1.id, a2.id) + } + + fn make_pool(members: Vec) -> ProviderPool { + ProviderPool { + id: PoolId::generate(), + name: "Test Pool".to_string(), + strategy: SelectionStrategy::RoundRobin, + members, + fallback_pool_id: None, + } + } + + #[tokio::test] + async fn insert_and_get_pool_round_trips() { + let (db, a1, a2) = make_db_with_accounts().await; + let pool = make_pool(vec![a1, a2]); + + db.insert_pool(&pool).await.unwrap(); + + let fetched = db.get_pool(&pool.id).await.unwrap().unwrap(); + assert_eq!(fetched.id, pool.id); + assert_eq!(fetched.name, pool.name); + assert_eq!(fetched.strategy, pool.strategy); + assert_eq!(fetched.fallback_pool_id, pool.fallback_pool_id); + + let mut fetched_members = fetched.members.clone(); + let mut expected_members = pool.members.clone(); + fetched_members.sort_by_key(|id| id.to_string()); + expected_members.sort_by_key(|id| id.to_string()); + assert_eq!(fetched_members, expected_members); + } + + #[tokio::test] + async fn get_pool_returns_none_for_missing_id() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let missing = PoolId::generate(); + assert!(db.get_pool(&missing).await.unwrap().is_none()); + } + + #[tokio::test] + async fn add_pool_member_and_get_members() { + let (db, a1, a2) = make_db_with_accounts().await; + let pool = make_pool(vec![]); + db.insert_pool(&pool).await.unwrap(); + + db.add_pool_member(&pool.id, &a1).await.unwrap(); + db.add_pool_member(&pool.id, &a2).await.unwrap(); + + let members = db.get_pool_members(&pool.id).await.unwrap(); + assert_eq!(members.len(), 2); + assert!(members.contains(&a1)); + assert!(members.contains(&a2)); + } + + #[tokio::test] + async fn remove_pool_member_removes_correctly() { + let (db, a1, a2) = make_db_with_accounts().await; + let pool = make_pool(vec![a1, a2]); + db.insert_pool(&pool).await.unwrap(); + + db.remove_pool_member(&pool.id, &a1).await.unwrap(); + + let members = db.get_pool_members(&pool.id).await.unwrap(); + assert_eq!(members.len(), 1); + assert!(members.contains(&a2)); + assert!(!members.contains(&a1)); + } + + #[tokio::test] + async fn list_pools_returns_all_inserted() { + let (db, a1, _a2) = make_db_with_accounts().await; + + let p1 = make_pool(vec![a1]); + let p2 = ProviderPool { + id: PoolId::generate(), + name: "Another Pool".to_string(), + strategy: SelectionStrategy::Priority, + members: vec![], + fallback_pool_id: None, + }; + + db.insert_pool(&p1).await.unwrap(); + db.insert_pool(&p2).await.unwrap(); + + let pools = db.list_pools().await.unwrap(); + assert_eq!(pools.len(), 2); + + let ids: Vec<_> = pools.iter().map(|p| p.id).collect(); + assert!(ids.contains(&p1.id)); + assert!(ids.contains(&p2.id)); + } + + #[tokio::test] + async fn add_pool_member_is_idempotent() { + let (db, a1, _a2) = make_db_with_accounts().await; + let pool = make_pool(vec![]); + db.insert_pool(&pool).await.unwrap(); + + db.add_pool_member(&pool.id, &a1).await.unwrap(); + db.add_pool_member(&pool.id, &a1).await.unwrap(); // should not error + + let members = db.get_pool_members(&pool.id).await.unwrap(); + assert_eq!(members.len(), 1); + } +} diff --git a/clients/rook/src/db/route.rs b/clients/rook/src/db/route.rs new file mode 100644 index 000000000..3bc372bcf --- /dev/null +++ b/clients/rook/src/db/route.rs @@ -0,0 +1,310 @@ +//! CRUD operations for [`ModelRoute`] backed by the `model_routes` table. + +use crate::db::SqliteDb; +use crate::domain::{ModelRoute, PoolId, RouteId, RookError}; +use chrono::Utc; +use sqlx::Row; +use uuid::Uuid; + +// ── Row mapping ─────────────────────────────────────────────────────────────── + +/// Minimal JSON structure stored in the `policy` column. +/// +/// The PRD notes that full [`RoutingPolicy`](crate::domain::RoutingPolicy) +/// wiring is a future concern. For now we persist only `capability_constraints` +/// so it survives a round-trip through the DB without loss. +#[derive(serde::Serialize, serde::Deserialize, Default)] +struct StoredPolicy { + #[serde(default)] + capability_constraints: Vec, +} + +fn row_to_route(row: &sqlx::sqlite::SqliteRow) -> Result { + let id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing route id: {e}")))?; + let id = RouteId::new( + Uuid::parse_str(&id_str) + .map_err(|e| RookError::Registry(format!("invalid route UUID: {e}")))?, + ); + + let logical_model: String = row + .try_get("logical_model") + .map_err(|e| RookError::Registry(format!("missing logical_model: {e}")))?; + + let target_str: String = row + .try_get("target_pool_id") + .map_err(|e| RookError::Registry(format!("missing target_pool_id: {e}")))?; + let target_pool_id = PoolId::new( + Uuid::parse_str(&target_str) + .map_err(|e| { + RookError::Registry(format!("invalid target_pool_id UUID: {e}")) + })?, + ); + + let fallback_str: Option = row + .try_get("fallback_route_id") + .map_err(|e| RookError::Registry(format!("missing fallback_route_id: {e}")))?; + let fallback_route_id = fallback_str + .map(|s| { + Uuid::parse_str(&s) + .map(RouteId::new) + .map_err(|e| { + RookError::Registry(format!("invalid fallback_route_id UUID: {e}")) + }) + }) + .transpose()?; + + let policy_json: String = row + .try_get("policy") + .map_err(|e| RookError::Registry(format!("missing policy: {e}")))?; + let policy: StoredPolicy = serde_json::from_str(&policy_json).unwrap_or_default(); + + Ok(ModelRoute { + id, + logical_model, + target_pool_id, + fallback_route_id, + capability_constraints: policy.capability_constraints, + }) +} + +// ── CRUD impl ───────────────────────────────────────────────────────────────── + +impl SqliteDb { + /// Persist a new [`ModelRoute`]. + pub async fn insert_route(&self, route: &ModelRoute) -> Result<(), RookError> { + let id = route.id.to_string(); + let target_pool_id = route.target_pool_id.to_string(); + let fallback_route_id = route.fallback_route_id.as_ref().map(|r| r.to_string()); + + let policy = StoredPolicy { + capability_constraints: route.capability_constraints.clone(), + }; + let policy_json = serde_json::to_string(&policy) + .map_err(|e| RookError::Registry(format!("failed to serialize policy: {e}")))?; + + let now = Utc::now().to_rfc3339(); + + sqlx::query( + "INSERT INTO model_routes \ + (id, logical_model, target_pool_id, fallback_route_id, policy, created_at, updated_at) \ + VALUES (?, ?, ?, ?, ?, ?, ?)", + ) + .bind(&id) + .bind(&route.logical_model) + .bind(&target_pool_id) + .bind(&fallback_route_id) + .bind(&policy_json) + .bind(&now) + .bind(&now) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("insert_route failed: {e}")))?; + + Ok(()) + } + + /// Fetch a [`ModelRoute`] by its ID. + pub async fn get_route(&self, id: &RouteId) -> Result, RookError> { + let id_str = id.to_string(); + let row = sqlx::query( + "SELECT id, logical_model, target_pool_id, fallback_route_id, policy, \ + created_at, updated_at \ + FROM model_routes WHERE id = ?", + ) + .bind(&id_str) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("get_route failed: {e}")))?; + + row.map(|r| row_to_route(&r)).transpose() + } + + /// Find a [`ModelRoute`] by logical model name (e.g., `"gpt-4o"`). + pub async fn find_route_by_model( + &self, + logical_model: &str, + ) -> Result, RookError> { + let row = sqlx::query( + "SELECT id, logical_model, target_pool_id, fallback_route_id, policy, \ + created_at, updated_at \ + FROM model_routes WHERE logical_model = ?", + ) + .bind(logical_model) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("find_route_by_model failed: {e}")))?; + + row.map(|r| row_to_route(&r)).transpose() + } + + /// Return all [`ModelRoute`]s ordered by logical model name. + pub async fn list_routes(&self) -> Result, RookError> { + let rows = sqlx::query( + "SELECT id, logical_model, target_pool_id, fallback_route_id, policy, \ + created_at, updated_at \ + FROM model_routes ORDER BY logical_model ASC", + ) + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("list_routes failed: {e}")))?; + + rows.iter().map(row_to_route).collect() + } + + /// Delete a [`ModelRoute`] by ID. + /// + /// Returns `true` if a row was deleted, `false` if not found. + pub async fn delete_route(&self, id: &RouteId) -> Result { + let id_str = id.to_string(); + let result = sqlx::query("DELETE FROM model_routes WHERE id = ?") + .bind(&id_str) + .execute(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("delete_route failed: {e}")))?; + + Ok(result.rows_affected() > 0) + } +} + +// ── Tests ───────────────────────────────────────────────────────────────────── + +#[cfg(test)] +mod tests { + use super::*; + use crate::domain::{ + AccountId, PoolId, ProviderAccount, ProviderPool, ProviderVendor, RouteId, + SelectionStrategy, + }; + + async fn make_db_with_pool() -> (SqliteDb, PoolId) { + let db = SqliteDb::open_in_memory().await.unwrap(); + + let account = ProviderAccount { + id: AccountId::generate(), + display_name: "OpenAI".to_string(), + vendor: ProviderVendor::OpenAi, + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec![], + capabilities: vec![], + }; + db.insert_account(&account).await.unwrap(); + + let pool = ProviderPool { + id: PoolId::generate(), + name: "Main Pool".to_string(), + strategy: SelectionStrategy::RoundRobin, + members: vec![account.id], + fallback_pool_id: None, + }; + db.insert_pool(&pool).await.unwrap(); + + (db, pool.id) + } + + fn make_route(target_pool_id: PoolId) -> ModelRoute { + ModelRoute { + id: RouteId::generate(), + logical_model: "gpt-4o".to_string(), + target_pool_id, + fallback_route_id: None, + capability_constraints: vec![], + } + } + + #[tokio::test] + async fn insert_and_get_route_round_trips() { + let (db, pool_id) = make_db_with_pool().await; + let route = make_route(pool_id); + + db.insert_route(&route).await.unwrap(); + + let fetched = db.get_route(&route.id).await.unwrap().unwrap(); + assert_eq!(fetched.id, route.id); + assert_eq!(fetched.logical_model, route.logical_model); + assert_eq!(fetched.target_pool_id, route.target_pool_id); + assert_eq!(fetched.fallback_route_id, route.fallback_route_id); + assert_eq!(fetched.capability_constraints, route.capability_constraints); + } + + #[tokio::test] + async fn insert_route_with_capability_constraints_round_trips() { + let (db, pool_id) = make_db_with_pool().await; + let route = ModelRoute { + id: RouteId::generate(), + logical_model: "claude-3-sonnet".to_string(), + target_pool_id: pool_id, + fallback_route_id: None, + capability_constraints: vec!["vision".to_string(), "function_calling".to_string()], + }; + db.insert_route(&route).await.unwrap(); + + let fetched = db.get_route(&route.id).await.unwrap().unwrap(); + assert_eq!(fetched.capability_constraints, route.capability_constraints); + } + + #[tokio::test] + async fn find_route_by_model_finds_correct_route() { + let (db, pool_id) = make_db_with_pool().await; + let route = make_route(pool_id); + db.insert_route(&route).await.unwrap(); + + let found = db.find_route_by_model("gpt-4o").await.unwrap().unwrap(); + assert_eq!(found.id, route.id); + } + + #[tokio::test] + async fn find_route_by_model_returns_none_for_unknown_model() { + let (db, _) = make_db_with_pool().await; + let result = db.find_route_by_model("claude-3-opus").await.unwrap(); + assert!(result.is_none()); + } + + #[tokio::test] + async fn list_routes_returns_all_inserted() { + let (db, pool_id) = make_db_with_pool().await; + + let r1 = make_route(pool_id); + let r2 = ModelRoute { + id: RouteId::generate(), + logical_model: "claude-3-sonnet".to_string(), + target_pool_id: pool_id, + fallback_route_id: None, + capability_constraints: vec!["vision".to_string()], + }; + + db.insert_route(&r1).await.unwrap(); + db.insert_route(&r2).await.unwrap(); + + let routes = db.list_routes().await.unwrap(); + assert_eq!(routes.len(), 2); + + let ids: Vec<_> = routes.iter().map(|r| r.id).collect(); + assert!(ids.contains(&r1.id)); + assert!(ids.contains(&r2.id)); + } + + #[tokio::test] + async fn delete_route_returns_true_and_removes_row() { + let (db, pool_id) = make_db_with_pool().await; + let route = make_route(pool_id); + db.insert_route(&route).await.unwrap(); + + let deleted = db.delete_route(&route.id).await.unwrap(); + assert!(deleted); + + assert!(db.get_route(&route.id).await.unwrap().is_none()); + } + + #[tokio::test] + async fn delete_route_returns_false_for_missing_id() { + let (db, _) = make_db_with_pool().await; + let missing = RouteId::generate(); + let deleted = db.delete_route(&missing).await.unwrap(); + assert!(!deleted); + } +} diff --git a/clients/rook/src/lib.rs b/clients/rook/src/lib.rs index 2423884b2..4562aa5f0 100644 --- a/clients/rook/src/lib.rs +++ b/clients/rook/src/lib.rs @@ -4,8 +4,11 @@ pub mod config; pub mod dashboard; +pub mod db; pub mod domain; pub mod gateway; pub mod registry; pub mod routing; +pub mod server; +pub mod services; pub mod tui; diff --git a/clients/rook/src/services/account.rs b/clients/rook/src/services/account.rs index 0d7ef2617..f47b774cd 100644 --- a/clients/rook/src/services/account.rs +++ b/clients/rook/src/services/account.rs @@ -61,28 +61,29 @@ impl AccountService for InMemoryAccountService { fn create(&self, account: ProviderAccount) -> Result { let id = account.id; - let mut guard = self - .store + self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))?; - if guard.contains_key(&id) { - return Err(RookError::Registry(format!("account {} already exists", id))); - } - guard.insert(id, account); + .map_err(|e| RookError::Registry(e.to_string()))? + .insert(id, account); Ok(id) } fn update(&self, account: ProviderAccount) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if !guard.contains_key(&account.id) { - return Err(RookError::Registry(format!("account {} not found", account.id))); + return Err(RookError::Registry(format!( + "account {} not found", + account.id + ))); } guard.insert(account.id, account); Ok(()) } fn delete(&self, id: AccountId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if guard.remove(&id).is_none() { return Err(RookError::Registry(format!("account {id} not found"))); } diff --git a/clients/rook/src/services/health.rs b/clients/rook/src/services/health.rs index 034d4d3c6..ddc6f4876 100644 --- a/clients/rook/src/services/health.rs +++ b/clients/rook/src/services/health.rs @@ -62,11 +62,11 @@ pub trait HealthService: Send + Sync { fn get(&self, account_id: AccountId) -> AccountHealth; /// Record a successful probe for `account_id`, clearing any cooldown. - fn mark_success(&self, account_id: AccountId) -> Result<(), RookError>; + fn mark_success(&self, account_id: AccountId); /// Record a failed probe for `account_id` and set a cooldown window of /// `cooldown_seconds` from now. - fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64) -> Result<(), RookError>; + fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64); /// Return `true` when the account is healthy and any previous cooldown has /// expired. @@ -93,7 +93,9 @@ impl InMemoryHealthService { } /// Acquire the lock, propagating a [`RookError::Registry`] on poisoning. - fn lock(&self) -> Result>, RookError> { + fn lock( + &self, + ) -> Result>, RookError> { self.store.lock().map_err(|e| RookError::Registry(e.to_string())) } } @@ -106,44 +108,41 @@ impl HealthService for InMemoryHealthService { .unwrap_or_else(|_| AccountHealth::new(account_id)) } - fn mark_success(&self, account_id: AccountId) -> Result<(), RookError> { - let mut guard = self.lock()?; - let entry = guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); - entry.status = HealthStatus::Healthy; - entry.last_checked = Some(Utc::now()); - entry.consecutive_failures = 0; - entry.cooldown_until = None; - Ok(()) + fn mark_success(&self, account_id: AccountId) { + if let Ok(mut guard) = self.lock() { + let entry = + guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); + entry.status = HealthStatus::Healthy; + entry.last_checked = Some(Utc::now()); + entry.consecutive_failures = 0; + entry.cooldown_until = None; + } } - fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64) -> Result<(), RookError> { - let mut guard = self.lock()?; - let entry = guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); - entry.consecutive_failures = entry.consecutive_failures.saturating_add(1); - entry.last_checked = Some(Utc::now()); - entry.status = HealthStatus::Unhealthy; - - let cooldown_i64 = i64::try_from(cooldown_seconds) - .map_err(|e| RookError::Registry(format!("cooldown conversion failed: {}", e)))?; - let duration = chrono::Duration::seconds(cooldown_i64); - let cooldown_time = Utc::now() - .checked_add_signed(duration) - .ok_or_else(|| RookError::Registry("cooldown time overflow".to_string()))?; - - entry.cooldown_until = Some(cooldown_time); - Ok(()) + fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64) { + if let Ok(mut guard) = self.lock() { + let entry = + guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); + entry.consecutive_failures = entry.consecutive_failures.saturating_add(1); + entry.last_checked = Some(Utc::now()); + entry.status = HealthStatus::Unhealthy; + entry.cooldown_until = Some( + Utc::now() + + chrono::Duration::seconds(cooldown_seconds as i64), + ); + } } fn is_available(&self, account_id: AccountId) -> bool { let health = self.get(account_id); + if health.status == HealthStatus::Unhealthy { + return false; + } if let Some(until) = health.cooldown_until { if Utc::now() < until { return false; } } - if health.status == HealthStatus::Unhealthy && health.cooldown_until.is_some() { - return false; - } true } @@ -164,6 +163,7 @@ mod tests { let id = AccountId::generate(); let health = svc.get(id); assert_eq!(health.status, HealthStatus::Unknown); + // Unknown accounts are treated as available (no cooldown, not explicitly unhealthy). assert!(svc.is_available(id)); } @@ -172,10 +172,12 @@ mod tests { let svc = InMemoryHealthService::new(); let id = AccountId::generate(); - svc.mark_failure(id, 300).unwrap(); + // First mark as failed to set a cooldown. + svc.mark_failure(id, 300); assert!(!svc.is_available(id)); - svc.mark_success(id).unwrap(); + // Then recover. + svc.mark_success(id); let health = svc.get(id); assert_eq!(health.status, HealthStatus::Healthy); assert_eq!(health.consecutive_failures, 0); @@ -188,14 +190,15 @@ mod tests { let svc = InMemoryHealthService::new(); let id = AccountId::generate(); - svc.mark_failure(id, 60).unwrap(); + svc.mark_failure(id, 60); let health = svc.get(id); assert_eq!(health.status, HealthStatus::Unhealthy); assert_eq!(health.consecutive_failures, 1); assert!(health.cooldown_until.is_some()); assert!(health.cooldown_until.unwrap() > Utc::now()); - svc.mark_failure(id, 60).unwrap(); + // Second failure increments counter. + svc.mark_failure(id, 60); assert_eq!(svc.get(id).consecutive_failures, 2); } @@ -204,7 +207,8 @@ mod tests { let svc = InMemoryHealthService::new(); let id = AccountId::generate(); - svc.mark_failure(id, 9999).unwrap(); + // Large cooldown — will not expire within the test. + svc.mark_failure(id, 9999); assert!(!svc.is_available(id)); } @@ -216,9 +220,9 @@ mod tests { let good2 = AccountId::generate(); let bad = AccountId::generate(); - svc.mark_success(good1).unwrap(); - svc.mark_success(good2).unwrap(); - svc.mark_failure(bad, 9999).unwrap(); + svc.mark_success(good1); + svc.mark_success(good2); + svc.mark_failure(bad, 9999); let healthy = svc.list_healthy(&[good1, bad, good2]); assert_eq!(healthy.len(), 2); @@ -232,11 +236,13 @@ mod tests { let svc = InMemoryHealthService::new(); let id = AccountId::generate(); + // get creates a default entry let h = svc.get(id); assert_eq!(h.account_id, id); - svc.mark_failure(id, 1).unwrap(); - svc.mark_success(id).unwrap(); + // mark failure then success + svc.mark_failure(id, 1); + svc.mark_success(id); assert_eq!(svc.get(id).status, HealthStatus::Healthy); } } diff --git a/clients/rook/src/services/pool.rs b/clients/rook/src/services/pool.rs index 9ca38da40..aca015cde 100644 --- a/clients/rook/src/services/pool.rs +++ b/clients/rook/src/services/pool.rs @@ -72,19 +72,16 @@ impl PoolService for InMemoryPoolService { fn create(&self, pool: ProviderPool) -> Result { let id = pool.id; - let mut guard = self - .store + self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))?; - if guard.contains_key(&id) { - return Err(RookError::Registry(format!("pool {} already exists", id))); - } - guard.insert(id, pool); + .map_err(|e| RookError::Registry(e.to_string()))? + .insert(id, pool); Ok(id) } fn update(&self, pool: ProviderPool) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if !guard.contains_key(&pool.id) { return Err(RookError::Registry(format!("pool {} not found", pool.id))); } @@ -93,7 +90,8 @@ impl PoolService for InMemoryPoolService { } fn delete(&self, id: PoolId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if guard.remove(&id).is_none() { return Err(RookError::Registry(format!("pool {id} not found"))); } @@ -101,7 +99,8 @@ impl PoolService for InMemoryPoolService { } fn add_member(&self, pool_id: PoolId, account_id: AccountId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; let pool = guard .get_mut(&pool_id) .ok_or_else(|| RookError::Registry(format!("pool {pool_id} not found")))?; @@ -112,7 +111,8 @@ impl PoolService for InMemoryPoolService { } fn remove_member(&self, pool_id: PoolId, account_id: AccountId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; let pool = guard .get_mut(&pool_id) .ok_or_else(|| RookError::Registry(format!("pool {pool_id} not found")))?; diff --git a/clients/rook/src/services/route.rs b/clients/rook/src/services/route.rs index 0e8c9adae..e2094eabd 100644 --- a/clients/rook/src/services/route.rs +++ b/clients/rook/src/services/route.rs @@ -64,56 +64,36 @@ impl RouteService for InMemoryRouteService { } fn resolve(&self, logical_model: &str) -> Option { - let guard = self.store.lock().ok()?; - let matches: Vec = guard + self.store + .lock() + .ok()? .values() - .filter(|r| r.logical_model == logical_model) + .find(|r| r.logical_model == logical_model) .cloned() - .collect(); - if matches.len() == 1 { - Some(matches[0].clone()) - } else { - None - } } fn create(&self, route: ModelRoute) -> Result { let id = route.id; - let mut guard = self - .store + self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))?; - - if guard.values().any(|r| r.logical_model == route.logical_model) { - return Err(RookError::Registry(format!( - "route with logical_model '{}' already exists", - route.logical_model - ))); - } - - guard.insert(id, route); + .map_err(|e| RookError::Registry(e.to_string()))? + .insert(id, route); Ok(id) } fn update(&self, route: ModelRoute) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if !guard.contains_key(&route.id) { return Err(RookError::Registry(format!("route {} not found", route.id))); } - - if guard.values().any(|r| r.id != route.id && r.logical_model == route.logical_model) { - return Err(RookError::Registry(format!( - "another route with logical_model '{}' already exists", - route.logical_model - ))); - } - guard.insert(route.id, route); Ok(()) } fn delete(&self, id: RouteId) -> Result<(), RookError> { - let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + let mut guard = + self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; if guard.remove(&id).is_none() { return Err(RookError::Registry(format!("route {id} not found"))); } From 895527c3f97eda5d7eba6d7fd36f6a724918e541 Mon Sep 17 00:00:00 2001 From: "coderabbitai[bot]" <136622811+coderabbitai[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2026 11:32:17 +0000 Subject: [PATCH 3/3] fix: apply CodeRabbit auto-fixes Fixed 11 file(s) based on 16 unresolved review comments. Co-authored-by: CodeRabbit --- clients/rook/Cargo.lock | 528 +---------------------- clients/rook/Cargo.toml | 4 +- clients/rook/migrations/0001_initial.sql | 5 +- clients/rook/src/db/account.rs | 62 ++- clients/rook/src/db/mod.rs | 62 ++- clients/rook/src/db/pool.rs | 141 +++++- clients/rook/src/db/route.rs | 113 ++++- clients/rook/src/services/account.rs | 26 +- clients/rook/src/services/health.rs | 46 +- clients/rook/src/services/pool.rs | 26 +- clients/rook/src/services/route.rs | 118 ++++- 11 files changed, 541 insertions(+), 590 deletions(-) diff --git a/clients/rook/Cargo.lock b/clients/rook/Cargo.lock index 224b5287e..daf2726a9 100644 --- a/clients/rook/Cargo.lock +++ b/clients/rook/Cargo.lock @@ -170,20 +170,11 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" - [[package]] name = "bitflags" version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" -dependencies = [ - "serde_core", -] [[package]] name = "block-buffer" @@ -200,12 +191,6 @@ version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "bytes" version = "1.11.1" @@ -295,12 +280,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -371,17 +350,6 @@ dependencies = [ "typenum", ] -[[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 = "digest" version = "0.10.7" @@ -389,9 +357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", - "subtle", ] [[package]] @@ -436,17 +402,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 = "event-listener" version = "5.4.1" @@ -633,33 +588,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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -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 = "http" version = "1.4.0" @@ -945,9 +873,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] [[package]] name = "leb128fmt" @@ -961,24 +886,6 @@ version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" -[[package]] -name = "libm" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" - -[[package]] -name = "libredox" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" -dependencies = [ - "bitflags", - "libc", - "plain", - "redox_syscall 0.7.4", -] - [[package]] name = "libsqlite3-sys" version = "0.30.1" @@ -1026,16 +933,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - [[package]] name = "memchr" version = "2.8.0" @@ -1078,42 +975,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[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", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -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-traits" version = "0.2.19" @@ -1121,7 +982,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1160,20 +1020,11 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.18", + "redox_syscall", "smallvec", "windows-link", ] -[[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" @@ -1186,39 +1037,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "potential_utf" version = "0.1.5" @@ -1228,15 +1052,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "prettyplease" version = "0.2.37" @@ -1271,36 +1086,6 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" -[[package]] -name = "rand" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] - [[package]] name = "redox_syscall" version = "0.5.18" @@ -1310,15 +1095,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_syscall" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a" -dependencies = [ - "bitflags", -] - [[package]] name = "regex-automata" version = "0.4.14" @@ -1405,26 +1181,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "rsa" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "rust-embed" version = "8.11.0" @@ -1593,17 +1349,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sha2" version = "0.10.9" @@ -1640,16 +1385,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - [[package]] name = "slab" version = "0.4.12" @@ -1661,9 +1396,6 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -dependencies = [ - "serde", -] [[package]] name = "socket2" @@ -1684,16 +1416,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "sqlx" version = "0.8.6" @@ -1702,8 +1424,6 @@ checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" dependencies = [ "sqlx-core", "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", "sqlx-sqlite", ] @@ -1732,7 +1452,6 @@ dependencies = [ "percent-encoding", "rustls", "serde", - "serde_json", "sha2", "smallvec", "thiserror", @@ -1779,84 +1498,6 @@ dependencies = [ "url", ] -[[package]] -name = "sqlx-mysql" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" -dependencies = [ - "atoi", - "base64", - "bitflags", - "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", - "rsa", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "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", - "bitflags", - "byteorder", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - [[package]] name = "sqlx-sqlite" version = "0.8.6" @@ -1887,17 +1528,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - [[package]] name = "strsim" version = "0.11.1" @@ -1980,21 +1610,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "tinyvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" version = "1.52.1" @@ -2167,33 +1782,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" -[[package]] -name = "unicode-bidi" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" - [[package]] name = "unicode-ident" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unicode-normalization" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" - [[package]] name = "unicode-xid" version = "0.2.6" @@ -2297,12 +1891,6 @@ dependencies = [ "wit-bindgen 0.51.0", ] -[[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.118" @@ -2420,16 +2008,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "whoami" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" -dependencies = [ - "libredox", - "wasite", -] - [[package]] name = "winapi-util" version = "0.1.11" @@ -2498,22 +2076,13 @@ dependencies = [ "windows-link", ] -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -2525,67 +2094,34 @@ dependencies = [ "windows-link", ] -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[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" @@ -2598,48 +2134,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[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" @@ -2769,26 +2281,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zerocopy" -version = "0.8.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "zerofrom" version = "0.1.7" @@ -2853,4 +2345,4 @@ dependencies = [ name = "zmij" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" \ No newline at end of file diff --git a/clients/rook/Cargo.toml b/clients/rook/Cargo.toml index 9d13fa776..d2b8b3486 100644 --- a/clients/rook/Cargo.toml +++ b/clients/rook/Cargo.toml @@ -41,7 +41,7 @@ tracing-subscriber = { version = "0.3", default-features = false, features = ["f uuid = { version = "1.23", default-features = false, features = ["v4", "std", "serde"] } # Persistence -sqlx = { version = "0.8", default-features = false, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } +sqlx = { version = "0.8", default-features = false, features = ["runtime-tokio-rustls", "sqlite"] } # Time chrono = { version = "0.4", default-features = false, features = ["clock", "std", "serde"] } @@ -57,4 +57,4 @@ tower-http = { version = "0.6", default-features = false, features = ["fs", "tra http = "1.0" # Shared runtime contracts (no internal corvus binary dependency) -corvus-traits = { path = "../agent-runtime/crates/corvus-traits" } +corvus-traits = { path = "../agent-runtime/crates/corvus-traits" } \ No newline at end of file diff --git a/clients/rook/migrations/0001_initial.sql b/clients/rook/migrations/0001_initial.sql index 1c9c25e4f..34ebea63e 100644 --- a/clients/rook/migrations/0001_initial.sql +++ b/clients/rook/migrations/0001_initial.sql @@ -40,5 +40,8 @@ CREATE TABLE IF NOT EXISTS model_routes ( policy TEXT NOT NULL DEFAULT '{}', -- JSON-serialized RoutingPolicy created_at TEXT NOT NULL, updated_at TEXT NOT NULL, - FOREIGN KEY (target_pool_id) REFERENCES provider_pools(id) + FOREIGN KEY (target_pool_id) REFERENCES provider_pools(id) ON DELETE RESTRICT, + FOREIGN KEY (fallback_route_id) REFERENCES model_routes(id) ON DELETE SET NULL ); + +CREATE INDEX IF NOT EXISTS idx_pool_members_account_id ON pool_members(account_id); \ No newline at end of file diff --git a/clients/rook/src/db/account.rs b/clients/rook/src/db/account.rs index c0351abc3..d4961d4b9 100644 --- a/clients/rook/src/db/account.rs +++ b/clients/rook/src/db/account.rs @@ -7,6 +7,27 @@ use chrono::Utc; use sqlx::Row; use uuid::Uuid; +// ── Vendor serialization helpers ────────────────────────────────────────────── + +/// Convert a `ProviderVendor` to its canonical database string representation. +fn vendor_to_db_str(vendor: &ProviderVendor) -> Result { + match vendor { + ProviderVendor::OpenAi => Ok("open_ai".to_string()), + ProviderVendor::Anthropic => Ok("anthropic".to_string()), + ProviderVendor::Google => Ok("google".to_string()), + ProviderVendor::OpenRouter => Ok("open_router".to_string()), + ProviderVendor::DeepSeek => Ok("deep_seek".to_string()), + ProviderVendor::Other(s) => Ok(s.clone()), + } +} + +/// Parse a database string into a `ProviderVendor`. +fn db_str_to_vendor(s: &str) -> Result { + // Parse as JSON string to leverage existing deserialization logic + serde_json::from_str(&format!("\"{s}\"")) + .map_err(|e| RookError::Registry(format!("invalid vendor '{s}': {e}"))) +} + // ── Row mapping ─────────────────────────────────────────────────────────────── fn row_to_account(row: &sqlx::sqlite::SqliteRow) -> Result { @@ -21,9 +42,7 @@ fn row_to_account(row: &sqlx::sqlite::SqliteRow) -> Result Result = serde_json::from_str(&caps_str) .map_err(|e| RookError::Registry(format!("invalid capabilities JSON: {e}")))?; + let weight = u32::try_from(weight) + .map_err(|_| RookError::Registry(format!("weight out of range: {}", weight)))?; + let priority = u32::try_from(priority) + .map_err(|_| RookError::Registry(format!("priority out of range: {}", priority)))?; + Ok(ProviderAccount { id, display_name, vendor, api_base_override: api_base, enabled: enabled != 0, - weight: weight as u32, - priority: priority as u32, + weight, + priority, tags, capabilities, }) @@ -74,11 +98,8 @@ impl SqliteDb { /// Returns [`RookError::Registry`] if the ID already exists. pub async fn insert_account(&self, account: &ProviderAccount) -> Result<(), RookError> { let id = account.id.to_string(); - // Serialize vendor to its canonical string (strip surrounding quotes). - let vendor_json = serde_json::to_string(&account.vendor) - .map_err(|e| RookError::Registry(format!("failed to serialize vendor: {e}")))?; - // vendor_json is `"open_ai"` — strip the outer quotes for storage. - let vendor_str = vendor_json.trim_matches('"').to_string(); + // Convert vendor to its canonical string form for storage + let vendor_str = vendor_to_db_str(&account.vendor)?; let tags = serde_json::to_string(&account.tags) .map_err(|e| RookError::Registry(format!("failed to serialize tags: {e}")))?; @@ -275,4 +296,23 @@ mod tests { let fetched = db.get_account(&account.id).await.unwrap().unwrap(); assert_eq!(fetched.vendor, ProviderVendor::Other("mistral".to_string())); } -} + + #[tokio::test] + async fn vendor_other_with_quotes_round_trips() { + let db = SqliteDb::open_in_memory().await.unwrap(); + let account = ProviderAccount { + id: AccountId::generate(), + display_name: "Weird Vendor".to_string(), + vendor: ProviderVendor::Other("weird\"name".to_string()), + api_base_override: None, + enabled: true, + weight: 100, + priority: 0, + tags: vec![], + capabilities: vec![], + }; + db.insert_account(&account).await.unwrap(); + let fetched = db.get_account(&account.id).await.unwrap().unwrap(); + assert_eq!(fetched.vendor, ProviderVendor::Other("weird\"name".to_string())); + } +} \ No newline at end of file diff --git a/clients/rook/src/db/mod.rs b/clients/rook/src/db/mod.rs index 7e15dcc2d..0fb1f00ba 100644 --- a/clients/rook/src/db/mod.rs +++ b/clients/rook/src/db/mod.rs @@ -10,7 +10,9 @@ pub mod pool; pub mod route; use crate::domain::RookError; -use sqlx::SqlitePool; +use chrono::Utc; +use sqlx::{sqlite::SqliteConnectOptions, SqlitePool}; +use std::str::FromStr; /// Migration SQL embedded at compile time so the binary is self-contained. const MIGRATION_SQL: &str = include_str!(concat!( @@ -33,7 +35,13 @@ impl SqliteDb { /// (e.g., `"./rook.db"`). pub async fn open(path: &str) -> Result { let url = format!("sqlite:{path}?mode=rwc"); - let pool = SqlitePool::connect(&url) + let options = SqliteConnectOptions::from_str(&url) + .map_err(|e| { + RookError::Registry(format!("failed to parse database URL {path}: {e}")) + })? + .foreign_keys(true); + + let pool = SqlitePool::connect_with(options) .await .map_err(|e| { RookError::Registry(format!("failed to open database at {path}: {e}")) @@ -49,9 +57,15 @@ impl SqliteDb { pub async fn open_in_memory() -> Result { // max_connections(1) ensures a single connection so the in-memory // database is not dropped between pool checkouts. + let options = SqliteConnectOptions::from_str("sqlite::memory:") + .map_err(|e| { + RookError::Registry(format!("failed to parse in-memory URL: {e}")) + })? + .foreign_keys(true); + let pool = sqlx::pool::PoolOptions::::new() .max_connections(1) - .connect("sqlite::memory:") + .connect_with(options) .await .map_err(|e| { RookError::Registry(format!("failed to open in-memory database: {e}")) @@ -70,10 +84,46 @@ impl SqliteDb { /// Execute the embedded migration SQL against `pool`. async fn run_migrations(pool: &SqlitePool) -> Result<(), RookError> { - sqlx::raw_sql(MIGRATION_SQL) + // Create schema_migrations table if it doesn't exist + sqlx::query( + "CREATE TABLE IF NOT EXISTS schema_migrations ( + version TEXT PRIMARY KEY, + applied_at TEXT NOT NULL + )" + ) + .execute(pool) + .await + .map_err(|e| RookError::Registry(format!("failed to create schema_migrations table: {e}")))?; + + // Check if migration 0001_initial has already been applied + let version = "0001_initial"; + let row: Option<(String,)> = sqlx::query_as( + "SELECT version FROM schema_migrations WHERE version = ?" + ) + .bind(version) + .fetch_optional(pool) + .await + .map_err(|e| RookError::Registry(format!("failed to check migration status: {e}")))?; + + if row.is_none() { + // Apply the migration + sqlx::raw_sql(MIGRATION_SQL) + .execute(pool) + .await + .map_err(|e| RookError::Registry(format!("migration failed: {e}")))?; + + // Record that it was applied + let now = chrono::Utc::now().to_rfc3339(); + sqlx::query( + "INSERT INTO schema_migrations (version, applied_at) VALUES (?, ?)" + ) + .bind(version) + .bind(&now) .execute(pool) .await - .map_err(|e| RookError::Registry(format!("migration failed: {e}")))?; + .map_err(|e| RookError::Registry(format!("failed to record migration: {e}")))?; + } + Ok(()) } -} +} \ No newline at end of file diff --git a/clients/rook/src/db/pool.rs b/clients/rook/src/db/pool.rs index c8efb6486..02b539979 100644 --- a/clients/rook/src/db/pool.rs +++ b/clients/rook/src/db/pool.rs @@ -7,6 +7,25 @@ use chrono::Utc; use sqlx::Row; use uuid::Uuid; +// ── SelectionStrategy serialization helpers ─────────────────────────────────── + +/// Convert a `SelectionStrategy` to its canonical database string representation. +fn strategy_to_db_str(strategy: &SelectionStrategy) -> Result { + match strategy { + SelectionStrategy::Priority => Ok("priority".to_string()), + SelectionStrategy::RoundRobin => Ok("round_robin".to_string()), + SelectionStrategy::Weighted => Ok("weighted".to_string()), + SelectionStrategy::Failover => Ok("failover".to_string()), + } +} + +/// Parse a database string into a `SelectionStrategy`. +fn db_str_to_strategy(s: &str) -> Result { + // Parse as JSON string to leverage existing deserialization logic + serde_json::from_str(&format!("\"{s}\"")) + .map_err(|e| RookError::Registry(format!("invalid strategy '{s}': {e}"))) +} + // ── Row mapping ─────────────────────────────────────────────────────────────── fn row_to_pool( @@ -28,11 +47,7 @@ fn row_to_pool( let strategy_str: String = row .try_get("strategy") .map_err(|e| RookError::Registry(format!("missing strategy: {e}")))?; - let strategy: SelectionStrategy = - serde_json::from_str(&format!("\"{strategy_str}\"")) - .map_err(|e| { - RookError::Registry(format!("invalid strategy '{strategy_str}': {e}")) - })?; + let strategy = db_str_to_strategy(&strategy_str)?; let fallback_str: Option = row .try_get("fallback_pool_id") @@ -64,12 +79,17 @@ impl SqliteDb { /// Members in `pool.members` are inserted into `pool_members`. pub async fn insert_pool(&self, pool: &ProviderPool) -> Result<(), RookError> { let id = pool.id.to_string(); - let strategy_json = serde_json::to_string(&pool.strategy) - .map_err(|e| RookError::Registry(format!("failed to serialize strategy: {e}")))?; - let strategy_str = strategy_json.trim_matches('"').to_string(); + let strategy_str = strategy_to_db_str(&pool.strategy)?; let fallback = pool.fallback_pool_id.as_ref().map(|p| p.to_string()); let now = Utc::now().to_rfc3339(); + // Start transaction to make pool + members insertion atomic + let mut tx = self.pool() + .begin() + .await + .map_err(|e| RookError::Registry(format!("failed to begin transaction: {e}")))?; + + // Insert pool sqlx::query( "INSERT INTO provider_pools \ (id, name, strategy, fallback_pool_id, created_at, updated_at) \ @@ -81,14 +101,28 @@ impl SqliteDb { .bind(&fallback) .bind(&now) .bind(&now) - .execute(self.pool()) + .execute(&mut *tx) .await .map_err(|e| RookError::Registry(format!("insert_pool failed: {e}")))?; + // Insert members for account_id in &pool.members { - self.add_pool_member(&pool.id, account_id).await?; + let acct_str = account_id.to_string(); + sqlx::query( + "INSERT OR IGNORE INTO pool_members (pool_id, account_id) VALUES (?, ?)", + ) + .bind(&id) + .bind(&acct_str) + .execute(&mut *tx) + .await + .map_err(|e| RookError::Registry(format!("add_pool_member failed: {e}")))?; } + // Commit transaction + tx.commit() + .await + .map_err(|e| RookError::Registry(format!("failed to commit transaction: {e}")))?; + Ok(()) } @@ -123,16 +157,68 @@ impl SqliteDb { .await .map_err(|e| RookError::Registry(format!("list_pools failed: {e}")))?; - let mut pools = Vec::with_capacity(rows.len()); - for row in &rows { + if rows.is_empty() { + return Ok(vec![]); + } + + // Collect all pool IDs + let pool_ids: Vec = rows + .iter() + .map(|row| { + let pool_id_str: String = row + .try_get("id") + .map_err(|e| RookError::Registry(format!("missing pool id: {e}")))?; + Uuid::parse_str(&pool_id_str) + .map(PoolId::new) + .map_err(|e| RookError::Registry(format!("invalid pool UUID: {e}"))) + }) + .collect::, _>>()?; + + // Query all members in one go + let pool_id_strings: Vec = pool_ids.iter().map(|id| id.to_string()).collect(); + let placeholders = pool_id_strings.iter().map(|_| "?").collect::>().join(", "); + let query_str = format!( + "SELECT pool_id, account_id FROM pool_members WHERE pool_id IN ({}) ORDER BY pool_id, account_id", + placeholders + ); + + let mut query = sqlx::query(&query_str); + for id_str in &pool_id_strings { + query = query.bind(id_str); + } + + let member_rows = query + .fetch_all(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("fetch pool_members failed: {e}")))?; + + // Group members by pool_id + let mut members_by_pool: std::collections::HashMap> = + std::collections::HashMap::new(); + for row in member_rows { let pool_id_str: String = row - .try_get("id") - .map_err(|e| RookError::Registry(format!("missing pool id: {e}")))?; + .try_get("pool_id") + .map_err(|e| RookError::Registry(format!("missing pool_id: {e}")))?; let pool_id = PoolId::new( Uuid::parse_str(&pool_id_str) .map_err(|e| RookError::Registry(format!("invalid pool UUID: {e}")))?, ); - let members = self.get_pool_members(&pool_id).await?; + + let account_id_str: String = row + .try_get("account_id") + .map_err(|e| RookError::Registry(format!("missing account_id: {e}")))?; + let account_id = AccountId::new( + Uuid::parse_str(&account_id_str) + .map_err(|e| RookError::Registry(format!("invalid account UUID: {e}")))?, + ); + + members_by_pool.entry(pool_id).or_default().push(account_id); + } + + // Build pools with their members + let mut pools = Vec::with_capacity(rows.len()); + for (row, pool_id) in rows.iter().zip(pool_ids.iter()) { + let members = members_by_pool.remove(pool_id).unwrap_or_default(); pools.push(row_to_pool(row, members)?); } @@ -349,4 +435,27 @@ mod tests { let members = db.get_pool_members(&pool.id).await.unwrap(); assert_eq!(members.len(), 1); } -} + + #[tokio::test] + async fn deleting_pool_cascades_to_pool_members() { + let (db, a1, a2) = make_db_with_accounts().await; + let pool = make_pool(vec![a1, a2]); + db.insert_pool(&pool).await.unwrap(); + + // Verify members exist + let members = db.get_pool_members(&pool.id).await.unwrap(); + assert_eq!(members.len(), 2); + + // Delete the pool directly via SQL (simulating CASCADE) + let pool_id_str = pool.id.to_string(); + sqlx::query("DELETE FROM provider_pools WHERE id = ?") + .bind(&pool_id_str) + .execute(db.pool()) + .await + .unwrap(); + + // Verify pool_members rows are gone (CASCADE behavior) + let members_after = db.get_pool_members(&pool.id).await.unwrap(); + assert_eq!(members_after.len(), 0); + } +} \ No newline at end of file diff --git a/clients/rook/src/db/route.rs b/clients/rook/src/db/route.rs index 3bc372bcf..5d5d93aa7 100644 --- a/clients/rook/src/db/route.rs +++ b/clients/rook/src/db/route.rs @@ -58,7 +58,8 @@ fn row_to_route(row: &sqlx::sqlite::SqliteRow) -> Result let policy_json: String = row .try_get("policy") .map_err(|e| RookError::Registry(format!("missing policy: {e}")))?; - let policy: StoredPolicy = serde_json::from_str(&policy_json).unwrap_or_default(); + let policy: StoredPolicy = serde_json::from_str(&policy_json) + .map_err(|e| RookError::Registry(format!("invalid policy JSON: {e}; policy_json={policy_json}")))?; Ok(ModelRoute { id, @@ -78,6 +79,22 @@ impl SqliteDb { let target_pool_id = route.target_pool_id.to_string(); let fallback_route_id = route.fallback_route_id.as_ref().map(|r| r.to_string()); + // Validate that fallback_route_id exists if provided + if let Some(fallback_id) = &route.fallback_route_id { + let exists = sqlx::query("SELECT 1 FROM model_routes WHERE id = ?") + .bind(fallback_id.to_string()) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("failed to validate fallback_route_id: {e}")))?; + + if exists.is_none() { + return Err(RookError::Registry(format!( + "fallback_route_id {} does not exist", + fallback_id + ))); + } + } + let policy = StoredPolicy { capability_constraints: route.capability_constraints.clone(), }; @@ -158,6 +175,23 @@ impl SqliteDb { /// Returns `true` if a row was deleted, `false` if not found. pub async fn delete_route(&self, id: &RouteId) -> Result { let id_str = id.to_string(); + + // Check if any routes reference this one as a fallback + let referencing: Option<(String,)> = sqlx::query_as( + "SELECT id FROM model_routes WHERE fallback_route_id = ? LIMIT 1" + ) + .bind(&id_str) + .fetch_optional(self.pool()) + .await + .map_err(|e| RookError::Registry(format!("failed to check route references: {e}")))?; + + if let Some((referring_id,)) = referencing { + return Err(RookError::Registry(format!( + "cannot delete route {}: referenced by route {} as fallback", + id, referring_id + ))); + } + let result = sqlx::query("DELETE FROM model_routes WHERE id = ?") .bind(&id_str) .execute(self.pool()) @@ -307,4 +341,79 @@ mod tests { let deleted = db.delete_route(&missing).await.unwrap(); assert!(!deleted); } -} + + #[tokio::test] + async fn insert_route_with_nonexistent_fallback_fails() { + let (db, pool_id) = make_db_with_pool().await; + let route = ModelRoute { + id: RouteId::generate(), + logical_model: "gpt-4o".to_string(), + target_pool_id: pool_id, + fallback_route_id: Some(RouteId::generate()), // doesn't exist + capability_constraints: vec![], + }; + + let result = db.insert_route(&route).await; + assert!(result.is_err()); + assert!(result.unwrap_err().to_string().contains("does not exist")); + } + + #[tokio::test] + async fn delete_route_referenced_as_fallback_fails() { + let (db, pool_id) = make_db_with_pool().await; + + // Create fallback route first + let fallback_route = ModelRoute { + id: RouteId::generate(), + logical_model: "gpt-4o-fallback".to_string(), + target_pool_id: pool_id, + fallback_route_id: None, + capability_constraints: vec![], + }; + db.insert_route(&fallback_route).await.unwrap(); + + // Create primary route that references the fallback + let primary_route = ModelRoute { + id: RouteId::generate(), + logical_model: "gpt-4o".to_string(), + target_pool_id: pool_id, + fallback_route_id: Some(fallback_route.id), + capability_constraints: vec![], + }; + db.insert_route(&primary_route).await.unwrap(); + + // Try to delete the fallback route - should fail + let result = db.delete_route(&fallback_route.id).await; + assert!(result.is_err()); + assert!(result.unwrap_err().to_string().contains("referenced by")); + } + + #[tokio::test] + async fn insert_route_with_existing_fallback_succeeds() { + let (db, pool_id) = make_db_with_pool().await; + + // Create fallback route first + let fallback_route = ModelRoute { + id: RouteId::generate(), + logical_model: "gpt-4o-fallback".to_string(), + target_pool_id: pool_id, + fallback_route_id: None, + capability_constraints: vec![], + }; + db.insert_route(&fallback_route).await.unwrap(); + + // Create primary route that references the fallback + let primary_route = ModelRoute { + id: RouteId::generate(), + logical_model: "gpt-4o".to_string(), + target_pool_id: pool_id, + fallback_route_id: Some(fallback_route.id), + capability_constraints: vec![], + }; + db.insert_route(&primary_route).await.unwrap(); + + // Verify it was created + let fetched = db.get_route(&primary_route.id).await.unwrap().unwrap(); + assert_eq!(fetched.fallback_route_id, Some(fallback_route.id)); + } +} \ No newline at end of file diff --git a/clients/rook/src/services/account.rs b/clients/rook/src/services/account.rs index f47b774cd..850b56f88 100644 --- a/clients/rook/src/services/account.rs +++ b/clients/rook/src/services/account.rs @@ -61,10 +61,15 @@ impl AccountService for InMemoryAccountService { fn create(&self, account: ProviderAccount) -> Result { let id = account.id; - self.store + let mut guard = self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))? - .insert(id, account); + .map_err(|e| RookError::Registry(e.to_string()))?; + + if guard.contains_key(&id) { + return Err(RookError::Registry(format!("duplicate account id {}", id))); + } + + guard.insert(id, account); Ok(id) } @@ -167,4 +172,17 @@ mod tests { let err = svc.update(account).unwrap_err(); assert!(err.to_string().contains("not found")); } -} + + #[test] + fn create_duplicate_returns_error() { + let svc = InMemoryAccountService::new(); + let account = make_account("test"); + + // First create should succeed + svc.create(account.clone()).unwrap(); + + // Second create with same ID should fail + let err = svc.create(account).unwrap_err(); + assert!(err.to_string().contains("duplicate")); + } +} \ No newline at end of file diff --git a/clients/rook/src/services/health.rs b/clients/rook/src/services/health.rs index ddc6f4876..f08911955 100644 --- a/clients/rook/src/services/health.rs +++ b/clients/rook/src/services/health.rs @@ -109,27 +109,37 @@ impl HealthService for InMemoryHealthService { } fn mark_success(&self, account_id: AccountId) { - if let Ok(mut guard) = self.lock() { - let entry = - guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); - entry.status = HealthStatus::Healthy; - entry.last_checked = Some(Utc::now()); - entry.consecutive_failures = 0; - entry.cooldown_until = None; + match self.lock() { + Ok(mut guard) => { + let entry = + guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); + entry.status = HealthStatus::Healthy; + entry.last_checked = Some(Utc::now()); + entry.consecutive_failures = 0; + entry.cooldown_until = None; + } + Err(e) => { + tracing::warn!("mark_success: poisoned mutex for account {}: {}", account_id, e); + } } } fn mark_failure(&self, account_id: AccountId, cooldown_seconds: u64) { - if let Ok(mut guard) = self.lock() { - let entry = - guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); - entry.consecutive_failures = entry.consecutive_failures.saturating_add(1); - entry.last_checked = Some(Utc::now()); - entry.status = HealthStatus::Unhealthy; - entry.cooldown_until = Some( - Utc::now() - + chrono::Duration::seconds(cooldown_seconds as i64), - ); + match self.lock() { + Ok(mut guard) => { + let entry = + guard.entry(account_id).or_insert_with(|| AccountHealth::new(account_id)); + entry.consecutive_failures = entry.consecutive_failures.saturating_add(1); + entry.last_checked = Some(Utc::now()); + entry.status = HealthStatus::Unhealthy; + let cooldown_secs = i64::try_from(cooldown_seconds).unwrap_or(i64::MAX); + entry.cooldown_until = Some( + Utc::now() + chrono::Duration::seconds(cooldown_secs), + ); + } + Err(e) => { + tracing::warn!("mark_failure: poisoned mutex for account {}: {}", account_id, e); + } } } @@ -245,4 +255,4 @@ mod tests { svc.mark_success(id); assert_eq!(svc.get(id).status, HealthStatus::Healthy); } -} +} \ No newline at end of file diff --git a/clients/rook/src/services/pool.rs b/clients/rook/src/services/pool.rs index aca015cde..448bffcf3 100644 --- a/clients/rook/src/services/pool.rs +++ b/clients/rook/src/services/pool.rs @@ -72,10 +72,15 @@ impl PoolService for InMemoryPoolService { fn create(&self, pool: ProviderPool) -> Result { let id = pool.id; - self.store + let mut guard = self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))? - .insert(id, pool); + .map_err(|e| RookError::Registry(e.to_string()))?; + + if guard.contains_key(&id) { + return Err(RookError::Registry(format!("duplicate pool id {}", id))); + } + + guard.insert(id, pool); Ok(id) } @@ -229,4 +234,17 @@ mod tests { let err = svc.add_member(PoolId::generate(), AccountId::generate()).unwrap_err(); assert!(err.to_string().contains("not found")); } -} + + #[test] + fn create_duplicate_pool_returns_error() { + let svc = InMemoryPoolService::new(); + let pool = make_pool("test"); + + // First create should succeed + svc.create(pool.clone()).unwrap(); + + // Second create with same ID should fail + let err = svc.create(pool).unwrap_err(); + assert!(err.to_string().contains("duplicate")); + } +} \ No newline at end of file diff --git a/clients/rook/src/services/route.rs b/clients/rook/src/services/route.rs index e2094eabd..54d3ec4f4 100644 --- a/clients/rook/src/services/route.rs +++ b/clients/rook/src/services/route.rs @@ -64,29 +64,65 @@ impl RouteService for InMemoryRouteService { } fn resolve(&self, logical_model: &str) -> Option { - self.store - .lock() - .ok()? + let guard = self.store.lock().ok()?; + let matches: Vec = guard .values() - .find(|r| r.logical_model == logical_model) + .filter(|r| r.logical_model == logical_model) .cloned() + .collect(); + + // Only return a route if exactly one is found + if matches.len() == 1 { + Some(matches[0].clone()) + } else { + None + } } fn create(&self, route: ModelRoute) -> Result { let id = route.id; - self.store + let mut guard = self.store .lock() - .map_err(|e| RookError::Registry(e.to_string()))? - .insert(id, route); + .map_err(|e| RookError::Registry(e.to_string()))?; + + // Check for duplicate route ID + if guard.contains_key(&id) { + return Err(RookError::Registry(format!("duplicate route id {}", id))); + } + + // Check for duplicate logical_model + for existing in guard.values() { + if existing.logical_model == route.logical_model { + return Err(RookError::Registry(format!( + "route for logical_model '{}' already exists", + route.logical_model + ))); + } + } + + guard.insert(id, route); Ok(id) } fn update(&self, route: ModelRoute) -> Result<(), RookError> { let mut guard = self.store.lock().map_err(|e| RookError::Registry(e.to_string()))?; + + // Verify route exists if !guard.contains_key(&route.id) { return Err(RookError::Registry(format!("route {} not found", route.id))); } + + // Check that no OTHER route has the same logical_model + for (existing_id, existing_route) in guard.iter() { + if *existing_id != route.id && existing_route.logical_model == route.logical_model { + return Err(RookError::Registry(format!( + "route for logical_model '{}' already exists (id: {})", + route.logical_model, existing_id + ))); + } + } + guard.insert(route.id, route); Ok(()) } @@ -184,4 +220,70 @@ mod tests { let svc = InMemoryRouteService::new(); assert!(svc.resolve("no-such-model").is_none()); } -} + + #[test] + fn create_duplicate_route_id_returns_error() { + let svc = InMemoryRouteService::new(); + let route = make_route("gpt-4o"); + + // First create should succeed + svc.create(route.clone()).unwrap(); + + // Second create with same ID should fail + let err = svc.create(route).unwrap_err(); + assert!(err.to_string().contains("duplicate")); + } + + #[test] + fn create_duplicate_logical_model_returns_error() { + let svc = InMemoryRouteService::new(); + let route1 = make_route("gpt-4o"); + let mut route2 = make_route("gpt-4o"); + route2.id = RouteId::generate(); // different ID, same logical_model + + // First create should succeed + svc.create(route1).unwrap(); + + // Second create with same logical_model should fail + let err = svc.create(route2).unwrap_err(); + assert!(err.to_string().contains("already exists")); + } + + #[test] + fn update_with_duplicate_logical_model_returns_error() { + let svc = InMemoryRouteService::new(); + let route1 = make_route("gpt-4o"); + let route2 = make_route("claude-3-opus"); + + svc.create(route1.clone()).unwrap(); + svc.create(route2.clone()).unwrap(); + + // Try to update route2 to have the same logical_model as route1 + let mut updated_route2 = route2.clone(); + updated_route2.logical_model = "gpt-4o".to_string(); + + let err = svc.update(updated_route2).unwrap_err(); + assert!(err.to_string().contains("already exists")); + } + + #[test] + fn resolve_with_multiple_matches_returns_none() { + let svc = InMemoryRouteService::new(); + + // This shouldn't happen in practice due to create() validation, + // but resolve should handle it gracefully + let route1 = make_route("gpt-4o"); + let mut route2 = make_route("gpt-4o"); + route2.id = RouteId::generate(); + + // Manually insert both (bypassing create validation) + { + let mut guard = svc.store.lock().unwrap(); + guard.insert(route1.id, route1); + guard.insert(route2.id, route2); + } + + // resolve should return None when multiple routes match + assert!(svc.resolve("gpt-4o").is_none()); + } +} \ No newline at end of file