moderation tag

- failed tasks to show in image generation session view
- failed tasks now show in task queue dropdown
- completed and failed tasks clearable on "clear all" click
- styling updates

.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-33aa8a1cf85bf1b8b68f4e2ab46541f25d7e8bb5eeb503c5ec14cb5e115f69ce.json

@@ -1,12 +0,0 @@
-{
-  "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_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": 14
-    },
-    "nullable": []
-  },
-  "hash": "33aa8a1cf85bf1b8b68f4e2ab46541f25d7e8bb5eeb503c5ec14cb5e115f69ce"
-}

.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

@@ -1,6 +1,6 @@
 {
   "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\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    ",
+  "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": [
       {
@@ -72,6 +72,16 @@
           "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": {
@@ -84,8 +94,9 @@
       true,
       false,
       false,
+      true,
       true
     ]
   },
-  "hash": "ca96942d8214edb84f163cf40131ceed873209e86718054e1502219fc81d2dc6"
+  "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.lock

@@ -677,10 +677,12 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "artcraft"
-version = "0.6.0"
+version = "0.0.1"
 dependencies = [
  "anyhow",
  "artcraft_api_defs",
+ "artcraft_client",
+ "artcraft_router",
  "base64 0.22.1",
  "build_metadata",
  "bytes",
@@ -713,7 +715,6 @@ dependencies = [
  "serde_json",
  "serial_test",
  "sqlite_tasks",
- "storyteller_client",
  "tauri",
  "tauri-build",
  "tauri-plugin-dialog",
@@ -737,6 +738,7 @@ dependencies = [
 name = "artcraft_api_defs"
 version = "0.0.1"
 dependencies = [
+ "anyhow",
  "chrono",
  "enums",
  "enums_public",
@@ -749,6 +751,54 @@ dependencies = [
  "workspace-build-acceleration",
 ]
 
+[[package]]
+name = "artcraft_client"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "artcraft_api_defs",
+ "backoff",
+ "chrono",
+ "cloudflare_errors",
+ "cookie 0.18.1",
+ "enums",
+ "enums_public",
+ "errors",
+ "idempotency",
+ "log",
+ "mimetypes",
+ "reqwest 0.12.23",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tokens",
+ "tokio",
+ "url",
+ "url-builder",
+ "uuid 1.18.1",
+ "workspace-build-acceleration",
+]
+
+[[package]]
+name = "artcraft_router"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "artcraft_api_defs",
+ "artcraft_client",
+ "fal_client",
+ "log",
+ "seedance2pro",
+ "serde",
+ "serde_derive",
+ "strum 0.28.0",
+ "test_data",
+ "tokens",
+ "tokio",
+ "uuid 1.18.1",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "ashpd"
 version = "0.9.2"
@@ -1474,7 +1524,7 @@ dependencies = [
  "bitflags 2.11.0",
  "cexpr",
  "clang-sys",
- "itertools 0.11.0",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "regex",
@@ -3422,7 +3472,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.7.4",
+ "libloading 0.8.6",
 ]
 
 [[package]]
@@ -3727,7 +3777,7 @@ dependencies = [
  "serde_json",
  "sqlx",
  "storyteller_root",
- "strum",
+ "strum 0.26.2",
  "tokens",
  "tokio",
  "workspace-build-acceleration",
@@ -3889,7 +3939,7 @@ dependencies = [
  "sqlx",
  "sqlx-core",
  "sqlx-mysql",
- "strum",
+ "strum 0.26.2",
  "toml 0.8.23",
  "utoipa",
  "workspace-build-acceleration",
@@ -3903,7 +3953,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "strum",
+ "strum 0.26.2",
  "toml 0.8.23",
  "utoipa",
  "workspace-build-acceleration",
@@ -6452,7 +6502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7017,7 +7067,7 @@ dependencies = [
  "serde_json",
  "sqlx",
  "storyteller_root",
- "strum",
+ "strum 0.26.2",
  "tempdir",
  "tokens",
  "tokio",
@@ -11459,6 +11509,7 @@ dependencies = [
  "actix_helpers",
  "anyhow",
  "artcraft_api_defs",
+ "artcraft_router",
  "async-stripe 0.26.0",
  "async-trait",
  "base64 0.22.1",
@@ -11520,7 +11571,6 @@ dependencies = [
  "redis_common",
  "redis_schema",
  "regex",
- "reqwest 0.12.23",
  "resend-rs",
  "reusable_types",
  "rust-s3",
@@ -11532,8 +11582,8 @@ dependencies = [
  "server_environment",
  "speculoos",
  "sqlx",
- "strum",
- "strum_macros",
+ "strum 0.26.2",
+ "strum_macros 0.26.4",
  "tempdir",
  "tempfile",
  "testing",
@@ -11552,37 +11602,10 @@ dependencies = [
  "utoipa-swagger-ui",
  "videos",
  "workspace-build-acceleration",
+ "wreq",
  "zip 0.6.6",
 ]
 
-[[package]]
-name = "storyteller_client"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "artcraft_api_defs",
- "backoff",
- "chrono",
- "cloudflare_errors",
- "cookie 0.18.1",
- "enums",
- "enums_public",
- "errors",
- "idempotency",
- "log",
- "mimetypes",
- "reqwest 0.12.23",
- "serde",
- "serde_derive",
- "serde_json",
- "tokens",
- "tokio",
- "url",
- "url-builder",
- "uuid 1.18.1",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "storyteller_root"
 version = "0.0.1"
@@ -11645,7 +11668,16 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.26.4",
+]
+
+[[package]]
+name = "strum"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
+dependencies = [
+ "strum_macros 0.28.0",
 ]
 
 [[package]]
@@ -11661,6 +11693,18 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "subprocess"
 version = "0.2.9"
@@ -12657,7 +12701,7 @@ dependencies = [
  "sqlx",
  "sqlx-core",
  "sqlx-mysql",
- "strum",
+ "strum 0.26.2",
  "utoipa",
  "workspace-build-acceleration",
 ]
@@ -14007,7 +14051,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "strum",
+ "strum 0.26.2",
  "workspace-build-acceleration",
 ]
 

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",
@@ -207,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" }
@@ -238,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" }
@@ -281,12 +283,13 @@ redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp", "tokio-com
 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"] }
+serde = { version = "1.0.219", features = ["derive"] }
 serde_derive = "1.0.219"
 serde_json = "1.0.140"
 serde_yaml = "0.9.34+deprecated"
 sha2 = "0.11.0-rc.2"
 sha3 = "0.10.8"
+strum = { version = "0.28.0", features = ["derive"] }
 tauri = { version = "2.8.3", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution; "ubstable" is needed for window access
 tauri-plugin-dialog = "2.3.3"
 tauri-plugin-fs = "2.4.2"
@@ -300,7 +303,7 @@ toml = "0.8.23"
 url = { version = "2.5.4", features = ["serde"] }
 uuid = "1.18.1"
 
-# NB(1): wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
+# NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
 #
 # Mac:
 #   brew install --formula cmake pkg-config llvm
@@ -311,5 +314,5 @@ uuid = "1.18.1"
 #   choco install llvm -y
 #   choco install nasm -y
 wreq-util = "3.0.0-rc.10"
-wreq = { version = "6.0.0-rc.28", features = ["json", "query", "multipart", "cookies", "ws", "stream", "gzip", "form"] }
+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

@@ -202,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/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen.rs

@@ -0,0 +1,68 @@
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use tokens::tokens::media_files::MediaFileToken;
+use utoipa::ToSchema;
+
+pub const BYTEDANCE_SEEDREAM_5_LITE_MULTI_FUNCTION_IMAGE_GEN_PATH: &str = "/v1/generate/image/multi_function/bytedance_seedream_5_lite";
+
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct BytedanceSeedream5LiteMultiFunctionImageGenRequest {
+  /// Idempotency token to prevent duplicate requests.
+  pub uuid_idempotency_token: String,
+
+  /// Text prompt to generate the image from.
+  pub prompt: Option<String>,
+
+  /// Image media tokens to include in the editing context.
+  /// If present, we're doing image editing (image-to-image / image-editing)
+  /// If absent, we're doing image generation (text-to-image)
+  pub image_media_tokens: Option<Vec<MediaFileToken>>,
+
+  /// Number of images to generate. Default is one.
+  pub num_images: Option<BytedanceSeedream5LiteMultiFunctionImageGenNumImages>,
+
+  pub max_images: Option<BytedanceSeedream5LiteMultiFunctionImageGenMaxImages>,
+
+  pub image_size: Option<BytedanceSeedream5LiteMultiFunctionImageGenImageSize>,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum BytedanceSeedream5LiteMultiFunctionImageGenNumImages {
+  One, // Default
+  Two,
+  Three,
+  Four,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum BytedanceSeedream5LiteMultiFunctionImageGenMaxImages {
+  One, // Default
+  Two,
+  Three,
+  Four,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum BytedanceSeedream5LiteMultiFunctionImageGenImageSize {
+  // Square
+  Square,
+  SquareHd,
+  // Tall
+  PortraitFourThree,
+  PortraitSixteenNine,
+  // Wide
+  LandscapeFourThree,
+  LandscapeSixteenNine,
+  // Auto (NB: 5 Lite max is auto_3K, not auto_4K like V4.5)
+  Auto2k,
+  Auto3k,
+}
+
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct BytedanceSeedream5LiteMultiFunctionImageGenResponse {
+  pub success: bool,
+  pub inference_job_token: InferenceJobToken,
+}

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

@@ -1,5 +1,7 @@
 pub mod bytedance_seedream_v4_multi_function_image_gen;
 pub mod bytedance_seedream_v4p5_multi_function_image_gen;
+pub mod bytedance_seedream_5_lite_multi_function_image_gen;
 pub mod gpt_image_1p5_multi_function_image_gen;
+pub mod nano_banana_2_multi_function_image_gen;
 pub mod nano_banana_multi_function_image_gen;
 pub mod nano_banana_pro_multi_function_image_gen;

crates/api_clients/artcraft/artcraft_api_defs/src/generate/image/multi_function/nano_banana_2_multi_function_image_gen.rs

@@ -0,0 +1,74 @@
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use tokens::tokens::media_files::MediaFileToken;
+use utoipa::ToSchema;
+
+pub const NANO_BANANA_2_MULTI_FUNCTION_IMAGE_GEN_PATH: &str = "/v1/generate/image/multi_function/nano_banana_2";
+
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
+pub struct NanaBanana2MultiFunctionImageGenRequest {
+  /// Idempotency token to prevent duplicate requests.
+  pub uuid_idempotency_token: String,
+
+  /// Text prompt to generate the image from.
+  pub prompt: Option<String>,
+
+  /// Image media tokens to include in the editing context.
+  /// If present, we're doing image editing (image-to-image / image-editing)
+  /// If absent, we're doing image generation (text-to-image)
+  pub image_media_tokens: Option<Vec<MediaFileToken>>,
+
+  /// Number of images to generate. Default is one.
+  pub num_images: Option<NanaBanana2MultiFunctionImageGenNumImages>,
+
+  /// Resolution of the image to generate. Default is OneK (1K).
+  pub resolution: Option<NanaBanana2MultiFunctionImageGenImageResolution>,
+
+  /// Aspect ratio of the images to generate. Default is "1:1"
+  pub aspect_ratio: Option<NanaBanana2MultiFunctionImageGenAspectRatio>,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum NanaBanana2MultiFunctionImageGenNumImages {
+  One, // Default
+  Two,
+  Three,
+  Four,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum NanaBanana2MultiFunctionImageGenImageResolution {
+  HalfK,
+  OneK,
+  TwoK,
+  FourK,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum NanaBanana2MultiFunctionImageGenAspectRatio {
+  // Auto (only for image editing)
+  Auto, // Default for image editing.
+  // Square
+  OneByOne, // Default for text-to-image
+  // Wide
+  FiveByFour,
+  FourByThree,
+  ThreeByTwo,
+  SixteenByNine,
+  TwentyOneByNine,
+  // Tall
+  FourByFive,
+  ThreeByFour,
+  TwoByThree,
+  NineBySixteen,
+}
+
+
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct NanaBanana2MultiFunctionImageGenResponse {
+  pub success: bool,
+  pub inference_job_token: InferenceJobToken,
+}

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/seedance_2p0_multi_function_video_gen.rs

@@ -33,7 +33,7 @@ pub struct Seedance2p0MultiFunctionVideoGenRequest {
   pub batch_count: Option<Seedance2p0BatchCount>,
 }
 
-#[derive(Serialize, Deserialize, ToSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Seedance2p0AspectRatio {
   /// 16:9 landscape (1280x720)
@@ -48,7 +48,7 @@ pub enum Seedance2p0AspectRatio {
   Portrait3x4,
 }
 
-#[derive(Serialize, Deserialize, ToSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Seedance2p0BatchCount {
   One,
@@ -66,3 +66,20 @@ pub struct Seedance2p0MultiFunctionVideoGenResponse {
   /// 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/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_image.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::image::multi_function::bytedance_seedream_5_lite_multi_function_image_gen::{BytedanceSeedream5LiteMultiFunctionImageGenRequest, BytedanceSeedream5LiteMultiFunctionImageGenResponse, BYTEDANCE_SEEDREAM_5_LITE_MULTI_FUNCTION_IMAGE_GEN_PATH};
+
+pub async fn bytedance_seedream_5_lite_multi_function_image_gen(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: BytedanceSeedream5LiteMultiFunctionImageGenRequest,
+) -> Result<BytedanceSeedream5LiteMultiFunctionImageGenResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    BYTEDANCE_SEEDREAM_5_LITE_MULTI_FUNCTION_IMAGE_GEN_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}

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

@@ -1,5 +1,7 @@
 pub mod bytedance_seedream_v4_multi_function_image_gen_image;
 pub mod bytedance_seedream_v4p5_multi_function_image_gen_image;
+pub mod bytedance_seedream_5_lite_multi_function_image_gen_image;
 pub mod gpt_image_1p5_multi_function_image_gen_image;
+pub mod nano_banana_2_multi_function_image_gen_image;
 pub mod nano_banana_multi_function_image_gen_image;
 pub mod nano_banana_pro_multi_function_image_gen_image;

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_image.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::image::multi_function::nano_banana_2_multi_function_image_gen::{NanaBanana2MultiFunctionImageGenRequest, NanaBanana2MultiFunctionImageGenResponse, NANO_BANANA_2_MULTI_FUNCTION_IMAGE_GEN_PATH};
+
+pub async fn nano_banana_2_multi_function_image_gen(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: NanaBanana2MultiFunctionImageGenRequest,
+) -> Result<NanaBanana2MultiFunctionImageGenResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    NANO_BANANA_2_MULTI_FUNCTION_IMAGE_GEN_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}

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/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)