diff --git a/.gitignore b/.gitignore index d01bd1a990..506a7a2729 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk - +.idea # MSVC Windows builds of rustc generate these, which store debugging information *.pdb diff --git a/Cargo.lock b/Cargo.lock index 802035d030..c856c5a4c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,44 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + +[[package]] +name = "async-convert" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d416feee97712e43152cd42874de162b8f9b77295b1c85e5d92725cc8310bae" +dependencies = [ + "async-trait", +] + +[[package]] +name = "async-openai" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e1df052c2bd7b241fc828bc2fda74ce9a7ef05e0a593c37275aaaba52caf49d" +dependencies = [ + "async-convert", + "backoff", + "base64", + "derive_builder", + "futures", + "rand", + "reqwest", + "reqwest-eventsource", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + [[package]] name = "async-trait" version = "0.1.83" @@ -25,7 +63,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -35,58 +73,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] -name = "axum" -version = "0.7.9" +name = "backoff" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "async-trait", - "axum-core", - "bytes", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.5.1", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", + "futures-core", + "getrandom", + "instant", "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper 1.0.2", + "rand", "tokio", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 1.0.2", - "tower-layer", - "tower-service", - "tracing", ] [[package]] @@ -128,17 +125,29 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "bytes" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + [[package]] name = "cc" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" +checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" dependencies = [ "shlex", ] @@ -153,15 +162,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" name = "code-forge" version = "0.1.0" dependencies = [ - "axum", - "derive_more", - "derive_setters", - "rig-core", + "async-openai", + "crossterm", + "futures", + "ratatui", + "reqwest", "serde", "serde_json", + "thiserror", "tokio", - "tower", - "tower-http", + "tokio-stream", ] [[package]] @@ -180,11 +190,36 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "libc", + "mio 0.8.11", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + [[package]] name = "darling" -version = "0.20.10" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -192,60 +227,58 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "derive_more" -version = "1.0.0" +name = "derive_builder" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_more-impl", + "derive_builder_macro", ] [[package]] -name = "derive_more-impl" -version = "1.0.0" +name = "derive_builder_core" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ + "darling", "proc-macro2", "quote", - "syn", - "unicode-xid", + "syn 1.0.109", ] [[package]] -name = "derive_setters" -version = "0.1.6" +name = "derive_builder_macro" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", + "derive_builder_core", + "syn 1.0.109", ] [[package]] @@ -256,14 +289,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] -name = "dyn-clone" -version = "1.0.17" +name = "either" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" @@ -290,6 +323,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "eventsource-stream" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" +dependencies = [ + "futures-core", + "nom", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "2.3.0" @@ -302,6 +346,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -382,7 +432,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -397,6 +447,12 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + [[package]] name = "futures-util" version = "0.3.31" @@ -416,16 +472,21 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.31.1" +name = "getrandom" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] [[package]] -name = "glob" -version = "0.3.1" +name = "gimli" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "h2" @@ -438,7 +499,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.12", + "http", "indexmap", "slab", "tokio", @@ -451,23 +512,23 @@ name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] -name = "http" -version = "0.2.12" +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "http" -version = "1.2.0" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -481,39 +542,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http 1.2.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", "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.9.5" @@ -537,8 +569,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -551,22 +583,17 @@ dependencies = [ ] [[package]] -name = "hyper" -version = "1.5.1" +name = "hyper-rustls" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ - "bytes", - "futures-channel", "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", + "http", + "hyper", + "rustls", "tokio", + "tokio-rustls", ] [[package]] @@ -576,28 +603,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.31", + "hyper", "native-tls", "tokio", "tokio-native-tls", ] -[[package]] -name = "hyper-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" -dependencies = [ - "bytes", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "hyper 1.5.1", - "pin-project-lite", - "tokio", - "tower-service", -] - [[package]] name = "icu_collections" version = "1.5.0" @@ -713,7 +724,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -753,12 +764,36 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + [[package]] name = "ipnet" version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.14" @@ -777,9 +812,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "linux-raw-sys" @@ -793,6 +828,16 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.22" @@ -800,10 +845,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] -name = "matchit" -version = "0.7.3" +name = "lru" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown", +] [[package]] name = "memchr" @@ -827,6 +875,12 @@ dependencies = [ "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.8.0" @@ -836,6 +890,18 @@ dependencies = [ "adler2", ] +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + [[package]] name = "mio" version = "1.0.3" @@ -865,12 +931,13 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.19" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "autocfg", + "memchr", + "minimal-lexical", ] [[package]] @@ -911,7 +978,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -933,14 +1000,34 @@ dependencies = [ ] [[package]] -name = "ordered-float" -version = "4.5.0" +name = "parking_lot" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65ee1f9701bf938026630b455d5315f490640234259037edb259798b3bcf85e" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ - "num-traits", + "lock_api", + "parking_lot_core", ] +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "percent-encoding" version = "2.3.1" @@ -965,6 +1052,15 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + [[package]] name = "proc-macro2" version = "1.0.92" @@ -983,6 +1079,64 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +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", +] + +[[package]] +name = "ratatui" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" +dependencies = [ + "bitflags 2.6.0", + "cassowary", + "crossterm", + "indoc", + "itertools", + "lru", + "paste", + "stability", + "strum", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "reqwest" version = "0.11.27" @@ -995,49 +1149,70 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", + "http", + "http-body", + "hyper", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "rustls", + "rustls-native-certs", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", + "tokio-rustls", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "winreg", ] [[package]] -name = "rig-core" -version = "0.5.0" +name = "reqwest-eventsource" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d6a8a31988c7e0e151bb0868e6f8bf0d4a0d01ba57c46a84ad3f354c55cc18" +checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" dependencies = [ - "futures", - "glob", - "ordered-float", + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom", + "pin-project-lite", "reqwest", - "schemars", - "serde", - "serde_json", "thiserror", - "tracing", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", ] [[package]] @@ -1048,9 +1223,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", @@ -1059,6 +1234,30 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -1068,6 +1267,16 @@ dependencies = [ "base64", ] +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.18" @@ -1090,27 +1299,19 @@ dependencies = [ ] [[package]] -name = "schemars" -version = "0.8.21" +name = "scopeguard" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "schemars_derive" -version = "0.8.21" +name = "sct" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn", + "ring", + "untrusted", ] [[package]] @@ -1138,33 +1339,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_derive_internals" -version = "0.29.1" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -1179,16 +1369,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1207,6 +1387,36 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio 0.8.11", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + [[package]] name = "slab" version = "0.4.9" @@ -1232,6 +1442,22 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stability" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -1240,9 +1466,42 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.11.1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.90", +] + +[[package]] +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] [[package]] name = "syn" @@ -1261,12 +1520,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" - [[package]] name = "synstructure" version = "0.13.1" @@ -1275,7 +1528,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -1329,7 +1582,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -1351,8 +1604,10 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio", + "mio 1.0.3", + "parking_lot", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", "windows-sys 0.52.0", @@ -1366,7 +1621,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -1380,65 +1635,39 @@ dependencies = [ ] [[package]] -name = "tokio-util" -version = "0.7.13" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", + "rustls", "tokio", ] [[package]] -name = "tower" -version = "0.5.1" +name = "tokio-stream" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", - "futures-util", "pin-project-lite", - "sync_wrapper 0.1.2", "tokio", - "tower-layer", - "tower-service", - "tracing", ] [[package]] -name = "tower-http" -version = "0.6.2" +name = "tokio-util" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ - "bitflags 2.6.0", "bytes", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "http-body-util", - "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", + "futures-core", + "futures-sink", "pin-project-lite", "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", ] -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -1451,7 +1680,6 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -1465,7 +1693,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -1496,10 +1724,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] -name = "unicode-xid" -version = "0.2.6" +name = "unicode-segmentation" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" @@ -1566,7 +1806,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 2.0.90", "wasm-bindgen-shared", ] @@ -1601,7 +1841,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1612,6 +1852,19 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.76" @@ -1622,6 +1875,28 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-sys" version = "0.48.0" @@ -1812,10 +2087,31 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", "synstructure", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "zerofrom" version = "0.1.5" @@ -1833,7 +2129,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", "synstructure", ] @@ -1856,5 +2152,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] diff --git a/Cargo.toml b/Cargo.toml index 7510922d5d..73aa6cae4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,12 +4,20 @@ version = "0.1.0" edition = "2021" [dependencies] -axum = "0.7.9" -derive_more = { version = "1.0.0", features = ["debug", "from"] } -derive_setters = "0.1.6" -rig-core = "0.5.0" -serde = { version = "1.0.215", features = ["derive"] } -serde_json = "1.0.133" -tokio = { version = "1.42.0", features = ["rt-multi-thread", "fs"] } -tower = { version = "0.5.1", features = ["util"] } -tower-http = { version = "0.6.2", features = ["fs", "trace"] } +tokio = { version = "1", features = ["full"] } +ratatui = { version = "0.25", features = ["crossterm"] } +crossterm = "0.27" +futures = "0.3" +tokio-stream = "0.1" +thiserror = "1.0" +async-openai = "0.14" +reqwest = { version = "0.11", features = ["json"] } +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" + +[dev-dependencies] +tokio = { version = "1", features = ["full", "test-util"] } + +[[test]] +name = "integration_test" +path = "tests/integration_test.rs" diff --git a/assets/index.html b/assets/index.html deleted file mode 100644 index 48b7e91199..0000000000 --- a/assets/index.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - LLM API Interaction - - - -
-

