diff --git a/Cargo.lock b/Cargo.lock index 028934b915..2eafa4b874 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -263,7 +263,7 @@ dependencies = [ "serde_urlencoded", "static_assertions_next", "tempfile", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -280,7 +280,7 @@ dependencies = [ "quote", "strum", "syn 2.0.101", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -650,7 +650,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "shlex", "syn 2.0.101", "which 4.4.2", @@ -793,7 +793,7 @@ dependencies = [ "sha2 0.10.8", "ssri", "tempfile", - "thiserror 1.0.69", + "thiserror", "walkdir", ] @@ -818,7 +818,7 @@ dependencies = [ "sha2 0.10.8", "ssri", "tempfile", - "thiserror 1.0.69", + "thiserror", "tokio", "tokio-stream", "walkdir", @@ -1678,6 +1678,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1830,8 +1845,8 @@ dependencies = [ [[package]] name = "genai" -version = "0.1.7-wip" -source = "git+https://github.com/laststylebender14/rust-genai.git?rev=63a542ce20132503c520f4e07108e0d768f243c3#63a542ce20132503c520f4e07108e0d768f243c3" +version = "0.1.8-wip" +source = "git+https://github.com/laststylebender14/rust-genai.git?rev=59e48b51825cdf190e5ebbb443c54ce2b00172cf#59e48b51825cdf190e5ebbb443c54ce2b00172cf" dependencies = [ "bytes", "derive_more", @@ -1980,7 +1995,7 @@ dependencies = [ "serde", "serde-wasm-bindgen 0.5.0", "serde_urlencoded", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", "web-sys", ] @@ -2000,7 +2015,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -2026,7 +2041,7 @@ dependencies = [ "js-sys", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", "web-sys", ] @@ -2125,7 +2140,7 @@ dependencies = [ "pest_derive", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -2481,24 +2496,6 @@ dependencies = [ "tokio-rustls 0.25.0", ] -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.6.0", - "hyper-util", - "rustls 0.23.26", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.0", - "tower-service", - "webpki-roots 0.26.7", -] - [[package]] name = "hyper-timeout" version = "0.4.1" @@ -2511,6 +2508,22 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.11" @@ -3253,7 +3266,7 @@ checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "miette-derive 5.10.0", "once_cell", - "thiserror 1.0.69", + "thiserror", "unicode-width", ] @@ -3265,7 +3278,7 @@ checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64" dependencies = [ "cfg-if", "miette-derive 7.4.0", - "thiserror 1.0.69", + "thiserror", "unicode-width", ] @@ -3383,7 +3396,7 @@ dependencies = [ "rustc_version", "smallvec", "tagptr", - "thiserror 1.0.69", + "thiserror", "uuid", ] @@ -3410,6 +3423,23 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" +[[package]] +name = "native-tls" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -3565,7 +3595,7 @@ dependencies = [ "libloading 0.7.4", "nvml-wrapper-sys", "static_assertions", - "thiserror 1.0.69", + "thiserror", "wrapcenum-derive", ] @@ -3611,12 +3641,50 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +[[package]] +name = "openssl" +version = "0.10.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-sys" +version = "0.9.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "opentelemetry" version = "0.23.0" @@ -3628,7 +3696,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -3641,7 +3709,7 @@ dependencies = [ "futures-sink", "js-sys", "pin-project-lite", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -3682,7 +3750,7 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk", "prost 0.12.6", - "thiserror 1.0.69", + "thiserror", "tokio", "tonic 0.11.0", ] @@ -3732,7 +3800,7 @@ dependencies = [ "ordered-float 4.5.0", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -3768,7 +3836,7 @@ dependencies = [ "percent-encoding", "rand", "serde_json", - "thiserror 1.0.69", + "thiserror", "tokio", "tokio-stream", ] @@ -3867,7 +3935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror 1.0.69", + "thiserror", "ucd-trie", ] @@ -3941,7 +4009,7 @@ dependencies = [ "serde", "serde_derive", "strum", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -3993,6 +4061,12 @@ dependencies = [ "futures-io", ] +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + [[package]] name = "plotters" version = "0.3.7" @@ -4144,7 +4218,7 @@ dependencies = [ "memchr", "parking_lot", "protobuf 2.28.0", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4275,7 +4349,7 @@ checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "once_cell", "protobuf-support", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4290,7 +4364,7 @@ dependencies = [ "protobuf-parse", "regex", "tempfile", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4305,7 +4379,7 @@ dependencies = [ "protobuf 3.7.1", "protobuf-support", "tempfile", - "thiserror 1.0.69", + "thiserror", "which 4.4.2", ] @@ -4315,7 +4389,7 @@ version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4387,7 +4461,7 @@ dependencies = [ "prost-reflect 0.13.1", "prost-types 0.12.6", "protox-parse 0.6.1", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4402,7 +4476,7 @@ dependencies = [ "prost-reflect 0.14.3", "prost-types 0.13.3", "protox-parse 0.7.0", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4414,7 +4488,7 @@ dependencies = [ "logos", "miette 7.4.0", "prost-types 0.12.6", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4426,7 +4500,7 @@ dependencies = [ "logos", "miette 7.4.0", "prost-types 0.13.3", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4464,58 +4538,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "quinn" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.0.0", - "rustls 0.23.26", - "socket2", - "thiserror 2.0.3", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" -dependencies = [ - "bytes", - "getrandom 0.2.15", - "rand", - "ring", - "rustc-hash 2.0.0", - "rustls 0.23.26", - "rustls-pki-types", - "slab", - "thiserror 2.0.3", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.59.0", -] - [[package]] name = "quote" version = "1.0.40" @@ -4592,7 +4614,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4706,7 +4728,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.4", + "webpki-roots", "winreg 0.50.0", ] @@ -4724,25 +4746,23 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.6.0", - "hyper-rustls 0.27.3", + "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "quinn", - "rustls 0.23.26", "rustls-pemfile 2.2.0", - "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.2", "tokio", - "tokio-rustls 0.26.0", + "tokio-native-tls", "tokio-util", "tower-service", "url", @@ -4750,7 +4770,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.7", "windows-registry", ] @@ -4767,7 +4786,7 @@ dependencies = [ "nom", "pin-project-lite", "reqwest 0.12.9", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4782,7 +4801,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "task-local-extensions", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4871,12 +4890,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - [[package]] name = "rustc_version" version = "0.4.1" @@ -4945,7 +4958,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" dependencies = [ "once_cell", - "ring", "rustls-pki-types", "rustls-webpki 0.103.1", "subtle", @@ -4988,9 +5000,6 @@ name = "rustls-pki-types" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" -dependencies = [ - "web-time", -] [[package]] name = "rustls-webpki" @@ -5248,7 +5257,7 @@ checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6" dependencies = [ "percent-encoding", "serde", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -5404,7 +5413,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror 1.0.69", + "thiserror", "time", ] @@ -5458,7 +5467,7 @@ dependencies = [ "serde", "sha-1 0.10.1", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror", "xxhash-rust", ] @@ -5753,7 +5762,7 @@ dependencies = [ "tailcall-version", "tempfile", "test-log", - "thiserror 1.0.69", + "thiserror", "tokio", "tokio-test", "tonic 0.11.0", @@ -5864,7 +5873,7 @@ version = "0.1.0" dependencies = [ "lazy_static", "strum_macros", - "thiserror 1.0.69", + "thiserror", "tokio", ] @@ -5938,7 +5947,7 @@ dependencies = [ "prost-types 0.12.6", "protoc-bin-vendored", "tailcall-fixtures", - "thiserror 1.0.69", + "thiserror", "tokio", "tonic 0.11.0", "tonic-build 0.11.0", @@ -5962,7 +5971,7 @@ dependencies = [ "serde", "serde_json", "serde_path_to_error", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", ] @@ -6056,16 +6065,7 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" -dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl", ] [[package]] @@ -6079,17 +6079,6 @@ dependencies = [ "syn 2.0.101", ] -[[package]] -name = "thiserror-impl" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] - [[package]] name = "thread_local" version = "1.1.8" @@ -6160,21 +6149,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -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.43.1" @@ -6215,33 +6189,32 @@ dependencies = [ ] [[package]] -name = "tokio-rustls" -version = "0.24.1" +name = "tokio-native-tls" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ - "rustls 0.21.12", + "native-tls", "tokio", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", + "rustls 0.21.12", "tokio", ] [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.23.26", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -6721,6 +6694,12 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.5" @@ -6900,15 +6879,6 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" -[[package]] -name = "webpki-roots" -version = "0.26.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "which" version = "4.4.2" @@ -7362,7 +7332,7 @@ dependencies = [ "futures", "log", "serde", - "thiserror 1.0.69", + "thiserror", "windows 0.48.0", ] @@ -7407,7 +7377,7 @@ dependencies = [ "serde", "serde-wasm-bindgen 0.5.0", "serde_json", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", "wasm-bindgen-futures", ] diff --git a/Cargo.toml b/Cargo.toml index 5a344242c0..eec5c170ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ opentelemetry-otlp = { version = "0.16.0", features = [ opentelemetry-system-metrics = { version = "0.2.0", optional = true } tailcall-http-cache = { path = "tailcall-http-cache", optional = true } tailcall-version = { path = "./tailcall-version", optional = true } -genai = { git = "https://github.com/laststylebender14/rust-genai.git", rev = "63a542ce20132503c520f4e07108e0d768f243c3", optional = true } +genai = { git = "https://github.com/laststylebender14/rust-genai.git", rev = "59e48b51825cdf190e5ebbb443c54ce2b00172cf", optional = true } ctrlc = { version = "3.4.5", optional = true } # dependencies safe for wasm: