From f0f5c958df0e3b55a20b57aec2efdb658a2ab06b Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 2 Jun 2025 01:42:30 -0400 Subject: [PATCH] switch to using vendored fal client --- Cargo.lock | 111 +++++++++++++++++-- Cargo.toml | 3 + crates/lib/api_clients/fal_client/Cargo.toml | 6 +- crates/vendor/fal-rs/Cargo.toml | 22 ++-- crates/vendor/fal-rs/generate/Cargo.toml | 8 +- 5 files changed, 124 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3007b13225..0de6fd09ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1666,6 +1666,17 @@ dependencies = [ "serde", ] +[[package]] +name = "cargo-manifest" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d8af896b707212cd0e99c112a78c9497dd32994192a463ed2f7419d29bd8c6" +dependencies = [ + "serde", + "thiserror 2.0.12", + "toml 0.8.22", +] + [[package]] name = "cargo-platform" version = "0.1.9" @@ -3537,8 +3548,6 @@ dependencies = [ [[package]] name = "fal" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd7dd8565317310f05569296166e2cbdd2bc870173b2b24b77ed681166268d0" dependencies = [ "base64 0.22.1", "eventsource-stream", @@ -3550,13 +3559,12 @@ dependencies = [ "serde_json", "smart-default 0.7.1", "thiserror 1.0.63", + "tokio", ] [[package]] name = "fal-derive" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f377f2f18a6bf107f907aa687df6bda2874bd38b25b1531f2a6fb38a9ca643" dependencies = [ "proc-macro2", "quote", @@ -4037,6 +4045,21 @@ dependencies = [ "x11", ] +[[package]] +name = "generate-endpoints" +version = "0.1.0" +dependencies = [ + "cargo-manifest", + "percent-encoding", + "reqwest 0.12.15", + "serde", + "serde_json", + "tokio", + "toml 0.8.22", + "tracing", + "tracing-subscriber", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -6384,6 +6407,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + [[package]] name = "num" version = "0.4.3" @@ -7018,6 +7051,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "p256" version = "0.13.2" @@ -9342,6 +9381,15 @@ dependencies = [ "keccak", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shared_service_components" version = "0.0.1" @@ -10831,6 +10879,16 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + [[package]] name = "thumbnail_generator" version = "0.1.0" @@ -11156,6 +11214,7 @@ version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ + "indexmap 2.9.0", "serde", "serde_spanned", "toml_datetime", @@ -11302,9 +11361,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -11314,9 +11373,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -11325,11 +11384,37 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec 1.13.2", + "thread_local", + "tracing-core", + "tracing-log", ] [[package]] @@ -11741,6 +11826,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "valuable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" + [[package]] name = "value-bag" version = "1.10.0" diff --git a/Cargo.toml b/Cargo.toml index 0beeb796cb..a788299486 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,6 +113,9 @@ members = [ "crates/service/plugins/user_traits_component", # Vendored code + "crates/vendor/fal-rs", + "crates/vendor/fal-rs/fal-derive", + "crates/vendor/fal-rs/generate", "crates/vendor/limitation", "crates/vendor/tauri-plugin-http", # NB(bt,2025-05-25): Too many failures on Mac. Disable for now. diff --git a/crates/lib/api_clients/fal_client/Cargo.toml b/crates/lib/api_clients/fal_client/Cargo.toml index c2ca13ea8a..03266674c5 100644 --- a/crates/lib/api_clients/fal_client/Cargo.toml +++ b/crates/lib/api_clients/fal_client/Cargo.toml @@ -22,12 +22,16 @@ errors = { workspace = true } # External anyhow = { workspace = true } -fal = { version = "0.3.6", features = ["endpoints"] } futures = { workspace = true } reqwest = { workspace = true } serde = { workspace = true } tokio = { workspace = true } url = { workspace = true } +# For now, we'll vendor in fal. +# We need to implement webhooks and the upstream doesn't support them yet. +#fal = { version = "0.3.6", features = ["endpoints"] } +fal = { path = "../../../vendor/fal-rs", features = ["endpoints"] } + [dev-dependencies] testing = { path = "../../testing" } diff --git a/crates/vendor/fal-rs/Cargo.toml b/crates/vendor/fal-rs/Cargo.toml index e608f8031f..6661a145b5 100644 --- a/crates/vendor/fal-rs/Cargo.toml +++ b/crates/vendor/fal-rs/Cargo.toml @@ -16,18 +16,18 @@ repository = "https://github.com/carlosdp/fal-rs" [package.metadata.docs.rs] all-features = true -[workspace] -members = [ - "fal-derive", - "generate", -] -resolver = "2" +#[workspace] +#members = [ +# "fal-derive", +# "generate", +#] +#resolver = "2" -[workspace.dependencies] -reqwest = "0.12" -serde = "1" -serde_json = "1" -tokio = "1" +#[workspace.dependencies] +#reqwest = "0.12" +#serde = "1" +#serde_json = "1" +#tokio = "1" [dependencies] eventsource-stream = "0.2" diff --git a/crates/vendor/fal-rs/generate/Cargo.toml b/crates/vendor/fal-rs/generate/Cargo.toml index 776a0c9d8d..51c8df20b4 100644 --- a/crates/vendor/fal-rs/generate/Cargo.toml +++ b/crates/vendor/fal-rs/generate/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" publish = false [dependencies] -reqwest = { workspace = true, features = ["json", "stream", "multipart"] } -tokio = { workspace = true, features = ["full"] } -serde = { workspace = true, features = ["derive"] } -serde_json.workspace = true +reqwest = { version = "0.12", features = ["json", "stream", "multipart"] } +tokio = { version = "1", features = ["full"] } +serde = { version = "1", features = ["derive"] } +serde_json = { version = "1" } percent-encoding = "2.3" tracing = "0.1.41" tracing-subscriber = "0.3.19"