Compare commits

..
20 Commits
Author SHA1 Message Date
Brandon Thomas 3dbc540fb2 restore artcraft tauri portions 2026-02-22 09:24:48 +07:00
Brandon Thomas f3943818d9 remove wreq openssl hack 2026-02-22 09:20:35 +07:00
Brandon Thomas 0a99b77a6a ugh 2026-02-22 08:49:33 +07:00
Brandon Thomas 9cd6685f02 re-add seedance2-pro-job 2026-02-22 08:42:06 +07:00
Brandon Thomas 89e8346fa6 re-add seedance job 2026-02-22 08:39:11 +07:00
Brandon Thomas 79a85e1b32 configure rustls 2026-02-22 08:28:24 +07:00
Brandon Thomas fe1235a93c goodbye openssl 2026-02-22 08:20:01 +07:00
Brandon Thomas 5217e9ff07 upgrade rust 2026-02-22 07:42:35 +07:00
Brandon Thomas bb375e405f this appears to work 2026-02-22 07:20:24 +07:00
Brandon Thomas 0a44642c95 prefix-symbols is in a future release 2026-02-21 14:02:45 +07:00
Brandon Thomas 0b68e04b5f perhaps this bypasses the conflict with openssl 2026-02-21 13:58:27 +07:00
Brandon Thomas a0e6b5721b add seedance2pro lib. works on mac, maybe fails on linux 2026-02-21 10:32:04 +07:00
Brandon Thomas 8ffa1de27f fixup, should build now 2026-02-21 10:00:02 +07:00
Brandon Thomas 1f0eb35ff1 shouldn't be impacting 2026-02-21 09:55:00 +07:00
Brandon Thomas 43ec1ae5d7 shouldn't be impacting 2026-02-21 09:54:41 +07:00
Brandon Thomas 625ba41423 shouldn't be impacting 2026-02-21 09:54:14 +07:00
Brandon Thomas 2a62bcc7f8 query codegen 2026-02-21 09:53:21 +07:00
Brandon Thomas 5c92adff8f not relevant to our test 2026-02-21 09:52:55 +07:00
Brandon Thomas 1276df9f29 force a re-build 2026-02-21 09:08:30 +07:00
Brandon Thomas 026d356d9c run on test branch 2026-02-21 09:02:36 +07:00
7 changed files with 16 additions and 13 deletions
Generated
+1 -1
View File
@@ -11520,6 +11520,7 @@ dependencies = [
"redis_common",
"redis_schema",
"regex",
"reqwest 0.12.23",
"resend-rs",
"reusable_types",
"rust-s3",
@@ -11551,7 +11552,6 @@ dependencies = [
"utoipa-swagger-ui",
"videos",
"workspace-build-acceleration",
"wreq",
"zip 0.6.6",
]
+1 -1
View File
@@ -300,7 +300,7 @@ toml = "0.8.23"
url = { version = "2.5.4", features = ["serde"] }
uuid = "1.18.1"
# NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
# NB(1): wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
#
# Mac:
# brew install --formula cmake pkg-config llvm
@@ -22,5 +22,8 @@ workspace-build-acceleration.workspace = true
once_cell.workspace = true
wreq.workspace = true
[target.'cfg(target_os = "linux")'.dependencies]
wreq = { workspace = true, features = ["prefix-symbols"] }
[dev-dependencies]
# (None)
+4 -4
View File
@@ -16,11 +16,11 @@ path = "src/lib.rs"
normal = ["workspace-build-acceleration"]
[dependencies]
# cargo-hakari workspace hack (faster compile times)
workspace-build-acceleration.workspace = true
# Internal
errors.workspace = true
errors = { path = "../errors" }
# Workspace hack (faster compile times)
workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
# External
# (None yet)
@@ -52,6 +52,7 @@ email_sender= { path = "../../../lib/email_sender" }
enums.workspace = true
enums_public.workspace = true
errors.workspace = true
seedance2pro.workspace = true
fal_client.workspace = true
filesys.workspace = true
google_sign_in = { path = "../../../api_clients/google_sign_in" }
@@ -65,6 +66,7 @@ memory_caching = { path = "../../../lib/caching/memory_caching" }
migration = { path = "../../../lib/migration" }
mimetypes.workspace = true
mysql_queries = { path = "../../../schema/database/mysql_queries" }
#openai_sora_client = { path = "../../../api_clients/openai_sora_client" }
password = { path = "../../../lib/password" }
primitives = { path = "../../../lib/data/primitives" }
prompt_engineering = { path = "../../../lib/machine_learning/prompt_engineering" }
@@ -72,7 +74,6 @@ redis_caching = { path = "../../../lib/caching/redis_caching" }
redis_common = { path = "../../../schema/database/redis_common" }
redis_schema = { path = "../../../schema/database/redis_schema" }
reusable_types = { path = "../../../schema/public/reusable_types" }
seedance2pro.workspace = true
server_environment = { path = "../../../lib/server_environment" }
thumbnail_generator = { path = "../../../api_clients/thumbnail_generator" }
tokens.workspace = true
@@ -111,12 +112,10 @@ language-tags = "0.3.2" # Parsing single tags richly
# HTTP
# TODO/NB: This is just for Twitch, but we might need it later.
# reqwest.workspace = true
wreq.workspace = true
reqwest.workspace = true
# Email
resend-rs = { version = "0.21.0", default-features = false, features = ["rustls-tls"] }
# NB: Both ring (via reqwest 0.12/hyper-rustls) and aws-lc-rs (via quinn/resend-rs)
# are features of rustls 0.23 in this binary. rustls requires an explicit default
# provider when multiple crypto providers are compiled in.
@@ -1,13 +1,13 @@
use bytes::Bytes;
use errors::AnyhowResult;
use wreq::Client;
use reqwest::{Client, IntoUrl};
const USER_AGENT: &str = "storyteller-web/1.0";
// TODO(bt, 2025-06-03): Don't load the entire file into memory!
/// Downloads a (binary) file to memory. Good for images, etc. Not great for large files.
pub async fn http_download_url_to_bytes(url: &str) -> AnyhowResult<Bytes> {
pub async fn http_download_url_to_bytes<U: IntoUrl>(url: U) -> AnyhowResult<Bytes> {
let client = Client::builder()
.gzip(true)
.build()?;
@@ -1,12 +1,13 @@
use crate::util::http_download_url_to_bytes::http_download_url_to_bytes;
use errors::AnyhowResult;
use reqwest::IntoUrl;
use std::io::Write;
use tempfile::NamedTempFile;
const USER_AGENT: &str = "storyteller-web/1.0";
/// Downloads a (binary) file to a filesystem path. Good for images, etc. Not great for large files.
pub async fn http_download_url_to_tempfile(url: &str, temp_file: &mut NamedTempFile) -> AnyhowResult<()> {
pub async fn http_download_url_to_tempfile<U: IntoUrl>(url: U, temp_file: &mut NamedTempFile) -> AnyhowResult<()> {
let bytes = http_download_url_to_bytes(url).await?;
temp_file.write_all(&bytes)?;
Ok(())