diff --git a/Cargo.lock b/Cargo.lock index 05cbfa24c7..b52e402174 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -722,7 +722,7 @@ dependencies = [ "os_info", "primitives", "rand 0.9.2", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_derive", "serde_json", @@ -2532,24 +2532,6 @@ dependencies = [ "url", ] -[[package]] -name = "cookie_store" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206" -dependencies = [ - "cookie 0.18.1", - "document-features", - "idna 1.0.3", - "log", - "publicsuffix", - "serde", - "serde_derive", - "serde_json", - "time", - "url", -] - [[package]] name = "cookies" version = "0.0.1" @@ -3129,16 +3111,6 @@ dependencies = [ "serde", ] -[[package]] -name = "deranged" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4" -dependencies = [ - "powerfmt", - "serde_core", -] - [[package]] name = "derivative" version = "2.2.0" @@ -4132,7 +4104,7 @@ dependencies = [ "image", "log", "percent-encoding-rfc3986", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_json", "smart-default 0.7.1", @@ -4159,7 +4131,7 @@ dependencies = [ "file_to_base64_url", "futures 0.3.31", "log", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "test_data", "testing", @@ -4649,7 +4621,7 @@ version = "0.1.0" dependencies = [ "cargo-manifest", "percent-encoding", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_json", "tokio", @@ -4877,7 +4849,7 @@ dependencies = [ "coarsetime", "errors", "jwt-simple", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_derive", "serde_json", @@ -5939,7 +5911,7 @@ dependencies = [ "rand 0.8.5", "redis_common", "redis_schema", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_derive", "serde_json", @@ -7499,9 +7471,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.0" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-derive" @@ -8006,7 +7978,7 @@ dependencies = [ "log", "once_cell", "rand 0.9.2", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_derive", "serde_json", @@ -9612,14 +9584,15 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.28" +version = "0.12.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" dependencies = [ + "async-compression", "base64 0.22.1", "bytes", "cookie 0.18.1", - "cookie_store 0.22.1", + "cookie_store 0.21.1", "encoding_rs", "futures-channel", "futures-core", @@ -9863,7 +9836,7 @@ dependencies = [ "log", "once_cell", "rand 0.9.2", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_derive", "serde_json", @@ -9943,7 +9916,7 @@ dependencies = [ "minidom", "percent-encoding", "quick-xml 0.36.2", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_derive", "serde_json", @@ -10361,37 +10334,6 @@ dependencies = [ "libc", ] -[[package]] -name = "seedance2-pro-job" -version = "0.0.1" -dependencies = [ - "actix-web", - "actix_helpers", - "anyhow", - "bootstrap", - "bucket_paths", - "cloud_storage", - "concurrency", - "config", - "easyenv", - "enums", - "errors", - "hashing", - "jobs_common", - "log", - "mysql_queries", - "reqwest 0.12.28", - "seedance2pro", - "serde", - "serde_derive", - "serde_json", - "server_environment", - "sqlx", - "tokens", - "tokio", - "workspace-build-acceleration", -] - [[package]] name = "seedance2pro" version = "0.0.1" @@ -11506,11 +11448,10 @@ dependencies = [ "redis_common", "redis_schema", "regex", - "reqwest 0.12.28", + "reqwest 0.12.23", "resend-rs", "reusable_types", "rust-s3", - "seedance2pro", "serde", "serde_derive", "serde_json", @@ -11556,7 +11497,7 @@ dependencies = [ "idempotency", "log", "mimetypes", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_derive", "serde_json", @@ -12070,7 +12011,7 @@ dependencies = [ "percent-encoding", "plist", "raw-window-handle", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_json", "serde_repr", @@ -12221,7 +12162,7 @@ dependencies = [ "data-url", "http 1.3.1", "regex", - "reqwest 0.12.28", + "reqwest 0.12.23", "schemars", "serde", "serde_json", @@ -12288,7 +12229,7 @@ dependencies = [ "futures-util", "log", "read-progress-stream", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_json", "tauri", @@ -12536,7 +12477,7 @@ version = "0.1.0" dependencies = [ "easyenv", "log", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde_json", "workspace-build-acceleration", ] @@ -12565,32 +12506,32 @@ dependencies = [ [[package]] name = "time" -version = "0.3.47" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ - "deranged 0.5.6", + "deranged", "itoa 1.0.11", "libc", "num-conv", "num_threads", "powerfmt", - "serde_core", + "serde", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.8" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.27" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -13138,7 +13079,7 @@ dependencies = [ "memory_caching", "mysql_queries", "r2d2_redis", - "reqwest 0.12.28", + "reqwest 0.12.23", "serde", "serde_derive", "serde_json", @@ -13498,7 +13439,7 @@ dependencies = [ "actix-web", "mime_guess", "regex", - "reqwest 0.12.28", + "reqwest 0.12.23", "rust-embed", "serde", "serde_json", @@ -13989,7 +13930,7 @@ dependencies = [ "errors", "log", "once_cell", - "reqwest 0.12.28", + "reqwest 0.12.23", "rss", "scraper 0.17.1", "serde", @@ -14845,7 +14786,7 @@ dependencies = [ "core-foundation-sys", "crossbeam-utils", "crypto-common 0.1.6", - "deranged 0.3.11", + "deranged", "derive_more 0.99.17", "digest 0.10.7", "either", diff --git a/Cargo.toml b/Cargo.toml index b5446e2ca3..d75f49475a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,7 +117,6 @@ members = [ "crates/service/job/email_sender_job", "crates/service/job/es-update-job", "crates/service/job/inference_job", - "crates/service/job/seedance2_pro_job", "crates/service/job/tts_download_job", "crates/service/job/tts_inference_job", "crates/service/job/w2l_download_job", @@ -279,7 +278,7 @@ r2d2 = "0.8.10" rand = "0.9.1" redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp", "tokio-comp", "cluster-async", "aio"] } regex = "1.12.2" -reqwest = { version = "0.12.28", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls", "gzip", "multipart" ] } +reqwest = { version = "0.12.23", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls", "gzip" ] } reqwest-websocket = { version = "0.5.0" } serde = { version = "1.0.219", features = ["derive"] } serde_derive = "1.0.219" diff --git a/build/service_cpu.Dockerfile b/build/service_cpu.Dockerfile index a4400a1f80..3475475af8 100644 --- a/build/service_cpu.Dockerfile +++ b/build/service_cpu.Dockerfile @@ -33,7 +33,6 @@ RUN apt-get update \ FROM ubuntu:jammy as rust-base # NB: This can be "stable" or another version. -#ARG RUST_TOOLCHAIN="1.93.1" ARG RUST_TOOLCHAIN="1.86.0" WORKDIR /tmp @@ -129,9 +128,8 @@ RUN du -hsc * | sort -hr # Build all the binaries. RUN SQLX_OFFLINE=true \ - RUST_BACKTRACE=1 \ LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \ - $HOME/.cargo/bin/cargo build -vv \ + $HOME/.cargo/bin/cargo build \ --release \ --bin storyteller-web @@ -141,12 +139,6 @@ RUN SQLX_OFFLINE=true \ --release \ --bin dummy-service -RUN SQLX_OFFLINE=true \ - LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \ - $HOME/.cargo/bin/cargo build \ - --release \ - --bin seedance2-pro-job - RUN SQLX_OFFLINE=true \ LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \ $HOME/.cargo/bin/cargo build \ @@ -201,7 +193,6 @@ RUN echo -n ${GIT_SHA} > GIT_SHA # Copy all the binaries (except those that need a GPU): COPY --from=builder /tmp/target/release/storyteller-web / COPY --from=builder /tmp/target/release/dummy-service / -COPY --from=builder /tmp/target/release/seedance2-pro-job / COPY --from=builder /tmp/target/release/analytics-job / COPY --from=builder /tmp/target/release/email-sender-job / COPY --from=builder /tmp/target/release/es-update-job /