this doesn't seem right either

we'll soon be able to support fal API keys and cost estimates for Nano
Banana Pro

- NBP cost estimates
- NBP at ArtCraft
- NBP at FAL

.github/workflows/docker-publish-cpu.yml

@@ -9,6 +9,7 @@ on:
       # NB: Default-branch doesn't work, despite Github's documentation.
       #- $default-branch
       - main
+      - test
 env:
   IMAGE_NAME: storyteller-rust
 

.gitignore

@@ -68,6 +68,9 @@ __pycache__/
 # We use diesel for DB migrations only. We don't care about its codgen.
 _ignored_schema.rs
 
+# Diesel lock file
+.diesel_lock
+
 # AI Chat Sidecar has its own schema managed by diesel, but we don't care for diesel codegen.
 crates/programs/aichatbot-sidecar/_ignored_schema.rs
 

.sqlx/query-01f6369e0ab7b0fa5b95b4595827dcf15897f3b50cce5b1dc421101b157b7008.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE wallets\nSET\n  banked_credits = ?,\n  version = version + 1\nWHERE token = ?\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "01f6369e0ab7b0fa5b95b4595827dcf15897f3b50cce5b1dc421101b157b7008"
+}

.sqlx/query-15939605e0da2722693371799ba94c7d0cc2f77a5c5b37e346855996d16033ec.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = ?,\n  failure_reason = ?,\n  internal_debugging_failure_reason = ?,\n  frontend_failure_category = ?,\n  retry_at = NULL\nWHERE token = ?\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "15939605e0da2722693371799ba94c7d0cc2f77a5c5b37e346855996d16033ec"
+}

.sqlx/query-6701a7adad65bc351e4600dad3ebf0f5dbdefa7dc9a0f890790cfaf368bf572d.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE wallet_ledger_entries\nSET\n  is_refunded = TRUE,\n  maybe_linked_refund_ledger_token = ?\nWHERE token = ?\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "6701a7adad65bc351e4600dad3ebf0f5dbdefa7dc9a0f890790cfaf368bf572d"
+}

.sqlx/query-a7365998006f4d40ad26efb42e6958a7aed689562a4c5b8c91cbe0033d0270e7.json

@@ -0,0 +1,102 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  wallet_token as `wallet_token: tokens::tokens::wallets::WalletToken`,\n  entry_type,\n  is_refunded as `is_refunded: bool`,\n  credits_delta,\n  banked_credits_before,\n  banked_credits_after,\n  monthly_credits_before,\n  monthly_credits_after\nFROM wallet_ledger_entries\nWHERE token = ?\nLIMIT 1\nFOR UPDATE\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "wallet_token: tokens::tokens::wallets::WalletToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "entry_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "is_refunded: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "credits_delta",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 11
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "banked_credits_before",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "banked_credits_after",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "monthly_credits_before",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "monthly_credits_after",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "a7365998006f4d40ad26efb42e6958a7aed689562a4c5b8c91cbe0033d0270e7"
+}

.sqlx/query-cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4.json

