restore artcraft tauri portions

remove wreq openssl hack
ugh
2026-10-21 09:22:41 -04:00 · 2026-02-22 09:24:48 +07:00 · 2026-02-22 09:20:35 +07:00 · 2026-02-22 08:49:33 +07:00 · 2026-02-22 08:42:06 +07:00 · 2026-02-22 08:39:11 +07:00
410 changed files with 1844 additions and 9047 deletions
@@ -68,9 +68,6 @@ __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

@@ -1,12 +0,0 @@
-{
-  "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"
-}
@@ -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_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"
+}
@@ -1,12 +0,0 @@
-{
-  "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"
-}
@@ -1,102 +0,0 @@
-{
-  "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"
-}
@@ -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    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    ",
+  "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    ",
  "describe": {
    "columns": [
      {
@@ -72,16 +72,6 @@
          "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": {
@@ -94,9 +84,8 @@
      true,
      false,
      false,
-      true,
      true
    ]
  },
-  "hash": "cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4"
+  "hash": "ca96942d8214edb84f163cf40131ceed873209e86718054e1502219fc81d2dc6"
 }
@@ -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_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"
-}
@@ -677,12 +677,10 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"

 [[package]]
 name = "artcraft"
-version = "0.0.1"
+version = "0.6.0"
 dependencies = [
 "anyhow",
 "artcraft_api_defs",
- "artcraft_client",
- "artcraft_router",
 "base64 0.22.1",
 "build_metadata",
 "bytes",
@@ -715,6 +713,7 @@ dependencies = [
 "serde_json",
 "serial_test",
 "sqlite_tasks",
+ "storyteller_client",
 "tauri",
 "tauri-build",
 "tauri-plugin-dialog",
@@ -738,7 +737,6 @@ dependencies = [
 name = "artcraft_api_defs"
 version = "0.0.1"
 dependencies = [
- "anyhow",
 "chrono",
 "enums",
 "enums_public",
@@ -751,53 +749,6 @@ 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",
- "test_data",
- "tokens",
- "tokio",
- "uuid 1.18.1",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "ashpd"
 version = "0.9.2"
@@ -11508,7 +11459,6 @@ dependencies = [
 "actix_helpers",
 "anyhow",
 "artcraft_api_defs",
- "artcraft_router",
 "async-stripe 0.26.0",
 "async-trait",
 "base64 0.22.1",
@@ -11570,6 +11520,7 @@ dependencies = [
 "redis_common",
 "redis_schema",
 "regex",
+ "reqwest 0.12.23",
 "resend-rs",
 "reusable_types",
 "rust-s3",
@@ -11601,10 +11552,37 @@ 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"
@@ -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/artcraft_client",
+  "crates/api_clients/artcraft/storyteller_client",
  "crates/api_clients/cloud_storage",
  "crates/api_clients/fal_client",
  "crates/api_clients/google_drive_common",
@@ -72,7 +72,6 @@ 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",
@@ -208,7 +207,6 @@ 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" }
@@ -240,7 +238,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" }
-artcraft_client = { path = "crates/api_clients/artcraft/artcraft_client" }
+storyteller_client = { path = "crates/api_clients/artcraft/storyteller_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
 test_data = { path = "crates/lib/test_data" }
 testing = { path = "crates/lib/testing" }
@@ -302,7 +300,7 @@ toml = "0.8.23"
 url = { version = "2.5.4", features = ["serde"] }
 uuid = "1.18.1"

-# NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
+# NB(1): wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
 #
 # Mac:
 #   brew install --formula cmake pkg-config llvm
@@ -313,5 +311,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", "form", "multipart", "cookies", "ws", "stream", "gzip", "brotli", "zstd", "deflate"] }
+wreq = { version = "6.0.0-rc.28", features = ["json", "query", "multipart", "cookies", "ws", "stream", "gzip", "form"] }

@@ -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, 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 |
+| 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 |
 | Grok       | Grok Imagine, Grok Video                                                                                                                                                |
 | Midjourney | Image Gen (all versions)                                                                                                                                                |
 | Sora       | Sora 1, Sora 2, GPT-Image-1                                                                                                                                             |
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-DROP COLUMN
-maybe_wallet_ledger_entry_token;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-ADD COLUMN
-maybe_wallet_ledger_entry_token VARCHAR(32) DEFAULT NULL;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE wallet_ledger_entries
-DROP COLUMN
-is_refunded;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE wallet_ledger_entries
-ADD COLUMN
-is_refunded BOOLEAN NOT NULL DEFAULT FALSE;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE wallet_ledger_entries
-DROP COLUMN
-maybe_linked_refund_ledger_token;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE wallet_ledger_entries
-ADD COLUMN
-maybe_linked_refund_ledger_token VARCHAR(32) DEFAULT NULL;
@@ -182,9 +182,6 @@ 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
@@ -40,12 +40,6 @@ 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,
@@ -202,7 +202,6 @@ RUN echo -n ${GIT_SHA} > GIT_SHA

 # Copy all the binaries (except those that need a GPU):
 COPY --from=builder /tmp/target/release/storyteller-web /
-COPY --from=builder /tmp/target/release/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  /
@@ -36,4 +36,3 @@ serde_json.workspace = true
 utoipa = { version = "4", features = ["chrono", "actix_extras"] }

 [dev-dependencies]
-anyhow.workspace = true
@@ -1,116 +0,0 @@
-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}"));
-  }
-}
@@ -1,122 +0,0 @@
-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}"));
-  }
-}
@@ -1,2 +0,0 @@
-pub mod estimate_image_cost;
-pub mod estimate_video_cost;
@@ -1,4 +1,3 @@
-pub mod cost_estimate;
 pub mod image;
 pub mod object;
 pub mod video;
@@ -33,7 +33,7 @@ pub struct Seedance2p0MultiFunctionVideoGenRequest {
  pub batch_count: Option<Seedance2p0BatchCount>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Seedance2p0AspectRatio {
  /// 16:9 landscape (1280x720)
@@ -48,7 +48,7 @@ pub enum Seedance2p0AspectRatio {
  Portrait3x4,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Seedance2p0BatchCount {
  One,
@@ -66,20 +66,3 @@ 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(())
-  }
-}
@@ -1,35 +0,0 @@
-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)))
-}
@@ -1,20 +0,0 @@
-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?)
-}
@@ -1 +0,0 @@
-pub mod estimate_image_cost;
@@ -1,2 +0,0 @@
-pub mod image;
-pub mod video;
@@ -1,20 +0,0 @@
-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?)
-}
@@ -1 +0,0 @@
-pub mod estimate_video_cost;
@@ -1,34 +0,0 @@
-[package]
-name = "artcraft_router"
-edition = "2024"
-version = "0.0.1"
-publish = false
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[lib]
-name = "artcraft_router"
-path = "src/lib.rs"
-
-[dependencies]
-# cargo-hakari workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# Internal
-artcraft_api_defs.workspace = true
-fal_client.workspace = true
-seedance2pro.workspace = true
-artcraft_client.workspace = true
-tokens.workspace = true
-
-# External
-anyhow.workspace = true
-log.workspace = true
-serde.workspace = true
-serde_derive.workspace = true
-tokio.workspace = true
-uuid.workspace = true
-
-[dev-dependencies]
-test_data.workspace = true
@@ -1,42 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-/// This is a comprehensive list of common aspect ratios you can specify when enqueuing a generation.
-/// Not every model will support every aspect ratio.
-/// In the case a model doesn't support the aspect ratio, gracefully pick the nearest option.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CommonAspectRatio {
-  // Auto (eg. for image editing to use the source; used by Nano Banana Pro edit image, but not text-to-image)
-  Auto,
-
-  // Square
-  Square,
-
-  // Wide
-  WideThreeByTwo,
-  WideFourByThree,
-  WideFiveByFour,
-  WideSixteenByNine,
-  WideTwentyOneByNine,
-
-  // Tall
-  TallTwoByThree,
-  TallThreeByFour,
-  TallFourByFive,
-  TallNineBySixteen,
-  TallNineByTwentyOne,
-
-  // Imprecise semantic values that we probably remap to other meanings
-  // on a model-by-model basis.
-  Wide,
-  Tall,
-
-  // Auto values that bake in resolution
-  // These are from the Seedream models
-  Auto2k,
-  Auto4k,
-
-  // Defined aspect ratios that bake in resolution
-  // These are from the Seedream models
-  SquareHd,
-}
@@ -1,10 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-/// Common image models supported by the router.
-/// Not all models are available through all providers.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CommonImageModel {
-  #[serde(rename = "nano_banana_pro")]
-  NanaBananaPro,
-}
@@ -1,17 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-/// This is a comprehensive list of common resolutions you can specify when enqueuing a generation.
-/// Not every model will support every resolution.
-/// In the case a model doesn't support the resolution, gracefully pick the nearest option.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CommonResolution {
-  /// Models: Nano Banana Pro
-  OneK,
-  /// Models: Nano Banana Pro
-  TwoK,
-  /// Models: (None)
-  ThreeK,
-  /// Models: Nano Banana Pro
-  FourK,
-}
@@ -1,52 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-/// Common video models supported by the router.
-/// Not all models are available through all providers.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CommonVideoModel {
-  #[serde(rename = "grok_video")]
-  GrokVideo,
-
-  #[serde(rename = "kling_1p6_pro")]
-  Kling16Pro,
-
-  #[serde(rename = "kling_2p1_pro")]
-  Kling21Pro,
-
-  #[serde(rename = "kling_2p1_master")]
-  Kling21Master,
-
-  #[serde(rename = "kling_2p5_turbo_pro")]
-  Kling2p5TurboPro,
-
-  #[serde(rename = "kling_2p6_pro")]
-  Kling2p6Pro,
-
-  #[serde(rename = "seedance_1p0_lite")]
-  Seedance10Lite,
-
-  #[serde(rename = "seedance_2p0")]
-  Seedance2p0,
-
-  #[serde(rename = "sora_2")]
-  Sora2,
-
-  #[serde(rename = "sora_2_pro")]
-  Sora2Pro,
-
-  #[serde(rename = "veo_2")]
-  Veo2,
-
-  #[serde(rename = "veo_3")]
-  Veo3,
-
-  #[serde(rename = "veo_3_fast")]
-  Veo3Fast,
-
-  #[serde(rename = "veo_3p1")]
-  Veo3p1,
-
-  #[serde(rename = "veo_3p1_fast")]
-  Veo3p1Fast,
-}
@@ -1,7 +0,0 @@
-use tokens::tokens::media_files::MediaFileToken;
-
-#[derive(Copy, Clone)]
-pub enum ImageListRef<'a> {
-  MediaFileTokens(&'a Vec<MediaFileToken>),
-  Urls(&'a Vec<String>),
-}
@@ -1,7 +0,0 @@
-use tokens::tokens::media_files::MediaFileToken;
-
-#[derive(Copy, Clone)]
-pub enum ImageRef<'a> {
-  MediaFileToken(&'a MediaFileToken),
-  Url(&'a str),
-}
@@ -1,7 +0,0 @@
-pub mod common_aspect_ratio;
-pub mod common_image_model;
-pub mod common_resolution;
-pub mod common_video_model;
-pub mod image_list_ref;
-pub mod image_ref;
-pub mod provider;
@@ -1,9 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-/// The provider to route a generation request to.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum Provider {
-  Artcraft,
-  Fal,
-}
@@ -1,6 +0,0 @@
-pub mod multi_router_client;
-pub mod multi_router_client_builder;
-pub mod request_mismatch_mitigation_strategy;
-pub mod router_artcraft_client;
-pub mod router_client;
-pub mod router_fal_client;
@@ -1,20 +0,0 @@
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::client::router_fal_client::RouterFalClient;
-use crate::errors::client_error::{ClientError, ClientType};
-
-pub struct MultiRouterClient {
-  pub(crate) artcraft_client: Option<RouterArtcraftClient>,
-  pub(crate) fal_client: Option<RouterFalClient>,
-}
-
-impl MultiRouterClient {
-  pub fn get_artcraft_client_ref(&self) -> Result<&RouterArtcraftClient, ClientError> {
-    self.artcraft_client.as_ref()
-      .ok_or(ClientError::ClientNotConfigured(ClientType::Artcraft))
-  }
-
-  pub fn get_fal_client_ref(&self) -> Result<&RouterFalClient, ClientError> {
-    self.fal_client.as_ref()
-      .ok_or(ClientError::ClientNotConfigured(ClientType::Fal))
-  }
-}
@@ -1,34 +0,0 @@
-use crate::client::multi_router_client::MultiRouterClient;
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::client::router_fal_client::RouterFalClient;
-
-pub struct MultiRouterClientBuilder {
-  artcraft_client: Option<RouterArtcraftClient>,
-  fal_client: Option<RouterFalClient>,
-}
-
-impl MultiRouterClientBuilder {
-  pub fn new() -> Self {
-    Self {
-      artcraft_client: None,
-      fal_client: None,
-    }
-  }
-
-  pub fn set_artcraft_client(mut self, client: RouterArtcraftClient) -> Self {
-    self.artcraft_client = Some(client);
-    self
-  }
-
-  pub fn set_fal_client(mut self, client: RouterFalClient) -> Self {
-    self.fal_client = Some(client);
-    self
-  }
-
-  pub fn build(self) -> MultiRouterClient {
-    MultiRouterClient {
-      artcraft_client: self.artcraft_client,
-      fal_client: self.fal_client,
-    }
-  }
-}
@@ -1,12 +0,0 @@
-
-#[derive(Copy, Clone, Debug)]
-pub enum RequestMismatchMitigationStrategy {
-  /// Upgrade the request to pay more.
-  PayMoreUpgrade,
-  
-  /// Downgrade the request to pay less
-  PayLessDowngrade,
-  
-  /// Fail the request.
-  ErrorOut,
-}
@@ -1,13 +0,0 @@
-use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use artcraft_client::utils::api_host::ApiHost;
-
-pub struct RouterArtcraftClient {
-  pub(crate) api_host: ApiHost,
-  pub(crate) credentials: StorytellerCredentialSet,
-}
-
-impl RouterArtcraftClient {
-  pub fn new(api_host: ApiHost, credentials: StorytellerCredentialSet) -> Self {
-    Self { api_host, credentials }
-  }
-}
@@ -1,28 +0,0 @@
-use crate::client::multi_router_client::MultiRouterClient;
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::client::router_fal_client::RouterFalClient;
-use crate::errors::client_error::{ClientError, ClientType};
-
-pub enum RouterClient {
-  Multi(MultiRouterClient),
-  Artcraft(RouterArtcraftClient),
-  Fal(RouterFalClient),
-}
-
-impl RouterClient {
-  pub fn get_artcraft_client_ref(&self) -> Result<&RouterArtcraftClient, ClientError> {
-    match self {
-      RouterClient::Artcraft(client) => Ok(client),
-      RouterClient::Multi(multi) => multi.get_artcraft_client_ref(),
-      _ => Err(ClientError::ClientNotConfigured(ClientType::Artcraft)),
-    }
-  }
-
-  pub fn get_fal_client_ref(&self) -> Result<&RouterFalClient, ClientError> {
-    match self {
-      RouterClient::Fal(client) => Ok(client),
-      RouterClient::Multi(multi) => multi.get_fal_client_ref(),
-      _ => Err(ClientError::ClientNotConfigured(ClientType::Fal)),
-    }
-  }
-}
@@ -1,12 +0,0 @@
-use fal_client::creds::fal_api_key::FalApiKey;
-
-pub struct RouterFalClient {
-  pub(crate) api_key: FalApiKey,
-  pub(crate) webhook_url: String,
-}
-
-impl RouterFalClient {
-  pub fn new(api_key: FalApiKey, webhook_url: String) -> Self {
-    Self { api_key, webhook_url }
-  }
-}
@@ -1,44 +0,0 @@
-use crate::errors::client_error::ClientError;
-use crate::errors::provider_error::ProviderError;
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug)]
-pub enum ArtcraftRouterError {
-  /// A client configuration error.
-  Client(ClientError),
-
-  /// The requested model is not yet supported by the router.
-  UnsupportedModel(String),
-
-  /// Invalid or missing input arguments.
-  InvalidInput(String),
-
-  /// An error from an underlying provider.
-  Provider(ProviderError),
-}
-
-impl Error for ArtcraftRouterError {}
-
-impl Display for ArtcraftRouterError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::Client(e) => write!(f, "Client error: {}", e),
-      Self::UnsupportedModel(model) => write!(f, "Unsupported model: {}", model),
-      Self::InvalidInput(msg) => write!(f, "Invalid input: {}", msg),
-      Self::Provider(e) => write!(f, "Provider error: {}", e),
-    }
-  }
-}
-
-impl From<ClientError> for ArtcraftRouterError {
-  fn from(error: ClientError) -> Self {
-    Self::Client(error)
-  }
-}
-
-impl From<ProviderError> for ArtcraftRouterError {
-  fn from(error: ProviderError) -> Self {
-    Self::Provider(error)
-  }
-}
@@ -1,60 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug, Clone, Copy)]
-pub enum ClientType {
-  Artcraft,
-  Fal,
-}
-
-impl Display for ClientType {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::Artcraft => write!(f, "Artcraft"),
-      Self::Fal => write!(f, "Fal"),
-    }
-  }
-}
-
-#[derive(Debug)]
-pub enum ClientError {
-  /// The requested client is not configured on the RouterClient.
-  ClientNotConfigured(ClientType),
-
-  /// The model does not support the given option value.
-  /// `field` is the request field name, `value` is what was requested.
-  ModelDoesNotSupportOption { field: &'static str, value: String },
-
-  /// The caller requested zero generations, which is never valid.
-  UserRequestedZeroGenerations,
-
-  /// ArtCraft only accepts media tokens for image inputs, not raw URLs.
-  ArtcraftOnlySupportsMediaTokens,
-
-  /// Fal only accepts image URLs for image inputs, not media tokens.
-  FalOnlySupportsUrls,
-}
-
-impl Error for ClientError {}
-
-impl Display for ClientError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::ClientNotConfigured(client_type) => {
-        write!(f, "{} client is not configured on the RouterClient", client_type)
-      }
-      Self::ModelDoesNotSupportOption { field, value } => {
-        write!(f, "Model does not support '{}' for field '{}'", value, field)
-      }
-      Self::UserRequestedZeroGenerations => {
-        write!(f, "Cannot request zero generations")
-      }
-      Self::ArtcraftOnlySupportsMediaTokens => {
-        write!(f, "ArtCraft only supports media tokens for image inputs; upload the image first to obtain a media token")
-      }
-      Self::FalOnlySupportsUrls => {
-        write!(f, "Fal only supports image URLs for image inputs, not media tokens")
-      }
-    }
-  }
-}
@@ -1,3 +0,0 @@
-pub mod artcraft_router_error;
-pub mod client_error;
-pub mod provider_error;
@@ -1,33 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-use artcraft_client::error::storyteller_error::StorytellerError;
-use fal_client::error::fal_error_plus::FalErrorPlus;
-
-#[derive(Debug)]
-pub enum ProviderError {
-  Storyteller(StorytellerError),
-  Fal(FalErrorPlus),
-}
-
-impl Error for ProviderError {}
-
-impl Display for ProviderError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::Storyteller(e) => write!(f, "Storyteller provider error: {}", e),
-      Self::Fal(e) => write!(f, "Fal provider error: {}", e),
-    }
-  }
-}
-
-impl From<StorytellerError> for ProviderError {
-  fn from(error: StorytellerError) -> Self {
-    Self::Storyteller(error)
-  }
-}
-
-impl From<FalErrorPlus> for ProviderError {
-  fn from(error: FalErrorPlus) -> Self {
-    Self::Fal(error)
-  }
-}
@@ -1,79 +0,0 @@
-use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::{
-  NanoBananaProMultiFunctionImageGenImageResolution, NanoBananaProMultiFunctionImageGenNumImages,
-};
-
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_pro::PlanArtcraftNanaBananaPro;
-
-pub(crate) fn estimate_image_cost_artcraft_nano_banana_pro(
-  plan: &PlanArtcraftNanaBananaPro<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.15/image at 1K or 2K resolution, $0.30/image at 4K.
-  // (Stored as USD cents.)
-  let cost_per_image: u64 = match plan.resolution {
-    Some(NanoBananaProMultiFunctionImageGenImageResolution::FourK) => 30,
-    _ => 15,
-  };
-
-  let num_images: u64 = match plan.num_images {
-    NanoBananaProMultiFunctionImageGenNumImages::One => 1,
-    NanoBananaProMultiFunctionImageGenNumImages::Two => 2,
-    NanoBananaProMultiFunctionImageGenNumImages::Three => 3,
-    NanoBananaProMultiFunctionImageGenNumImages::Four => 4,
-  };
-
-  let cost_in_usd_cents = cost_per_image * num_images;
-
-  ImageGenerationCostEstimate {
-    cost_in_credits: Some(cost_in_usd_cents),
-    cost_in_usd_cents: Some(cost_in_usd_cents),
-    is_free: false,
-    is_unlimited: false,
-    is_rate_limited: false,
-    has_watermark: false,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_image_model::CommonImageModel;
-  use crate::api::common_resolution::CommonResolution;
-  use crate::api::provider::Provider;
-  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-
-  fn estimate_usd_cents(resolution: Option<CommonResolution>, image_batch_count: u16) -> u64 {
-    let request = GenerateImageRequest {
-      model: CommonImageModel::NanaBananaPro,
-      provider: Provider::Artcraft,
-      prompt: None,
-      image_inputs: None,
-      resolution,
-      aspect_ratio: None,
-      image_batch_count: Some(image_batch_count),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      idempotency_token: None,
-    };
-    request.build()
-      .expect("build should succeed")
-      .estimate_costs()
-      .cost_in_usd_cents
-      .expect("cost_in_usd_cents should be present")
-  }
-
-  #[test]
-  fn test_estimate_cost_usd_cents() {
-    // 1K/2K: $0.15/image = 15 cents
-    assert_eq!(estimate_usd_cents(None, 1), 15);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 1), 15);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::TwoK), 1), 15);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 2), 30);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 3), 45);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 4), 60);
-
-    // 4K: $0.30/image = 30 cents
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 1), 30);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 2), 60);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 4), 120);
-  }
-}
@@ -1 +0,0 @@
-pub mod estimate_image_cost_artcraft_nano_banana_pro;
@@ -1,77 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::{
-  FalNbpNumImages, FalNbpResolution, PlanFalNanaBananaPro,
-};
-
-pub(crate) fn estimate_image_cost_fal_nano_banana_pro(
-  plan: &PlanFalNanaBananaPro<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.15/image at 1K or 2K resolution, $0.30/image at 4K.
-  // (Stored as USD cents.)
-  let cost_per_image: u64 = match plan.resolution {
-    Some(FalNbpResolution::FourK) => 30,
-    _ => 15,
-  };
-
-  let num_images: u64 = match plan.num_images {
-    FalNbpNumImages::One => 1,
-    FalNbpNumImages::Two => 2,
-    FalNbpNumImages::Three => 3,
-    FalNbpNumImages::Four => 4,
-  };
-
-  let cost_in_usd_cents = cost_per_image * num_images;
-
-  ImageGenerationCostEstimate {
-    cost_in_credits: Some(cost_in_usd_cents),
-    cost_in_usd_cents: Some(cost_in_usd_cents),
-    is_free: false,
-    is_unlimited: false,
-    is_rate_limited: false,
-    has_watermark: false,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_image_model::CommonImageModel;
-  use crate::api::common_resolution::CommonResolution;
-  use crate::api::provider::Provider;
-  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-
-  fn estimate_usd_cents(resolution: Option<CommonResolution>, image_batch_count: u16) -> u64 {
-    let request = GenerateImageRequest {
-      model: CommonImageModel::NanaBananaPro,
-      provider: Provider::Fal,
-      prompt: None,
-      image_inputs: None,
-      resolution,
-      aspect_ratio: None,
-      image_batch_count: Some(image_batch_count),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      idempotency_token: None,
-    };
-    request.build()
-      .expect("build should succeed")
-      .estimate_costs()
-      .cost_in_usd_cents
-      .expect("cost_in_usd_cents should be present")
-  }
-
-  #[test]
-  fn test_estimate_cost_usd_cents() {
-    // 1K/2K: $0.15/image = 15 cents
-    assert_eq!(estimate_usd_cents(None, 1), 15);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 1), 15);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::TwoK), 1), 15);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 2), 30);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 3), 45);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 4), 60);
-
-    // 4K: $0.30/image = 30 cents
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 1), 30);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 2), 60);
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 4), 120);
-  }
-}
@@ -1 +0,0 @@
-pub(crate) mod estimate_image_cost_fal_nano_banana_pro;
@@ -1,2 +0,0 @@
-pub(crate) mod artcraft;
-pub(crate) mod fal;
@@ -1,123 +0,0 @@
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::provider_error::ProviderError;
-use crate::generate::generate_image::generate_image_response::{
-  ArtcraftImageResponsePayload, GenerateImageResponse,
-};
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_pro::PlanArtcraftNanaBananaPro;
-use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::NanoBananaProMultiFunctionImageGenRequest;
-use artcraft_client::endpoints::generate::image::multi_function::nano_banana_pro_multi_function_image_gen_image::nano_banana_pro_multi_function_image_gen;
-
-pub async fn execute_artcraft_nano_banana_pro(
-  plan: &PlanArtcraftNanaBananaPro<'_>,
-  artcraft_client: &RouterArtcraftClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let request = NanoBananaProMultiFunctionImageGenRequest {
-    uuid_idempotency_token: plan.idempotency_token.clone(),
-    prompt: plan.prompt.map(|p| p.to_string()),
-    image_media_tokens: plan.image_inputs.map(|tokens| tokens.to_owned()),
-    num_images: Some(plan.num_images),
-    resolution: plan.resolution,
-    aspect_ratio: plan.aspect_ratio,
-  };
-
-  let response = nano_banana_pro_multi_function_image_gen(
-    &artcraft_client.api_host,
-    Some(&artcraft_client.credentials),
-    request,
-  )
-    .await
-    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Storyteller(err)))?;
-
-  Ok(GenerateImageResponse::Artcraft(ArtcraftImageResponsePayload {
-    inference_job_token: response.inference_job_token,
-  }))
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::common_resolution::CommonResolution;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-  use crate::test_helpers::{base_image_request, get_artcraft_client};
-  use tokens::tokens::media_files::MediaFileToken;
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_image_nano_banana_pro() {
-    let client = get_artcraft_client();
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      resolution: Some(CommonResolution::OneK),
-      image_batch_count: Some(1),
-      prompt: Some("a cat walking through a cyberpunk city at night"),
-      ..base_image_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_image(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_image request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-
-    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_image_nano_banana_pro_batch_four() {
-    let client = get_artcraft_client();
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::Square),
-      resolution: Some(CommonResolution::OneK),
-      image_batch_count: Some(4),
-      prompt: Some("a dog surfing a wave, cinematic"),
-      ..base_image_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_image(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_image request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-
-    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_edit_image_nano_banana_pro() {
-    let client = get_artcraft_client();
-
-    // Reference images: the man to transplant, then the destination scene.
-    let image_tokens = vec![
-      MediaFileToken::new_from_str("m_r45apt2swza6wp8j2z10237t92kkr8"),
-      MediaFileToken::new_from_str("m_2220d5we3masng5hvzg5zz68ywbdqd"),
-    ];
-
-    let request = GenerateImageRequest {
-      prompt: Some("Add the man in the first image into the fantasy scene in the second image. Keep his hoodie and attire, but match the vibe of the fantasy scene."),
-      image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
-      aspect_ratio: Some(CommonAspectRatio::Auto), // edit mode: preserve source dimensions
-      resolution: Some(CommonResolution::OneK),
-      image_batch_count: Some(1),
-      ..base_image_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_image(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_image request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-
-    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
-  }
-}
@@ -1 +0,0 @@
-pub mod generate_image_artcraft_nano_banana_pro;
@@ -1,185 +0,0 @@
-use crate::client::router_fal_client::RouterFalClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::provider_error::ProviderError;
-use crate::generate::generate_image::generate_image_response::{
-  FalImageResponsePayload, GenerateImageResponse,
-};
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::{
-  FalNbpNumImages, FalNbpResolution, PlanFalNanaBananaPro,
-};
-use fal_client::requests::webhook::image::edit::enqueue_nano_banana_pro_edit_image_webhook::{
-  enqueue_nano_banana_pro_image_edit_webhook, EnqueueNanoBananaProEditImageArgs,
-  EnqueueNanoBananaProEditImageNumImages, EnqueueNanoBananaProEditImageResolution,
-};
-use fal_client::requests::webhook::image::text::enqueue_nano_banana_pro_text_to_image_webhook::{
-  enqueue_nano_banana_pro_text_to_image_webhook, EnqueueNanoBananaProTextToImageArgs,
-  EnqueueNanoBananaProTextToImageNumImages, EnqueueNanoBananaProTextToImageResolution,
-};
-pub async fn execute_fal_nano_banana_pro(
-  plan: &PlanFalNanaBananaPro<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if plan.image_urls.is_empty() {
-    // Text-to-image mode
-    let args = EnqueueNanoBananaProTextToImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      num_images: to_t2i_num_images(plan.num_images),
-      resolution: plan.resolution.map(to_t2i_resolution),
-      aspect_ratio: plan.t2i_aspect_ratio,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_nano_banana_pro_text_to_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    // Image-edit mode
-    let args = EnqueueNanoBananaProEditImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      image_urls: plan.image_urls.clone(),
-      num_images: to_edit_num_images(plan.num_images),
-      resolution: plan.resolution.map(to_edit_resolution),
-      aspect_ratio: plan.edit_aspect_ratio,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_nano_banana_pro_image_edit_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  };
-
-  Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
-    request_id: webhook_response.request_id,
-    gateway_request_id: webhook_response.gateway_request_id,
-  }))
-}
-
-fn to_t2i_num_images(n: FalNbpNumImages) -> EnqueueNanoBananaProTextToImageNumImages {
-  match n {
-    FalNbpNumImages::One => EnqueueNanoBananaProTextToImageNumImages::One,
-    FalNbpNumImages::Two => EnqueueNanoBananaProTextToImageNumImages::Two,
-    FalNbpNumImages::Three => EnqueueNanoBananaProTextToImageNumImages::Three,
-    FalNbpNumImages::Four => EnqueueNanoBananaProTextToImageNumImages::Four,
-  }
-}
-
-fn to_edit_num_images(n: FalNbpNumImages) -> EnqueueNanoBananaProEditImageNumImages {
-  match n {
-    FalNbpNumImages::One => EnqueueNanoBananaProEditImageNumImages::One,
-    FalNbpNumImages::Two => EnqueueNanoBananaProEditImageNumImages::Two,
-    FalNbpNumImages::Three => EnqueueNanoBananaProEditImageNumImages::Three,
-    FalNbpNumImages::Four => EnqueueNanoBananaProEditImageNumImages::Four,
-  }
-}
-
-fn to_t2i_resolution(r: FalNbpResolution) -> EnqueueNanoBananaProTextToImageResolution {
-  match r {
-    FalNbpResolution::OneK => EnqueueNanoBananaProTextToImageResolution::OneK,
-    FalNbpResolution::TwoK => EnqueueNanoBananaProTextToImageResolution::TwoK,
-    FalNbpResolution::FourK => EnqueueNanoBananaProTextToImageResolution::FourK,
-  }
-}
-
-fn to_edit_resolution(r: FalNbpResolution) -> EnqueueNanoBananaProEditImageResolution {
-  match r {
-    FalNbpResolution::OneK => EnqueueNanoBananaProEditImageResolution::OneK,
-    FalNbpResolution::TwoK => EnqueueNanoBananaProEditImageResolution::TwoK,
-    FalNbpResolution::FourK => EnqueueNanoBananaProEditImageResolution::FourK,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::common_resolution::CommonResolution;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-  use crate::test_helpers::{base_fal_image_request, get_fal_client};
-  use test_data::web::image_urls::{GHOST_IMAGE_URL, TREX_SKELETON_IMAGE_URL};
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real Fal API request
-  async fn test_text_to_image_fal_nano_banana_pro() {
-    let client = get_fal_client();
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      resolution: Some(CommonResolution::TwoK),
-      image_batch_count: Some(1),
-      prompt: Some("a cyberpunk city skyline at dusk, neon lights reflecting on rain-soaked streets"),
-      ..base_fal_image_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_image(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_image request failed");
-    let payload = response.get_fal_payload().expect("expected Fal payload");
-    println!("Request ID: {:?}", payload.request_id);
-    println!("Gateway request ID: {:?}", payload.gateway_request_id);
-
-    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real Fal API request
-  async fn test_text_to_image_fal_nano_banana_pro_batch_four() {
-    let client = get_fal_client();
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::Square),
-      resolution: Some(CommonResolution::OneK),
-      image_batch_count: Some(4),
-      prompt: Some("a golden retriever surfing a wave, cinematic, 4K"),
-      ..base_fal_image_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_image(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_image request failed");
-    let payload = response.get_fal_payload().expect("expected Fal payload");
-    println!("Request ID: {:?}", payload.request_id);
-    println!("Gateway request ID: {:?}", payload.gateway_request_id);
-
-    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real Fal API request
-  async fn test_edit_image_fal_nano_banana_pro() {
-    let client = get_fal_client();
-
-    let image_urls = vec![
-      GHOST_IMAGE_URL.to_string(),
-      TREX_SKELETON_IMAGE_URL.to_string(),
-    ];
-
-    let request = GenerateImageRequest {
-      prompt: Some("Add the ghost from the first image hovering above the T-Rex skeleton in the second image, make it look spooky but friendly"),
-      image_inputs: Some(ImageListRef::Urls(&image_urls)),
-      aspect_ratio: Some(CommonAspectRatio::Auto), // edit mode: preserve source dimensions
-      resolution: Some(CommonResolution::TwoK),
-      image_batch_count: Some(1),
-      ..base_fal_image_request()
-    };
-
-    let plan = request.build().unwrap();
-    let ImageGenerationPlan::FalNanaBananaPro(ref p) = plan else {
-      panic!("expected FalNanaBananaPro plan");
-    };
-    println!("Plan image_urls: {:?}", p.image_urls);
-    println!("Plan edit_aspect_ratio: {:?}", p.edit_aspect_ratio);
-
-    let result = plan.generate_image(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_image request failed");
-    let payload = response.get_fal_payload().expect("expected Fal payload");
-    println!("Request ID: {:?}", payload.request_id);
-    println!("Gateway request ID: {:?}", payload.gateway_request_id);
-
-    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
-  }
-}
@@ -1 +0,0 @@
-pub mod generate_image_fal_nano_banana_pro;
@@ -1,2 +0,0 @@
-pub mod artcraft;
-pub mod fal;
@@ -1,65 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-use crate::api::common_image_model::CommonImageModel;
-use crate::api::common_resolution::CommonResolution;
-use crate::api::image_list_ref::ImageListRef;
-use crate::api::provider::Provider;
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_pro::plan_generate_image_artcraft_nano_banana_pro;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::plan_generate_image_fal_nano_banana_pro;
-
-pub struct GenerateImageRequest<'a> {
-  /// Which model to use.
-  pub model: CommonImageModel,
-
-  /// Which provider to use.
-  pub provider: Provider,
-
-  /// The prompt for the image generation.
-  pub prompt: Option<&'a str>,
-
-  /// Input images for image editing.
-  /// If present, we're doing image editing (image-to-image).
-  /// If absent, we're doing text-to-image.
-  pub image_inputs: Option<ImageListRef<'a>>,
-
-  /// The resolution to use.
-  pub resolution: Option<CommonResolution>,
-
-  /// The aspect ratio to use.
-  pub aspect_ratio: Option<CommonAspectRatio>,
-
-  /// How many images to generate.
-  pub image_batch_count: Option<u16>,
-
-  /// If the request is a mismatch with the (model/provider), how to mitigate it.
-  pub request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy,
-
-  /// Some providers support idempotency.
-  /// If not supplied, we'll generate one for the required providers.
-  pub idempotency_token: Option<&'a str>,
-}
-
-impl<'a> GenerateImageRequest<'a> {
-  /// Read the image generation request, construct a plan, then yield a means to execute it.
-  pub fn build(&self) -> Result<ImageGenerationPlan<'_>, ArtcraftRouterError> {
-    match self.provider {
-      Provider::Artcraft => match self.model {
-        CommonImageModel::NanaBananaPro => {
-          plan_generate_image_artcraft_nano_banana_pro(self).map(ImageGenerationPlan::ArtcraftNanaBananaPro)
-        }
-      },
-      Provider::Fal => match self.model {
-        CommonImageModel::NanaBananaPro => {
-          plan_generate_image_fal_nano_banana_pro(self).map(ImageGenerationPlan::FalNanaBananaPro)
-        }
-      },
-    }
-  }
-
-  pub fn get_or_generate_idempotency_token(&self) -> String {
-    self.idempotency_token.map(|t| t.to_string())
-        .unwrap_or_else(|| uuid::Uuid::new_v4().to_string())
-  }
-}
@@ -1,34 +0,0 @@
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftImageResponsePayload {
-  pub inference_job_token: InferenceJobToken,
-}
-
-#[derive(Clone, Debug)]
-pub struct FalImageResponsePayload {
-  pub request_id: Option<String>,
-  pub gateway_request_id: Option<String>,
-}
-
-#[derive(Clone, Debug)]
-pub enum GenerateImageResponse {
-  Artcraft(ArtcraftImageResponsePayload),
-  Fal(FalImageResponsePayload),
-}
-
-impl GenerateImageResponse {
-  pub fn get_artcraft_payload(&self) -> Option<ArtcraftImageResponsePayload> {
-    match self {
-      Self::Artcraft(p) => Some(p.clone()),
-      _ => None,
-    }
-  }
-
-  pub fn get_fal_payload(&self) -> Option<FalImageResponsePayload> {
-    match self {
-      Self::Fal(p) => Some(p.clone()),
-      _ => None,
-    }
-  }
-}
@@ -1,9 +0,0 @@
-/// The result of estimating the cost of an image generation plan.
-pub struct ImageGenerationCostEstimate {
-  pub cost_in_credits: Option<u64>,
-  pub cost_in_usd_cents: Option<u64>,
-  pub is_free: bool,
-  pub is_unlimited: bool,
-  pub is_rate_limited: bool,
-  pub has_watermark: bool,
-}
@@ -1,45 +0,0 @@
-use crate::client::router_client::RouterClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_nano_banana_pro::estimate_image_cost_artcraft_nano_banana_pro;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_nano_banana_pro::estimate_image_cost_fal_nano_banana_pro;
-use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_nano_banana_pro::execute_artcraft_nano_banana_pro;
-use crate::generate::generate_image::execute::fal::generate_image_fal_nano_banana_pro::execute_fal_nano_banana_pro;
-use crate::generate::generate_image::generate_image_response::GenerateImageResponse;
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_pro::PlanArtcraftNanaBananaPro;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::PlanFalNanaBananaPro;
-
-#[derive(Debug)]
-pub enum ImageGenerationPlan<'a> {
-  ArtcraftNanaBananaPro(PlanArtcraftNanaBananaPro<'a>),
-  FalNanaBananaPro(PlanFalNanaBananaPro<'a>),
-}
-
-impl<'a> ImageGenerationPlan<'a> {
-  pub async fn generate_image(
-    &self,
-    client: &RouterClient,
-  ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-    match self {
-      ImageGenerationPlan::ArtcraftNanaBananaPro(plan) => {
-        let artcraft_client = client.get_artcraft_client_ref()?;
-        execute_artcraft_nano_banana_pro(plan, artcraft_client).await
-      }
-      ImageGenerationPlan::FalNanaBananaPro(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_nano_banana_pro(plan, fal_client).await
-      }
-    }
-  }
-
-  pub fn estimate_costs(&self) -> ImageGenerationCostEstimate {
-    match self {
-      ImageGenerationPlan::ArtcraftNanaBananaPro(plan) => {
-        estimate_image_cost_artcraft_nano_banana_pro(plan)
-      }
-      ImageGenerationPlan::FalNanaBananaPro(plan) => {
-        estimate_image_cost_fal_nano_banana_pro(plan)
-      }
-    }
-  }
-}
@@ -1,7 +0,0 @@
-pub mod cost;
-pub mod execute;
-pub mod generate_image_request;
-pub mod generate_image_response;
-pub mod image_generation_cost_estimate;
-pub mod image_generation_plan;
-pub mod plan;
@@ -1 +0,0 @@
-pub mod plan_generate_image_artcraft_nano_banana_pro;
@@ -1,451 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-use crate::api::common_resolution::CommonResolution;
-use crate::api::image_list_ref::ImageListRef;
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::client_error::ClientError;
-use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::{
-  NanoBananaProMultiFunctionImageGenAspectRatio, NanoBananaProMultiFunctionImageGenImageResolution,
-  NanoBananaProMultiFunctionImageGenNumImages,
-};
-use tokens::tokens::media_files::MediaFileToken;
-
-#[derive(Debug, Clone)]
-pub struct PlanArtcraftNanaBananaPro<'a> {
-  pub prompt: Option<&'a str>,
-  /// Input images for image editing. None means text-to-image mode.
-  pub image_inputs: Option<&'a Vec<MediaFileToken>>,
-  pub aspect_ratio: Option<NanoBananaProMultiFunctionImageGenAspectRatio>,
-  pub resolution: Option<NanoBananaProMultiFunctionImageGenImageResolution>,
-  pub num_images: NanoBananaProMultiFunctionImageGenNumImages,
-  pub idempotency_token: String,
-}
-
-pub fn plan_generate_image_artcraft_nano_banana_pro<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftNanaBananaPro<'a>, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-
-  let is_edit_mode = request.image_inputs.is_some();
-  let image_inputs = resolve_image_list_ref(request.image_inputs)?;
-  let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, is_edit_mode, strategy)?;
-  let resolution = plan_resolution(request.resolution, strategy)?;
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(PlanArtcraftNanaBananaPro {
-    prompt: request.prompt,
-    image_inputs,
-    aspect_ratio,
-    resolution,
-    num_images,
-    idempotency_token: request.get_or_generate_idempotency_token(),
-  })
-}
-
-fn resolve_image_list_ref<'a>(
-  image_list_ref: Option<ImageListRef<'a>>,
-) -> Result<Option<&'a Vec<MediaFileToken>>, ArtcraftRouterError> {
-  match image_list_ref {
-    None => Ok(None),
-    Some(ImageListRef::MediaFileTokens(tokens)) => Ok(Some(tokens)),
-    Some(ImageListRef::Urls(_)) => {
-      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
-    }
-  }
-}
-
-// Nano Banana Pro supported aspect ratios:
-//   Text-to-image: OneByOne, FiveByFour, FourByThree, ThreeByTwo, SixteenByNine, TwentyOneByNine,
-//                  FourByFive, ThreeByFour, TwoByThree, NineBySixteen
-//   Image editing: Auto (uses source image AR), plus all text-to-image ratios
-fn plan_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  is_edit_mode: bool,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<NanoBananaProMultiFunctionImageGenAspectRatio>, ArtcraftRouterError> {
-  use NanoBananaProMultiFunctionImageGenAspectRatio as NbpAr;
-  match aspect_ratio {
-    // No preference — let the model use its default
-    None => Ok(None),
-
-    // Auto: only valid in edit mode (use source image dimensions)
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => {
-      if is_edit_mode {
-        Ok(Some(NbpAr::Auto))
-      } else {
-        // Auto not valid for text-to-image; fall back to square default
-        Ok(Some(NbpAr::OneByOne))
-      }
-    }
-
-    // Direct mappings
-    Some(CommonAspectRatio::Square) | Some(CommonAspectRatio::SquareHd) => Ok(Some(NbpAr::OneByOne)),
-    Some(CommonAspectRatio::WideFiveByFour) => Ok(Some(NbpAr::FiveByFour)),
-    Some(CommonAspectRatio::WideFourByThree) => Ok(Some(NbpAr::FourByThree)),
-    Some(CommonAspectRatio::WideThreeByTwo) => Ok(Some(NbpAr::ThreeByTwo)),
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Some(NbpAr::SixteenByNine)),
-    Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Some(NbpAr::TwentyOneByNine)),
-    Some(CommonAspectRatio::TallFourByFive) => Ok(Some(NbpAr::FourByFive)),
-    Some(CommonAspectRatio::TallThreeByFour) => Ok(Some(NbpAr::ThreeByFour)),
-    Some(CommonAspectRatio::TallTwoByThree) => Ok(Some(NbpAr::TwoByThree)),
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Some(NbpAr::NineBySixteen)),
-
-    // Mismatch — TallNineByTwentyOne has no direct equivalent
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(nearest_aspect_ratio(unsupported)))
-      }
-    },
-  }
-}
-
-/// Pick the nearest supported aspect ratio for unsupported inputs.
-fn nearest_aspect_ratio(aspect_ratio: CommonAspectRatio) -> NanoBananaProMultiFunctionImageGenAspectRatio {
-  use NanoBananaProMultiFunctionImageGenAspectRatio as NbpAr;
-  match aspect_ratio {
-    // TallNineByTwentyOne (0.43) — nearest is NineBySixteen (0.5625)
-    CommonAspectRatio::TallNineByTwentyOne => NbpAr::NineBySixteen,
-    _ => NbpAr::OneByOne,
-  }
-}
-
-fn plan_resolution(
-  resolution: Option<CommonResolution>,
-  _strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<NanoBananaProMultiFunctionImageGenImageResolution>, ArtcraftRouterError> {
-  use CommonResolution as R;
-  use NanoBananaProMultiFunctionImageGenImageResolution as NbpRes;
-  match resolution {
-    None => Ok(None),
-    Some(R::OneK) => Ok(Some(NbpRes::OneK)),
-    Some(R::TwoK) => Ok(Some(NbpRes::TwoK)),
-    Some(R::FourK) => Ok(Some(NbpRes::FourK)),
-    Some(R::ThreeK) => {
-      // No 3K option; default to 2K
-      Ok(Some(NbpRes::TwoK))
-    }
-  }
-}
-
-// Nano Banana Pro supports 1, 2, 3, and 4 images.
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<NanoBananaProMultiFunctionImageGenNumImages, ArtcraftRouterError> {
-  use NanoBananaProMultiFunctionImageGenNumImages as NbpN;
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(NbpN::One),
-    2 => Ok(NbpN::Two),
-    3 => Ok(NbpN::Three),
-    4 => Ok(NbpN::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade => Ok(NbpN::Four),
-      RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(NbpN::Four),
-    },
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::common_resolution::CommonResolution;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::errors::artcraft_router_error::ArtcraftRouterError;
-  use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-  use crate::test_helpers::base_image_request;
-  use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::{
-    NanoBananaProMultiFunctionImageGenAspectRatio as NbpAr,
-    NanoBananaProMultiFunctionImageGenImageResolution as NbpRes,
-    NanoBananaProMultiFunctionImageGenNumImages as NbpN,
-  };
-
-  // ── Aspect ratio ────────────────────────────────────────────────────────────
-
-  #[test]
-  fn aspect_ratio_none_is_none() {
-    let request = GenerateImageRequest { aspect_ratio: None, ..base_image_request() };
-    let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-    assert!(plan.aspect_ratio.is_none());
-  }
-
-  #[test]
-  fn aspect_ratio_direct_square() {
-    for ar in [CommonAspectRatio::Square, CommonAspectRatio::SquareHd] {
-      let request = GenerateImageRequest { aspect_ratio: Some(ar), ..base_image_request() };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(matches!(plan.aspect_ratio, Some(NbpAr::OneByOne)), "expected OneByOne for {:?}", ar);
-    }
-  }
-
-  #[test]
-  fn aspect_ratio_direct_wide() {
-    let cases = [
-      (CommonAspectRatio::WideFiveByFour, NbpAr::FiveByFour),
-      (CommonAspectRatio::WideFourByThree, NbpAr::FourByThree),
-      (CommonAspectRatio::WideThreeByTwo, NbpAr::ThreeByTwo),
-      (CommonAspectRatio::WideSixteenByNine, NbpAr::SixteenByNine),
-      (CommonAspectRatio::Wide, NbpAr::SixteenByNine),
-      (CommonAspectRatio::WideTwentyOneByNine, NbpAr::TwentyOneByNine),
-    ];
-    for (common, expected) in cases {
-      let request = GenerateImageRequest { aspect_ratio: Some(common), ..base_image_request() };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(
-        matches!(plan.aspect_ratio, Some(ar) if std::mem::discriminant(&ar) == std::mem::discriminant(&expected)),
-        "expected {:?} for {:?}", expected, common,
-      );
-    }
-  }
-
-  #[test]
-  fn aspect_ratio_direct_tall() {
-    let cases = [
-      (CommonAspectRatio::TallFourByFive, NbpAr::FourByFive),
-      (CommonAspectRatio::TallThreeByFour, NbpAr::ThreeByFour),
-      (CommonAspectRatio::TallTwoByThree, NbpAr::TwoByThree),
-      (CommonAspectRatio::TallNineBySixteen, NbpAr::NineBySixteen),
-      (CommonAspectRatio::Tall, NbpAr::NineBySixteen),
-    ];
-    for (common, expected) in cases {
-      let request = GenerateImageRequest { aspect_ratio: Some(common), ..base_image_request() };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(
-        matches!(plan.aspect_ratio, Some(ar) if std::mem::discriminant(&ar) == std::mem::discriminant(&expected)),
-        "expected {:?} for {:?}", expected, common,
-      );
-    }
-  }
-
-  #[test]
-  fn aspect_ratio_auto_in_edit_mode_yields_auto() {
-    // Auto is only valid for edit mode (image_inputs present)
-    for auto_ar in [CommonAspectRatio::Auto, CommonAspectRatio::Auto2k, CommonAspectRatio::Auto4k] {
-      let tokens = vec![];
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(auto_ar),
-        image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
-        ..base_image_request()
-      };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(
-        matches!(plan.aspect_ratio, Some(NbpAr::Auto)),
-        "expected Auto in edit mode for {:?}", auto_ar,
-      );
-    }
-  }
-
-  #[test]
-  fn aspect_ratio_auto_in_text_to_image_mode_falls_back_to_square() {
-    for auto_ar in [CommonAspectRatio::Auto, CommonAspectRatio::Auto2k, CommonAspectRatio::Auto4k] {
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(auto_ar),
-        image_inputs: None,
-        ..base_image_request()
-      };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(
-        matches!(plan.aspect_ratio, Some(NbpAr::OneByOne)),
-        "expected OneByOne fallback in text-to-image for {:?}", auto_ar,
-      );
-    }
-  }
-
-  #[test]
-  fn aspect_ratio_unsupported_error_out() {
-    // TallNineByTwentyOne has no direct equivalent
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::TallNineByTwentyOne),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      ..base_image_request()
-    };
-    let result = request.build();
-    assert!(matches!(
-      result,
-      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))
-    ));
-  }
-
-  #[test]
-  fn aspect_ratio_unsupported_nearest_match() {
-    // TallNineByTwentyOne (0.43) is nearest to NineBySixteen (0.5625)
-    for strategy in [
-      RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      RequestMismatchMitigationStrategy::PayLessDowngrade,
-    ] {
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(CommonAspectRatio::TallNineByTwentyOne),
-        request_mismatch_mitigation_strategy: strategy,
-        ..base_image_request()
-      };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(
-        matches!(plan.aspect_ratio, Some(NbpAr::NineBySixteen)),
-        "expected NineBySixteen nearest match with {:?}", strategy,
-      );
-    }
-  }
-
-  // ── Resolution ──────────────────────────────────────────────────────────────
-
-  #[test]
-  fn resolution_none_is_none() {
-    let request = GenerateImageRequest { resolution: None, ..base_image_request() };
-    let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-    assert!(plan.resolution.is_none());
-  }
-
-  #[test]
-  fn resolution_direct_mappings() {
-    let cases = [
-      (CommonResolution::OneK, NbpRes::OneK),
-      (CommonResolution::TwoK, NbpRes::TwoK),
-      (CommonResolution::FourK, NbpRes::FourK),
-    ];
-    for (common, expected) in cases {
-      let request = GenerateImageRequest { resolution: Some(common), ..base_image_request() };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(
-        matches!(plan.resolution, Some(r) if std::mem::discriminant(&r) == std::mem::discriminant(&expected)),
-        "expected {:?} for {:?}", expected, common,
-      );
-    }
-  }
-
-  #[test]
-  fn resolution_three_k_falls_back_to_two_k() {
-    let request = GenerateImageRequest {
-      resolution: Some(CommonResolution::ThreeK),
-      ..base_image_request()
-    };
-    let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-    assert!(matches!(plan.resolution, Some(NbpRes::TwoK)));
-  }
-
-  // ── Num images ──────────────────────────────────────────────────────────────
-
-  #[test]
-  fn num_images_zero_is_always_error() {
-    for strategy in [
-      RequestMismatchMitigationStrategy::ErrorOut,
-      RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      RequestMismatchMitigationStrategy::PayLessDowngrade,
-    ] {
-      let request = GenerateImageRequest {
-        image_batch_count: Some(0),
-        request_mismatch_mitigation_strategy: strategy,
-        ..base_image_request()
-      };
-      let result = request.build();
-      assert!(
-        matches!(result, Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))),
-        "expected UserRequestedZeroGenerations with {:?}", strategy,
-      );
-    }
-  }
-
-  #[test]
-  fn num_images_direct_mapping() {
-    let cases = [
-      (1, NbpN::One),
-      (2, NbpN::Two),
-      (3, NbpN::Three),
-      (4, NbpN::Four),
-    ];
-    for (count, expected) in cases {
-      let request = GenerateImageRequest { image_batch_count: Some(count), ..base_image_request() };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(
-        std::mem::discriminant(&plan.num_images) == std::mem::discriminant(&expected),
-        "expected {:?} for count {}", expected, count,
-      );
-    }
-  }
-
-  #[test]
-  fn num_images_out_of_range_error_out() {
-    let request = GenerateImageRequest {
-      image_batch_count: Some(5),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      ..base_image_request()
-    };
-    let result = request.build();
-    assert!(matches!(
-      result,
-      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))
-    ));
-  }
-
-  #[test]
-  fn num_images_out_of_range_clamps_to_four() {
-    for strategy in [
-      RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      RequestMismatchMitigationStrategy::PayLessDowngrade,
-    ] {
-      let request = GenerateImageRequest {
-        image_batch_count: Some(5),
-        request_mismatch_mitigation_strategy: strategy,
-        ..base_image_request()
-      };
-      let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-      assert!(
-        matches!(plan.num_images, NbpN::Four),
-        "expected Four for count 5 with {:?}", strategy,
-      );
-    }
-  }
-
-  // ── Image inputs ─────────────────────────────────────────────────────────
-
-  #[test]
-  fn url_image_inputs_returns_error() {
-    let urls = vec!["https://example.com/image.jpg".to_string()];
-    let request = GenerateImageRequest {
-      image_inputs: Some(ImageListRef::Urls(&urls)),
-      ..base_image_request()
-    };
-    let result = request.build();
-    assert!(matches!(
-      result,
-      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
-    ));
-  }
-
-  #[test]
-  fn no_image_inputs_is_text_to_image_mode() {
-    let request = GenerateImageRequest { image_inputs: None, ..base_image_request() };
-    let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-    assert!(plan.image_inputs.is_none());
-  }
-
-  #[test]
-  fn media_token_image_inputs_is_edit_mode() {
-    let tokens = vec![];
-    let request = GenerateImageRequest {
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
-      ..base_image_request()
-    };
-    let ImageGenerationPlan::ArtcraftNanaBananaPro(plan) = request.build().unwrap() else { panic!("expected ArtcraftNanaBananaPro") };
-    assert!(plan.image_inputs.is_some());
-  }
-}
@@ -1 +0,0 @@
-pub mod plan_generate_image_fal_nano_banana_pro;
@@ -1,530 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-use crate::api::common_resolution::CommonResolution;
-use crate::api::image_list_ref::ImageListRef;
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::client_error::ClientError;
-use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-use fal_client::requests::webhook::image::edit::enqueue_nano_banana_pro_edit_image_webhook::EnqueueNanoBananaProEditImageAspectRatio;
-use fal_client::requests::webhook::image::text::enqueue_nano_banana_pro_text_to_image_webhook::EnqueueNanoBananaProTextToImageAspectRatio;
-
-/// Intermediate resolution type shared between t2i and edit enums
-/// (both have the same variants: OneK, TwoK, FourK).
-#[derive(Debug, Clone, Copy)]
-pub enum FalNbpResolution {
-  OneK,
-  TwoK,
-  FourK,
-}
-
-/// Intermediate num-images type shared between t2i and edit enums
-/// (both have the same variants: One, Two, Three, Four).
-#[derive(Debug, Clone, Copy)]
-pub enum FalNbpNumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalNanaBananaPro<'a> {
-  pub prompt: Option<&'a str>,
-  /// Image URLs for editing. Empty vec = text-to-image mode.
-  pub image_urls: Vec<String>,
-  /// Pre-resolved aspect ratio for text-to-image mode.
-  pub t2i_aspect_ratio: Option<EnqueueNanoBananaProTextToImageAspectRatio>,
-  /// Pre-resolved aspect ratio for image-edit mode.
-  pub edit_aspect_ratio: Option<EnqueueNanoBananaProEditImageAspectRatio>,
-  /// Pre-resolved resolution (shared for both modes).
-  pub resolution: Option<FalNbpResolution>,
-  /// Pre-resolved number of images (1–4, shared for both modes).
-  pub num_images: FalNbpNumImages,
-}
-
-pub fn plan_generate_image_fal_nano_banana_pro<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanFalNanaBananaPro<'a>, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-  let is_edit_mode = request.image_inputs.is_some();
-  let image_urls = resolve_image_list_ref(request.image_inputs)?;
-  let t2i_aspect_ratio = plan_t2i_aspect_ratio(request.aspect_ratio, strategy)?;
-  let edit_aspect_ratio = plan_edit_aspect_ratio(request.aspect_ratio, is_edit_mode, strategy)?;
-  let resolution = plan_resolution(request.resolution)?;
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(PlanFalNanaBananaPro {
-    prompt: request.prompt,
-    image_urls,
-    t2i_aspect_ratio,
-    edit_aspect_ratio,
-    resolution,
-    num_images,
-  })
-}
-
-fn resolve_image_list_ref(
-  image_list_ref: Option<ImageListRef<'_>>,
-) -> Result<Vec<String>, ArtcraftRouterError> {
-  match image_list_ref {
-    None => Ok(vec![]),
-    Some(ImageListRef::Urls(urls)) => Ok(urls.clone()),
-    Some(ImageListRef::MediaFileTokens(_)) => {
-      Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))
-    }
-  }
-}
-
-// Nano Banana Pro text-to-image supported aspect ratios:
-//   OneByOne, FiveByFour, FourByThree, ThreeByTwo, SixteenByNine, TwentyOneByNine,
-//   FourByFive, ThreeByFour, TwoByThree, NineBySixteen
-//   (no Auto — that's edit-only)
-fn plan_t2i_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<EnqueueNanoBananaProTextToImageAspectRatio>, ArtcraftRouterError> {
-  use EnqueueNanoBananaProTextToImageAspectRatio as T2iAr;
-  match aspect_ratio {
-    None => Ok(None),
-
-    // Auto not valid for text-to-image; fall back to square
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => Ok(Some(T2iAr::OneByOne)),
-
-    // Direct mappings
-    Some(CommonAspectRatio::Square) | Some(CommonAspectRatio::SquareHd) => Ok(Some(T2iAr::OneByOne)),
-    Some(CommonAspectRatio::WideFiveByFour) => Ok(Some(T2iAr::FiveByFour)),
-    Some(CommonAspectRatio::WideFourByThree) => Ok(Some(T2iAr::FourByThree)),
-    Some(CommonAspectRatio::WideThreeByTwo) => Ok(Some(T2iAr::ThreeByTwo)),
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Some(T2iAr::SixteenByNine)),
-    Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Some(T2iAr::TwentyOneByNine)),
-    Some(CommonAspectRatio::TallFourByFive) => Ok(Some(T2iAr::FourByFive)),
-    Some(CommonAspectRatio::TallThreeByFour) => Ok(Some(T2iAr::ThreeByFour)),
-    Some(CommonAspectRatio::TallTwoByThree) => Ok(Some(T2iAr::TwoByThree)),
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Some(T2iAr::NineBySixteen)),
-
-    // Mismatch — TallNineByTwentyOne has no direct equivalent
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(nearest_t2i_aspect_ratio(unsupported)))
-      }
-    },
-  }
-}
-
-fn nearest_t2i_aspect_ratio(
-  aspect_ratio: CommonAspectRatio,
-) -> EnqueueNanoBananaProTextToImageAspectRatio {
-  use EnqueueNanoBananaProTextToImageAspectRatio as T2iAr;
-  match aspect_ratio {
-    // TallNineByTwentyOne (0.43) — nearest is NineBySixteen (0.5625)
-    CommonAspectRatio::TallNineByTwentyOne => T2iAr::NineBySixteen,
-    _ => T2iAr::OneByOne,
-  }
-}
-
-// Nano Banana Pro image-edit supported aspect ratios:
-//   Auto (use source image dims), plus all text-to-image ratios
-fn plan_edit_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  is_edit_mode: bool,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<EnqueueNanoBananaProEditImageAspectRatio>, ArtcraftRouterError> {
-  use EnqueueNanoBananaProEditImageAspectRatio as EditAr;
-  match aspect_ratio {
-    None => Ok(None),
-
-    // Auto: valid in edit mode (use source image dimensions)
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => {
-      if is_edit_mode {
-        Ok(Some(EditAr::Auto))
-      } else {
-        Ok(Some(EditAr::OneByOne))
-      }
-    }
-
-    // Direct mappings
-    Some(CommonAspectRatio::Square) | Some(CommonAspectRatio::SquareHd) => Ok(Some(EditAr::OneByOne)),
-    Some(CommonAspectRatio::WideFiveByFour) => Ok(Some(EditAr::FiveByFour)),
-    Some(CommonAspectRatio::WideFourByThree) => Ok(Some(EditAr::FourByThree)),
-    Some(CommonAspectRatio::WideThreeByTwo) => Ok(Some(EditAr::ThreeByTwo)),
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Some(EditAr::SixteenByNine)),
-    Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Some(EditAr::TwentyOneByNine)),
-    Some(CommonAspectRatio::TallFourByFive) => Ok(Some(EditAr::FourByFive)),
-    Some(CommonAspectRatio::TallThreeByFour) => Ok(Some(EditAr::ThreeByFour)),
-    Some(CommonAspectRatio::TallTwoByThree) => Ok(Some(EditAr::TwoByThree)),
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Some(EditAr::NineBySixteen)),
-
-    // Mismatch
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(nearest_edit_aspect_ratio(unsupported)))
-      }
-    },
-  }
-}
-
-fn nearest_edit_aspect_ratio(
-  aspect_ratio: CommonAspectRatio,
-) -> EnqueueNanoBananaProEditImageAspectRatio {
-  use EnqueueNanoBananaProEditImageAspectRatio as EditAr;
-  match aspect_ratio {
-    CommonAspectRatio::TallNineByTwentyOne => EditAr::NineBySixteen,
-    _ => EditAr::OneByOne,
-  }
-}
-
-fn plan_resolution(
-  resolution: Option<CommonResolution>,
-) -> Result<Option<FalNbpResolution>, ArtcraftRouterError> {
-  match resolution {
-    None => Ok(None),
-    Some(CommonResolution::OneK) => Ok(Some(FalNbpResolution::OneK)),
-    Some(CommonResolution::TwoK) => Ok(Some(FalNbpResolution::TwoK)),
-    Some(CommonResolution::FourK) => Ok(Some(FalNbpResolution::FourK)),
-    // No 3K option; fall back to 2K
-    Some(CommonResolution::ThreeK) => Ok(Some(FalNbpResolution::TwoK)),
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalNbpNumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalNbpNumImages::One),
-    2 => Ok(FalNbpNumImages::Two),
-    3 => Ok(FalNbpNumImages::Three),
-    4 => Ok(FalNbpNumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade => Ok(FalNbpNumImages::Four),
-      RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(FalNbpNumImages::Four),
-    },
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::common_image_model::CommonImageModel;
-  use crate::api::common_resolution::CommonResolution;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::provider::Provider;
-  use crate::errors::artcraft_router_error::ArtcraftRouterError;
-  use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use fal_client::requests::webhook::image::edit::enqueue_nano_banana_pro_edit_image_webhook::EnqueueNanoBananaProEditImageAspectRatio as EditAr;
-  use fal_client::requests::webhook::image::text::enqueue_nano_banana_pro_text_to_image_webhook::EnqueueNanoBananaProTextToImageAspectRatio as T2iAr;
-
-  fn base_fal_request() -> GenerateImageRequest<'static> {
-    GenerateImageRequest {
-      model: CommonImageModel::NanaBananaPro,
-      provider: Provider::Fal,
-      prompt: Some("a cat in space"),
-      image_inputs: None,
-      resolution: None,
-      aspect_ratio: None,
-      image_batch_count: None,
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      idempotency_token: None,
-    }
-  }
-
-  fn build_plan<'a>(
-    request: &'a GenerateImageRequest<'a>,
-  ) -> PlanFalNanaBananaPro<'a> {
-    plan_generate_image_fal_nano_banana_pro(request).expect("plan should succeed")
-  }
-
-  // ── Image inputs / mode detection ────────────────────────────────────────────
-
-  #[test]
-  fn no_image_inputs_yields_empty_urls() {
-    let request = GenerateImageRequest { image_inputs: None, ..base_fal_request() };
-    let plan = build_plan(&request);
-    assert!(plan.image_urls.is_empty());
-  }
-
-  #[test]
-  fn url_image_inputs_are_extracted() {
-    let urls = vec![
-      "https://example.com/a.jpg".to_string(),
-      "https://example.com/b.jpg".to_string(),
-    ];
-    let request = GenerateImageRequest {
-      image_inputs: Some(ImageListRef::Urls(&urls)),
-      ..base_fal_request()
-    };
-    let plan = build_plan(&request);
-    assert_eq!(plan.image_urls, urls);
-  }
-
-  #[test]
-  fn media_token_inputs_return_error() {
-    let tokens = vec![];
-    let request = GenerateImageRequest {
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
-      ..base_fal_request()
-    };
-    let result = plan_generate_image_fal_nano_banana_pro(&request);
-    assert!(matches!(
-      result,
-      Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))
-    ));
-  }
-
-  // ── Text-to-image aspect ratio ────────────────────────────────────────────────
-
-  #[test]
-  fn t2i_aspect_ratio_none_is_none() {
-    let request = GenerateImageRequest { aspect_ratio: None, ..base_fal_request() };
-    let plan = build_plan(&request);
-    assert!(plan.t2i_aspect_ratio.is_none());
-  }
-
-  #[test]
-  fn t2i_aspect_ratio_auto_falls_back_to_square() {
-    for auto_ar in [CommonAspectRatio::Auto, CommonAspectRatio::Auto2k, CommonAspectRatio::Auto4k] {
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(auto_ar),
-        image_inputs: None,
-        ..base_fal_request()
-      };
-      let plan = build_plan(&request);
-      assert!(
-        matches!(plan.t2i_aspect_ratio, Some(T2iAr::OneByOne)),
-        "expected OneByOne fallback in text-to-image for {:?}", auto_ar,
-      );
-    }
-  }
-
-  #[test]
-  fn t2i_aspect_ratio_direct_mappings() {
-    let cases = [
-      (CommonAspectRatio::Square, T2iAr::OneByOne),
-      (CommonAspectRatio::SquareHd, T2iAr::OneByOne),
-      (CommonAspectRatio::WideFiveByFour, T2iAr::FiveByFour),
-      (CommonAspectRatio::WideFourByThree, T2iAr::FourByThree),
-      (CommonAspectRatio::WideThreeByTwo, T2iAr::ThreeByTwo),
-      (CommonAspectRatio::WideSixteenByNine, T2iAr::SixteenByNine),
-      (CommonAspectRatio::Wide, T2iAr::SixteenByNine),
-      (CommonAspectRatio::WideTwentyOneByNine, T2iAr::TwentyOneByNine),
-      (CommonAspectRatio::TallFourByFive, T2iAr::FourByFive),
-      (CommonAspectRatio::TallThreeByFour, T2iAr::ThreeByFour),
-      (CommonAspectRatio::TallTwoByThree, T2iAr::TwoByThree),
-      (CommonAspectRatio::TallNineBySixteen, T2iAr::NineBySixteen),
-      (CommonAspectRatio::Tall, T2iAr::NineBySixteen),
-    ];
-    for (common, expected) in cases {
-      let request = GenerateImageRequest { aspect_ratio: Some(common), ..base_fal_request() };
-      let plan = build_plan(&request);
-      assert!(
-        matches!(plan.t2i_aspect_ratio, Some(ar) if std::mem::discriminant(&ar) == std::mem::discriminant(&expected)),
-        "expected {:?} for {:?}", expected, common,
-      );
-    }
-  }
-
-  #[test]
-  fn t2i_aspect_ratio_unsupported_error_out() {
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::TallNineByTwentyOne),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      ..base_fal_request()
-    };
-    let result = plan_generate_image_fal_nano_banana_pro(&request);
-    assert!(matches!(
-      result,
-      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))
-    ));
-  }
-
-  #[test]
-  fn t2i_aspect_ratio_unsupported_nearest_match() {
-    for strategy in [
-      RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      RequestMismatchMitigationStrategy::PayLessDowngrade,
-    ] {
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(CommonAspectRatio::TallNineByTwentyOne),
-        request_mismatch_mitigation_strategy: strategy,
-        ..base_fal_request()
-      };
-      let plan = build_plan(&request);
-      assert!(
-        matches!(plan.t2i_aspect_ratio, Some(T2iAr::NineBySixteen)),
-        "expected NineBySixteen nearest match with {:?}", strategy,
-      );
-    }
-  }
-
-  // ── Edit aspect ratio ─────────────────────────────────────────────────────────
-
-  #[test]
-  fn edit_aspect_ratio_auto_in_edit_mode_yields_auto() {
-    let urls = vec!["https://example.com/img.jpg".to_string()];
-    for auto_ar in [CommonAspectRatio::Auto, CommonAspectRatio::Auto2k, CommonAspectRatio::Auto4k] {
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(auto_ar),
-        image_inputs: Some(ImageListRef::Urls(&urls)),
-        ..base_fal_request()
-      };
-      let plan = build_plan(&request);
-      assert!(
-        matches!(plan.edit_aspect_ratio, Some(EditAr::Auto)),
-        "expected Auto in edit mode for {:?}", auto_ar,
-      );
-    }
-  }
-
-  #[test]
-  fn edit_aspect_ratio_auto_in_text_to_image_falls_back_to_square() {
-    for auto_ar in [CommonAspectRatio::Auto, CommonAspectRatio::Auto2k, CommonAspectRatio::Auto4k] {
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(auto_ar),
-        image_inputs: None,
-        ..base_fal_request()
-      };
-      let plan = build_plan(&request);
-      assert!(
-        matches!(plan.edit_aspect_ratio, Some(EditAr::OneByOne)),
-        "expected OneByOne in text-to-image for {:?}", auto_ar,
-      );
-    }
-  }
-
-  // ── Resolution ────────────────────────────────────────────────────────────────
-
-  #[test]
-  fn resolution_none_is_none() {
-    let request = GenerateImageRequest { resolution: None, ..base_fal_request() };
-    let plan = build_plan(&request);
-    assert!(plan.resolution.is_none());
-  }
-
-  #[test]
-  fn resolution_direct_mappings() {
-    let cases = [
-      (CommonResolution::OneK, FalNbpResolution::OneK),
-      (CommonResolution::TwoK, FalNbpResolution::TwoK),
-      (CommonResolution::FourK, FalNbpResolution::FourK),
-    ];
-    for (common, expected) in cases {
-      let request = GenerateImageRequest { resolution: Some(common), ..base_fal_request() };
-      let plan = build_plan(&request);
-      assert!(
-        matches!(plan.resolution, Some(r) if std::mem::discriminant(&r) == std::mem::discriminant(&expected)),
-        "expected {:?} for {:?}", expected, common,
-      );
-    }
-  }
-
-  #[test]
-  fn resolution_three_k_falls_back_to_two_k() {
-    let request = GenerateImageRequest {
-      resolution: Some(CommonResolution::ThreeK),
-      ..base_fal_request()
-    };
-    let plan = build_plan(&request);
-    assert!(matches!(plan.resolution, Some(FalNbpResolution::TwoK)));
-  }
-
-  // ── Num images ────────────────────────────────────────────────────────────────
-
-  #[test]
-  fn num_images_zero_is_always_error() {
-    for strategy in [
-      RequestMismatchMitigationStrategy::ErrorOut,
-      RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      RequestMismatchMitigationStrategy::PayLessDowngrade,
-    ] {
-      let request = GenerateImageRequest {
-        image_batch_count: Some(0),
-        request_mismatch_mitigation_strategy: strategy,
-        ..base_fal_request()
-      };
-      let result = plan_generate_image_fal_nano_banana_pro(&request);
-      assert!(
-        matches!(result, Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))),
-        "expected UserRequestedZeroGenerations with {:?}", strategy,
-      );
-    }
-  }
-
-  #[test]
-  fn num_images_direct_mapping() {
-    let cases = [
-      (1, FalNbpNumImages::One),
-      (2, FalNbpNumImages::Two),
-      (3, FalNbpNumImages::Three),
-      (4, FalNbpNumImages::Four),
-    ];
-    for (count, expected) in cases {
-      let request = GenerateImageRequest { image_batch_count: Some(count), ..base_fal_request() };
-      let plan = build_plan(&request);
-      assert!(
-        std::mem::discriminant(&plan.num_images) == std::mem::discriminant(&expected),
-        "expected {:?} for count {}", expected, count,
-      );
-    }
-  }
-
-  #[test]
-  fn num_images_out_of_range_error_out() {
-    let request = GenerateImageRequest {
-      image_batch_count: Some(5),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      ..base_fal_request()
-    };
-    let result = plan_generate_image_fal_nano_banana_pro(&request);
-    assert!(matches!(
-      result,
-      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))
-    ));
-  }
-
-  #[test]
-  fn num_images_out_of_range_clamps_to_four() {
-    for strategy in [
-      RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      RequestMismatchMitigationStrategy::PayLessDowngrade,
-    ] {
-      let request = GenerateImageRequest {
-        image_batch_count: Some(5),
-        request_mismatch_mitigation_strategy: strategy,
-        ..base_fal_request()
-      };
-      let plan = build_plan(&request);
-      assert!(
-        matches!(plan.num_images, FalNbpNumImages::Four),
-        "expected Four for count 5 with {:?}", strategy,
-      );
-    }
-  }
-}
@@ -1,2 +0,0 @@
-pub mod artcraft;
-pub mod fal;
@@ -1,96 +0,0 @@
-use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount;
-use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
-use seedance2pro::requests::generate_video::generate_video::{BatchCount, GenerateVideoArgs, Resolution};
-
-use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-pub (crate) fn estimate_video_cost_artcraft_seedance2p0(
-  plan: &PlanArtcraftSeedance2p0<'_>,
-) -> VideoGenerationCostEstimate {
-  let duration_seconds = plan.duration_seconds.unwrap_or(5).clamp(4, 15);
-
-  let batch_count = match plan.batch_count {
-    Seedance2p0BatchCount::One => BatchCount::One,
-    Seedance2p0BatchCount::Two => BatchCount::Two,
-    Seedance2p0BatchCount::Four => BatchCount::Four,
-  };
-
-  // TODO: Make a better client that doesn't require this.
-  // A dummy session is sufficient — cost estimation does not make any network calls.
-  let dummy_session = Seedance2ProSession::from_cookies_string(String::new());
-
-  let args = GenerateVideoArgs {
-    session: &dummy_session,
-    prompt: String::new(),
-    resolution: Resolution::Square1x1,
-    duration_seconds,
-    batch_count,
-
-    // NB: These do not contribute to costs in the Seedance2 integration
-    start_frame_url: None,
-    end_frame_url: None,
-    reference_image_urls: None,
-  };
-
-  let cost_in_usd_cents = args.estimate_cost_in_usd_cents();
-
-  VideoGenerationCostEstimate {
-    cost_in_credits: Some(cost_in_usd_cents),
-    cost_in_usd_cents: Some(cost_in_usd_cents),
-    is_free: false,
-    is_unlimited: false,
-    is_rate_limited: false,
-    has_watermark: false,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_video_model::CommonVideoModel;
-  use crate::api::provider::Provider;
-  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
-
-  fn estimate_usd_cents(duration_seconds: u16, video_batch_count: u16) -> u64 {
-    let request = GenerateVideoRequest {
-      model: CommonVideoModel::Seedance2p0,
-      provider: Provider::Artcraft,
-      prompt: None,
-      start_frame: None,
-      end_frame: None,
-      reference_images: None,
-      resolution: None,
-      aspect_ratio: None,
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      idempotency_token: None,
-    };
-    request.build()
-      .expect("build should succeed")
-      .estimate_costs()
-      .cost_in_usd_cents
-      .expect("cost_in_usd_cents should be present")
-  }
-
-  #[test]
-  fn test_estimate_cost_usd_cents() {
-    // Batch 1:
-    assert_eq!(estimate_usd_cents(4, 1), 64);
-    assert_eq!(estimate_usd_cents(5, 1), 80);
-    assert_eq!(estimate_usd_cents(6, 1), 96);
-    assert_eq!(estimate_usd_cents(7, 1), 112);
-    assert_eq!(estimate_usd_cents(15, 1), 240);
-
-    // Batch 2 = 2×
-    assert_eq!(estimate_usd_cents(4, 2), 128);
-    assert_eq!(estimate_usd_cents(5, 2), 160);
-    assert_eq!(estimate_usd_cents(15, 2), 480);
-
-    // Batch 4 = 3× (not 4×)
-    assert_eq!(estimate_usd_cents(4, 4), 192);
-    assert_eq!(estimate_usd_cents(5, 4), 240);
-    assert_eq!(estimate_usd_cents(15, 4), 720);
-  }
-}
@@ -1 +0,0 @@
-pub mod estimate_video_cost_artcraft_seedance2p0;
@@ -1 +0,0 @@
-pub (crate) mod artcraft;
@@ -1,93 +0,0 @@
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::provider_error::ProviderError;
-use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
-use crate::generate::generate_video::generate_video_response::{
-  ArtcraftVideoResponsePayload, GenerateVideoResponse,
-};
-use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0MultiFunctionVideoGenRequest;
-use artcraft_client::endpoints::generate::video::multi_function::seedance_2p0_multi_function_video_gen::seedance_2p0_multi_function_video_gen;
-
-pub async fn execute_artcraft_seedance2p0(
-  plan: &PlanArtcraftSeedance2p0<'_>,
-  artcraft_client: &RouterArtcraftClient,
-) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let request = Seedance2p0MultiFunctionVideoGenRequest {
-    uuid_idempotency_token: plan.idempotency_token.clone(),
-    prompt: plan.prompt.map(|p| p.to_string()),
-    start_frame_media_token: plan.start_frame.map(|t| t.to_owned()),
-    end_frame_media_token: plan.end_frame.map(|t| t.to_owned()),
-    reference_image_media_tokens: plan.reference_images.map(|tokens| tokens.to_owned()),
-    aspect_ratio: plan.aspect_ratio,
-    duration_seconds: plan.duration_seconds,
-    batch_count: Some(plan.batch_count),
-  };
-
-  let response = seedance_2p0_multi_function_video_gen(
-    &artcraft_client.api_host,
-    Some(&artcraft_client.credentials),
-    request,
-  )
-    .await
-    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Storyteller(err)))?;
-
-  Ok(GenerateVideoResponse::Artcraft(ArtcraftVideoResponsePayload {
-    inference_job_token: response.inference_job_token,
-    all_inference_job_tokens: response.all_inference_job_tokens,
-  }))
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
-  use crate::test_helpers::{base_video_request, get_artcraft_client};
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_video_seedance_2p0() {
-    let client = get_artcraft_client();
-    let request = crate::generate::generate_video::generate_video_request::GenerateVideoRequest {
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      video_batch_count: Some(1),
-      prompt: Some("a cat walking through a cyberpunk city at night"),
-      ..base_video_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_video(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_video request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-    println!("All job tokens: {:?}", payload.all_inference_job_tokens);
-
-    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_video_seedance_2p0_batch_two() {
-    let client = get_artcraft_client();
-    let request = crate::generate::generate_video::generate_video_request::GenerateVideoRequest {
-      aspect_ratio: Some(CommonAspectRatio::Square),
-      video_batch_count: Some(2),
-      prompt: Some("a dog surfing a wave, cinematic"),
-      ..base_video_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_video(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_video request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job tokens ({} total):", payload.all_inference_job_tokens.len());
-    for token in &payload.all_inference_job_tokens {
-      println!("  {:?}", token);
-    }
-
-    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
-  }
-}
@@ -1 +0,0 @@
-pub mod generate_video_artcraft_seedance2p0;
@@ -1 +0,0 @@
-pub mod artcraft;
@@ -1,78 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-use crate::api::common_resolution::CommonResolution;
-use crate::api::common_video_model::CommonVideoModel;
-use crate::api::image_list_ref::ImageListRef;
-use crate::api::image_ref::ImageRef;
-use crate::api::provider::Provider;
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::plan_generate_video_artcraft_seedance2p0;
-use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
-
-pub struct GenerateVideoRequest<'a> {
-  /// Which model to use.
-  pub model: CommonVideoModel,
-
-  /// Which provider to use.
-  pub provider: Provider,
-
-  /// The prompt for the video generation
-  pub prompt: Option<&'a str>,
-
-  // /// Some models support negative prompts
-  // pub negative_prompt: Option<String>,
-
-  /// Starting keyframe (optional).
-  pub start_frame: Option<ImageRef<'a>>,
-
-  /// Ending keyframe (optional).
-  pub end_frame: Option<ImageRef<'a>>,
-
-  /// Reference images (optional).
-  pub reference_images: Option<ImageListRef<'a>>,
-
-  /// The resolution to use
-  pub resolution: Option<CommonResolution>,
-
-  /// The aspect ratio to use
-  pub aspect_ratio: Option<CommonAspectRatio>,
-
-  /// How many seconds to generate.
-  pub duration_seconds: Option<u16>,
-
-  /// How many videos to generate.
-  pub video_batch_count: Option<u16>,
-
-  // /// Whether to turn on/off audio.
-  // /// Not all models support audio, not all models have a choice.
-  // pub generate_audio: Option<bool>,
-
-  /// If the request is a mismatch with the (model/provider), how to mitigate it.
-  pub request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy,
-
-  /// Some providers support idempotency.
-  /// If not supplied, we'll generate one for the required providers.
-  pub idempotency_token: Option<&'a str>,
-}
-
-impl<'a> GenerateVideoRequest<'a> {
-  /// Read the video generation request, construct a plan, then yield a means to execute it.
-  pub fn build(&self) -> Result<VideoGenerationPlan<'_>, ArtcraftRouterError> {
-    match self.provider {
-      Provider::Artcraft => match self.model {
-        CommonVideoModel::Seedance2p0 => {
-          plan_generate_video_artcraft_seedance2p0(self).map(VideoGenerationPlan::ArtcraftSeedance2p0)
-        }
-        _ => Err(ArtcraftRouterError::UnsupportedModel(format!("{:?}", self.model))),
-      },
-      Provider::Fal => Err(ArtcraftRouterError::UnsupportedModel(
-        format!("Video generation via Fal is not yet supported (model: {:?})", self.model)
-      )),
-    }
-  }
-
-  pub fn get_or_generate_idempotency_token(&self) -> String {
-    self.idempotency_token.map(|t| t.to_string())
-        .unwrap_or_else(|| uuid::Uuid::new_v4().to_string())
-  }
-}
@@ -1,20 +0,0 @@
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftVideoResponsePayload {
-  pub inference_job_token: InferenceJobToken,
-  pub all_inference_job_tokens: Vec<InferenceJobToken>,
-}
-
-#[derive(Clone, Debug)]
-pub enum GenerateVideoResponse {
-  Artcraft(ArtcraftVideoResponsePayload),
-}
-
-impl GenerateVideoResponse {
-  pub fn get_artcraft_payload(&self) -> Option<ArtcraftVideoResponsePayload> {
-    match self {
-      Self::Artcraft(p) => Some(p.clone()),
-    }
-  }
-}
@@ -1,7 +0,0 @@
-pub mod cost;
-pub mod execute;
-pub mod generate_video_request;
-pub mod generate_video_response;
-pub mod plan;
-pub mod video_generation_cost_estimate;
-pub mod video_generation_plan;
@@ -1 +0,0 @@
-pub mod plan_generate_video_artcraft_seedance2p0;
@@ -1,332 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-use crate::api::image_list_ref::ImageListRef;
-use crate::api::image_ref::ImageRef;
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::client_error::ClientError;
-use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
-use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{
-  Seedance2p0AspectRatio, Seedance2p0BatchCount,
-};
-use tokens::tokens::media_files::MediaFileToken;
-
-#[derive(Debug, Clone)]
-pub struct PlanArtcraftSeedance2p0<'a> {
-  pub prompt: Option<&'a str>,
-  pub start_frame: Option<&'a MediaFileToken>,
-  pub end_frame: Option<&'a MediaFileToken>,
-  pub reference_images: Option<&'a Vec<MediaFileToken>>,
-  pub aspect_ratio: Option<Seedance2p0AspectRatio>,
-  pub duration_seconds: Option<u8>,
-  pub batch_count: Seedance2p0BatchCount,
-  pub idempotency_token: String,
-}
-
-pub fn plan_generate_video_artcraft_seedance2p0<'a>(
-  request: &'a GenerateVideoRequest<'a>,
-) -> Result<PlanArtcraftSeedance2p0<'a>, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-
-  let start_frame = resolve_image_ref(request.start_frame)?;
-  let end_frame = resolve_image_ref(request.end_frame)?;
-  let reference_images = resolve_image_list_ref(request.reference_images)?;
-
-  let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
-  let batch_count = plan_batch_count(request.video_batch_count, strategy)?;
-  let duration_seconds = plan_duration(request.duration_seconds, strategy)?;
-
-  Ok(PlanArtcraftSeedance2p0 {
-    prompt: request.prompt,
-    start_frame,
-    end_frame,
-    reference_images,
-    aspect_ratio,
-    duration_seconds,
-    batch_count,
-    idempotency_token: request.get_or_generate_idempotency_token(),
-  })
-}
-
-fn resolve_image_ref<'a>(
-  image_ref: Option<ImageRef<'a>>,
-) -> Result<Option<&'a MediaFileToken>, ArtcraftRouterError> {
-  match image_ref {
-    None => Ok(None),
-    Some(ImageRef::MediaFileToken(t)) => Ok(Some(t)),
-    Some(ImageRef::Url(_)) => {
-      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
-    }
-  }
-}
-
-fn resolve_image_list_ref<'a>(
-  image_list_ref: Option<ImageListRef<'a>>,
-) -> Result<Option<&'a Vec<MediaFileToken>>, ArtcraftRouterError> {
-  match image_list_ref {
-    None => Ok(None),
-    Some(ImageListRef::MediaFileTokens(tokens)) => Ok(Some(tokens)),
-    Some(ImageListRef::Urls(_)) => {
-      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
-    }
-  }
-}
-
-// Supported aspect ratios and their AR values (width / height):
-//   Portrait9x16 = 0.5625, Portrait3x4 = 0.75, Square1x1 = 1.0, Standard4x3 = 1.33, Landscape16x9 = 1.78
-//
-// All supported ratios cost the same, so PayMoreUpgrade and PayLessDowngrade both
-// select the nearest match rather than rounding in a specific direction.
-fn plan_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<Seedance2p0AspectRatio>, ArtcraftRouterError> {
-  match aspect_ratio {
-    // No preference or auto — let the model decide
-    None
-    | Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => Ok(None),
-
-    // Direct mappings
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => {
-      Ok(Some(Seedance2p0AspectRatio::Landscape16x9))
-    }
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => {
-      Ok(Some(Seedance2p0AspectRatio::Portrait9x16))
-    }
-    Some(CommonAspectRatio::Square) | Some(CommonAspectRatio::SquareHd) => {
-      Ok(Some(Seedance2p0AspectRatio::Square1x1))
-    }
-    Some(CommonAspectRatio::WideFourByThree) => Ok(Some(Seedance2p0AspectRatio::Standard4x3)),
-    Some(CommonAspectRatio::TallThreeByFour) => Ok(Some(Seedance2p0AspectRatio::Portrait3x4)),
-
-    // Mismatches — apply strategy
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(nearest_aspect_ratio(unsupported)))
-      }
-    },
-  }
-}
-
-/// Pick the nearest supported aspect ratio by AR value (width / height).
-/// All Seedance2p0 aspect ratios cost the same, so this is used for both upgrade and downgrade.
-fn nearest_aspect_ratio(aspect_ratio: CommonAspectRatio) -> Seedance2p0AspectRatio {
-  match aspect_ratio {
-    CommonAspectRatio::WideFiveByFour => Seedance2p0AspectRatio::Standard4x3,    // 1.25, nearest 1.33
-    CommonAspectRatio::WideThreeByTwo => Seedance2p0AspectRatio::Standard4x3,    // 1.50, nearest 1.33
-    CommonAspectRatio::WideTwentyOneByNine => Seedance2p0AspectRatio::Landscape16x9, // 2.33, nearest 1.78
-    CommonAspectRatio::TallFourByFive => Seedance2p0AspectRatio::Portrait3x4,    // 0.80, nearest 0.75
-    CommonAspectRatio::TallTwoByThree => Seedance2p0AspectRatio::Portrait3x4,    // 0.67, nearest 0.75
-    CommonAspectRatio::TallNineByTwentyOne => Seedance2p0AspectRatio::Portrait9x16, // 0.43, nearest 0.56
-    _ => Seedance2p0AspectRatio::Square1x1,
-  }
-}
-
-// Seedance2p0 supports batch counts of 1, 2, and 4 only.
-fn plan_batch_count(
-  video_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Seedance2p0BatchCount, ArtcraftRouterError> {
-  let count = video_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(Seedance2p0BatchCount::One),
-    2 => Ok(Seedance2p0BatchCount::Two),
-    4 => Ok(Seedance2p0BatchCount::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "video_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade => {
-        // Round up: 3 → Four; anything > 4 clamps to Four
-        Ok(if count < 4 { Seedance2p0BatchCount::Four } else { Seedance2p0BatchCount::Four })
-      }
-      RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        // Round down: 3 → Two; anything > 4 clamps to Four (max available)
-        Ok(if count < 4 { Seedance2p0BatchCount::Two } else { Seedance2p0BatchCount::Four })
-      }
-    },
-  }
-}
-
-// Seedance2p0 supports duration of 4–15 seconds.
-
-fn plan_duration(
-  duration_seconds: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<u8>, ArtcraftRouterError> {
-  const MIN: u16 = 4;
-  const MAX: u16 = 15;
-  match duration_seconds {
-    None => Ok(None),
-    Some(d) if d >= MIN && d <= MAX => Ok(Some(d as u8)),
-    Some(d) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "duration_seconds",
-          value: format!("{}", d),
-        }))
-      }
-      _ => Ok(Some(d.clamp(MIN, MAX) as u8)),
-    },
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::image_ref::ImageRef;
-  use crate::errors::artcraft_router_error::ArtcraftRouterError;
-  use crate::errors::client_error::ClientError;
-  use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
-  use crate::test_helpers::base_video_request;
-  use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{
-    Seedance2p0AspectRatio, Seedance2p0BatchCount,
-  };
-
-  #[test]
-  fn aspect_ratio_direct_16x9() {
-    let request = GenerateVideoRequest {
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      ..base_video_request()
-    };
-    let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap();
-    assert!(matches!(plan.aspect_ratio, Some(Seedance2p0AspectRatio::Landscape16x9)));
-  }
-
-  #[test]
-  fn aspect_ratio_direct_9x16() {
-    let request = GenerateVideoRequest {
-      aspect_ratio: Some(CommonAspectRatio::TallNineBySixteen),
-      ..base_video_request()
-    };
-    let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap();
-    assert!(matches!(plan.aspect_ratio, Some(Seedance2p0AspectRatio::Portrait9x16)));
-  }
-
-  #[test]
-  fn aspect_ratio_direct_square() {
-    let request = GenerateVideoRequest {
-      aspect_ratio: Some(CommonAspectRatio::Square),
-      ..base_video_request()
-    };
-    let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap();
-    assert!(matches!(plan.aspect_ratio, Some(Seedance2p0AspectRatio::Square1x1)));
-  }
-
-  #[test]
-  fn aspect_ratio_nearest_match_both_strategies() {
-    // WideThreeByTwo (AR 1.5) is nearest to Standard4x3 (1.33), not Landscape16x9 (1.78)
-    for strategy in [
-      RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      RequestMismatchMitigationStrategy::PayLessDowngrade,
-    ] {
-      let request = GenerateVideoRequest {
-        aspect_ratio: Some(CommonAspectRatio::WideThreeByTwo),
-        request_mismatch_mitigation_strategy: strategy,
-        ..base_video_request()
-      };
-      let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap();
-      assert!(
-        matches!(plan.aspect_ratio, Some(Seedance2p0AspectRatio::Standard4x3)),
-        "Expected Standard4x3 for WideThreeByTwo with {:?}", strategy,
-      );
-    }
-  }
-
-  #[test]
-  fn aspect_ratio_error_out_on_unsupported() {
-    let request = GenerateVideoRequest {
-      aspect_ratio: Some(CommonAspectRatio::WideThreeByTwo),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      ..base_video_request()
-    };
-    let result = request.build();
-    assert!(matches!(
-      result,
-      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))
-    ));
-  }
-
-  #[test]
-  fn batch_count_zero_is_always_error() {
-    for strategy in [
-      RequestMismatchMitigationStrategy::ErrorOut,
-      RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      RequestMismatchMitigationStrategy::PayLessDowngrade,
-    ] {
-      let request = GenerateVideoRequest {
-        video_batch_count: Some(0),
-        request_mismatch_mitigation_strategy: strategy,
-        ..base_video_request()
-      };
-      let result = request.build();
-      assert!(
-        matches!(result, Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))),
-        "Expected UserRequestedZeroGenerations with {:?}", strategy,
-      );
-    }
-  }
-
-  #[test]
-  fn batch_count_direct_mapping() {
-    let req = GenerateVideoRequest { video_batch_count: Some(1), ..base_video_request() };
-    let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = req.build().unwrap();
-    assert!(matches!(plan.batch_count, Seedance2p0BatchCount::One));
-
-    let req = GenerateVideoRequest { video_batch_count: Some(2), ..base_video_request() };
-    let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = req.build().unwrap();
-    assert!(matches!(plan.batch_count, Seedance2p0BatchCount::Two));
-
-    let req = GenerateVideoRequest { video_batch_count: Some(4), ..base_video_request() };
-    let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = req.build().unwrap();
-    assert!(matches!(plan.batch_count, Seedance2p0BatchCount::Four));
-  }
-
-  #[test]
-  fn batch_count_three_upgrade_rounds_to_four() {
-    let request = GenerateVideoRequest {
-      video_batch_count: Some(3),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      ..base_video_request()
-    };
-    let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap();
-    assert!(matches!(plan.batch_count, Seedance2p0BatchCount::Four));
-  }
-
-  #[test]
-  fn batch_count_three_downgrade_rounds_to_two() {
-    let request = GenerateVideoRequest {
-      video_batch_count: Some(3),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayLessDowngrade,
-      ..base_video_request()
-    };
-    let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap();
-    assert!(matches!(plan.batch_count, Seedance2p0BatchCount::Two));
-  }
-
-  #[test]
-  fn url_image_ref_returns_error() {
-    let request = GenerateVideoRequest {
-      start_frame: Some(ImageRef::Url("https://example.com/image.jpg")),
-      ..base_video_request()
-    };
-    let result = request.build();
-    assert!(matches!(
-      result,
-      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
-    ));
-  }
-}
@@ -1 +0,0 @@
-pub mod artcraft;
@@ -1,9 +0,0 @@
-/// The result of estimating the cost of a video generation plan.
-pub struct VideoGenerationCostEstimate {
-  pub cost_in_credits: Option<u64>,
-  pub cost_in_usd_cents: Option<u64>,
-  pub is_free: bool,
-  pub is_unlimited: bool,
-  pub is_rate_limited: bool,
-  pub has_watermark: bool,
-}
@@ -1,34 +0,0 @@
-use crate::client::router_client::RouterClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::cost::artcraft::estimate_video_cost_artcraft_seedance2p0::estimate_video_cost_artcraft_seedance2p0;
-use crate::generate::generate_video::execute::artcraft::generate_video_artcraft_seedance2p0::execute_artcraft_seedance2p0;
-use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-#[derive(Debug)]
-pub enum VideoGenerationPlan<'a> {
-  ArtcraftSeedance2p0(PlanArtcraftSeedance2p0<'a>),
-}
-
-impl<'a> VideoGenerationPlan<'a> {
-  pub async fn generate_video(
-    &self,
-    client: &RouterClient,
-  ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    match self {
-      VideoGenerationPlan::ArtcraftSeedance2p0(plan) => {
-        let artcraft_client = client.get_artcraft_client_ref()?;
-        execute_artcraft_seedance2p0(plan, artcraft_client).await
-      }
-    }
-  }
-
-  pub fn estimate_costs(&self) -> VideoGenerationCostEstimate {
-    match self {
-      VideoGenerationPlan::ArtcraftSeedance2p0(plan) => {
-        estimate_video_cost_artcraft_seedance2p0(plan)
-      }
-    }
-  }
-}
@@ -1,2 +0,0 @@
-pub mod generate_image;
-pub mod generate_video;
@@ -1,7 +0,0 @@
-pub mod api;
-pub mod client;
-pub mod errors;
-pub mod generate;
-
-#[cfg(test)]
-pub mod test_helpers;
@@ -1,75 +0,0 @@
-use crate::api::common_image_model::CommonImageModel;
-use crate::api::common_video_model::CommonVideoModel;
-use crate::api::provider::Provider;
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::client::router_client::RouterClient;
-use crate::client::router_fal_client::RouterFalClient;
-use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
-use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use artcraft_client::utils::api_host::ApiHost;
-use fal_client::creds::fal_api_key::FalApiKey;
-
-pub fn get_artcraft_client() -> RouterClient {
-  let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/artcraft_cookies.txt")
-    .expect("Failed to read /Users/bt/Artcraft/credentials/artcraft_cookies.txt");
-  let cookies = cookies.trim().to_string();
-  let credentials = StorytellerCredentialSet::parse_multi_cookie_header(&cookies)
-      .expect("Failed to parse cookies")
-      .expect("No credentials found");
-  RouterClient::Artcraft(RouterArtcraftClient::new(ApiHost::Storyteller, credentials))
-}
-
-pub fn base_image_request() -> GenerateImageRequest<'static> {
-  GenerateImageRequest {
-    model: CommonImageModel::NanaBananaPro,
-    provider: Provider::Artcraft,
-    prompt: Some("a cat in space"),
-    image_inputs: None,
-    resolution: None,
-    aspect_ratio: None,
-    image_batch_count: None,
-    request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-    idempotency_token: None,
-  }
-}
-
-pub fn get_fal_client() -> RouterClient {
-  let secret = std::fs::read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")
-    .expect("Failed to read /Users/bt/Artcraft/credentials/fal_api_key.txt");
-  let api_key = FalApiKey::from_str(secret.trim());
-  let webhook_url = "https://example.com/fal-webhook-test".to_string();
-  RouterClient::Fal(RouterFalClient::new(api_key, webhook_url))
-}
-
-pub fn base_fal_image_request() -> GenerateImageRequest<'static> {
-  GenerateImageRequest {
-    model: CommonImageModel::NanaBananaPro,
-    provider: Provider::Fal,
-    prompt: Some("a cat in space"),
-    image_inputs: None,
-    resolution: None,
-    aspect_ratio: None,
-    image_batch_count: None,
-    request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-    idempotency_token: None,
-  }
-}
-
-pub fn base_video_request() -> GenerateVideoRequest<'static> {
-  GenerateVideoRequest {
-    model: CommonVideoModel::Seedance2p0,
-    provider: Provider::Artcraft,
-    prompt: Some("a cat in space"),
-    start_frame: None,
-    end_frame: None,
-    reference_images: None,
-    resolution: None,
-    aspect_ratio: None,
-    duration_seconds: None,
-    video_batch_count: None,
-    request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-    idempotency_token: None,
-  }
-}
@@ -1,5 +1,5 @@
 [package]