Alchemy

-
-
- - -
- -
-
-
- - - - diff --git a/src/api.rs b/src/api.rs deleted file mode 100644 index 26ab1aa707..0000000000 --- a/src/api.rs +++ /dev/null @@ -1,25 +0,0 @@ -use axum::{ - routing::post, - Router, -}; - -use crate::exec::Exec; - -pub struct Api { - router: Router, -} - -impl Api { - pub fn new() -> Self { - let router = Router::new().route( - "/exec", - post(|req| async { Exec::new().execute(req).await }), - ); - - Api { router } - } - - pub fn into_router(self) -> Router { - self.router - } -} diff --git a/src/cause.rs b/src/cause.rs deleted file mode 100644 index 0a5ab104db..0000000000 --- a/src/cause.rs +++ /dev/null @@ -1,28 +0,0 @@ -use axum::{ - body::Body, - response::{IntoResponse, Response}, -}; -use derive_setters::Setters; -use serde::{Deserialize, Serialize}; - -#[derive(Serialize, Deserialize, Setters)] -#[setters(strip_option, into)] -pub struct Cause { - error: String, - cause: Option>, -} - -impl IntoResponse for Cause { - fn into_response(self) -> Response { - Response::new(Body::from(serde_json::to_string(&self).unwrap())) - } -} - -impl Cause { - pub fn new(error: impl Into) -> Cause { - Cause { - error: error.into(), - cause: None, - } - } -} diff --git a/src/chat_engine.rs b/src/chat_engine.rs new file mode 100644 index 0000000000..9f30a42319 --- /dev/null +++ b/src/chat_engine.rs @@ -0,0 +1,207 @@ +use std::env; +use async_openai::{ + types::{ + ChatCompletionRequestMessage, + CreateChatCompletionRequest, + Role, + ChatCompletionRequestMessageArgs, + }, + Client, config::Config, +}; +use futures::stream::Stream; +use futures::StreamExt; +use tokio::sync::mpsc; +use tokio_stream::wrappers::ReceiverStream; +use reqwest::header::{HeaderMap, HeaderValue, AUTHORIZATION, CONTENT_TYPE}; + +const OPENROUTER_BASE_URL: &str = "https://openrouter.ai/api/v1"; +const MODEL_NAME: &str = "anthropic/claude-3-sonnet"; + +#[derive(Clone)] +struct OpenRouterConfig { + api_key: String, +} + +impl Config for OpenRouterConfig { + fn api_key(&self) -> &str { + &self.api_key + } + + fn api_base(&self) -> &str { + OPENROUTER_BASE_URL + } + + fn headers(&self) -> HeaderMap { + let mut headers = HeaderMap::new(); + headers.insert( + AUTHORIZATION, + HeaderValue::from_str(&format!("Bearer {}", self.api_key)).unwrap(), + ); + headers.insert( + CONTENT_TYPE, + HeaderValue::from_static("application/json"), + ); + headers.insert( + "X-Title", + HeaderValue::from_static("Code Forge Chat"), + ); + headers + } + + fn url(&self, path: &str) -> String { + format!("{}{}", self.api_base(), path) + } + + fn query(&self) -> Vec<(&str, &str)> { + Vec::new() + } +} + +#[derive(Clone)] +pub struct Agent { + system_prompt: String, + user_prompt: String, + client: Client, + messages: Vec, +} + +impl Agent { + pub fn new(system: String, user: String) -> Self { + let api_key = env::var("OPENROUTER_API_KEY").expect("OPENROUTER_API_KEY must be set"); + let config = OpenRouterConfig { api_key }; + let client = Client::with_config(config); + + let mut messages = Vec::new(); + messages.push( + ChatCompletionRequestMessageArgs::default() + .role(Role::System) + .content(system.clone()) + .build() + .unwrap() + ); + + Self { + system_prompt: system, + user_prompt: user, + client, + messages, + } + } + + /// Test the connection to OpenRouter + pub async fn test_connection(&self) -> Result> { + let request = CreateChatCompletionRequest { + model: MODEL_NAME.to_string(), + messages: vec![ + ChatCompletionRequestMessageArgs::default() + .role(Role::System) + .content("You are a helpful AI assistant.") + .build() + .unwrap(), + ChatCompletionRequestMessageArgs::default() + .role(Role::User) + .content("Respond with 'Connected successfully!' if you receive this message.") + .build() + .unwrap(), + ], + temperature: Some(0.7), + stream: Some(false), + max_tokens: Some(50), + ..Default::default() + }; + + let response = self.client.chat().create(request).await?; + Ok(response.choices[0].message.content.clone().unwrap_or_default()) + } + + /// Get a streaming response from OpenRouter + pub async fn stream_response(&mut self, input: String) -> impl Stream + Unpin { + let (tx, rx) = mpsc::channel::(100); + + // Add user message to history + self.messages.push( + ChatCompletionRequestMessageArgs::default() + .role(Role::User) + .content(input) + .build() + .unwrap() + ); + + // Create chat completion request + let request = CreateChatCompletionRequest { + model: MODEL_NAME.to_string(), + messages: self.messages.clone(), + temperature: Some(0.7), + stream: Some(true), + max_tokens: Some(1000), + ..Default::default() + }; + + let client = self.client.clone(); + let messages = self.messages.clone(); + + // Spawn task to handle streaming response + tokio::spawn(async move { + match client.chat().create_stream(request).await { + Ok(mut stream) => { + let mut current_content = String::new(); + + while let Some(result) = stream.next().await { + match result { + Ok(response) => { + if let Some(ref delta) = response.choices[0].delta.content { + current_content.push_str(delta); + let _ = tx.send(delta.to_string()).await; + } + } + Err(e) => { + eprintln!("Error in stream: {}", e); + let _ = tx.send(format!("Error: {}", e)).await; + break; + } + } + } + + // Add assistant's message to history and send newline to signal completion + if !current_content.is_empty() { + let mut messages = messages; + messages.push( + ChatCompletionRequestMessageArgs::default() + .role(Role::Assistant) + .content(current_content) + .build() + .unwrap() + ); + let _ = tx.send("\n".to_string()).await; + } + } + Err(e) => { + eprintln!("Failed to create stream: {}", e); + let _ = tx.send(format!("Error: {}", e)).await; + } + } + }); + + ReceiverStream::new(rx) + } +} + +pub struct ChatEngine { + agent: Agent, +} + +impl ChatEngine { + pub fn new(system_prompt: String, user_prompt: String) -> Self { + Self { + agent: Agent::new(system_prompt, user_prompt), + } + } + + pub async fn test_connection(&self) -> Result> { + self.agent.test_connection().await + } + + pub async fn process_message(&mut self, input: String) -> impl Stream + Unpin { + self.agent.stream_response(input).await + } +} diff --git a/src/chat_ui.rs b/src/chat_ui.rs new file mode 100644 index 0000000000..182574e8da --- /dev/null +++ b/src/chat_ui.rs @@ -0,0 +1,331 @@ +use std::error::Error; +use std::io::{self}; + +use crossterm::{ + event::{self, Event, KeyCode, KeyEventKind}, + execute, + terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, +}; +use futures::stream::Stream; +use futures::StreamExt; +use ratatui::{ + prelude::*, + widgets::{Block, Borders, Paragraph, Wrap}, + style::{Style, Modifier}, + layout::Margin, +}; +use tokio::sync::{mpsc, Mutex}; +use std::sync::Arc; + +#[derive(Clone)] +pub struct ChatState { + input: String, + cursor_position: usize, + messages: Vec, + streaming_response: Option, +} + +impl ChatState { + pub fn new() -> Self { + let mut state = Self { + input: String::new(), + cursor_position: 0, + messages: Vec::new(), + streaming_response: None, + }; + + // Add welcome message to initial state + state.messages.push( + "Welcome to Code Forge Chat, powered by Claude 3 Sonnet.\n\ + I'm your AI programming assistant, specializing in software development and technical topics.\n\ + Feel free to ask questions about programming, architecture, best practices, or any tech-related topics.\n\ + Type your message and press Enter to send. Press Ctrl+C or Esc to exit.".to_string() + ); + + state + } + + fn insert_char(&mut self, c: char) { + let pos = self.cursor_position; + if pos == self.input.len() { + self.input.push(c); + } else { + self.input.insert(pos, c); + } + self.cursor_position += 1; + } + + fn backspace(&mut self) { + if self.cursor_position > 0 { + let pos = self.cursor_position - 1; + self.input.remove(pos); + self.cursor_position = pos; + } + } + + fn delete(&mut self) { + if self.cursor_position < self.input.len() { + self.input.remove(self.cursor_position); + } + } + + fn start_response(&mut self) { + self.streaming_response = Some(String::from("Assistant: ")); + } + + fn append_to_response(&mut self, text: &str) { + // Skip "Sending response part:" messages + if text.starts_with("Sending response part:") { + return; + } + + if let Some(ref mut response) = self.streaming_response { + response.push_str(text); + } else { + self.streaming_response = Some(format!("Assistant: {}", text)); + } + } + + fn complete_response(&mut self) { + if let Some(response) = self.streaming_response.take() { + // Format the response with proper line breaks + let formatted = response + .lines() + .map(|line| line.trim()) + .collect::>() + .join("\n"); + self.messages.push(formatted); + } + } +} + +pub struct ChatUI { + terminal: Terminal>, + state: Arc>, +} + +impl ChatUI { + pub fn new() -> Result> { + // Terminal setup + enable_raw_mode()?; + let mut stdout = io::stdout(); + execute!(stdout, EnterAlternateScreen)?; + let backend = CrosstermBackend::new(stdout); + let terminal = Terminal::new(backend)?; + + Ok(Self { + terminal, + state: Arc::new(Mutex::new(ChatState::new())), + }) + } + + fn calculate_wrapped_height(text: &str, width: u16) -> u16 { + let mut height = 0; + for line in text.lines() { + // Calculate how many lines this text will wrap to + let line_length = line.chars().count() as u16; + let wrapped_lines = (line_length + width - 1) / width; + height += wrapped_lines.max(1); // At least one line even if empty + } + height + } + + fn render_chat_ui(frame: &mut Frame, state: &ChatState) -> Result<(), Box> { + let layout = Layout::default() + .direction(Direction::Vertical) + .constraints([ + Constraint::Min(10), // Messages area + Constraint::Length(3), // Input area + ]) + .split(frame.size()); + + // Messages area with scrolling + let mut display_messages = state.messages.clone(); + if let Some(ref current) = state.streaming_response { + display_messages.push(current.clone()); + } + + let messages_text = display_messages.join("\n\n"); + + // Get the inner area dimensions accounting for borders + let messages_block = Block::default().borders(Borders::ALL).title("Chat Messages"); + let inner_area = layout[0].inner(&Margin::new(1, 1)); + + // Calculate total content height including message separators + let content_height = Self::calculate_wrapped_height(&messages_text, inner_area.width) + + (display_messages.len().saturating_sub(1) as u16); // Add space for \n\n separators + + // Calculate scroll offset to keep the latest content visible + let viewport_height = inner_area.height; + let scroll_offset = content_height.saturating_sub(viewport_height); + + let messages_widget = Paragraph::new(messages_text) + .block(messages_block) + .wrap(Wrap { trim: true }) + .scroll((scroll_offset, 0)); + + frame.render_widget(messages_widget, layout[0]); + + // Input area with cursor + let input_len = state.input.len(); + let cursor_style = Style::default().add_modifier(Modifier::REVERSED); + + let input_text = if state.cursor_position < input_len { + let (before, at_cursor) = state.input.split_at(state.cursor_position); + let (at_cursor, after) = at_cursor.split_at(1); + Line::from(vec![ + Span::raw(before), + Span::styled(at_cursor, cursor_style), + Span::raw(after), + ]) + } else if input_len > 0 { + Line::from(vec![ + Span::raw(&state.input), + Span::styled(" ", cursor_style), + ]) + } else { + Line::from(vec![Span::styled(" ", cursor_style)]) + }; + + let input_block = Paragraph::new(input_text) + .block(Block::default().borders(Borders::ALL).title("Input")); + frame.render_widget(input_block, layout[1]); + + Ok(()) + } + + async fn handle_key_event(&mut self, key: KeyCode, input_tx: &mpsc::Sender) -> Result> { + let mut state = self.state.lock().await; + match key { + KeyCode::Enter => { + let input = state.input.clone(); + if !input.is_empty() { + state.messages.push(format!("You: {}", input)); + state.start_response(); + state.input.clear(); + state.cursor_position = 0; + input_tx.send(input).await?; + } + }, + KeyCode::Char(c) => { + state.insert_char(c); + }, + KeyCode::Backspace => { + state.backspace(); + }, + KeyCode::Delete => { + state.delete(); + }, + KeyCode::Left => { + if state.cursor_position > 0 { + state.cursor_position -= 1; + } + }, + KeyCode::Right => { + if state.cursor_position < state.input.len() { + state.cursor_position += 1; + } + }, + KeyCode::Home => { + state.cursor_position = 0; + }, + KeyCode::End => { + state.cursor_position = state.input.len(); + }, + KeyCode::Esc => { + return Ok(true); + } + _ => {} + } + + let state_snapshot = state.clone(); + drop(state); + self.terminal.draw(|frame| { + Self::render_chat_ui(frame, &state_snapshot).unwrap() + })?; + + Ok(false) + } + + pub async fn run( + &mut self, + mut response_stream: S, + input_tx: mpsc::Sender, + ) -> Result<(), Box> + where + S: Stream + Unpin, + { + let (shutdown_tx, mut shutdown_rx) = mpsc::channel(1); + let (event_tx, mut event_rx) = mpsc::channel(100); + + // Set up Ctrl+C handler + let shutdown_tx_clone = shutdown_tx.clone(); + tokio::spawn(async move { + if let Ok(()) = tokio::signal::ctrl_c().await { + let _ = shutdown_tx_clone.send(()).await; + } + }); + + // Spawn event reading task + let event_tx_clone = event_tx.clone(); + tokio::spawn(async move { + loop { + if let Ok(event) = event::read() { + if let Err(_) = event_tx_clone.send(event).await { + break; + } + } + } + }); + + // Initial render + let state_snapshot = self.state.lock().await.clone(); + self.terminal.draw(|frame| { + Self::render_chat_ui(frame, &state_snapshot).unwrap() + })?; + + // Main event loop + loop { + tokio::select! { + Some(event) = event_rx.recv() => { + if let Event::Key(key) = event { + if key.kind == KeyEventKind::Press { + if self.handle_key_event(key.code, &input_tx).await? { + break; + } + } + } + } + Some(response) = response_stream.next() => { + let mut state = self.state.lock().await; + if response == "\n" { + state.complete_response(); + } else { + state.append_to_response(&response); + } + let state_snapshot = state.clone(); + drop(state); + + self.terminal.draw(|frame| { + Self::render_chat_ui(frame, &state_snapshot).unwrap() + })?; + } + Some(_) = shutdown_rx.recv() => { + break; + } + else => break, + } + } + + Ok(()) + } +} + +impl Drop for ChatUI { + fn drop(&mut self) { + // Cleanup terminal + disable_raw_mode().unwrap(); + execute!(self.terminal.backend_mut(), LeaveAlternateScreen).unwrap(); + self.terminal.show_cursor().unwrap(); + } +} diff --git a/src/error.rs b/src/error.rs deleted file mode 100644 index a0d6b09b3c..0000000000 --- a/src/error.rs +++ /dev/null @@ -1,30 +0,0 @@ -use axum::response::{IntoResponse, Response}; -use derive_more::derive::{Debug, From}; - -use crate::cause::Cause; - -#[derive(Debug, From)] -pub enum Error { - IO { - error: tokio::io::Error, - resource: String, - }, -} - -pub type Result = std::result::Result; - -impl From for Cause { - fn from(value: Error) -> Self { - match value { - Error::IO { error, resource } => { - Cause::new(format!("IO Error: {}", resource)).cause(Cause::new(error.to_string())) - } - } - } -} - -impl IntoResponse for Error { - fn into_response(self) -> Response { - Cause::from(self).into_response() - } -} diff --git a/src/exec.rs b/src/exec.rs deleted file mode 100644 index dcb3a9cfd1..0000000000 --- a/src/exec.rs +++ /dev/null @@ -1,46 +0,0 @@ - -use crate::error::Result; -use axum::{ - body::Body, - http::{Request, Response}, -}; -use derive_more::Debug; - -#[derive(Clone)] -pub struct Exec {} - -impl Exec { - pub fn new() -> Self { - Exec {} - } - - pub async fn execute(&self, request: Request) -> Result> { - println!("{:?}", request); - todo!() - } -} - -struct LLMAgent {} - -#[derive(Debug)] -enum Prompt { - Message(String), -} - -impl LLMAgent { - async fn execute(prompt: Prompt) { - use rig::{completion::Prompt, providers::openai}; - - // Create OpenAI client and model - // This requires the `OPENAI_API_KEY` environment variable to be set. - let gpt4 = openai::Client::from_env().agent("gpt-4").build(); - - // Prompt the model and print its response - let response = gpt4 - .prompt(format!("{:?}", prompt).as_str()) - .await - .expect("Failed to prompt GPT-4"); - - println!("GPT-4: {response}"); - } -} diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000000..68ec546813 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,3 @@ +pub mod chat_engine; + +pub use chat_engine::*; \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index ed6d5b4385..96363f45ff 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,20 +1,66 @@ -mod api; -mod cause; -mod error; -mod exec; +mod chat_engine; +mod chat_ui; -use api::Api; -use tower_http::services::ServeDir; +use std::error::Error; +use futures::stream::Stream; +use futures::StreamExt; +use tokio::sync::mpsc; +use tokio_stream::wrappers::ReceiverStream; +use chat_engine::ChatEngine; +use chat_ui::ChatUI; -use axum::{self, Router}; +async fn create_response_stream( + mut chat_engine: ChatEngine, + mut input_rx: mpsc::Receiver, +) -> impl Stream + Unpin { + let (tx, rx) = mpsc::channel(100); + + // Spawn a task to process inputs and generate responses + tokio::spawn(async move { + // Process incoming messages + while let Some(input) = input_rx.recv().await { + let mut response_stream = chat_engine.process_message(input).await; + + while let Some(response_part) = response_stream.next().await { + let _ = tx.send(response_part).await; + } + } + }); + + ReceiverStream::new(rx) +} #[tokio::main] -async fn main() { - let api = Api::new(); - let app = Router::new() - .nest("/api", api.into_router()) - .nest_service("/assets", ServeDir::new("assets")); +async fn main() -> Result<(), Box> { + // Initialize chat engine + let chat_engine = ChatEngine::new( + "You are Claude 3 Sonnet, an AI assistant with expertise in programming, software development, and technology. \ + You excel at providing clear, accurate, and well-structured responses. When discussing code, you use proper \ + formatting and explain key concepts thoroughly. You are direct and professional, focusing on delivering \ + high-quality technical assistance while maintaining a helpful demeanor.".to_string(), + "Start a conversation".to_string() + ); + + // Test connection before creating chat window + match chat_engine.test_connection().await { + Ok(_) => { + println!("🟢 Successfully connected to Claude 3 Sonnet! Starting chat interface..."); + + // Create chat UI and channels + let mut chat_ui = ChatUI::new()?; + let (input_tx, input_rx) = mpsc::channel(100); + + // Create response stream + let response_stream = create_response_stream(chat_engine, input_rx).await; - let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap(); - axum::serve(listener, app).await.unwrap(); + // Start the chat interface + chat_ui.run(response_stream, input_tx).await?; + Ok(()) + } + Err(e) => { + eprintln!("🔴 Failed to connect to Claude 3 Sonnet: {}", e); + eprintln!("Please check your OPENROUTER_API_KEY environment variable and internet connection."); + Ok(()) + } + } } diff --git a/tests/integration_test.rs b/tests/integration_test.rs new file mode 100644 index 0000000000..62d6ee8eef --- /dev/null +++ b/tests/integration_test.rs @@ -0,0 +1,94 @@ +//! Integration tests for Code Forge Chat +//! +//! These tests verify the connection to OpenRouter and basic functionality +//! of the chat engine. To run these tests, make sure you have set the +//! OPENROUTER_API_KEY environment variable. + +use code_forge::ChatEngine; +use std::env; +use futures::StreamExt; + +/// Test the connection to OpenRouter and verify we can access Claude 3 Sonnet +#[tokio::test] +async fn test_openrouter_connection() { + // Verify API key is set + if env::var("OPENROUTER_API_KEY").is_err() { + panic!("❌ OPENROUTER_API_KEY environment variable is not set"); + } + + let chat_engine = ChatEngine::new( + "You are a test assistant.".to_string(), + "Test connection".to_string() + ); + + match chat_engine.test_connection().await { + Ok(response) => { + assert!( + response.contains("Connected successfully"), + "Expected connection test response, got: {}", + response + ); + println!("✅ Successfully connected to OpenRouter"); + println!("Response: {}", response); + }, + Err(e) => { + panic!("❌ Failed to connect to OpenRouter: {}\n\ + \nTroubleshooting steps:\n\ + 1. Verify your API key is valid\n\ + 2. Check if you have access to 'anthropic/claude-3-sonnet-20240229'\n\ + 3. Visit https://openrouter.ai/docs#models for supported models\n\ + 4. Check your internet connection\n", + e); + } + } +} + +/// Helper function to run the test with proper environment setup +#[tokio::test] +async fn test_chat_engine_initialization() { + let chat_engine = ChatEngine::new( + "Test system prompt".to_string(), + "Test user prompt".to_string() + ); + + assert_eq!( + chat_engine.test_connection().await.is_ok(), + true, + "Chat engine should initialize and connect successfully" + ); +} + +/// This test will test connection ask a question and get a response and verify the response +#[tokio::test] +async fn test_chat_engine_response() { + let mut chat_engine = ChatEngine::new( + "You are a test assistant.".to_string(), + "Test connection".to_string() + ); + + match chat_engine.test_connection().await { + Ok(_) => { + let mut response = chat_engine.process_message("who is PM of India".to_string()).await; + let mut final_response = String::new(); + while let Some(response_part) = response.next().await { + final_response.push_str(&response_part); + } + println!("Response: {}", final_response); + assert_eq!( + !final_response.is_empty(), + true, + "Expected response from chat engine" + ); + println!("✅ Successfully received response from chat engine"); + }, + Err(e) => { + panic!("❌ Failed to connect to OpenRouter: {}\n\ + \nTroubleshooting steps:\n\ + 1. Verify your API key is valid\n\ + 2. Check if you have access to 'anthropic/claude-3-sonnet-20240229'\n\ + 3. Visit https://openrouter.ai/docs#models for supported models\n\ + 4. Check your internet connection\n", + e); + } + } +}