@@ -0,0 +1,102 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `order_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "order_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "creator_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4"
+}

.sqlx/query-ee228ab4a079fde6b3683b6cde2a2384d3def27a5d09baa5caf00a521d5d2bcd.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n\n  maybe_prompt_token = ?,\n\n  maybe_wallet_ledger_entry_token = ?,\n\n  maybe_raw_inference_text = NULL,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  priority_level = 0,\n  is_keepalive_required = FALSE,\n  max_duration_seconds = 0,\n\n  is_debug_request = FALSE,\n  maybe_routing_tag = NULL,\n\n  status = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 15
+    },
+    "nullable": []
+  },
+  "hash": "ee228ab4a079fde6b3683b6cde2a2384d3def27a5d09baa5caf00a521d5d2bcd"
+}

Cargo.toml

@@ -7,7 +7,7 @@ members = [
   # API clients for external services
   # These might be custom implementations or wrappers over other client libraries.
   "crates/api_clients/artcraft/artcraft_api_defs", # TODO: api_clients/{artcraft}/{api_defs,client}
-  "crates/api_clients/artcraft/storyteller_client",
+  "crates/api_clients/artcraft/artcraft_client",
   "crates/api_clients/cloud_storage",
   "crates/api_clients/fal_client",
   "crates/api_clients/google_drive_common",
@@ -72,6 +72,7 @@ members = [
   "crates/lib/files/videos",
   "crates/lib/http_headers",
   "crates/lib/idempotency",
+  "crates/api_clients/artcraft/artcraft_router",
   "crates/lib/image_algorithms",
   "crates/lib/jobs_common",
   "crates/lib/jwt_light",
@@ -117,6 +118,7 @@ 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",
@@ -206,6 +208,7 @@ workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }
 # Setting paths here ensures we don't need to do so in every crate's Cargo.toml
 # It makes refactoring much easier.
 actix_artcraft = { path = "crates/lib/actix_artcraft" }
+artcraft_router = { path = "crates/api_clients/artcraft/artcraft_router" }
 actix_helpers = { path = "crates/lib/actix_helpers" }
 artcraft_api_defs = { path = "crates/api_clients/artcraft/artcraft_api_defs" }
 build_metadata = { path = "crates/lib/build_metadata" }
@@ -237,7 +240,7 @@ seedance2pro = { path = "crates/api_clients/seedance2pro" }
 primitives = { path = "crates/lib/data/primitives" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
 sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
-storyteller_client = { path = "crates/api_clients/artcraft/storyteller_client" }
+artcraft_client = { path = "crates/api_clients/artcraft/artcraft_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
 test_data = { path = "crates/lib/test_data" }
 testing = { path = "crates/lib/testing" }
@@ -260,24 +263,24 @@ actix-utils = "3.0.1"
 actix-web = "4.7.0" # TODO(bt): We're behind and need to bump versions.
 actix-web-actors = "4.3.1+deprecated"
 actix-web-lab = "0.20.2"
-anyhow = "1.0.98"
+anyhow = "1.0.102"
 base64 = "0.22.1"
 bstr = "1.12.1"
 bytes = "1.10.1"
 chrono = { version = "0.4.41", features = ["serde"] }
 cookie = "0.18.1"
 env = "1.0.1"
-env_logger = "0.11.8"
+env_logger = "0.11.9"
 futures = { version = "0.3.31" }
 hex-literal = "1.0.0"
 indexmap = "2.9.0"
-log = "0.4.27"
+log = "0.4.29"
 md-5 = "0.10.6" # insecure but used for gravatar
 once_cell = "1.21.3"
 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"
+regex = "1.12.3"
 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"] }
@@ -295,7 +298,7 @@ tempdir = "0.3.7"
 tempfile = "3.20.0"
 thiserror = "2.0.12"
 tokio = { version = "1.45.1", features = ["macros"] }
-toml = "0.8.22"
+toml = "0.8.23"
 url = { version = "2.5.4", features = ["serde"] }
 uuid = "1.18.1"
 
@@ -309,5 +312,6 @@ uuid = "1.18.1"
 #   choco install pkgconfiglite -y
 #   choco install llvm -y
 #   choco install nasm -y
-wreq = { version = "6.0.0-rc.20", features = ["json", "multipart", "cookies", "ws", "stream"] }
-wreq-util = "3.0.0-rc.6"
+wreq-util = "3.0.0-rc.10"
+wreq = { version = "6.0.0-rc.28", features = ["json", "query", "form", "multipart", "cookies", "ws", "stream", "gzip", "brotli", "zstd", "deflate"] }
+

README.md

@@ -55,7 +55,7 @@ We haven't abandoned text-to-asset generation for quick prototyping and ideation
 
 | Provider   | Features                                                                                                                                                                |
 |------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Artcraft   | Nano Banana, Nano Banana Pro, GPT-Image-1 / 1.5, Seedream 4 / 4.5, Flux 1.1 / Kontext, Veo 2 / 3 / 3.1, Kling 1.6 / 2.1 / 2.5 / 2.6, Seedance, Sora 2 / Pro, Hunyuan 3d 2 / 3 |
+| Artcraft   | Nano Banana, Nano Banana Pro, GPT-Image-1 / 1.5, Seedance 2 / Seedream 4 / 4.5, Flux 1.1 / Kontext, Veo 2 / 3 / 3.1, Kling 1.6 / 2.1 / 2.5 / 2.6, Seedance, Sora 2 / Pro, Hunyuan 3d 2 / 3 |
 | Grok       | Grok Imagine, Grok Video                                                                                                                                                |
 | Midjourney | Image Gen (all versions)                                                                                                                                                |
 | Sora       | Sora 1, Sora 2, GPT-Image-1                                                                                                                                             |

_database/sql/migrations/2026-02-26-083102-0000_alter_jobs_add_wallet_ledger_entry_token/down.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE generic_inference_jobs
+DROP COLUMN
+maybe_wallet_ledger_entry_token;

_database/sql/migrations/2026-02-26-083102-0000_alter_jobs_add_wallet_ledger_entry_token/up.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE generic_inference_jobs
+ADD COLUMN
+maybe_wallet_ledger_entry_token VARCHAR(32) DEFAULT NULL;

_database/sql/migrations/2026-02-26-083139-0000_alter_wallet_ledger_entries_add_is_refunded/down.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE wallet_ledger_entries
+DROP COLUMN
+is_refunded;

_database/sql/migrations/2026-02-26-083139-0000_alter_wallet_ledger_entries_add_is_refunded/up.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE wallet_ledger_entries
+ADD COLUMN
+is_refunded BOOLEAN NOT NULL DEFAULT FALSE;

_database/sql/migrations/2026-02-26-083221-0000_alter_wallet_ledger_entries_add_linked_refund_token/down.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE wallet_ledger_entries
+DROP COLUMN
+maybe_linked_refund_ledger_token;

_database/sql/migrations/2026-02-26-083221-0000_alter_wallet_ledger_entries_add_linked_refund_token/up.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE wallet_ledger_entries
+ADD COLUMN
+maybe_linked_refund_ledger_token VARCHAR(32) DEFAULT NULL;

_database/sql/migrations_squashed/generic_inference_jobs.sql

@@ -182,6 +182,9 @@ CREATE TABLE generic_inference_jobs (
   is_from_api_user BOOLEAN NOT NULL DEFAULT FALSE,
   is_for_twitch BOOLEAN NOT NULL DEFAULT FALSE,
 
+  -- If credits were spent for this job, this references the corresponding wallet ledger entry.
+  maybe_wallet_ledger_entry_token VARCHAR(32) DEFAULT NULL,
+
   -- ========== DEVELOPMENT AND DEBUGGING METADATA ==========
 
   -- If true, the request gets a "debug" flag, which may do different

_database/sql/migrations_squashed/wallets/wallet_ledger_entries.sql

@@ -40,6 +40,12 @@ CREATE TABLE wallet_ledger_entries (
   -- Balance of monthly credits after the event.
   monthly_credits_after INTEGER UNSIGNED NOT NULL DEFAULT 0,
 
+  -- Whether this ledger entry has been refunded.
+  is_refunded BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- If this entry was refunded, this points to the refund ledger entry.
+  maybe_linked_refund_ledger_token VARCHAR(32) DEFAULT NULL,
+
   -- ========== RECORD TIMESTAMPS ==========
 
   created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,

build/service_cpu.Dockerfile

@@ -33,7 +33,7 @@ RUN apt-get update \
 FROM ubuntu:jammy as rust-base
 
 # NB: This can be "stable" or another version.
-ARG RUST_TOOLCHAIN="1.86.0"
+ARG RUST_TOOLCHAIN="1.93.0"
 
 WORKDIR /tmp
 
@@ -48,8 +48,12 @@ RUN apt-get update \
         curl \
         ffmpeg \
         fontconfig \
+        git \
+        libclang-dev \
         libfontconfig1-dev \
         libssl-dev \
+        musl-tools \
+        perl \
         pkg-config
 
 # NB: Fix for fontconfig (servo-fontconfig-sys): https://github.com/alacritty/alacritty/issues/4423#issuecomment-727277235
@@ -133,6 +137,12 @@ RUN SQLX_OFFLINE=true \
   --release \
   --bin storyteller-web
 
+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 \
@@ -192,6 +202,7 @@ 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/seedance2-pro-job /
 COPY --from=builder /tmp/target/release/dummy-service /
 COPY --from=builder /tmp/target/release/analytics-job /
 COPY --from=builder /tmp/target/release/email-sender-job  /

crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml

@@ -36,3 +36,4 @@ serde_json.workspace = true
 utoipa = { version = "4", features = ["chrono", "actix_extras"] }
 
 [dev-dependencies]
+anyhow.workspace = true

crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs

@@ -0,0 +1,116 @@
+use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
+use enums::common::generation::common_image_model::CommonImageModel;
+use enums::common::generation::common_video_resolution::CommonVideoResolution;
+use enums::common::generation_provider::GenerationProvider;
+
+pub const ESTIMATE_IMAGE_COST_PATH: &str = "/v1/generate/cost_estimate/image";
+
+/// Request body for the image cost estimate endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct EstimateImageCostRequest {
+  /// The image model to estimate costs for.
+  pub model: CommonImageModel,
+
+  /// The provider to route the generation through.
+  pub provider: GenerationProvider,
+
+  /// The type of generation (determines whether input images are involved).
+  /// This is a tagged enum, so it looks like:
+  ///   "generation_mode": {"type": "text_to_image"}
+  ///   "generation_mode": {"type": "image_edit", "count": 2}
+  pub generation_mode: GenerationMode,
+
+  /// Optional aspect ratio.
+  pub aspect_ratio: Option<CommonAspectRatio>,
+
+  /// Optional resolution.
+  pub resolution: Option<CommonVideoResolution>,
+
+  /// Number of images to generate in parallel.
+  pub image_batch_count: Option<u16>,
+}
+
+/// Describes the type of image generation being requested.
+#[derive(Serialize, Deserialize, ToSchema)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum GenerationMode {
+  /// No input images — generate from prompt only.
+  TextToImage,
+  /// One or more input images are provided for editing/compositing.
+  ImageEdit { count: u32 },
+}
+
+/// Response body for the image cost estimate endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct EstimateImageCostResponse {
+  pub success: bool,
+
+  /// Estimated cost in credits.
+  pub cost_in_credits: Option<u64>,
+
+  /// Estimated cost in USD cents.
+  pub cost_in_usd_cents: Option<u64>,
+
+  /// Whether the generation is free for this user/plan.
+  pub is_free: bool,
+
+  /// Whether the user has unlimited generations.
+  pub is_unlimited: bool,
+
+  /// Whether the user is rate limited.
+  pub is_rate_limited: bool,
+
+  /// Whether the output will have a watermark.
+  pub has_watermark: bool,
+}
+
+/// Error response for the image cost estimate endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct EstimateImageCostError {
+  pub success: bool,
+  pub error_type: EstimateImageCostErrorType,
+  pub error_message: String,
+}
+
+#[derive(Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum EstimateImageCostErrorType {
+  InvalidProviderForModel,
+  InvalidInput,
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  fn test_serialization_text_to_image() {
+    let request = EstimateImageCostRequest {
+      model: CommonImageModel::NanaBananaPro,
+      provider: GenerationProvider::Artcraft,
+      generation_mode: GenerationMode::TextToImage,
+      aspect_ratio: None,
+      resolution: None,
+      image_batch_count: None,
+    };
+    let serialized = serde_json::to_string(&request).unwrap();
+    assert!(serialized.contains("\"generation_mode\":{\"type\":\"text_to_image\"}"));
+  }
+
+  #[test]
+  fn test_serialization_image_edit() {
+    let request = EstimateImageCostRequest {
+      model: CommonImageModel::NanaBananaPro,
+      provider: GenerationProvider::Artcraft,
+      generation_mode: GenerationMode::ImageEdit { count: 2 },
+      aspect_ratio: None,
+      resolution: None,
+      image_batch_count: None,
+    };
+    let serialized = serde_json::to_string(&request).unwrap();
+    assert!(serialized.contains("\"generation_mode\":{\"type\":\"image_edit\",\"count\":2}"));
+  }
+}

crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs

@@ -0,0 +1,122 @@
+use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
+use enums::common::generation::common_video_model::CommonVideoModel;
+use enums::common::generation::common_video_resolution::CommonVideoResolution;
+use enums::common::generation_provider::GenerationProvider;
+
+pub const ESTIMATE_VIDEO_COST_PATH: &str = "/v1/generate/cost_estimate/video";
+
+/// Request body for the video cost estimate endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct EstimateVideoCostRequest {
+  /// The video model to estimate costs for.
+  pub model: CommonVideoModel,
+
+  /// The provider to route the generation through.
+  pub provider: GenerationProvider,
+
+  /// The type of generation (determines how many input images are involved).
+  /// This is a tagged enum, so it looks like:
+  ///   "generation_mode": {"type": "text_to_video"}
+  ///   "generation_mode": {"type": "reference_image_to_video", "count": 1}
+  pub generation_mode: GenerationMode,
+
+  /// Optional aspect ratio.
+  pub aspect_ratio: Option<CommonAspectRatio>,
+
+  /// Optional resolution.
+  pub resolution: Option<CommonVideoResolution>,
+
+  /// Duration in seconds.
+  pub duration_seconds: Option<u16>,
+
+  /// Number of videos to generate in parallel.
+  pub video_batch_count: Option<u16>,
+}
+
+/// Describes the type of video generation being requested.
+#[derive(Serialize, Deserialize, ToSchema)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum GenerationMode {
+  TextToVideo,
+  StartFrameToVideo,
+  StartAndEndFrameToVideo,
+  ReferenceImageToVideo { count: u32 },
+}
+
+/// Response body for the video cost estimate endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct EstimateVideoCostResponse {
+  pub success: bool,
+
+  /// Estimated cost in credits.
+  pub cost_in_credits: Option<u64>,
+
+  /// Estimated cost in USD cents.
+  pub cost_in_usd_cents: Option<u64>,
+
+  /// Whether the generation is free for this user/plan.
+  pub is_free: bool,
+
+  /// Whether the user has unlimited generations.
+  pub is_unlimited: bool,
+
+  /// Whether the user is rate limited.
+  pub is_rate_limited: bool,
+
+  /// Whether the output will have a watermark.
+  pub has_watermark: bool,
+}
+
+/// Error response for the video cost estimate endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct EstimateVideoCostError {
+  pub success: bool,
+  pub error_type: EstimateVideoCostErrorType,
+  pub error_message: String,
+}
+
+#[derive(Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum EstimateVideoCostErrorType {
+  InvalidProviderForModel,
+  InvalidInput,
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  fn test_serialization_tagging1() {
+    let request = EstimateVideoCostRequest {
+      model: CommonVideoModel::GrokVideo,
+      provider: GenerationProvider::Artcraft,
+      generation_mode: GenerationMode::TextToVideo,
+      aspect_ratio: None,
+      resolution: None,
+      duration_seconds: None,
+      video_batch_count: None,
+    };
+    let serialized = serde_json::to_string(&request).unwrap();
+    assert!(serialized.contains("\"generation_mode\":{\"type\":\"text_to_video\"}"));
+    //assert_eq!(serialized, "{}");
+  }
+
+  #[test]
+  fn test_serialization_tagging2() {
+    let request = EstimateVideoCostRequest {
+      model: CommonVideoModel::GrokVideo,
+      provider: GenerationProvider::Artcraft,
+      generation_mode: GenerationMode::ReferenceImageToVideo { count: 1 },
+      aspect_ratio: None,
+      resolution: None,
+      duration_seconds: None,
+      video_batch_count: None,
+    };
+    let serialized = serde_json::to_string(&request).unwrap();
+    assert!(serialized.contains("\"generation_mode\":{\"type\":\"reference_image_to_video\",\"count\":1}"));
+  }
+}

crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/mod.rs

@@ -0,0 +1,2 @@
+pub mod estimate_image_cost;
+pub mod estimate_video_cost;

crates/api_clients/artcraft/artcraft_api_defs/src/generate/mod.rs

@@ -1,3 +1,4 @@
+pub mod cost_estimate;
 pub mod image;
 pub mod object;
 pub mod video;

crates/api_clients/artcraft/artcraft_api_defs/src/generate/video/multi_function/mod.rs

@@ -1,5 +1,6 @@
 pub mod kling_2_5_turbo_multi_function_video_gen;
 pub mod kling_2_6_multi_function_video_gen;
+pub mod seedance_2p0_multi_function_video_gen;
 pub mod sora_2_multi_function_video_gen;
 pub mod sora_2_pro_multi_function_video_gen;
 pub mod veo_3p1_fast_multi_function_video_gen;

crates/api_clients/artcraft/artcraft_api_defs/src/generate/video/multi_function/seedance_2p0_multi_function_video_gen.rs

@@ -0,0 +1,85 @@
+use serde::{Deserialize, Serialize};
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use tokens::tokens::media_files::MediaFileToken;
+use utoipa::ToSchema;
+
+pub const SEEDANCE_2P0_MULTI_FUNCTION_VIDEO_GEN_PATH: &str = "/v1/generate/video/multi_function/seedance_2p0";
+
+/// Seedance 2.0 multi-function video generation (text-to-video, image-to-video, and reference-based).
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct Seedance2p0MultiFunctionVideoGenRequest {
+  /// Idempotency token to prevent duplicate requests.
+  pub uuid_idempotency_token: String,
+
+  /// Text prompt.
+  pub prompt: Option<String>,
+
+  /// Optional start frame image.
+  pub start_frame_media_token: Option<MediaFileToken>,
+
+  /// Optional end frame image.
+  pub end_frame_media_token: Option<MediaFileToken>,
+
+  /// Optional reference images (reference mode). When present, takes priority over start/end frames.
+  pub reference_image_media_tokens: Option<Vec<MediaFileToken>>,
+
+  /// Video aspect ratio / resolution.
+  pub aspect_ratio: Option<Seedance2p0AspectRatio>,
+
+  /// Duration in seconds (4–15).
+  pub duration_seconds: Option<u8>,
+
+  /// Number of videos to generate.
+  pub batch_count: Option<Seedance2p0BatchCount>,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum Seedance2p0AspectRatio {
+  /// 16:9 landscape (1280x720)
+  Landscape16x9,
+  /// 9:16 portrait (720x1280)
+  Portrait9x16,
+  /// 1:1 square (720x720)
+  Square1x1,
+  /// 4:3 standard (960x720)
+  Standard4x3,
+  /// 3:4 portrait (720x960)
+  Portrait3x4,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum Seedance2p0BatchCount {
+  One,
+  Two,
+  Four,
+}
+
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct Seedance2p0MultiFunctionVideoGenResponse {
+  pub success: bool,
+
+  /// The first inference job token (always present).
+  pub inference_job_token: InferenceJobToken,
+
+  /// All inference job tokens for the batch (includes `inference_job_token` as the first entry).
+  pub all_inference_job_tokens: Vec<InferenceJobToken>,
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  fn aspect_to_string(input: Seedance2p0AspectRatio) -> anyhow::Result<String> {
+    let val = serde_json::to_string(&input)?;
+    Ok(val.replace("\"", ""))
+  }
+
+  #[test]
+  fn just_testing_snake_case() -> anyhow::Result<()> {
+    // Ugh, not sure what these are...
+    assert_eq!(aspect_to_string(Seedance2p0AspectRatio::Landscape16x9)?, "landscape16x9");
+    Ok(())
+  }
+}

crates/api_clients/artcraft/artcraft_client/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "storyteller_client"
+name = "artcraft_client"
 edition = "2021"
 version = "0.0.1"
 authors = [
@@ -15,7 +15,7 @@ normal = ["workspace-build-acceleration"]
 # unused_imports = "forbid"
 
 [lib]
-name = "storyteller_client"
+name = "artcraft_client"
 path = "src/lib.rs"
 
 [dependencies]

crates/api_clients/artcraft/artcraft_client/src/credentials/mod.rs

@@ -1,3 +1,4 @@
+pub mod parse_multi_cookie_header;
 pub mod storyteller_avt_cookie;
 pub mod storyteller_credential_set;
 pub mod storyteller_session_cookie;

crates/api_clients/artcraft/artcraft_client/src/credentials/parse_multi_cookie_header.rs

@@ -0,0 +1,35 @@
+use crate::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::credentials::storyteller_session_cookie::StorytellerSessionCookie;
+use cookie::Cookie;
+
+/// Parses a multi-cookie header string (e.g. `"visitor=abc; session=xyz"`) and extracts
+/// the known Storyteller cookies by name.
+///
+/// Returns `Ok(Some(...))` if at least one recognised cookie is present,
+/// `Ok(None)` if the input is empty or contains no recognised cookies,
+/// and `Err` if any individual cookie segment fails to parse.
+pub fn parse_multi_cookie_header(header: &str) -> Result<Option<StorytellerCredentialSet>, cookie::ParseError> {
+  let mut avt: Option<StorytellerAvtCookie> = None;
+  let mut session: Option<StorytellerSessionCookie> = None;
+
+  for segment in header.split(';') {
+    let segment = segment.trim();
+    if segment.is_empty() {
+      continue;
+    }
+    let cookie = Cookie::parse(segment.to_owned())?;
+    if avt.is_none() {
+      avt = StorytellerAvtCookie::maybe_from_cookie(&cookie);
+    }
+    if session.is_none() {
+      session = StorytellerSessionCookie::maybe_from_cookie(&cookie);
+    }
+  }
+
+  if avt.is_none() && session.is_none() {
+    return Ok(None);
+  }
+
+  Ok(Some(StorytellerCredentialSet::initialize(avt, session)))
+}

crates/api_clients/artcraft/artcraft_client/src/credentials/storyteller_credential_set.rs

@@ -1,3 +1,4 @@
+use crate::credentials::parse_multi_cookie_header::parse_multi_cookie_header;
 use crate::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
 use crate::credentials::storyteller_session_cookie::StorytellerSessionCookie;
 
@@ -25,6 +26,10 @@ impl StorytellerCredentialSet {
     }
   }
 
+  pub fn parse_multi_cookie_header(header: &str) -> Result<Option<Self>, cookie::ParseError> {
+    parse_multi_cookie_header(header)
+  }
+
   pub fn initialize_with_just_cookie(session: StorytellerSessionCookie) -> Self {
     Self {
       avt: None,

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/cost_estimate/image/estimate_image_cost.rs

@@ -0,0 +1,20 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::generate::cost_estimate::estimate_image_cost::{
+  EstimateImageCostRequest, EstimateImageCostResponse, ESTIMATE_IMAGE_COST_PATH,
+};
+
+pub async fn estimate_image_cost(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: EstimateImageCostRequest,
+) -> Result<EstimateImageCostResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    ESTIMATE_IMAGE_COST_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/cost_estimate/image/mod.rs

@@ -0,0 +1 @@
+pub mod estimate_image_cost;

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/cost_estimate/mod.rs

@@ -0,0 +1,2 @@
+pub mod image;
+pub mod video;

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/cost_estimate/video/estimate_video_cost.rs

@@ -0,0 +1,20 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::generate::cost_estimate::estimate_video_cost::{
+  EstimateVideoCostRequest, EstimateVideoCostResponse, ESTIMATE_VIDEO_COST_PATH,
+};
+
+pub async fn estimate_video_cost(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: EstimateVideoCostRequest,
+) -> Result<EstimateVideoCostResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    ESTIMATE_VIDEO_COST_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/cost_estimate/video/mod.rs

@@ -0,0 +1 @@
+pub mod estimate_video_cost;

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/mod.rs

@@ -1,3 +1,4 @@
+pub mod cost_estimate;
 pub mod image;
 pub mod object;
 pub mod video;

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/video/multi_function/mod.rs

@@ -1,4 +1,5 @@
 pub mod kling_2p5_turbo_pro_multi_function_video_gen;
+pub mod seedance_2p0_multi_function_video_gen;
 pub mod kling_2p6_pro_multi_function_video_gen;
 pub mod sora_2_multi_function_video_gen;
 pub mod sora_2_pro_multi_function_video_gen;

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen.rs

@@ -0,0 +1,18 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{Seedance2p0MultiFunctionVideoGenRequest, Seedance2p0MultiFunctionVideoGenResponse, SEEDANCE_2P0_MULTI_FUNCTION_VIDEO_GEN_PATH};
+
+pub async fn seedance_2p0_multi_function_video_gen(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: Seedance2p0MultiFunctionVideoGenRequest,
+) -> Result<Seedance2p0MultiFunctionVideoGenResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    SEEDANCE_2P0_MULTI_FUNCTION_VIDEO_GEN_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs

@@ -18,11 +18,9 @@ use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use idempotency::uuid::generate_random_uuid;
 use log::debug;
-use reqwest::multipart::Form;
+use reqwest::multipart::{Form, Part};
 use reqwest::Client;
 use serde_derive::{Deserialize, Serialize};
-use std::fs::File;
-use std::io::Read;
 use std::path::Path;
 use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
@@ -73,11 +71,13 @@ pub async fn legacy_upload_media_file_from_file<P: AsRef<Path>>(
       .build()
       .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
 
+  let file_bytes = std::fs::read(args.path.as_ref())
+      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
+  let file_name = args.path.as_ref().file_name()
+      .and_then(|n| n.to_str()).unwrap_or("file").to_string();
   let mut form = Form::new()
       .text("uuid_idempotency_token", generate_random_uuid())
-      .file("file", args.path)
-      .await
-      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
+      .part("file", Part::bytes(file_bytes).file_name(file_name));
 
   //if args.is_intermediate_system_file {
   //  form = form.text("is_intermediate_system_file", "true");

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs

@@ -18,11 +18,9 @@ use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use idempotency::uuid::generate_random_uuid;
 use log::debug;
-use reqwest::multipart::Form;
+use reqwest::multipart::{Form, Part};
 use reqwest::Client;
 use serde_derive::{Deserialize, Serialize};
-use std::fs::File;
-use std::io::Read;
 use std::path::Path;
 use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
@@ -73,11 +71,13 @@ pub async fn upload_image_media_file_from_file<P: AsRef<Path>>(
       .build()
       .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
 
+  let file_bytes = std::fs::read(args.path.as_ref())
+      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
+  let file_name = args.path.as_ref().file_name()
+      .and_then(|n| n.to_str()).unwrap_or("file").to_string();
   let mut form = Form::new()
       .text("uuid_idempotency_token", generate_random_uuid())
-      .file("file", args.path)
-      .await
-      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
+      .part("file", Part::bytes(file_bytes).file_name(file_name));
 
   if args.is_intermediate_system_file {
     form = form.text("is_intermediate_system_file", "true");

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs

@@ -15,11 +15,9 @@ use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use idempotency::uuid::generate_random_uuid;
 use log::debug;
-use reqwest::multipart::Form;
+use reqwest::multipart::{Form, Part};
 use reqwest::Client;
 use serde_derive::{Deserialize, Serialize};
-use std::fs::File;
-use std::io::Read;
 use std::path::Path;
 use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
@@ -44,11 +42,13 @@ pub async fn upload_new_engine_asset_from_file<P: AsRef<Path>>(
       .gzip(true)
       .build()?;
 
+  let file_bytes = std::fs::read(path.as_ref())?;
+  let file_name = path.as_ref().file_name()
+      .and_then(|n| n.to_str()).unwrap_or("file").to_string();
   let form = Form::new()
       .text("uuid_idempotency_token", generate_random_uuid())
-      .text("engine_category", "object") // TODO: Which type should we use? 
-      .file("file", path)
-      .await?;
+      .text("engine_category", "object") // TODO: Which type should we use?
+      .part("file", Part::bytes(file_bytes).file_name(file_name));
 
   let mut request_builder = client.post(url)
       .header("User-Agent", USER_AGENT)

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs

@@ -15,11 +15,9 @@ use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use idempotency::uuid::generate_random_uuid;
 use log::debug;
-use reqwest::multipart::Form;
+use reqwest::multipart::{Form, Part};
 use reqwest::Client;
 use serde_derive::{Deserialize, Serialize};
-use std::fs::File;
-use std::io::Read;
 use std::path::Path;
 use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::media_files::MediaFileToken;
@@ -74,10 +72,12 @@ pub async fn upload_video_media_file_from_file<P: AsRef<Path>>(
       .gzip(true)
       .build()?;
 
+  let file_bytes = std::fs::read(args.path.as_ref())?;
+  let file_name = args.path.as_ref().file_name()
+      .and_then(|n| n.to_str()).unwrap_or("file").to_string();
   let mut form = Form::new()
       .text("uuid_idempotency_token", generate_random_uuid())
-      .file("file", args.path)
-      .await?;
+      .part("file", Part::bytes(file_bytes).file_name(file_name));
 
   if let Some(prompt_token) = &args.maybe_prompt_token {
     form = form.text("maybe_prompt_token", prompt_token.to_string());