-name = "artcraft_client"
+name = "storyteller_client"
 edition = "2021"
 version = "0.0.1"
 authors = [
@@ -15,7 +15,7 @@ normal = ["workspace-build-acceleration"]
 # unused_imports = "forbid"

 [lib]
-name = "artcraft_client"
+name = "storyteller_client"
 path = "src/lib.rs"

 [dependencies]
@@ -1,4 +1,3 @@
-pub mod parse_multi_cookie_header;
 pub mod storyteller_avt_cookie;
 pub mod storyteller_credential_set;
 pub mod storyteller_session_cookie;
@@ -1,4 +1,3 @@
-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;

@@ -26,10 +25,6 @@ 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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brandon Thomas	3dbc540fb2	restore artcraft tauri portions	2026-02-22 09:24:48 +07:00
Brandon Thomas	f3943818d9	remove wreq openssl hack	2026-02-22 09:20:35 +07:00
Brandon Thomas	0a99b77a6a	ugh	2026-02-22 08:49:33 +07:00
Brandon Thomas	9cd6685f02	re-add seedance2-pro-job	2026-02-22 08:42:06 +07:00
Brandon Thomas	89e8346fa6	re-add seedance job	2026-02-22 08:39:11 +07:00
Brandon Thomas	79a85e1b32	configure rustls	2026-02-22 08:28:24 +07:00
Brandon Thomas	fe1235a93c	goodbye openssl	2026-02-22 08:20:01 +07:00
Brandon Thomas	5217e9ff07	upgrade rust	2026-02-22 07:42:35 +07:00
Brandon Thomas	bb375e405f	this appears to work	2026-02-22 07:20:24 +07:00
Brandon Thomas	0a44642c95	prefix-symbols is in a future release	2026-02-21 14:02:45 +07:00
Brandon Thomas	0b68e04b5f	perhaps this bypasses the conflict with openssl	2026-02-21 13:58:27 +07:00
Brandon Thomas	a0e6b5721b	add seedance2pro lib. works on mac, maybe fails on linux	2026-02-21 10:32:04 +07:00
Brandon Thomas	8ffa1de27f	fixup, should build now	2026-02-21 10:00:02 +07:00
Brandon Thomas	1f0eb35ff1	shouldn't be impacting	2026-02-21 09:55:00 +07:00
Brandon Thomas	43ec1ae5d7	shouldn't be impacting	2026-02-21 09:54:41 +07:00
Brandon Thomas	625ba41423	shouldn't be impacting	2026-02-21 09:54:14 +07:00
Brandon Thomas	2a62bcc7f8	query codegen	2026-02-21 09:53:21 +07:00
Brandon Thomas	5c92adff8f	not relevant to our test	2026-02-21 09:52:55 +07:00
Brandon Thomas	1276df9f29	force a re-build	2026-02-21 09:08:30 +07:00
Brandon Thomas	026d356d9c	run on test branch	2026-02-21 09:02:36 +07:00
				`@@ -1 +0,0 @@`
				`pub mod estimate_image_cost_artcraft_nano_banana_pro;`
				`@@ -1 +0,0 @@`
				`pub(crate) mod estimate_image_cost_fal_nano_banana_pro;`
				`@@ -1 +0,0 @@`
				`pub mod generate_image_artcraft_nano_banana_pro;`
				`@@ -1 +0,0 @@`
				`pub mod generate_image_fal_nano_banana_pro;`
				`@@ -1 +0,0 @@`
				`pub mod plan_generate_image_artcraft_nano_banana_pro;`
				`@@ -1 +0,0 @@`
				`pub mod plan_generate_image_fal_nano_banana_pro;`
				`@@ -1 +0,0 @@`
				`pub mod estimate_video_cost_artcraft_seedance2p0;`
				`@@ -1 +0,0 @@`
				`pub mod generate_video_artcraft_seedance2p0;`
				`@@ -1 +0,0 @@`
				`pub mod plan_generate_video_artcraft_seedance2p0;`