fal errors handled

handle fal failures and mark jobs dead
refactor
2026-10-21 09:22:41 -04:00 · 2026-03-31 10:47:25 -04:00 · 2026-03-31 10:30:53 -04:00 · 2026-03-31 10:09:11 -04:00 · 2026-03-31 10:06:47 -04:00 · 2026-03-31 10:03:57 -04:00
632 changed files with 10840 additions and 23355 deletions
@@ -1,47 +0,0 @@
-# API Conventions
-
-## HTTP Handlers (Actix-Web)
-
-Handlers in `storyteller_web` follow this structure:
-
-1. **Request/Response types** with `#[derive(Deserialize/Serialize, ToSchema)]`
-2. **Error enum** implementing `ResponseError`, `Display`, `Serialize`, `ToSchema`
-3. **Handler function** annotated with `#[utoipa::path(...)]` for OpenAPI docs
-4. Handler returns `Result<Json<Response>, ErrorType>`. Only use `Result<HttpResponse, ErrorType>` when you need to set headers/cookies.
-
-### Error Types
-
- Use `CommonWebError` for simple handlers that only need standard HTTP error codes
- Use a custom error enum when you need endpoint-specific error variants (e.g. `LoginErrorType::InvalidCredentials`)
- Custom error enums MUST implement `ResponseError` (actix), `Display`, and `Serialize`
- When adding `From<RequireUserSessionError>` or similar conversions, implement them on `CommonWebError` in its own module (orphan rule)
- Error response bodies include: `success: false`, `error_code`, `error_code_str`
-
-### Session/Auth
-
- `require_user_session_using_connection()` reuses an open DB connection (preferred)
- `require_user_session()` acquires its own connection (deprecated)
- `require_moderator()` for admin-only endpoints
-
-### API Type Definitions
-
- Shared request/response types go in `artcraft_api_defs` crate (under `crates/api_clients/artcraft/artcraft_api_defs/`)
- Types that need `ResponseError` impl must stay in `storyteller_web` (orphan rule)
- New types must be added to `api_doc.rs` schemas (in storyteller-web) for Swagger generation
-
-## Enums (Database-backed)
-
- Located in `crates/schema/public/enums/src/by_table/{table_name}/`
- Require manual `to_str()` and `from_str()` implementations
- Use `impl_enum_display_and_debug_using_to_str!` and `impl_mysql_enum_coders!` macros
- Add comprehensive tests: serialization, round-trip, variant count
- YOU CAN ADD NEW VALUES but DO NOT CHANGE EXISTING VALUES without a migration strategy
- Note that adding new values can break older versions of the Tauri desktop app that read
-  responses over Rust - make sure it consumes variants with an "Unknown(String)" variant 
-  catch-all to future proof the APIs.
-
-## Tokens (Primary Keys)
-
- Located in `crates/schema/public/tokens/src/tokens/`
- Opaque `String` wrappers with Stripe-like prefixes (e.g. `user_`, `mf_`)
- Use `impl_string_token!`, `impl_mysql_token_from_row!`, `impl_crockford_generator!` macros
@@ -1,63 +0,0 @@
-# Code Style
-
-## Rust
-
- Two spaces for indentation (not four)
- No minimum supported Rust version; use latest stable features freely
- `#[macro_use] extern crate serde_derive;` is used in binary crates; library crates use `use serde_derive::{Serialize, Deserialize};`
- Never use `println!` or `eprintln!` outside of tests; use `log` crate macros (`info!`, `warn!`, `error!`, `debug!`, `trace!`) instead
- Use `anyhow::Result` / `AnyhowResult` for fallible functions in application code
- Enum Display/Debug: use `impl_enum_display_and_debug_using_to_str!` macro, not `derive_more::Display` (CLion doesn't understand it)
- Fields that are optional use the `maybe_` prefix: `maybe_creator_user_token`, `maybe_prompt_token`
- When implementing `fmt::Display` for error types, use the pattern: `write!(f, "{:?}", self)`
-
-## File Layout (Top-to-Bottom Reading Order)
-
-Organize code so a human reading top-to-bottom encounters the most important things first and
-can drill down into details only when curious. Think of it like a newspaper: headline first,
-then the story, then the fine print.
-
-### Ordering within a file
-
-1. **Constants** at the top, right after imports.
-2. **The primary public type** (the main struct/enum the file is about) comes next.
-   A reader opening this file should immediately see what it defines.
-3. **Supporting/subordinate types** (sub-structs, helper enums, serialization DTOs) go
-   below the primary type, not above it. Ask: "Would a reader need to know this type
-   exists before seeing the main type?" — if no, push it down.
-4. **Type ordering for API types**: Request, then Response (success), then Error.
-5. **`impl` blocks** after their type definitions.
-
-### Ordering within an `impl` block
-
-1. **Constructors** (`new`, `from_*`, `builder`) at the top.
-2. **Public methods** next — these are the main entry points a reader cares about.
-3. **Private helper methods** below public methods.
-   - Among helpers: place "meaty" helpers (substantial logic, direct continuations of the
-     public entry point) above "leaf" helpers (small formatters, simple lookups).
-   - A method that calls another method in the same file should appear *above* the method
-     it calls. This lets readers follow the call chain downward.
-
-## Naming
-
- Handler functions: `{verb}_{noun}_handler` (e.g. `get_health_check_handler`, `login_handler`)
- Error enums: `{Feature}Error` (e.g. `FalWebhookError`, `HealthCheckError`)
- Request/response structs: `{Action}Request`, `{Action}Response`, `{Action}SuccessResponse`
- Path params: `{Action}PathInfo`
- Builder structs: `{Thing}Builder` with `set_` prefixed setters and a `build()` method
-
-## Imports
-
- Group imports: std, external crates, internal workspace crates, `crate::` imports
- Use fully qualified paths for one-off references; `use` for repeated references
- Prefer specific imports over wildcards, except in `api_doc.rs` and test modules
- When two crates export a type with the same name, alias with a suffix describing the source crate:
-  `use enums::...::CommonResolution as CommonResolutionEnum;`
-  `use artcraft_router::...::CommonResolution as CommonResolutionRouter;`
-  This avoids long fully-qualified paths in function signatures and bodies.
-
-## TypeScript / Frontend
-
- TypeScript with React, Vite, Zustand, Three.js
- Nx monorepo under `crates/frontend/`
- Two spaces for indentation
@@ -1,27 +0,0 @@
-# Testing
-
-## Running Tests
-
- Most crates: `cargo test -p {crate_name}`
- Crates using SQLx offline mode: `SQLX_OFFLINE=true cargo test -p {crate_name}`
- The `storyteller-web` and `mysql_queries` crates require `SQLX_OFFLINE=true` for compilation
- Use `cargo check -p {crate_name}` for fast compilation checks without running tests
-
-## Test Patterns
-
- Tests live in `#[cfg(test)] mod tests { ... }` at the bottom of each file
- Group related tests in sub-modules: `mod explicit_checks`, `mod mechanical_checks`
- Enum tests should cover: serialization, deserialization, `to_str`/`from_str` round-trip, variant count
- Password/crypto tests: be mindful of computation cost, don't add too many bcrypt test cases
-
-## What to Test
-
- New error types and their mappings
- Enum variant serialization stability (these are stored in the database)
- Hash/deduplication functions with known inputs
- Edge cases in parsers (empty input, missing fields, malformed data)
-
-## What Not to Test
-
- Don't add integration tests that require a running database unless explicitly asked
- Don't add tests for simple struct construction or trivial getters
@@ -1,12 +1,12 @@
 {
  "db_name": "MySQL",
-  "query": "\nINSERT INTO users\nSET\n  token = ?,\n  \n  is_temporary = ?,\n  \n  username = ?,\n  display_name = ?,\n\n  username_is_generated = ?,\n  username_is_not_customized = ?,\n\n  email_address = ?,\n  email_gravatar_hash = ?,\n\n  email_confirmed = FALSE,\n  email_confirmed_by_google = ?,\n  email_is_synthetic = ?,\n  \n  was_eagerly_provisioned = ?,\n\n  profile_markdown = ?,\n  profile_rendered_html = ?,\n  user_role_slug = ?,\n\n  password_hash = ?,\n  is_without_password = ?,\n\n  maybe_feature_flags = ?,\n\n  ip_address_creation = ?,\n  ip_address_last_login = ?,\n  ip_address_last_update = ?,\n\n  maybe_source = ?,\n\n  maybe_signup_method = ?,\n\n  maybe_referral_url = ?,\n  maybe_landing_url = ?\n        ",
+  "query": "\nINSERT INTO users\nSET\n  token = ?,\n  \n  is_temporary = ?,\n  \n  username = ?,\n  display_name = ?,\n\n  username_is_generated = ?,\n  username_is_not_customized = ?,\n\n  email_address = ?,\n  email_gravatar_hash = ?,\n\n  email_confirmed = FALSE,\n  email_confirmed_by_google = ?,\n  email_is_synthetic = ?,\n  \n  was_eagerly_provisioned = ?,\n\n  profile_markdown = ?,\n  profile_rendered_html = ?,\n  user_role_slug = ?,\n\n  password_hash = ?,\n  is_without_password = ?,\n\n  maybe_feature_flags = ?,\n\n  ip_address_creation = ?,\n  ip_address_last_login = ?,\n  ip_address_last_update = ?,\n\n  maybe_source = ?,\n\n  maybe_signup_method = ?,\n\n  maybe_referral_url = ?\n        ",
  "describe": {
    "columns": [],
    "parameters": {
-      "Right": 24
+      "Right": 23
    },
    "nullable": []
  },
-  "hash": "3aacc0d270a9073ee5a38595cc32ab7793e0e8b9ce3ad81f554e7198fd0fd509"
+  "hash": "08996721482fe897c2721298c04cf0eba5fcf1d04d57397b8afab3dd59feaa8c"
 }
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO characters\nSET\n  token = ?,\n  character_type = ?,\n  is_active = false,\n  character_name = ?,\n  maybe_description = ?,\n  maybe_avatar_media_token = NULL,\n  maybe_full_image_media_token = NULL,\n  maybe_original_upload_media_token = ?,\n  maybe_creator_user_token = ?,\n  creator_ip_address = ?,\n  kinovi_character_id = ?,\n  kinovi_character_name = ?,\n  maybe_kinovi_asset_id = NULL,\n  maybe_generic_inference_job_token = ?\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 10
-    },
-    "nullable": []
-  },
-  "hash": "2a19cc533815aa3325b940eafe56b9f014fedb3b360b954935d6ec13ff14302d"
-}
@@ -1,157 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  id as `id: u64`,\n  token as `token: tokens::tokens::characters::CharacterToken`,\n  character_type as `character_type: enums::by_table::characters::character_type::CharacterType`,\n  is_active as `is_active: bool`,\n  character_name,\n  maybe_description,\n  maybe_avatar_media_token as `maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken`,\n  maybe_full_image_media_token as `maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken`,\n  maybe_original_upload_media_token as `maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken`,\n  maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n  kinovi_character_id,\n  kinovi_character_name,\n  maybe_kinovi_asset_id\nFROM characters\nWHERE maybe_creator_user_token = ?\n  AND is_active = true\n  AND deleted_at IS NULL\n  AND id < ?\nORDER BY id DESC\nLIMIT ?\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id: u64",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "token: tokens::tokens::characters::CharacterToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "character_type: enums::by_table::characters::character_type::CharacterType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 96
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "is_active: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "character_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_description",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 2048
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "kinovi_character_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "kinovi_character_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 12,
-        "name": "maybe_kinovi_asset_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "8c130ebd0d192355844863b3ebd44952aa8715eebe96375fb28f9f12baf7f9b1"
-}
@@ -1,47 +0,0 @@
-{
-  "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 `kinovi_character_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.job_type = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "kinovi_character_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      true,
-      true
-    ]
-  },
-  "hash": "9bd472515a1ec55a4b3eed9b37baea3a9740484172086b1797889a5f88b5750f"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE characters\nSET\n  is_active = true,\n  maybe_avatar_media_token = ?,\n  maybe_full_image_media_token = ?,\n  maybe_kinovi_asset_id = ?\nWHERE token = ?\n  AND deleted_at IS NULL\nLIMIT 1\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "abbd24f51fae54ba3cd54ec7e3caf1ed7121b244796331d56b2d7f20eb7d4b9b"
-}
@@ -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 = NULL,\n\n  maybe_wallet_ledger_entry_token = NULL,\n\n  maybe_raw_inference_text = NULL,\n\n  maybe_inference_args = NULL,\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": 12
-    },
-    "nullable": []
-  },
-  "hash": "b0ba0fe63908df3d66b4820ca47cbb773786e480464c84a278fe63b1fa8913b4"
-}
@@ -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.job_type = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `order_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
  "describe": {
    "columns": [
      {
@@ -85,7 +85,7 @@
      }
    ],
    "parameters": {
-      "Right": 2
+      "Right": 1
    },
    "nullable": [
      false,
@@ -98,5 +98,5 @@
      true
    ]
  },
-  "hash": "a0002183d4d077b07bb0cd062ca95bf113d1564ce3195f0e62e531ce4297dd76"
+  "hash": "cb33fd483f0fef7ec2a1f5950218f312a19e38c7971b88db949ccaa05bf7b7c4"
 }
@@ -1,146 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token as `token: tokens::tokens::characters::CharacterToken`,\n  character_type as `character_type: enums::by_table::characters::character_type::CharacterType`,\n  is_active as `is_active: bool`,\n  character_name,\n  maybe_description,\n  maybe_avatar_media_token as `maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken`,\n  maybe_full_image_media_token as `maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken`,\n  maybe_original_upload_media_token as `maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken`,\n  maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n  kinovi_character_id,\n  kinovi_character_name,\n  maybe_kinovi_asset_id\nFROM characters\nWHERE token = ?\n  AND deleted_at IS NULL\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::characters::CharacterToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "character_type: enums::by_table::characters::character_type::CharacterType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 96
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "is_active: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "character_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_description",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 2048
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "kinovi_character_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "kinovi_character_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "maybe_kinovi_asset_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "e9078c593087df3da20dbd193cdad102d6bb3ae83ee81c8c4ad75fe184e03c92"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE characters\nSET\n  character_name = ?,\n  kinovi_character_name = ?,\n  maybe_description = ?\nWHERE token = ?\n  AND deleted_at IS NULL\nLIMIT 1\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "f54e22efa17f3b8d36387dfd724e1fd0c88634fc8defa420ddd2de7e9103518c"
-}
@@ -60,18 +60,5 @@ artcraft/
 - Actix-web for HTTP services
 - SQLx for MySQL and SQLite
 - A mix of wreq and reqwest for Rust HTTP clients
- Never use `println!` or `eprintln!` outside of tests; use `log` crate macros instead
- When two crates export the same type name, alias imports with a suffix: `use foo::Bar as BarFoo;`
 - TypeScript with Nx, React, Vite, Zustand, and Three.js
 - Use two spaces for indentation
-
-### File Layout
-
-Organize for top-to-bottom reading. Important things first, details later.
-
- **Constants** at the top (after imports)
- **Structs/enums** next; outer structs above inner sub-structs
- **API types** in order: Request, Response, Error
- **In impl blocks**: constructors first, then public methods, then private helpers
- Private helpers go *below* the methods that call them
- Among helpers: meatier logic above leaf-level formatters
@@ -508,6 +508,7 @@ version = "0.0.1"
 dependencies = [
 "anyhow",
 "chrono",
+ "config",
 "datetimes",
 "dotenv",
 "easyenv",
@@ -522,7 +523,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "tokens",
 "tokio",
@@ -727,6 +727,7 @@ dependencies = [
 "anyhow",
 "chrono",
 "enums",
+ "enums_public",
 "serde",
 "serde_derive",
 "serde_json",
@@ -747,6 +748,7 @@ dependencies = [
 "cloudflare_errors",
 "cookie 0.18.1",
 "enums",
+ "enums_public",
 "errors",
 "log",
 "mimetypes",
@@ -3131,6 +3133,7 @@ dependencies = [
 "bucket_paths",
 "clap 4.5.60",
 "cloud_storage",
+ "config",
 "easyenv",
 "elasticsearch",
 "enums",
@@ -3141,7 +3144,6 @@ dependencies = [
 "mimetypes",
 "mysql_queries",
 "rand 0.9.2",
- "shared_env_var_config",
 "sqlx",
 "storyteller_root",
 "tokens",
@@ -3157,6 +3159,7 @@ dependencies = [
 "bucket_paths",
 "clap 4.5.60",
 "cloud_storage",
+ "config",
 "easyenv",
 "enums",
 "errors",
@@ -3164,7 +3167,6 @@ dependencies = [
 "log",
 "mimetypes",
 "mysql_queries",
- "shared_env_var_config",
 "sqlx",
 "tokens",
 "tokio",
@@ -3436,7 +3438,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "storyteller_root",
 "subprocess",
@@ -3444,7 +3445,6 @@ dependencies = [
 "tempdir",
 "tokens",
 "tokio",
- "url",
 "workspace-build-acceleration",
 "zip 0.6.6",
 ]
@@ -3610,6 +3610,7 @@ version = "0.0.1"
 dependencies = [
 "bucket_paths",
 "clap 4.5.60",
+ "config",
 "easyenv",
 "elasticsearch",
 "elasticsearch_schema",
@@ -3621,7 +3622,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "storyteller_root",
 "strum",
@@ -3701,7 +3701,6 @@ dependencies = [
 "serde_derive",
 "serde_json",
 "server_environment",
- "shared_env_var_config",
 "sqlx",
 "workspace-build-acceleration",
 ]
@@ -3795,6 +3794,20 @@ dependencies = [
 "workspace-build-acceleration",
 ]

+[[package]]
+name = "enums_public"
+version = "0.0.1"
+dependencies = [
+ "enums",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "strum",
+ "toml 1.0.7+spec-1.1.0",
+ "utoipa",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "env"
 version = "1.0.1"
@@ -3891,6 +3904,7 @@ dependencies = [
 "anyhow",
 "bootstrap",
 "chrono",
+ "config",
 "dotenv",
 "easyenv",
 "elasticsearch",
@@ -3909,7 +3923,6 @@ dependencies = [
 "serde_derive",
 "serde_json",
 "server_environment",
- "shared_env_var_config",
 "sqlx",
 "storyteller_root",
 "tokens",
@@ -5150,12 +5163,6 @@ dependencies = [
 "pin-project-lite",
 ]

-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
 [[package]]
 name = "http-types"
 version = "2.12.0"
@@ -5751,7 +5758,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "subprocess",
 "subprocess_common",
@@ -6089,6 +6095,7 @@ dependencies = [
 name = "jwt_signer"
 version = "0.0.1"
 dependencies = [
+ "errors",
 "hmac 0.10.1",
 "jwt",
 "sha2 0.9.9",
@@ -6133,13 +6140,13 @@ dependencies = [
 name = "kubectl-pod-cleanup"
 version = "0.0.1"
 dependencies = [
+ "config",
 "easyenv",
 "errors",
 "log",
 "once_cell",
 "rand 0.8.5",
 "regex",
- "shared_env_var_config",
 "workspace-build-acceleration",
 ]

@@ -6843,6 +6850,7 @@ dependencies = [
 "bucket_paths",
 "clap 4.5.60",
 "cloud_storage",
+ "config",
 "easyenv",
 "enums",
 "errors",
@@ -6853,7 +6861,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "storyteller_root",
 "strum",
@@ -8644,6 +8651,16 @@ dependencies = [
 "syn 2.0.117",
 ]

+[[package]]
+name = "prompt_engineering"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "regex",
+ "speculoos",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "prost"
 version = "0.12.6"
@@ -10174,6 +10191,7 @@ dependencies = [
 "bucket_paths",
 "cloud_storage",
 "concurrency",
+ "config",
 "easyenv",
 "enums",
 "errors",
@@ -11233,6 +11251,7 @@ dependencies = [
 "elasticsearch",
 "elasticsearch_schema",
 "enums",
+ "enums_public",
 "errors",
 "fal_client",
 "ffmpeg_utils",
@@ -11263,6 +11282,7 @@ dependencies = [
 "pager",
 "password",
 "primitives",
+ "prompt_engineering",
 "r2d2",
 "rand 0.9.2",
 "redis 1.0.2",
@@ -11826,7 +11846,6 @@ dependencies = [
 "gtk",
 "heck 0.5.0",
 "http 1.3.1",
- "http-range",
 "jni 0.21.1",
 "libc",
 "log",
@@ -12862,7 +12881,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "subprocess",
 "tempdir",
@@ -12896,7 +12914,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "tempdir",
 "tokio",
@@ -13353,6 +13370,7 @@ dependencies = [
 "bucket_paths",
 "cloud_storage",
 "concurrency",
+ "config",
 "easyenv",
 "errors",
 "ffmpeg_utils",
@@ -13434,7 +13452,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "subprocess",
 "tempdir",
@@ -13465,7 +13482,6 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "shared_env_var_config",
 "sqlx",
 "subprocess",
 "tempdir",
@@ -14737,6 +14753,7 @@ dependencies = [
 "bucket_paths",
 "cloud_storage",
 "concurrency",
+ "config",
 "easyenv",
 "enums",
 "errors",
@@ -14749,7 +14766,6 @@ dependencies = [
 "serde_derive",
 "serde_json",
 "server_environment",
- "shared_env_var_config",
 "sqlx",
 "tokens",
 "tokio",
@@ -94,6 +94,7 @@ members = [
  "crates/lib/deprecated/http_server_common", # TODO(bt, 2023-03-20): Move useful pieces to actix_helpers
  "crates/lib/deprecated/image_algorithms",
  "crates/lib/deprecated/machine_learning/ml_weights_registry",
+  "crates/lib/deprecated/machine_learning/prompt_engineering",
  "crates/lib/deprecated/subprocess_common",
  "crates/lib/deprecated/tts_common",

@@ -116,6 +117,7 @@ members = [
  # Schema (public): common strongly-typed tokens, ids, payloads, etc.
  "crates/schema/public/composite_identifiers",
  "crates/schema/public/enums",
+  "crates/schema/public/enums_public",
  "crates/schema/public/reusable_types", # TODO(bt, 2022-12-21): Deprecate
  "crates/schema/public/tokens",

@@ -236,6 +238,7 @@ cookie_store = { path = "crates/lib/cookie_store" }
 crockford = { path = "crates/lib/data/crockford" }
 easyenv = { path = "crates/lib/easyenv" }
 enums = { path = "crates/schema/public/enums" }
+enums_public = { path = "crates/schema/public/enums_public" }
 errors = { path = "crates/lib/errors" }
 fal_client = { path = "crates/api_clients/fal_client" }
 ffmpeg_utils = { path = "crates/lib/ffmpeg_utils" }
@@ -324,7 +327,7 @@ sha2 = "0.11.0-rc.5"
 sha3 = "0.10.8"
 speculoos = "0.11.0"
 strum = { version = "0.28.0", features = ["derive"] }
-tauri = { version = "2.8.3", features = ["unstable", "devtools", "protocol-asset"] } # NB: "devtools" prevents App Store distribution; "ubstable" is needed for window access
+tauri = { version = "2.8.3", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution; "ubstable" is needed for window access
 tauri-plugin-dialog = "2.3.3"
 tauri-plugin-fs = "2.4.2"
 tauri-plugin-log = "2.6.0"
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE IF EXISTS characters;
@@ -1,101 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-- Characters are reusable entities that can be referenced in video/image generations.
-- A character is created from one or more reference images and registered with third-party
-- systems (e.g. Kinovi/Seedance) that support character-based generation.
-CREATE TABLE characters (
-  -- Not used for anything except replication (private, not even used in queries)
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Public-facing "primary key" (PUBLIC)
-  token VARCHAR(32) NOT NULL,
-
-  -- The type or "features" of the character.
-  character_type VARCHAR(24) NOT NULL,
-
-  -- Whether the character has been fully created and is available for use.
-  -- A character may exist in the database before its creation job completes.
-  is_active BOOLEAN NOT NULL DEFAULT false,
-
-  -- ========== CHARACTER DETAILS ==========
-
-  -- User's display name for the character.
-  character_name VARCHAR(255) DEFAULT NULL,
-
-  -- Optional user description of the character.
-  maybe_description VARCHAR(512) DEFAULT NULL,
-
-  -- ========== MEDIA ==========
-
-  -- Avatar image (cropped to face, ideally).
-  maybe_avatar_media_token VARCHAR(32) DEFAULT NULL,
-
-  -- Full-size reference image.
-  maybe_full_image_media_token VARCHAR(32) DEFAULT NULL,
-
-  -- TEMPORARY FOR GOING FAST :
-  -- WE'LL NEED TO BREAK THIS INTO ANOTHER TABLE IF WE WANT TO SUPPORT MULTIPLE IMAGES.
-  -- Image the character was originally created with.
-  maybe_original_upload_media_token VARCHAR(32) DEFAULT NULL,
-
-  -- ========== CREATOR ==========
-
-  -- The user who created this character.
-  maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
-
-  -- For abuse tracking.
-  creator_ip_address VARCHAR(40) NOT NULL,
-
-  -- ========== KINOVI (TEMPORARY) ==========
-
-  -- TEMPORARY FOR GOING FAST :
-  -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- The identifier in the third-party system.
-  -- e.g. Kinovi's "char_1774752056469_2wlxoq"
-  kinovi_character_id VARCHAR(64) DEFAULT NULL,
-
-  -- TEMPORARY FOR GOING FAST :
-  -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- The name used by the third party.
-  -- Important for Kinovi since characters are referenced by name in prompts.
-  kinovi_character_name VARCHAR(255) DEFAULT NULL,
-
-  -- TEMPORARY FOR GOING FAST :
-  -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- This might be the upstream third party of kinovi.
-  -- e.g. Kinovi's assetId "asset-20260329104101-kk5kl"
-  maybe_kinovi_asset_id VARCHAR(64) DEFAULT NULL,
-
-  -- TEMPORARY FOR GOING FAST :
-  -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- Our job system token (if the character was created via a job).
-  maybe_generic_inference_job_token VARCHAR(32) DEFAULT NULL,
-
-  -- Maybe this doesn't exist
-  -- -- TEMPORARY FOR GOING FAST :
-  -- -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- -- Third party's job system token (if any).
-  -- maybe_kinovi_job_id VARCHAR(64) DEFAULT NULL,
-
-  -- ========== TIMESTAMPS ==========
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  deleted_at TIMESTAMP DEFAULT NULL,
-
-  -- ========== INDICES ==========
-
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  KEY index_character_type (character_type),
-  KEY index_maybe_creator_user_token (maybe_creator_user_token),
-  KEY index_maybe_creator_user_token_active (maybe_creator_user_token, is_active),
-  KEY index_is_active (is_active),
-  KEY index_kinovi_character_id (kinovi_character_id),
-  KEY index_maybe_generic_inference_job_token (maybe_generic_inference_job_token),
-  KEY index_created_at (created_at),
-  KEY index_deleted_at (deleted_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,6 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE users
-    DROP COLUMN maybe_landing_url;
@@ -1,6 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE users
-    ADD COLUMN maybe_landing_url VARCHAR(255) DEFAULT NULL;
@@ -15,9 +15,6 @@ CREATE TABLE characters (
  -- Effective "primary key" (PUBLIC)
  token VARCHAR(32) NOT NULL,

-  -- The type or "features" of the character.
-  character_type VARCHAR(24) NOT NULL,
-
  -- Whether the character has been fully created and is available for use.
  -- A character may exist in the database before its creation job completes.
  is_active BOOLEAN NOT NULL DEFAULT false,
@@ -25,7 +22,7 @@ CREATE TABLE characters (
  -- ========== CHARACTER DETAILS ==========

  -- Display name for the character.
-  character_name VARCHAR(255) DEFAULT NULL,
+  name VARCHAR(255) NOT NULL,

  -- Optional description of the character.
  maybe_description VARCHAR(512) DEFAULT NULL,
@@ -38,11 +35,6 @@ CREATE TABLE characters (
  -- Full-size reference image.
  maybe_full_image_media_token VARCHAR(32) DEFAULT NULL,

-  -- TEMPORARY FOR GOING FAST :
-  -- WE'LL NEED TO BREAK THIS INTO ANOTHER TABLE IF WE WANT TO SUPPORT MULTIPLE IMAGES.
-  -- Image the character was originally created with.
-  maybe_original_upload_media_token VARCHAR(32) DEFAULT NULL,
-
  -- ========== CREATOR ==========

  -- The user who created this character.
@@ -51,37 +43,6 @@ CREATE TABLE characters (
  -- For abuse tracking.
  creator_ip_address VARCHAR(40) NOT NULL,

-  -- ========== KINOVI (TEMPORARY) ==========
-
-  -- TEMPORARY FOR GOING FAST :
-  -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- The identifier in the third-party system.
-  -- e.g. Kinovi's "char_1774752056469_2wlxoq"
-  kinovi_character_id VARCHAR(64) DEFAULT NULL,
-
-  -- TEMPORARY FOR GOING FAST :
-  -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- The name used by the third party.
-  -- Important for Kinovi since characters are referenced by name in prompts.
-  kinovi_character_name VARCHAR(255) DEFAULT NULL,
-
-  -- TEMPORARY FOR GOING FAST :
-  -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- This might be the upstream third party of kinovi.
-  -- e.g. Kinovi's assetId "asset-20260329104101-kk5kl"
-  maybe_kinovi_asset_id VARCHAR(64) DEFAULT NULL,
-
-  -- TEMPORARY FOR GOING FAST :
-  -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- Our job system token (if the character was created via a job).
-  maybe_generic_inference_job_token VARCHAR(32) DEFAULT NULL,
-
-  -- Maybe this doesn't exist
-  -- -- TEMPORARY FOR GOING FAST :
-  -- -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-  -- -- Third party's job system token (if any).
-  -- maybe_kinovi_job_id VARCHAR(64) DEFAULT NULL,
-
  -- ========== TIMESTAMPS ==========

  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -92,13 +53,8 @@ CREATE TABLE characters (

  PRIMARY KEY (id),
  UNIQUE KEY (token),
-  KEY index_character_type (character_type),
  KEY index_maybe_creator_user_token (maybe_creator_user_token),
-  KEY index_maybe_creator_user_token_active (maybe_creator_user_token, is_active),
  KEY index_is_active (is_active),
-  KEY index_kinovi_character_id (kinovi_character_id),
-  KEY index_maybe_generic_inference_job_token (maybe_generic_inference_job_token),
-  KEY index_created_at (created_at),
-  KEY index_deleted_at (deleted_at)
+  KEY index_created_at (created_at)

 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -222,13 +222,8 @@ CREATE TABLE users (
  was_eagerly_provisioned BOOLEAN NOT NULL DEFAULT false,

  -- The referral URL the user arrived from when signing up.
-  -- This helps us know what marketing is effective.
  maybe_referral_url VARCHAR(255) DEFAULT NULL,

-  -- The actual URL the user first arrived at when signing up, including query params.
-  -- This helps us know what marketing is effective.
-  maybe_landing_url VARCHAR(255) DEFAULT NULL,
-
  -- ========== MODERATION DETAILS ==========

  -- Different than deleted.
@@ -1,3 +0,0 @@
-$kind: collection
-name: characters
-order: 4767
@@ -1,16 +0,0 @@
-$kind: http-request
-name: Create Character
-url: "{{api_host}}/v1/character/create"
-method: POST
-body:
-  type: json
-  content: >-
-    {
-        "uuid_idempotency_token": "{{$randomUUID}}",
-        "model": "seedance_2p0",
-        //"image_media_token": "m_v2hjh936k72knmggmqqa2xfs9sge8k", // steampunk clown
-        //"image_media_token": "m_13m13fm33bw3cxvfrncyc6873z0dyy", // mochi on couch
-        "image_media_token": "m_cp20gcxsattt6j7699brs4ndqf803z", // t-rex
-        "character_name": "T-rex"
-    }
-order: 1775175681198
@@ -1,5 +0,0 @@
-$kind: http-request
-name: Delete Character
-url: "{{api_host}}/v1/character/character_c40dzeq9pa1qtfy19q9f1w"
-method: DELETE
-order: 76446840865701
@@ -1,18 +0,0 @@
-$kind: http-request
-name: Edit Character
-url: "{{api_host}}/v1/character/edit"
-method: POST
-body:
-  type: json
-  content: |-
-    {
-      /// The character to edit.
-      "token": "character_4aj66rcqsbjmv3jp5ek4fc",
-
-      /// Updated name (if changing).
-      "updated_name": "Mochi",
-
-      /// Updated description (if changing).
-      "updated_description": "New Description"
-    }
-order: 487436956121943
@@ -1,23 +0,0 @@
-$kind: http-request
-name: Seedance 2.0 (character ref to video)
-url: "{{api_host}}/v1/generate/video/multi_function/seedance_2p0"
-method: POST
-headers:
-  - key: Accept
-    value: application/json
-  - key: Session
-    value: ""
-    disabled: true
-  - key: Session
-    value: ""
-    disabled: true
-body:
-  type: json
-  content: >
-    {
-        "uuid_idempotency_token": "{{$randomUUID}}",
-        "prompt": "@Mochi is riding on the shoulder of @Steampunk Clown while they're walking through a crowded shopping mall in the sci-fi future. Retro 80's aesthetics while simultaneously futuristic and steam punk. @Mochi licks her lips and barks.",
-        "duration_seconds": 5,
-        "reference_character_tokens": ["character_beph3xd1z2m4kkbedra24f", "character_4aj66rcqsbjmv3jp5ek4fc"]
-    }
-order: 3802
@@ -1,22 +0,0 @@
-$kind: http-request
-name: Add Wallet Banked Balance
-url: "{{api_host}}/v1/moderation/wallet/wallet_2pz2h3m2bdfvna7m3b92ccwwr/add_ba\
-  nked_balance"
-method: POST
-headers:
-  - key: Accept
-    value: application/json
-  - key: Session
-    value: ""
-    disabled: true
-  - key: Session
-    value: ""
-    disabled: true
-body:
-  type: json
-  content: |
-    {
-        "title": "test alert from thread 2",
-        "description": "testing testing test"
-    }
-order: 3365370184335612
@@ -1,21 +0,0 @@
-$kind: http-request
-name: Create Wallet for User
-url: "{{api_host}}/v1/moderation/wallet/create_for_user"
-method: POST
-headers:
-  - key: Accept
-    value: application/json
-  - key: Session
-    value: ""
-    disabled: true
-  - key: Session
-    value: ""
-    disabled: true
-body:
-  type: json
-  content: |
-    {
-        "user_token": "user_jg7ng4kdt2x5y", // newuser946
-        "payments_namespace": "artcraft"
-    }
-order: 4100053395280358
@@ -8,6 +8,6 @@ body:
  type: json
  content: |-
    {
-        "google_credential": "...[redacted]"
+        "google_credential": "eyJhbGciOiJSUzI1NiIsImtpZCI6ImIyN...[redacted]"
    }
 order: 4000
@@ -1,22 +0,0 @@
-# artcraft_api_defs
-
-Shared HTTP API type definitions used by both the server (`storyteller_web`) and clients.
-
-## Structure
-
-Organized by feature: `users/`, `media_file/`, `jobs/`, `moderation/`, etc.
-
-## Conventions
-
- Request types: `#[derive(Deserialize, ToSchema)]`
- Response types: `#[derive(Serialize, ToSchema)]`
- Path params: `#[derive(Deserialize, ToSchema)]` with `PathInfo` suffix
- Query params: `#[derive(Deserialize, IntoParams)]`
-
-## Orphan Rule
-
-Types that need `ResponseError` impl (actix-web) CANNOT live here because of Rust's orphan rule. Keep error response types in `storyteller_web` and only put data types here.
-
-## Dependencies
-
-Only `serde`, `serde_derive`, `utoipa`, `chrono`, `url`, and internal schema crates (`enums`, `tokens`). No actix-web dependency.
@@ -21,6 +21,7 @@ workspace-build-acceleration.workspace = true

 # Internal
 enums.workspace = true
+enums_public.workspace = true
 tokens.workspace = true

 # External
@@ -16,12 +16,6 @@ pub struct CreateCharacterRequest {

  /// The reference image media file token.
  pub image_media_token: MediaFileToken,
-
-  /// Name of the character.
-  pub character_name: String,
-
-  /// Description of the character.
-  pub character_description: Option<String>,
 }

 /// Response body for creating a character.
@@ -89,7 +89,7 @@ mod tests {
  #[test]
  fn test_serialization_text_to_image() {
    let request = EstimateImageCostRequest {
-      model: CommonImageModel::NanoBananaPro,
+      model: CommonImageModel::NanaBananaPro,
      provider: GenerationProvider::Artcraft,
      generation_mode: GenerationMode::TextToImage,
      aspect_ratio: None,
@@ -103,7 +103,7 @@ mod tests {
  #[test]
  fn test_serialization_image_edit() {
    let request = EstimateImageCostRequest {
-      model: CommonImageModel::NanoBananaPro,
+      model: CommonImageModel::NanaBananaPro,
      provider: GenerationProvider::Artcraft,
      generation_mode: GenerationMode::ImageEdit { count: 2 },
      aspect_ratio: None,
@@ -28,7 +28,7 @@ pub struct GenerateKling16ProImageToVideoRequest {
  pub duration: Option<GenerateKling16ProDuration>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateKling16ProAspectRatio {
  /// 16:9 aspect ratio
@@ -39,7 +39,7 @@ pub enum GenerateKling16ProAspectRatio {
  Square,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateKling16ProDuration {
  FiveSeconds,
@@ -24,7 +24,7 @@ pub struct GenerateKling21MasterImageToVideoRequest {
  pub duration: Option<GenerateKling21MasterDuration>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateKling21MasterAspectRatio {
  /// 16:9 aspect ratio
@@ -35,7 +35,7 @@ pub enum GenerateKling21MasterAspectRatio {
  Square,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateKling21MasterDuration {
  FiveSeconds,
@@ -28,7 +28,7 @@ pub struct GenerateKling21ProImageToVideoRequest {
  pub duration: Option<GenerateKling21ProDuration>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateKling21ProAspectRatio {
  /// 16:9 aspect ratio
@@ -39,7 +39,7 @@ pub enum GenerateKling21ProAspectRatio {
  Square,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateKling21ProDuration {
  FiveSeconds,
@@ -31,14 +31,14 @@ pub struct GenerateSeedance10LiteImageToVideoRequest {
  pub aspect_ratio: Option<GenerateSeedance10LiteAspectRatio>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateSeedance10LiteResolution {
  FourEightyP,
  SevenTwentyP,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateSeedance10LiteDuration {
  FiveSeconds,
@@ -46,7 +46,7 @@ pub enum GenerateSeedance10LiteDuration {
 }


-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateSeedance10LiteAspectRatio {
  Auto,
@@ -24,7 +24,7 @@ pub struct GenerateVeo2ImageToVideoRequest {
  pub duration: Option<GenerateVeo2Duration>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo2AspectRatio {
  Auto,
@@ -33,7 +33,7 @@ pub enum GenerateVeo2AspectRatio {
  TallNineSixteen, // 9:16
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo2Duration {
  FiveSeconds,
@@ -27,14 +27,14 @@ pub struct GenerateVeo3FastImageToVideoRequest {
  pub generate_audio: Option<bool>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo3FastResolution {
  SevenTwentyP, // 720p
  TenEightyP, // 1080p
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo3FastDuration {
  EightSeconds,
@@ -37,7 +37,7 @@ pub struct GenerateVeo3ImageToVideoRequest {
  // pub auto_fix: Option<bool>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo3AspectRatio {
  WideSixteenNine, // 16:9
@@ -45,14 +45,14 @@ pub enum GenerateVeo3AspectRatio {
  Square, // 1:1
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo3Resolution {
  SevenTwentyP, // 720p
  TenEightyP, // 1080p
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo3Duration {
  EightSeconds,
@@ -41,14 +41,14 @@ pub struct Kling2p5TurboProMultiFunctionVideoGenRequest {
  pub aspect_ratio: Option<Kling2p5TurboProMultiFunctionVideoGenAspectRatio>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Kling2p5TurboProMultiFunctionVideoGenDuration {
  FiveSeconds,
  TenSeconds,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Kling2p5TurboProMultiFunctionVideoGenAspectRatio {
  Square,
@@ -45,14 +45,14 @@ pub struct Kling2p6ProMultiFunctionVideoGenRequest {
  pub aspect_ratio: Option<Kling2p6ProMultiFunctionVideoGenAspectRatio>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Kling2p6ProMultiFunctionVideoGenDuration {
  FiveSeconds,
  TenSeconds,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Kling2p6ProMultiFunctionVideoGenAspectRatio {
  Square,
@@ -1,5 +1,4 @@
 use serde::{Deserialize, Serialize};
-use tokens::tokens::characters::CharacterToken;
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 use tokens::tokens::media_files::MediaFileToken;
 use utoipa::ToSchema;
@@ -30,10 +29,6 @@ pub struct Seedance2p0MultiFunctionVideoGenRequest {
  /// Optional reference audio files.
  pub reference_audio_media_tokens: Option<Vec<MediaFileToken>>,

-  /// Optional character tokens to reference in the prompt.
-  /// Characters are referenced in prompts as @CharacterName.
-  pub reference_character_tokens: Option<Vec<CharacterToken>>,
-
  /// Video aspect ratio / resolution.
  pub aspect_ratio: Option<Seedance2p0AspectRatio>,

@@ -35,14 +35,14 @@ pub struct Sora2MultiFunctionVideoGenRequest {
  pub aspect_ratio: Option<Sora2MultiFunctionVideoGenAspectRatio>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Sora2MultiFunctionVideoGenResolution {
  Auto,
  SevenTwentyP,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Sora2MultiFunctionVideoGenDuration {
  FourSeconds,
@@ -50,7 +50,7 @@ pub enum Sora2MultiFunctionVideoGenDuration {
  TwelveSeconds,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Sora2MultiFunctionVideoGenAspectRatio {
  Auto,
@@ -35,7 +35,7 @@ pub struct Sora2ProMultiFunctionVideoGenRequest {
  pub aspect_ratio: Option<Sora2ProMultiFunctionVideoGenAspectRatio>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Sora2ProMultiFunctionVideoGenResolution {
  Auto,
@@ -43,7 +43,7 @@ pub enum Sora2ProMultiFunctionVideoGenResolution {
  TenEightyP,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Sora2ProMultiFunctionVideoGenDuration {
  FourSeconds,
@@ -51,7 +51,7 @@ pub enum Sora2ProMultiFunctionVideoGenDuration {
  TwelveSeconds,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Sora2ProMultiFunctionVideoGenAspectRatio {
  Auto,
@@ -60,7 +60,7 @@ pub struct Veo3p1FastMultiFunctionVideoGenRequest {
  pub auto_fix: Option<bool>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Veo3p1FastMultiFunctionVideoGenDuration {
  FourSeconds,
@@ -68,7 +68,7 @@ pub enum Veo3p1FastMultiFunctionVideoGenDuration {
  EightSeconds,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Veo3p1FastMultiFunctionVideoGenAspectRatio {
  Auto,
@@ -76,7 +76,7 @@ pub enum Veo3p1FastMultiFunctionVideoGenAspectRatio {
  NineBySixteen,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Veo3p1FastMultiFunctionVideoGenResolution {
  SevenTwentyP,
@@ -60,7 +60,7 @@ pub struct Veo3p1MultiFunctionVideoGenRequest {
  pub auto_fix: Option<bool>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Veo3p1MultiFunctionVideoGenDuration {
  FourSeconds,
@@ -68,7 +68,7 @@ pub enum Veo3p1MultiFunctionVideoGenDuration {
  EightSeconds,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Veo3p1MultiFunctionVideoGenAspectRatio {
  Auto,
@@ -76,7 +76,7 @@ pub enum Veo3p1MultiFunctionVideoGenAspectRatio {
  NineBySixteen,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Veo3p1MultiFunctionVideoGenResolution {
  SevenTwentyP,
@@ -124,7 +124,7 @@ pub struct OmniGenImageModelDetails {
 impl Default for OmniGenImageModelDetails {
  fn default() -> Self {
    Self {
-      model: CommonImageModel::NanoBananaPro,
+      model: CommonImageModel::NanaBananaPro,
      full_name: None,
      text_prompt_supported: None,
      text_prompt_max_length: None,
@@ -12,14 +12,10 @@ pub struct StripeArtcraftCreateSubscriptionCheckoutWithUserSignupRequest {

  pub cadence: Option<PlanBillingCadence>,

-  /// Optional: The referral URL the user arrived from when first hitting the site, prior to navigation and signing up.
+  /// Optional: The referral URL the user arrived from when signing up.
  /// The browser can send `document.referrer` to the backend so we know how people are finding us.
  /// If the browser doesn't send this parameter, we'll try the `referer` header.
  pub maybe_referral_url: Option<String>,
-
-  /// Optional: The URL where the user landed when they first arrived, prior to navigation and signing up.
-  /// The browser can send `window.location.href` to the backend so we know how people are finding us.
-  pub maybe_landing_url: Option<String>,
 }

 #[derive(Serialize, Deserialize, ToSchema, Debug, Copy, Clone)]
@@ -26,6 +26,7 @@ workspace-build-acceleration.workspace = true
 artcraft_api_defs.workspace = true
 cloudflare_errors.workspace = true
 enums.workspace = true
+enums_public.workspace = true
 errors.workspace = true
 uuid_utils.workspace = true
 mimetypes.workspace = true
@@ -15,7 +15,7 @@ use enums::by_table::media_files::media_file_type::MediaFileType;
 use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
-use enums::by_table::model_weights::weights_types::WeightsType;
+use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use log::debug;
 use serde_derive::Deserialize;
 use tokens::tokens::batch_generations::BatchGenerationToken;
@@ -193,7 +193,7 @@ pub struct GetMediaFileModeratorFields {
 #[derive(Deserialize, Debug)]
 pub struct GetMediaFileModelInfo {
  pub weight_token: ModelWeightToken,
-  pub weight_type: WeightsType,
+  pub weight_type: PublicWeightsType,
  pub weight_category: WeightsCategory,
  pub title: String,

@@ -8,6 +8,7 @@ use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
 use enums::common::generation_provider::GenerationProvider;
+use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
@@ -7,6 +7,7 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
+use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
@@ -8,6 +8,7 @@ use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
 use enums::common::generation_provider::GenerationProvider;
+use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
@@ -5,6 +5,7 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
+use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
@@ -5,6 +5,7 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
+use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
 use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
@@ -1,6 +1,6 @@
 use tokens::tokens::media_files::MediaFileToken;

-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone)]
 pub enum AudioListRef<'a> {
  MediaFileTokens(&'a Vec<MediaFileToken>),
  Urls(&'a Vec<String>),
@@ -1,9 +0,0 @@
-use tokens::tokens::characters::CharacterToken;
-
-/// Forward-compatible character reference list.
-#[derive(Copy, Clone, Debug)]
-pub enum CharacterListRef<'a> {
-  CharacterTokens(&'a Vec<CharacterToken>),
-  
-  // In the future, we may have other identifiers for characters.
-}
@@ -16,11 +16,11 @@ pub enum CommonImageModel {
  #[serde(rename = "gpt_image_1p5")]
  GptImage1p5,
  #[serde(rename = "nano_banana")]
-  NanoBanana,
+  NanaBanana,
  #[serde(rename = "nano_banana_2")]
-  NanoBanana2,
+  NanaBanana2,
  #[serde(rename = "nano_banana_pro")]
-  NanoBananaPro,
+  NanaBananaPro,
  #[serde(rename = "seedream_4")]
  Seedream4,
  #[serde(rename = "seedream_4p5")]
@@ -1,6 +1,6 @@
 use tokens::tokens::media_files::MediaFileToken;

-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone)]
 pub enum ImageListRef<'a> {
  MediaFileTokens(&'a Vec<MediaFileToken>),
  Urls(&'a Vec<String>),
@@ -1,6 +1,6 @@
 use tokens::tokens::media_files::MediaFileToken;

-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone)]
 pub enum ImageRef<'a> {
  MediaFileToken(&'a MediaFileToken),
  Url(&'a str),
@@ -1,5 +1,4 @@
 pub mod audio_list_ref;
-pub mod character_list_ref;
 pub mod common_aspect_ratio;
 pub mod common_image_model;
 pub mod common_resolution;
@@ -1,6 +1,6 @@
 use tokens::tokens::media_files::MediaFileToken;

-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone)]
 pub enum VideoListRef<'a> {
  MediaFileTokens(&'a Vec<MediaFileToken>),
  Urls(&'a Vec<String>),
@@ -37,7 +37,7 @@ mod tests {

  fn estimate_usd_cents(image_batch_count: u16) -> u64 {
    let request = GenerateImageRequest {
-      model: CommonImageModel::NanoBanana,
+      model: CommonImageModel::NanaBanana,
      provider: Provider::Artcraft,
      prompt: None,
      image_inputs: None,
@@ -45,7 +45,7 @@ mod tests {

  fn estimate_usd_cents(resolution: Option<CommonResolution>, image_batch_count: u16) -> u64 {
    let request = GenerateImageRequest {
-      model: CommonImageModel::NanoBanana2,
+      model: CommonImageModel::NanaBanana2,
      provider: Provider::Artcraft,
      prompt: None,
      image_inputs: None,
@@ -44,7 +44,7 @@ mod tests {

  fn estimate_usd_cents(resolution: Option<CommonResolution>, image_batch_count: u16) -> u64 {
    let request = GenerateImageRequest {
-      model: CommonImageModel::NanoBananaPro,
+      model: CommonImageModel::NanaBananaPro,
      provider: Provider::Artcraft,
      prompt: None,
      image_inputs: None,
@@ -1,26 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_dev::PlanFalFlux1Dev;
-
-pub(crate) fn estimate_image_cost_fal_flux_1_dev(
-  plan: &PlanFalFlux1Dev<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.025 per megapixel, billed by rounding up to nearest megapixel.
-  // Default image sizes are ~1MP (1024x1024), so ~$0.025/image = 3 cents rounded up.
-  //
-  // Fal docs:
-  //   Your request will cost $0.025 per megapixel, with images billed by rounding up
-  //   to the nearest megapixel.
-  //
-  let cost_per_image: u64 = 3;
-  let num_images = plan.num_images.as_u64();
-  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,
-  }
-}
@@ -1,26 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_schnell::PlanFalFlux1Schnell;
-
-pub(crate) fn estimate_image_cost_fal_flux_1_schnell(
-  plan: &PlanFalFlux1Schnell<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.003 per megapixel, billed by rounding up to nearest megapixel.
-  // Default image sizes are ~1MP (1024x1024), so ~$0.003/image = 1 cent rounded up.
-  //
-  // Fal docs:
-  //   Your request will cost $0.003 per megapixel, with images billed by rounding up
-  //   to the nearest megapixel.
-  //
-  let cost_per_image: u64 = 1;
-  let num_images = plan.num_images.as_u64();
-  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,
-  }
-}
@@ -1,21 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::PlanFalFluxPro11;
-
-pub(crate) fn estimate_image_cost_fal_flux_pro_1p1(
-  plan: &PlanFalFluxPro11<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.04 per megapixel, billed by rounding up to nearest megapixel.
-  // Default image sizes are ~1MP (1024x1024), so ~$0.04/image = 4 cents.
-  let cost_per_image: u64 = 4;
-  let num_images = plan.num_images.as_u64();
-  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,
-  }
-}
@@ -1,20 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra;
-
-pub(crate) fn estimate_image_cost_fal_flux_pro_1p1_ultra(
-  plan: &PlanFalFluxPro11Ultra<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.06 per image.
-  let cost_per_image: u64 = 6;
-  let num_images = plan.num_images.as_u64();
-  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,
-  }
-}
@@ -1,33 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1p5::{
-  FalGptImage1p5ImageSize, FalGptImage1p5Quality, PlanFalGptImage1p5,
-};
-
-pub(crate) fn estimate_image_cost_fal_gpt_image_1p5(
-  plan: &PlanFalGptImage1p5<'_>,
-) -> ImageGenerationCostEstimate {
-  // Per fal docs:
-  //   Low:    $0.009 (1024x1024) / $0.013 (other)
-  //   Medium: $0.034 (1024x1024) / $0.050–0.051 (other)
-  //   High:   $0.133 (1024x1024) / $0.199–0.200 (other)
-  // Round up to whole cents.
-  let is_square = matches!(plan.image_size, None | Some(FalGptImage1p5ImageSize::Square));
-  let cost_per_image: u64 = match (plan.quality, is_square) {
-    (FalGptImage1p5Quality::Low, true) => 1,
-    (FalGptImage1p5Quality::Low, false) => 2,
-    (FalGptImage1p5Quality::Medium, true) => 4,
-    (FalGptImage1p5Quality::Medium, false) => 6,
-    (FalGptImage1p5Quality::High, true) => 14,
-    (FalGptImage1p5Quality::High, false) => 20,
-  };
-  let cost_in_usd_cents = cost_per_image * plan.num_images.as_u64();
-
-  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,
-  }
-}
@@ -1,34 +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::{
-  FalNbNumImages, PlanFalNanoBanana,
-};
-
-pub(crate) fn estimate_image_cost_fal_nano_banana(
-  plan: &PlanFalNanoBanana<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.039/image (no resolution multiplier — Gemini 25 Flash has no resolution option).
-  // Rounded to 4 cents per image.
-  //
-  // Fal docs:
-  //   Your request will cost $0.039 per image. For $1.00, you can run this model 25 times.
-  //
-  let cost_per_image: u64 = 4;
-
-  let num_images: u64 = match plan.num_images {
-    FalNbNumImages::One => 1,
-    FalNbNumImages::Two => 2,
-    FalNbNumImages::Three => 3,
-    FalNbNumImages::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,
-  }
-}
@@ -1,44 +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_2::{
-  FalNb2NumImages, FalNb2Resolution, PlanFalNanaBanana2,
-};
-
-pub(crate) fn estimate_image_cost_fal_nano_banana_2(
-  plan: &PlanFalNanaBanana2<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.08/image base (1K). Multipliers: 0.5K = 0.75x, 2K = 1.5x, 4K = 2x.
-  // (Stored as USD cents.)
-  //
-  // Fal docs:
-  //   Your request will cost $0.08 per image. For $1.00, you can run this model 12 times.
-  //   2K and 4K outputs will be charged at 1.5 times and 2 times the standard rate, respectively.
-  //   0.5K (512px) resolution outputs will be charged at 0.75 times the standard rate. If web
-  //   search is used, an additional $0.015 will be charged. If high thinking is used,
-  //   an additional $0.002 will be charged. Note: Pricing is subject to change.
-  //
-  let cost_per_image: u64 = match plan.resolution {
-    Some(FalNb2Resolution::HalfK) => 6,   // $0.06 = $0.08 * 0.75
-    Some(FalNb2Resolution::OneK) => 8,     // $0.08 base
-    Some(FalNb2Resolution::TwoK) => 12,    // $0.12 = $0.08 * 1.5
-    Some(FalNb2Resolution::FourK) => 16,   // $0.16 = $0.08 * 2.0
-    None => 8,                              // default = 1K base
-  };
-
-  let num_images: u64 = match plan.num_images {
-    FalNb2NumImages::One => 1,
-    FalNb2NumImages::Two => 2,
-    FalNb2NumImages::Three => 3,
-    FalNb2NumImages::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,
-  }
-}
@@ -42,7 +42,7 @@ mod tests {

  fn estimate_usd_cents(resolution: Option<CommonResolution>, image_batch_count: u16) -> u64 {
    let request = GenerateImageRequest {
-      model: CommonImageModel::NanoBananaPro,
+      model: CommonImageModel::NanaBananaPro,
      provider: Provider::Fal,
      prompt: None,
      image_inputs: None,
@@ -1,19 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4::PlanFalSeedream4;
-
-pub(crate) fn estimate_image_cost_fal_seedream_4(
-  plan: &PlanFalSeedream4<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.03 per image.
-  let cost_per_image: u64 = 3;
-  let cost_in_usd_cents = cost_per_image * plan.num_images.as_u64();
-
-  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,
-  }
-}
@@ -1,19 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4p5::PlanFalSeedream4p5;
-
-pub(crate) fn estimate_image_cost_fal_seedream_4p5(
-  plan: &PlanFalSeedream4p5<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.04 per image.
-  let cost_per_image: u64 = 4;
-  let cost_in_usd_cents = cost_per_image * plan.num_images.as_u64();
-
-  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,
-  }
-}
@@ -1,19 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_5_lite::PlanFalSeedream5Lite;
-
-pub(crate) fn estimate_image_cost_fal_seedream_5_lite(
-  plan: &PlanFalSeedream5Lite<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing: $0.035 per image — round up to 4 cents.
-  let cost_per_image: u64 = 4;
-  let cost_in_usd_cents = cost_per_image * plan.num_images.as_u64();
-
-  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,
-  }
-}
@@ -1,11 +1 @@
-pub(crate) mod estimate_image_cost_fal_flux_1_dev;
-pub(crate) mod estimate_image_cost_fal_flux_1_schnell;
-pub(crate) mod estimate_image_cost_fal_flux_pro_1p1;
-pub(crate) mod estimate_image_cost_fal_flux_pro_1p1_ultra;
-pub(crate) mod estimate_image_cost_fal_gpt_image_1p5;
-pub(crate) mod estimate_image_cost_fal_seedream_4;
-pub(crate) mod estimate_image_cost_fal_seedream_4p5;
-pub(crate) mod estimate_image_cost_fal_seedream_5_lite;
-pub(crate) mod estimate_image_cost_fal_nano_banana;
-pub(crate) mod estimate_image_cost_fal_nano_banana_2;
 pub(crate) mod estimate_image_cost_fal_nano_banana_pro;
@@ -1,49 +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_flux_1_dev::PlanFalFlux1Dev;
-use fal_client::requests::webhook::image::edit::enqueue_flux_1_dev_edit_image_webhook::{
-  enqueue_flux_1_dev_edit_image_webhook, Flux1DevEditImageArgs,
-};
-use fal_client::requests::webhook::image::text::enqueue_flux_1_dev_text_to_image_webhook::{
-  enqueue_flux_1_dev_text_to_image_webhook, Flux1DevArgs,
-};
-
-pub async fn execute_fal_flux_1_dev(
-  plan: &PlanFalFlux1Dev<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if let Some(image_url) = &plan.maybe_image_url {
-    // Image-to-image mode
-    let args = Flux1DevEditImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      image_url: image_url.clone(),
-      num_images: plan.num_images.to_edit(),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_flux_1_dev_edit_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    // Text-to-image mode
-    let args = Flux1DevArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      aspect_ratio: plan.aspect_ratio,
-      num_images: plan.num_images.to_t2i(),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_flux_1_dev_text_to_image_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,
-  }))
-}
@@ -1,49 +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_flux_1_schnell::PlanFalFlux1Schnell;
-use fal_client::requests::webhook::image::edit::enqueue_flux_1_schnell_edit_image_webhook::{
-  enqueue_flux_1_schnell_edit_image_webhook, Flux1SchnellEditImageArgs,
-};
-use fal_client::requests::webhook::image::text::enqueue_flux_1_schnell_text_to_image_webhook::{
-  enqueue_flux_1_schnell_text_to_image_webhook, Flux1SchnellArgs,
-};
-
-pub async fn execute_fal_flux_1_schnell(
-  plan: &PlanFalFlux1Schnell<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if let Some(image_url) = &plan.maybe_image_url {
-    // Image-to-image (redux) mode
-    let args = Flux1SchnellEditImageArgs {
-      image_url: image_url.clone(),
-      num_images: plan.num_images.to_edit(),
-      image_size: plan.edit_image_size,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_flux_1_schnell_edit_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    // Text-to-image mode
-    let args = Flux1SchnellArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      aspect_ratio: plan.t2i_aspect_ratio,
-      num_images: plan.num_images.to_t2i(),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_flux_1_schnell_text_to_image_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,
-  }))
-}
@@ -1,32 +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_flux_pro_1p1::PlanFalFluxPro11;
-use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_text_to_image_webhook::{
-  enqueue_flux_pro_11_text_to_image_webhook, FluxPro11Args,
-};
-
-pub async fn execute_fal_flux_pro_1p1(
-  plan: &PlanFalFluxPro11<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let args = FluxPro11Args {
-    prompt: plan.prompt.unwrap_or(""),
-    aspect_ratio: plan.aspect_ratio,
-    num_images: plan.num_images.to_fal(),
-    webhook_url: fal_client.webhook_url.as_str(),
-    api_key: &fal_client.api_key,
-  };
-
-  let webhook_response = enqueue_flux_pro_11_text_to_image_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,
-  }))
-}
@@ -1,32 +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_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra;
-use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_ultra_text_to_image_webhook::{
-  enqueue_flux_pro_11_ultra_text_to_image_webhook, FluxPro11UltraArgs,
-};
-
-pub async fn execute_fal_flux_pro_1p1_ultra(
-  plan: &PlanFalFluxPro11Ultra<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let args = FluxPro11UltraArgs {
-    prompt: plan.prompt.unwrap_or(""),
-    aspect_ratio: plan.aspect_ratio,
-    num_images: plan.num_images.to_fal(),
-    webhook_url: fal_client.webhook_url.as_str(),
-    api_key: &fal_client.api_key,
-  };
-
-  let webhook_response = enqueue_flux_pro_11_ultra_text_to_image_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,
-  }))
-}
@@ -1,56 +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_gpt_image_1p5::PlanFalGptImage1p5;
-use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1p5_edit_image_webhook::{
-  enqueue_gpt_image_1p5_image_edit_webhook, EnqueueGptImage1p5EditImageArgs,
-};
-use fal_client::requests::webhook::image::text::enqueue_gpt_image_1p5_text_to_image_webhook::{
-  enqueue_gpt_image_1p5_text_to_image_webhook, EnqueueGptImage1p5TextToImageArgs,
-};
-
-pub async fn execute_fal_gpt_image_1p5(
-  plan: &PlanFalGptImage1p5<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if plan.image_urls.is_empty() {
-    let args = EnqueueGptImage1p5TextToImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      num_images: plan.num_images.to_t2i(),
-      image_size: plan.image_size.map(|s| s.to_t2i()),
-      background: None,
-      quality: Some(plan.quality.to_t2i()),
-      output_format: None,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_gpt_image_1p5_text_to_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    let args = EnqueueGptImage1p5EditImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      image_urls: plan.image_urls.clone(),
-      num_images: plan.num_images.to_edit(),
-      mask_image_url: None,
-      image_size: plan.image_size.map(|s| s.to_edit()),
-      background: None,
-      quality: Some(plan.quality.to_edit()),
-      input_fidelity: None,
-      output_format: None,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_gpt_image_1p5_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,
-  }))
-}
@@ -1,72 +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::{
-  FalNbNumImages, PlanFalNanoBanana,
-};
-use fal_client::requests::webhook::image::edit::enqueue_gemini_25_flash_edit_webhook::{
-  enqueue_gemini_25_flash_edit_webhook, Gemini25FlashEditArgs,
-  Gemini25FlashEditNumImages,
-};
-use fal_client::requests::webhook::image::text::enqueue_gemini_25_flash_text_to_image_webhook::{
-  enqueue_gemini_25_flash_text_to_image_webhook, Gemini25FlashTextToImageArgs,
-  Gemini25FlashTextToImageNumImages,
-};
-
-pub async fn execute_fal_nano_banana(
-  plan: &PlanFalNanoBanana<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if plan.image_urls.is_empty() {
-    // Text-to-image mode
-    let args = Gemini25FlashTextToImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      num_images: to_t2i_num_images(plan.num_images),
-      aspect_ratio: plan.t2i_aspect_ratio,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_gemini_25_flash_text_to_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    // Image-edit mode
-    let args = Gemini25FlashEditArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      image_urls: plan.image_urls.clone(),
-      num_images: to_edit_num_images(plan.num_images),
-      aspect_ratio: plan.edit_aspect_ratio,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_gemini_25_flash_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: FalNbNumImages) -> Gemini25FlashTextToImageNumImages {
-  match n {
-    FalNbNumImages::One => Gemini25FlashTextToImageNumImages::One,
-    FalNbNumImages::Two => Gemini25FlashTextToImageNumImages::Two,
-    FalNbNumImages::Three => Gemini25FlashTextToImageNumImages::Three,
-    FalNbNumImages::Four => Gemini25FlashTextToImageNumImages::Four,
-  }
-}
-
-fn to_edit_num_images(n: FalNbNumImages) -> Gemini25FlashEditNumImages {
-  match n {
-    FalNbNumImages::One => Gemini25FlashEditNumImages::One,
-    FalNbNumImages::Two => Gemini25FlashEditNumImages::Two,
-    FalNbNumImages::Three => Gemini25FlashEditNumImages::Three,
-    FalNbNumImages::Four => Gemini25FlashEditNumImages::Four,
-  }
-}
@@ -1,92 +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_2::{
-  FalNb2NumImages, FalNb2Resolution, PlanFalNanaBanana2,
-};
-use fal_client::requests::webhook::image::edit::enqueue_nano_banana_2_edit_image_webhook::{
-  enqueue_nano_banana_2_edit_image_webhook, EnqueueNanoBanana2EditImageArgs,
-  EnqueueNanoBanana2EditImageNumImages, EnqueueNanoBanana2EditImageResolution,
-};
-use fal_client::requests::webhook::image::text::enqueue_nano_banana_2_text_to_image_webhook::{
-  enqueue_nano_banana_2_text_to_image_webhook, EnqueueNanoBanana2TextToImageArgs,
-  EnqueueNanoBanana2TextToImageNumImages, EnqueueNanoBanana2TextToImageResolution,
-};
-
-pub async fn execute_fal_nano_banana_2(
-  plan: &PlanFalNanaBanana2<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if plan.image_urls.is_empty() {
-    // Text-to-image mode
-    let args = EnqueueNanoBanana2TextToImageArgs {
-      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_2_text_to_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    // Image-edit mode
-    let args = EnqueueNanoBanana2EditImageArgs {
-      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_2_edit_image_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: FalNb2NumImages) -> EnqueueNanoBanana2TextToImageNumImages {
-  match n {
-    FalNb2NumImages::One => EnqueueNanoBanana2TextToImageNumImages::One,
-    FalNb2NumImages::Two => EnqueueNanoBanana2TextToImageNumImages::Two,
-    FalNb2NumImages::Three => EnqueueNanoBanana2TextToImageNumImages::Three,
-    FalNb2NumImages::Four => EnqueueNanoBanana2TextToImageNumImages::Four,
-  }
-}
-
-fn to_edit_num_images(n: FalNb2NumImages) -> EnqueueNanoBanana2EditImageNumImages {
-  match n {
-    FalNb2NumImages::One => EnqueueNanoBanana2EditImageNumImages::One,
-    FalNb2NumImages::Two => EnqueueNanoBanana2EditImageNumImages::Two,
-    FalNb2NumImages::Three => EnqueueNanoBanana2EditImageNumImages::Three,
-    FalNb2NumImages::Four => EnqueueNanoBanana2EditImageNumImages::Four,
-  }
-}
-
-fn to_t2i_resolution(r: FalNb2Resolution) -> EnqueueNanoBanana2TextToImageResolution {
-  match r {
-    FalNb2Resolution::HalfK => EnqueueNanoBanana2TextToImageResolution::HalfK,
-    FalNb2Resolution::OneK => EnqueueNanoBanana2TextToImageResolution::OneK,
-    FalNb2Resolution::TwoK => EnqueueNanoBanana2TextToImageResolution::TwoK,
-    FalNb2Resolution::FourK => EnqueueNanoBanana2TextToImageResolution::FourK,
-  }
-}
-
-fn to_edit_resolution(r: FalNb2Resolution) -> EnqueueNanoBanana2EditImageResolution {
-  match r {
-    FalNb2Resolution::HalfK => EnqueueNanoBanana2EditImageResolution::HalfK,
-    FalNb2Resolution::OneK => EnqueueNanoBanana2EditImageResolution::OneK,
-    FalNb2Resolution::TwoK => EnqueueNanoBanana2EditImageResolution::TwoK,
-    FalNb2Resolution::FourK => EnqueueNanoBanana2EditImageResolution::FourK,
-  }
-}
@@ -1,50 +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_seedream_4::PlanFalSeedream4;
-use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4_edit_image_webhook::{
-  enqueue_bytedance_seedream_v4_edit_image_webhook, EnqueueBytedanceSeedreamV4EditImageArgs,
-};
-use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4_text_to_image_webhook::{
-  enqueue_bytedance_seedream_v4_text_to_image_webhook, EnqueueBytedanceSeedreamV4TextToImageArgs,
-};
-
-pub async fn execute_fal_seedream_4(
-  plan: &PlanFalSeedream4<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if plan.image_urls.is_empty() {
-    let args = EnqueueBytedanceSeedreamV4TextToImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      num_images: Some(plan.num_images.to_t2i()),
-      max_images: None,
-      image_size: plan.image_size.map(|s| s.to_t2i()),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_bytedance_seedream_v4_text_to_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    let args = EnqueueBytedanceSeedreamV4EditImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      image_urls: plan.image_urls.clone(),
-      num_images: Some(plan.num_images.to_edit()),
-      max_images: None,
-      image_size: plan.image_size.map(|s| s.to_edit()),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_bytedance_seedream_v4_edit_image_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,
-  }))
-}
@@ -1,50 +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_seedream_4p5::PlanFalSeedream4p5;
-use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_edit_image_webhook::{
-  enqueue_bytedance_seedream_v4p5_edit_image_webhook, EnqueueBytedanceSeedreamV4p5EditImageArgs,
-};
-use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4p5_text_to_image_webhook::{
-  enqueue_bytedance_seedream_v4p5_text_to_image_webhook, EnqueueBytedanceSeedreamV4p5TextToImageArgs,
-};
-
-pub async fn execute_fal_seedream_4p5(
-  plan: &PlanFalSeedream4p5<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if plan.image_urls.is_empty() {
-    let args = EnqueueBytedanceSeedreamV4p5TextToImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      num_images: Some(plan.num_images.to_t2i()),
-      max_images: None,
-      image_size: plan.image_size.map(|s| s.to_t2i()),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_bytedance_seedream_v4p5_text_to_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    let args = EnqueueBytedanceSeedreamV4p5EditImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      image_urls: plan.image_urls.clone(),
-      num_images: Some(plan.num_images.to_edit()),
-      max_images: None,
-      image_size: plan.image_size.map(|s| s.to_edit()),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_bytedance_seedream_v4p5_edit_image_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,
-  }))
-}
@@ -1,50 +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_seedream_5_lite::PlanFalSeedream5Lite;
-use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v5_lite_edit_image_webhook::{
-  enqueue_bytedance_seedream_v5_lite_edit_image_webhook, EnqueueBytedanceSeedreamV5LiteEditImageArgs,
-};
-use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v5_lite_text_to_image_webhook::{
-  enqueue_bytedance_seedream_v5_lite_text_to_image_webhook, EnqueueBytedanceSeedreamV5LiteTextToImageArgs,
-};
-
-pub async fn execute_fal_seedream_5_lite(
-  plan: &PlanFalSeedream5Lite<'_>,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let webhook_response = if plan.image_urls.is_empty() {
-    let args = EnqueueBytedanceSeedreamV5LiteTextToImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      num_images: Some(plan.num_images.to_t2i()),
-      max_images: None,
-      image_size: plan.image_size.map(|s| s.to_t2i()),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_bytedance_seedream_v5_lite_text_to_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
-  } else {
-    let args = EnqueueBytedanceSeedreamV5LiteEditImageArgs {
-      prompt: plan.prompt.unwrap_or(""),
-      image_urls: plan.image_urls.clone(),
-      num_images: Some(plan.num_images.to_edit()),
-      max_images: None,
-      image_size: plan.image_size.map(|s| s.to_edit()),
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    enqueue_bytedance_seedream_v5_lite_edit_image_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,
-  }))
-}
@@ -1,11 +1 @@
-pub mod generate_image_fal_flux_1_dev;
-pub mod generate_image_fal_flux_1_schnell;
-pub mod generate_image_fal_flux_pro_1p1;
-pub mod generate_image_fal_flux_pro_1p1_ultra;
-pub mod generate_image_fal_gpt_image_1p5;
-pub mod generate_image_fal_seedream_4;
-pub mod generate_image_fal_seedream_4p5;
-pub mod generate_image_fal_seedream_5_lite;
-pub mod generate_image_fal_nano_banana;
-pub mod generate_image_fal_nano_banana_2;
 pub mod generate_image_fal_nano_banana_pro;
@@ -10,30 +10,19 @@ use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_1_dev::plan_generate_image_artcraft_flux_1_dev;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_1_schnell::plan_generate_image_artcraft_flux_1_schnell;
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::plan_generate_image_artcraft_flux_2_lora_angles;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_pro_1p1::plan_generate_image_artcraft_flux_pro_1p1;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_pro_1p1_ultra::plan_generate_image_artcraft_flux_pro_1p1_ultra;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_1p5::plan_generate_image_artcraft_gpt_image_1p5;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana::plan_generate_image_artcraft_nano_banana;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_2::plan_generate_image_artcraft_nano_banana_2;
 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::artcraft::plan_generate_image_artcraft_qwen_edit_2511_angles::plan_generate_image_artcraft_qwen_edit_2511_angles;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_4::plan_generate_image_artcraft_seedream_4;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_4p5::plan_generate_image_artcraft_seedream_4p5;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_5_lite::plan_generate_image_artcraft_seedream_5_lite;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_dev::plan_generate_image_fal_flux_1_dev;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_schnell::plan_generate_image_fal_flux_1_schnell;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::plan_generate_image_fal_flux_pro_1p1;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::plan_generate_image_fal_flux_pro_1p1_ultra;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1p5::plan_generate_image_fal_gpt_image_1p5;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4::plan_generate_image_fal_seedream_4;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4p5::plan_generate_image_fal_seedream_4p5;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_5_lite::plan_generate_image_fal_seedream_5_lite;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana::plan_generate_image_fal_nano_banana;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_2::plan_generate_image_fal_nano_banana_2;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_qwen_edit_2511_angles::plan_generate_image_artcraft_qwen_edit_2511_angles;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::plan_generate_image_artcraft_flux_2_lora_angles;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::plan_generate_image_fal_nano_banana_pro;

-#[derive(Debug)]
 pub struct GenerateImageRequest<'a> {
  /// Which model to use.
  pub model: CommonImageModel,
@@ -97,9 +86,9 @@ impl<'a> GenerateImageRequest<'a> {
      CommonImageModel::FluxPro11 => plan_generate_image_artcraft_flux_pro_1p1(self),
      CommonImageModel::FluxPro11Ultra => plan_generate_image_artcraft_flux_pro_1p1_ultra(self),
      CommonImageModel::GptImage1p5 => plan_generate_image_artcraft_gpt_image_1p5(self),
-      CommonImageModel::NanoBanana => plan_generate_image_artcraft_nano_banana(self),
-      CommonImageModel::NanoBanana2 => plan_generate_image_artcraft_nano_banana_2(self),
-      CommonImageModel::NanoBananaPro => plan_generate_image_artcraft_nano_banana_pro(self),
+      CommonImageModel::NanaBanana => plan_generate_image_artcraft_nano_banana(self),
+      CommonImageModel::NanaBanana2 => plan_generate_image_artcraft_nano_banana_2(self),
+      CommonImageModel::NanaBananaPro => plan_generate_image_artcraft_nano_banana_pro(self),
      CommonImageModel::Seedream4 => plan_generate_image_artcraft_seedream_4(self),
      CommonImageModel::Seedream4p5 => plan_generate_image_artcraft_seedream_4p5(self),
      CommonImageModel::Seedream5Lite => plan_generate_image_artcraft_seedream_5_lite(self),
@@ -110,17 +99,7 @@ impl<'a> GenerateImageRequest<'a> {

  fn build_fal(&self) -> Result<ImageGenerationPlan<'_>, ArtcraftRouterError> {
    match self.model {
-      CommonImageModel::Flux1Dev => plan_generate_image_fal_flux_1_dev(self),
-      CommonImageModel::Flux1Schnell => plan_generate_image_fal_flux_1_schnell(self),
-      CommonImageModel::FluxPro11 => plan_generate_image_fal_flux_pro_1p1(self),
-      CommonImageModel::FluxPro11Ultra => plan_generate_image_fal_flux_pro_1p1_ultra(self),
-      CommonImageModel::GptImage1p5 => plan_generate_image_fal_gpt_image_1p5(self),
-      CommonImageModel::Seedream4 => plan_generate_image_fal_seedream_4(self),
-      CommonImageModel::Seedream4p5 => plan_generate_image_fal_seedream_4p5(self),
-      CommonImageModel::Seedream5Lite => plan_generate_image_fal_seedream_5_lite(self),
-      CommonImageModel::NanoBanana => plan_generate_image_fal_nano_banana(self),
-      CommonImageModel::NanoBanana2 => plan_generate_image_fal_nano_banana_2(self),
-      CommonImageModel::NanoBananaPro => plan_generate_image_fal_nano_banana_pro(self),
+      CommonImageModel::NanaBananaPro => plan_generate_image_fal_nano_banana_pro(self),
      _ => {
        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
          field: "provider",
@@ -13,16 +13,6 @@ use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraf
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_seedream_5_lite::estimate_image_cost_artcraft_seedream_5_lite;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_qwen_edit_2511_angles::estimate_image_cost_artcraft_qwen_edit_2511_angles;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_flux_2_lora_angles::estimate_image_cost_artcraft_flux_2_lora_angles;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_1_dev::estimate_image_cost_fal_flux_1_dev;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_1_schnell::estimate_image_cost_fal_flux_1_schnell;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_pro_1p1::estimate_image_cost_fal_flux_pro_1p1;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_pro_1p1_ultra::estimate_image_cost_fal_flux_pro_1p1_ultra;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_gpt_image_1p5::estimate_image_cost_fal_gpt_image_1p5;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_seedream_4::estimate_image_cost_fal_seedream_4;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_seedream_4p5::estimate_image_cost_fal_seedream_4p5;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_seedream_5_lite::estimate_image_cost_fal_seedream_5_lite;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_nano_banana::estimate_image_cost_fal_nano_banana;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_nano_banana_2::estimate_image_cost_fal_nano_banana_2;
 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_flux_1_dev::execute_artcraft_flux_1_dev;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_flux_1_schnell::execute_artcraft_flux_1_schnell;
@@ -37,16 +27,6 @@ use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_seedream_5_lite::execute_artcraft_seedream_5_lite;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_qwen_edit_2511_angles::execute_artcraft_qwen_edit_2511_angles;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_flux_2_lora_angles::execute_artcraft_flux_2_lora_angles;
-use crate::generate::generate_image::execute::fal::generate_image_fal_flux_1_dev::execute_fal_flux_1_dev;
-use crate::generate::generate_image::execute::fal::generate_image_fal_flux_1_schnell::execute_fal_flux_1_schnell;
-use crate::generate::generate_image::execute::fal::generate_image_fal_flux_pro_1p1::execute_fal_flux_pro_1p1;
-use crate::generate::generate_image::execute::fal::generate_image_fal_flux_pro_1p1_ultra::execute_fal_flux_pro_1p1_ultra;
-use crate::generate::generate_image::execute::fal::generate_image_fal_gpt_image_1p5::execute_fal_gpt_image_1p5;
-use crate::generate::generate_image::execute::fal::generate_image_fal_seedream_4::execute_fal_seedream_4;
-use crate::generate::generate_image::execute::fal::generate_image_fal_seedream_4p5::execute_fal_seedream_4p5;
-use crate::generate::generate_image::execute::fal::generate_image_fal_seedream_5_lite::execute_fal_seedream_5_lite;
-use crate::generate::generate_image::execute::fal::generate_image_fal_nano_banana::execute_fal_nano_banana;
-use crate::generate::generate_image::execute::fal::generate_image_fal_nano_banana_2::execute_fal_nano_banana_2;
 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;
@@ -63,16 +43,6 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_5_lite::PlanArtcraftSeedream5Lite;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_qwen_edit_2511_angles::PlanArtcraftQwenEdit2511Angles;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::PlanArtcraftFlux2LoraAngles;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_dev::PlanFalFlux1Dev;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_schnell::PlanFalFlux1Schnell;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::PlanFalFluxPro11;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1p5::PlanFalGptImage1p5;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4::PlanFalSeedream4;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4p5::PlanFalSeedream4p5;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_5_lite::PlanFalSeedream5Lite;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana::PlanFalNanoBanana;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_2::PlanFalNanaBanana2;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::PlanFalNanaBananaPro;

 #[derive(Debug)]
@@ -90,16 +60,6 @@ pub enum ImageGenerationPlan<'a> {
  ArtcraftSeedream5Lite(PlanArtcraftSeedream5Lite<'a>),
  ArtcraftQwenEdit2511Angles(PlanArtcraftQwenEdit2511Angles<'a>),
  ArtcraftFlux2LoraAngles(PlanArtcraftFlux2LoraAngles<'a>),
-  FalFlux1Dev(PlanFalFlux1Dev<'a>),
-  FalFlux1Schnell(PlanFalFlux1Schnell<'a>),
-  FalFluxPro11(PlanFalFluxPro11<'a>),
-  FalFluxPro11Ultra(PlanFalFluxPro11Ultra<'a>),
-  FalGptImage1p5(PlanFalGptImage1p5<'a>),
-  FalSeedream4(PlanFalSeedream4<'a>),
-  FalSeedream4p5(PlanFalSeedream4p5<'a>),
-  FalSeedream5Lite(PlanFalSeedream5Lite<'a>),
-  FalNanoBanana(PlanFalNanoBanana<'a>),
-  FalNanaBanana2(PlanFalNanaBanana2<'a>),
  FalNanaBananaPro(PlanFalNanaBananaPro<'a>),
 }

@@ -161,46 +121,6 @@ impl<'a> ImageGenerationPlan<'a> {
        let artcraft_client = client.get_artcraft_client_ref()?;
        execute_artcraft_flux_2_lora_angles(plan, artcraft_client).await
      }
-      ImageGenerationPlan::FalFlux1Dev(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_flux_1_dev(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalFlux1Schnell(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_flux_1_schnell(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalFluxPro11(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_flux_pro_1p1(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalFluxPro11Ultra(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_flux_pro_1p1_ultra(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalGptImage1p5(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_gpt_image_1p5(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalSeedream4(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_seedream_4(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalSeedream4p5(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_seedream_4p5(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalSeedream5Lite(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_seedream_5_lite(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalNanoBanana(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_nano_banana(plan, fal_client).await
-      }
-      ImageGenerationPlan::FalNanaBanana2(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_nano_banana_2(plan, fal_client).await
-      }
      ImageGenerationPlan::FalNanaBananaPro(plan) => {
        let fal_client = client.get_fal_client_ref()?;
        execute_fal_nano_banana_pro(plan, fal_client).await
@@ -249,36 +169,6 @@ impl<'a> ImageGenerationPlan<'a> {
      ImageGenerationPlan::ArtcraftFlux2LoraAngles(plan) => {
        estimate_image_cost_artcraft_flux_2_lora_angles(plan)
      }
-      ImageGenerationPlan::FalFlux1Dev(plan) => {
-        estimate_image_cost_fal_flux_1_dev(plan)
-      }
-      ImageGenerationPlan::FalFlux1Schnell(plan) => {
-        estimate_image_cost_fal_flux_1_schnell(plan)
-      }
-      ImageGenerationPlan::FalFluxPro11(plan) => {
-        estimate_image_cost_fal_flux_pro_1p1(plan)
-      }
-      ImageGenerationPlan::FalFluxPro11Ultra(plan) => {
-        estimate_image_cost_fal_flux_pro_1p1_ultra(plan)
-      }
-      ImageGenerationPlan::FalGptImage1p5(plan) => {
-        estimate_image_cost_fal_gpt_image_1p5(plan)
-      }
-      ImageGenerationPlan::FalSeedream4(plan) => {
-        estimate_image_cost_fal_seedream_4(plan)
-      }
-      ImageGenerationPlan::FalSeedream4p5(plan) => {
-        estimate_image_cost_fal_seedream_4p5(plan)
-      }
-      ImageGenerationPlan::FalSeedream5Lite(plan) => {
-        estimate_image_cost_fal_seedream_5_lite(plan)
-      }
-      ImageGenerationPlan::FalNanoBanana(plan) => {
-        estimate_image_cost_fal_nano_banana(plan)
-      }
-      ImageGenerationPlan::FalNanaBanana2(plan) => {
-        estimate_image_cost_fal_nano_banana_2(plan)
-      }
      ImageGenerationPlan::FalNanaBananaPro(plan) => {
        estimate_image_cost_fal_nano_banana_pro(plan)
      }
@@ -1,11 +1 @@
-pub mod plan_generate_image_fal_flux_1_dev;
-pub mod plan_generate_image_fal_flux_1_schnell;
-pub mod plan_generate_image_fal_flux_pro_1p1;
-pub mod plan_generate_image_fal_flux_pro_1p1_ultra;
-pub mod plan_generate_image_fal_gpt_image_1p5;
-pub mod plan_generate_image_fal_seedream_4;
-pub mod plan_generate_image_fal_seedream_4p5;
-pub mod plan_generate_image_fal_seedream_5_lite;
-pub mod plan_generate_image_fal_nano_banana;
-pub mod plan_generate_image_fal_nano_banana_2;
 pub mod plan_generate_image_fal_nano_banana_pro;
@@ -1,158 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-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 crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-use fal_client::requests::webhook::image::edit::enqueue_flux_1_dev_edit_image_webhook::Flux1DevEditImageNumImages;
-use fal_client::requests::webhook::image::text::enqueue_flux_1_dev_text_to_image_webhook::{
-  Flux1DevAspectRatio, Flux1DevNumImages,
-};
-
-/// Shared num-images type for both t2i and edit modes.
-#[derive(Debug, Clone, Copy)]
-pub enum FalFlux1DevNumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalFlux1Dev<'a> {
-  pub prompt: Option<&'a str>,
-  /// Image URL for editing. None = text-to-image mode.
-  pub maybe_image_url: Option<String>,
-  pub aspect_ratio: Flux1DevAspectRatio,
-  pub num_images: FalFlux1DevNumImages,
-}
-
-pub fn plan_generate_image_fal_flux_1_dev<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-  let maybe_image_url = resolve_single_image_url(request.image_inputs)?;
-  let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(ImageGenerationPlan::FalFlux1Dev(PlanFalFlux1Dev {
-    prompt: request.prompt,
-    maybe_image_url,
-    aspect_ratio,
-    num_images,
-  }))
-}
-
-fn resolve_single_image_url(
-  image_inputs: Option<ImageListRef<'_>>,
-) -> Result<Option<String>, ArtcraftRouterError> {
-  match image_inputs {
-    None => Ok(None),
-    Some(ImageListRef::Urls(urls)) => {
-      if urls.is_empty() {
-        Ok(None)
-      } else if urls.len() == 1 {
-        Ok(Some(urls[0].clone()))
-      } else {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_inputs",
-          value: format!("Flux 1 Dev image-to-image supports exactly 1 image, got {}", urls.len()),
-        }))
-      }
-    }
-    Some(ImageListRef::MediaFileTokens(_)) => {
-      Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))
-    }
-  }
-}
-
-fn plan_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Flux1DevAspectRatio, ArtcraftRouterError> {
-  use Flux1DevAspectRatio as Ar;
-  match aspect_ratio {
-    None => Ok(Ar::Square),
-
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => Ok(Ar::Square),
-
-    Some(CommonAspectRatio::Square) => Ok(Ar::Square),
-    Some(CommonAspectRatio::SquareHd) => Ok(Ar::SquareHd),
-    Some(CommonAspectRatio::WideFourByThree) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Ar::LandscapeSixteenByNine),
-    Some(CommonAspectRatio::TallThreeByFour) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Ar::PortraitNineBySixteen),
-
-    Some(CommonAspectRatio::WideFiveByFour) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideThreeByTwo) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Ar::LandscapeSixteenByNine),
-    Some(CommonAspectRatio::TallFourByFive) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallTwoByThree) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallNineByTwentyOne) => Ok(Ar::PortraitNineBySixteen),
-
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      _ => Ok(Ar::Square),
-    },
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalFlux1DevNumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalFlux1DevNumImages::One),
-    2 => Ok(FalFlux1DevNumImages::Two),
-    3 => Ok(FalFlux1DevNumImages::Three),
-    4 => Ok(FalFlux1DevNumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      _ => Ok(FalFlux1DevNumImages::Four),
-    },
-  }
-}
-
-impl FalFlux1DevNumImages {
-  pub fn to_t2i(self) -> Flux1DevNumImages {
-    match self {
-      Self::One => Flux1DevNumImages::One,
-      Self::Two => Flux1DevNumImages::Two,
-      Self::Three => Flux1DevNumImages::Three,
-      Self::Four => Flux1DevNumImages::Four,
-    }
-  }
-
-  pub fn to_edit(self) -> Flux1DevEditImageNumImages {
-    match self {
-      Self::One => Flux1DevEditImageNumImages::One,
-      Self::Two => Flux1DevEditImageNumImages::Two,
-      Self::Three => Flux1DevEditImageNumImages::Three,
-      Self::Four => Flux1DevEditImageNumImages::Four,
-    }
-  }
-
-  pub fn as_u64(self) -> u64 {
-    match self {
-      Self::One => 1,
-      Self::Two => 2,
-      Self::Three => 3,
-      Self::Four => 4,
-    }
-  }
-}
@@ -1,169 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-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 crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-use fal_client::requests::webhook::image::edit::enqueue_flux_1_schnell_edit_image_webhook::{
-  Flux1SchnellEditImageNumImages, Flux1SchnellEditImageSize,
-};
-use fal_client::requests::webhook::image::text::enqueue_flux_1_schnell_text_to_image_webhook::{
-  Flux1SchnellAspectRatio, Flux1SchnellNumImages,
-};
-
-/// Shared num-images type for both t2i and edit modes.
-#[derive(Debug, Clone, Copy)]
-pub enum FalFlux1SchnellNumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalFlux1Schnell<'a> {
-  pub prompt: Option<&'a str>,
-  /// Image URL for editing. None = text-to-image mode.
-  pub maybe_image_url: Option<String>,
-  pub t2i_aspect_ratio: Flux1SchnellAspectRatio,
-  pub edit_image_size: Option<Flux1SchnellEditImageSize>,
-  pub num_images: FalFlux1SchnellNumImages,
-}
-
-pub fn plan_generate_image_fal_flux_1_schnell<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-  let maybe_image_url = resolve_single_image_url(request.image_inputs)?;
-  let t2i_aspect_ratio = plan_t2i_aspect_ratio(request.aspect_ratio, strategy)?;
-  let edit_image_size = plan_edit_image_size(request.aspect_ratio);
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(ImageGenerationPlan::FalFlux1Schnell(PlanFalFlux1Schnell {
-    prompt: request.prompt,
-    maybe_image_url,
-    t2i_aspect_ratio,
-    edit_image_size,
-    num_images,
-  }))
-}
-
-fn resolve_single_image_url(
-  image_inputs: Option<ImageListRef<'_>>,
-) -> Result<Option<String>, ArtcraftRouterError> {
-  match image_inputs {
-    None => Ok(None),
-    Some(ImageListRef::Urls(urls)) => {
-      if urls.is_empty() {
-        Ok(None)
-      } else if urls.len() == 1 {
-        Ok(Some(urls[0].clone()))
-      } else {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_inputs",
-          value: format!("Flux 1 Schnell redux supports exactly 1 image, got {}", urls.len()),
-        }))
-      }
-    }
-    Some(ImageListRef::MediaFileTokens(_)) => {
-      Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))
-    }
-  }
-}
-
-fn plan_t2i_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Flux1SchnellAspectRatio, ArtcraftRouterError> {
-  use Flux1SchnellAspectRatio as Ar;
-  match aspect_ratio {
-    None => Ok(Ar::Square),
-    Some(CommonAspectRatio::Auto) | Some(CommonAspectRatio::Auto2k) | Some(CommonAspectRatio::Auto4k) => Ok(Ar::Square),
-    Some(CommonAspectRatio::Square) => Ok(Ar::Square),
-    Some(CommonAspectRatio::SquareHd) => Ok(Ar::SquareHd),
-    Some(CommonAspectRatio::WideFourByThree) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Ar::LandscapeSixteenByNine),
-    Some(CommonAspectRatio::TallThreeByFour) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Ar::PortraitNineBySixteen),
-    Some(CommonAspectRatio::WideFiveByFour) | Some(CommonAspectRatio::WideThreeByTwo) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Ar::LandscapeSixteenByNine),
-    Some(CommonAspectRatio::TallFourByFive) | Some(CommonAspectRatio::TallTwoByThree) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallNineByTwentyOne) => Ok(Ar::PortraitNineBySixteen),
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      _ => Ok(Ar::Square),
-    },
-  }
-}
-
-fn plan_edit_image_size(aspect_ratio: Option<CommonAspectRatio>) -> Option<Flux1SchnellEditImageSize> {
-  use Flux1SchnellEditImageSize as Size;
-  match aspect_ratio {
-    None => None,
-    Some(CommonAspectRatio::Square) => Some(Size::Square),
-    Some(CommonAspectRatio::SquareHd) => Some(Size::SquareHd),
-    Some(CommonAspectRatio::WideFourByThree) => Some(Size::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Some(Size::LandscapeSixteenByNine),
-    Some(CommonAspectRatio::TallThreeByFour) => Some(Size::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Some(Size::PortraitNineBySixteen),
-    _ => Some(Size::Square),
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalFlux1SchnellNumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalFlux1SchnellNumImages::One),
-    2 => Ok(FalFlux1SchnellNumImages::Two),
-    3 => Ok(FalFlux1SchnellNumImages::Three),
-    4 => Ok(FalFlux1SchnellNumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      _ => Ok(FalFlux1SchnellNumImages::Four),
-    },
-  }
-}
-
-impl FalFlux1SchnellNumImages {
-  pub fn to_t2i(self) -> Flux1SchnellNumImages {
-    match self {
-      Self::One => Flux1SchnellNumImages::One,
-      Self::Two => Flux1SchnellNumImages::Two,
-      Self::Three => Flux1SchnellNumImages::Three,
-      Self::Four => Flux1SchnellNumImages::Four,
-    }
-  }
-
-  pub fn to_edit(self) -> Flux1SchnellEditImageNumImages {
-    match self {
-      Self::One => Flux1SchnellEditImageNumImages::One,
-      Self::Two => Flux1SchnellEditImageNumImages::Two,
-      Self::Three => Flux1SchnellEditImageNumImages::Three,
-      Self::Four => Flux1SchnellEditImageNumImages::Four,
-    }
-  }
-
-  pub fn as_u64(self) -> u64 {
-    match self {
-      Self::One => 1,
-      Self::Two => 2,
-      Self::Three => 3,
-      Self::Four => 4,
-    }
-  }
-}
@@ -1,127 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-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 crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_text_to_image_webhook::{
-  FluxPro11AspectRatio, FluxPro11NumImages,
-};
-
-#[derive(Debug, Clone, Copy)]
-pub enum FalFluxPro11NumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalFluxPro11<'a> {
-  pub prompt: Option<&'a str>,
-  pub aspect_ratio: FluxPro11AspectRatio,
-  pub num_images: FalFluxPro11NumImages,
-}
-
-pub fn plan_generate_image_fal_flux_pro_1p1<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-
-  if request.image_inputs.is_some() {
-    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-      field: "image_inputs",
-      value: "Flux Pro 1.1 is text-to-image only".to_string(),
-    }));
-  }
-
-  let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(ImageGenerationPlan::FalFluxPro11(PlanFalFluxPro11 {
-    prompt: request.prompt,
-    aspect_ratio,
-    num_images,
-  }))
-}
-
-fn plan_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FluxPro11AspectRatio, ArtcraftRouterError> {
-  use FluxPro11AspectRatio as Ar;
-  match aspect_ratio {
-    None => Ok(Ar::Square),
-
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => Ok(Ar::Square),
-
-    Some(CommonAspectRatio::Square) => Ok(Ar::Square),
-    Some(CommonAspectRatio::SquareHd) => Ok(Ar::SquareHd),
-    Some(CommonAspectRatio::WideFourByThree) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Ar::LandscapeSixteenByNine),
-    Some(CommonAspectRatio::TallThreeByFour) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Ar::PortraitNineBySixteen),
-
-    Some(CommonAspectRatio::WideFiveByFour) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideThreeByTwo) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Ar::LandscapeSixteenByNine),
-    Some(CommonAspectRatio::TallFourByFive) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallTwoByThree) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallNineByTwentyOne) => Ok(Ar::PortraitNineBySixteen),
-
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      _ => Ok(Ar::Square),
-    },
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalFluxPro11NumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalFluxPro11NumImages::One),
-    2 => Ok(FalFluxPro11NumImages::Two),
-    3 => Ok(FalFluxPro11NumImages::Three),
-    4 => Ok(FalFluxPro11NumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      _ => Ok(FalFluxPro11NumImages::Four),
-    },
-  }
-}
-
-impl FalFluxPro11NumImages {
-  pub fn to_fal(self) -> FluxPro11NumImages {
-    match self {
-      Self::One => FluxPro11NumImages::One,
-      Self::Two => FluxPro11NumImages::Two,
-      Self::Three => FluxPro11NumImages::Three,
-      Self::Four => FluxPro11NumImages::Four,
-    }
-  }
-
-  pub fn as_u64(self) -> u64 {
-    match self {
-      Self::One => 1,
-      Self::Two => 2,
-      Self::Three => 3,
-      Self::Four => 4,
-    }
-  }
-}
@@ -1,126 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-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 crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_ultra_text_to_image_webhook::{
-  FluxPro11UltraAspectRatio, FluxPro11UltraNumImages,
-};
-
-#[derive(Debug, Clone, Copy)]
-pub enum FalFluxPro11UltraNumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalFluxPro11Ultra<'a> {
-  pub prompt: Option<&'a str>,
-  pub aspect_ratio: FluxPro11UltraAspectRatio,
-  pub num_images: FalFluxPro11UltraNumImages,
-}
-
-pub fn plan_generate_image_fal_flux_pro_1p1_ultra<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-
-  if request.image_inputs.is_some() {
-    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-      field: "image_inputs",
-      value: "Flux Pro 1.1 Ultra is text-to-image only".to_string(),
-    }));
-  }
-
-  let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(ImageGenerationPlan::FalFluxPro11Ultra(PlanFalFluxPro11Ultra {
-    prompt: request.prompt,
-    aspect_ratio,
-    num_images,
-  }))
-}
-
-fn plan_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FluxPro11UltraAspectRatio, ArtcraftRouterError> {
-  use FluxPro11UltraAspectRatio as Ar;
-  match aspect_ratio {
-    None => Ok(Ar::Square),
-
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => Ok(Ar::Square),
-
-    Some(CommonAspectRatio::Square) | Some(CommonAspectRatio::SquareHd) => Ok(Ar::Square),
-    Some(CommonAspectRatio::WideFourByThree) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::WideThreeByTwo) => Ok(Ar::LandscapeThreeByTwo),
-    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Ar::LandscapeSixteenByNine),
-    Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Ar::LandscapeTwentyOneByNine),
-    Some(CommonAspectRatio::TallThreeByFour) => Ok(Ar::PortraitThreeByFour),
-    Some(CommonAspectRatio::TallTwoByThree) => Ok(Ar::PortraitTwoByThree),
-    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Ar::PortraitNineBySixteen),
-    Some(CommonAspectRatio::TallNineByTwentyOne) => Ok(Ar::PortraitNineByTwentyOne),
-
-    Some(CommonAspectRatio::WideFiveByFour) => Ok(Ar::LandscapeFourByThree),
-    Some(CommonAspectRatio::TallFourByFive) => Ok(Ar::PortraitThreeByFour),
-
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      _ => Ok(Ar::Square),
-    },
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalFluxPro11UltraNumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalFluxPro11UltraNumImages::One),
-    2 => Ok(FalFluxPro11UltraNumImages::Two),
-    3 => Ok(FalFluxPro11UltraNumImages::Three),
-    4 => Ok(FalFluxPro11UltraNumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      _ => Ok(FalFluxPro11UltraNumImages::Four),
-    },
-  }
-}
-
-impl FalFluxPro11UltraNumImages {
-  pub fn to_fal(self) -> FluxPro11UltraNumImages {
-    match self {
-      Self::One => FluxPro11UltraNumImages::One,
-      Self::Two => FluxPro11UltraNumImages::Two,
-      Self::Three => FluxPro11UltraNumImages::Three,
-      Self::Four => FluxPro11UltraNumImages::Four,
-    }
-  }
-
-  pub fn as_u64(self) -> u64 {
-    match self {
-      Self::One => 1,
-      Self::Two => 2,
-      Self::Three => 3,
-      Self::Four => 4,
-    }
-  }
-}
@@ -1,197 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-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 crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1p5_edit_image_webhook::{
-  EnqueueGptImage1p5EditImageNumImages, EnqueueGptImage1p5EditImageQuality,
-  EnqueueGptImage1p5EditImageSize,
-};
-use fal_client::requests::webhook::image::text::enqueue_gpt_image_1p5_text_to_image_webhook::{
-  EnqueueGptImage1p5TextToImageNumImages, EnqueueGptImage1p5TextToImageQuality,
-  EnqueueGptImage1p5TextToImageSize,
-};
-
-#[derive(Debug, Clone, Copy)]
-pub enum FalGptImage1p5NumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-/// Quality is shared between t2i and edit (Low / Medium / High).
-#[derive(Debug, Clone, Copy)]
-pub enum FalGptImage1p5Quality {
-  Low,
-  Medium,
-  High,
-}
-
-/// GPT Image 1.5 supports three image sizes: 1024x1024, 1536x1024, 1024x1536.
-#[derive(Debug, Clone, Copy)]
-pub enum FalGptImage1p5ImageSize {
-  Square,
-  Wide,
-  Tall,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalGptImage1p5<'a> {
-  pub prompt: Option<&'a str>,
-  pub image_urls: Vec<String>,
-  pub image_size: Option<FalGptImage1p5ImageSize>,
-  pub quality: FalGptImage1p5Quality,
-  pub num_images: FalGptImage1p5NumImages,
-}
-
-pub fn plan_generate_image_fal_gpt_image_1p5<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-  let image_urls = resolve_image_list_ref(request.image_inputs)?;
-  let image_size = plan_image_size(request.aspect_ratio);
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(ImageGenerationPlan::FalGptImage1p5(PlanFalGptImage1p5 {
-    prompt: request.prompt,
-    image_urls,
-    image_size,
-    quality: FalGptImage1p5Quality::Medium,
-    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))
-    }
-  }
-}
-
-fn plan_image_size(aspect_ratio: Option<CommonAspectRatio>) -> Option<FalGptImage1p5ImageSize> {
-  use FalGptImage1p5ImageSize as S;
-  match aspect_ratio {
-    None
-    | Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => None,
-
-    Some(CommonAspectRatio::Square) | Some(CommonAspectRatio::SquareHd) => Some(S::Square),
-
-    Some(CommonAspectRatio::WideThreeByTwo)
-    | Some(CommonAspectRatio::WideFourByThree)
-    | Some(CommonAspectRatio::WideFiveByFour)
-    | Some(CommonAspectRatio::WideSixteenByNine)
-    | Some(CommonAspectRatio::WideTwentyOneByNine)
-    | Some(CommonAspectRatio::Wide) => Some(S::Wide),
-
-    Some(CommonAspectRatio::TallTwoByThree)
-    | Some(CommonAspectRatio::TallThreeByFour)
-    | Some(CommonAspectRatio::TallFourByFive)
-    | Some(CommonAspectRatio::TallNineBySixteen)
-    | Some(CommonAspectRatio::TallNineByTwentyOne)
-    | Some(CommonAspectRatio::Tall) => Some(S::Tall),
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalGptImage1p5NumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalGptImage1p5NumImages::One),
-    2 => Ok(FalGptImage1p5NumImages::Two),
-    3 => Ok(FalGptImage1p5NumImages::Three),
-    4 => Ok(FalGptImage1p5NumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      _ => Ok(FalGptImage1p5NumImages::Four),
-    },
-  }
-}
-
-impl FalGptImage1p5NumImages {
-  pub fn to_t2i(self) -> EnqueueGptImage1p5TextToImageNumImages {
-    use EnqueueGptImage1p5TextToImageNumImages as T;
-    match self {
-      Self::One => T::One,
-      Self::Two => T::Two,
-      Self::Three => T::Three,
-      Self::Four => T::Four,
-    }
-  }
-
-  pub fn to_edit(self) -> EnqueueGptImage1p5EditImageNumImages {
-    use EnqueueGptImage1p5EditImageNumImages as E;
-    match self {
-      Self::One => E::One,
-      Self::Two => E::Two,
-      Self::Three => E::Three,
-      Self::Four => E::Four,
-    }
-  }
-
-  pub fn as_u64(self) -> u64 {
-    match self {
-      Self::One => 1,
-      Self::Two => 2,
-      Self::Three => 3,
-      Self::Four => 4,
-    }
-  }
-}
-
-impl FalGptImage1p5Quality {
-  pub fn to_t2i(self) -> EnqueueGptImage1p5TextToImageQuality {
-    use EnqueueGptImage1p5TextToImageQuality as T;
-    match self {
-      Self::Low => T::Low,
-      Self::Medium => T::Medium,
-      Self::High => T::High,
-    }
-  }
-
-  pub fn to_edit(self) -> EnqueueGptImage1p5EditImageQuality {
-    use EnqueueGptImage1p5EditImageQuality as E;
-    match self {
-      Self::Low => E::Low,
-      Self::Medium => E::Medium,
-      Self::High => E::High,
-    }
-  }
-}
-
-impl FalGptImage1p5ImageSize {
-  pub fn to_t2i(self) -> EnqueueGptImage1p5TextToImageSize {
-    use EnqueueGptImage1p5TextToImageSize as T;
-    match self {
-      Self::Square => T::Square,
-      Self::Wide => T::Wide,
-      Self::Tall => T::Tall,
-    }
-  }
-
-  pub fn to_edit(self) -> EnqueueGptImage1p5EditImageSize {
-    use EnqueueGptImage1p5EditImageSize as E;
-    match self {
-      Self::Square => E::Square,
-      Self::Wide => E::Wide,
-      Self::Tall => E::Tall,
-    }
-  }
-}
@@ -1,174 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-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 crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-use fal_client::requests::webhook::image::edit::enqueue_gemini_25_flash_edit_webhook::Gemini25FlashEditAspectRatio;
-use fal_client::requests::webhook::image::text::enqueue_gemini_25_flash_text_to_image_webhook::Gemini25FlashTextToImageAspectRatio;
-
-/// Intermediate num-images type shared between t2i and edit enums.
-#[derive(Debug, Clone, Copy)]
-pub enum FalNbNumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalNanoBanana<'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<Gemini25FlashTextToImageAspectRatio>,
-  /// Pre-resolved aspect ratio for image-edit mode.
-  pub edit_aspect_ratio: Option<Gemini25FlashEditAspectRatio>,
-  /// Pre-resolved number of images (1–4, shared for both modes).
-  pub num_images: FalNbNumImages,
-}
-
-pub fn plan_generate_image_fal_nano_banana<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<ImageGenerationPlan<'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 num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(ImageGenerationPlan::FalNanoBanana(PlanFalNanoBanana {
-    prompt: request.prompt,
-    image_urls,
-    t2i_aspect_ratio,
-    edit_aspect_ratio,
-    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))
-    }
-  }
-}
-
-// Gemini 25 Flash text-to-image supported aspect ratios:
-//   1:1, 5:4, 4:3, 3:2, 16:9, 21:9, 4:5, 3:4, 2:3, 9:16
-//   (no Auto for text-to-image)
-fn plan_t2i_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<Gemini25FlashTextToImageAspectRatio>, ArtcraftRouterError> {
-  use Gemini25FlashTextToImageAspectRatio 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)),
-
-    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)),
-
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(T2iAr::NineBySixteen))
-      }
-    },
-  }
-}
-
-// Gemini 25 Flash image-edit supported aspect ratios: same as t2i plus Auto
-fn plan_edit_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  is_edit_mode: bool,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<Gemini25FlashEditAspectRatio>, ArtcraftRouterError> {
-  use Gemini25FlashEditAspectRatio as EditAr;
-  match aspect_ratio {
-    None => Ok(None),
-
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => {
-      if is_edit_mode {
-        Ok(Some(EditAr::Auto))
-      } else {
-        Ok(Some(EditAr::OneByOne))
-      }
-    }
-
-    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)),
-
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(EditAr::NineBySixteen))
-      }
-    },
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalNbNumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalNbNumImages::One),
-    2 => Ok(FalNbNumImages::Two),
-    3 => Ok(FalNbNumImages::Three),
-    4 => Ok(FalNbNumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(FalNbNumImages::Four),
-    },
-  }
-}
@@ -1,202 +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 crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-use fal_client::requests::webhook::image::edit::enqueue_nano_banana_2_edit_image_webhook::EnqueueNanoBanana2EditImageAspectRatio;
-use fal_client::requests::webhook::image::text::enqueue_nano_banana_2_text_to_image_webhook::EnqueueNanoBanana2TextToImageAspectRatio;
-
-/// Intermediate resolution type shared between t2i and edit enums.
-#[derive(Debug, Clone, Copy)]
-pub enum FalNb2Resolution {
-  HalfK,
-  OneK,
-  TwoK,
-  FourK,
-}
-
-/// Intermediate num-images type shared between t2i and edit enums.
-#[derive(Debug, Clone, Copy)]
-pub enum FalNb2NumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalNanaBanana2<'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<EnqueueNanoBanana2TextToImageAspectRatio>,
-  /// Pre-resolved aspect ratio for image-edit mode.
-  pub edit_aspect_ratio: Option<EnqueueNanoBanana2EditImageAspectRatio>,
-  /// Pre-resolved resolution (shared for both modes).
-  pub resolution: Option<FalNb2Resolution>,
-  /// Pre-resolved number of images (1–4, shared for both modes).
-  pub num_images: FalNb2NumImages,
-}
-
-pub fn plan_generate_image_fal_nano_banana_2<'a>(
-  request: &'a GenerateImageRequest<'a>,
-) -> Result<ImageGenerationPlan<'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(ImageGenerationPlan::FalNanaBanana2(PlanFalNanaBanana2 {
-    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))
-    }
-  }
-}
-
-// NB2 text-to-image supported aspect ratios:
-//   auto, 1:1, 5:4, 4:3, 3:2, 16:9, 21:9, 4:5, 3:4, 2:3, 9:16
-fn plan_t2i_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<EnqueueNanoBanana2TextToImageAspectRatio>, ArtcraftRouterError> {
-  use EnqueueNanoBanana2TextToImageAspectRatio as T2iAr;
-  match aspect_ratio {
-    None => Ok(None),
-
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => Ok(Some(T2iAr::Auto)),
-
-    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)),
-
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(T2iAr::NineBySixteen))
-      }
-    },
-  }
-}
-
-// NB2 image-edit supported aspect ratios: same as t2i plus Auto
-fn plan_edit_aspect_ratio(
-  aspect_ratio: Option<CommonAspectRatio>,
-  is_edit_mode: bool,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<EnqueueNanoBanana2EditImageAspectRatio>, ArtcraftRouterError> {
-  use EnqueueNanoBanana2EditImageAspectRatio as EditAr;
-  match aspect_ratio {
-    None => Ok(None),
-
-    Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto4k) => {
-      if is_edit_mode {
-        Ok(Some(EditAr::Auto))
-      } else {
-        Ok(Some(EditAr::OneByOne))
-      }
-    }
-
-    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)),
-
-    Some(unsupported) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "aspect_ratio",
-          value: format!("{:?}", unsupported),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(EditAr::NineBySixteen))
-      }
-    },
-  }
-}
-
-fn plan_resolution(
-  resolution: Option<CommonResolution>,
-) -> Result<Option<FalNb2Resolution>, ArtcraftRouterError> {
-  match resolution {
-    None => Ok(None),
-    Some(CommonResolution::HalfK) => Ok(Some(FalNb2Resolution::HalfK)),
-    Some(CommonResolution::OneK) => Ok(Some(FalNb2Resolution::OneK)),
-    Some(CommonResolution::TwoK) => Ok(Some(FalNb2Resolution::TwoK)),
-    Some(CommonResolution::FourK) => Ok(Some(FalNb2Resolution::FourK)),
-    Some(CommonResolution::ThreeK) => Ok(Some(FalNb2Resolution::TwoK)),
-    Some(CommonResolution::FourEightyP) => Ok(Some(FalNb2Resolution::HalfK)),
-    Some(CommonResolution::SevenTwentyP) => Ok(Some(FalNb2Resolution::OneK)),
-    Some(CommonResolution::TenEightyP) => Ok(Some(FalNb2Resolution::OneK)),
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalNb2NumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalNb2NumImages::One),
-    2 => Ok(FalNb2NumImages::Two),
-    3 => Ok(FalNb2NumImages::Three),
-    4 => Ok(FalNb2NumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(FalNb2NumImages::Four),
-    },
-  }
-}
@@ -250,7 +250,7 @@ mod tests {

  fn base_fal_request() -> GenerateImageRequest<'static> {
    GenerateImageRequest {
-      model: CommonImageModel::NanoBananaPro,
+      model: CommonImageModel::NanaBananaPro,
      provider: Provider::Fal,
      prompt: Some("a cat in space"),
      image_inputs: None,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brandon Thomas	68ca341faa	fal errors handled	2026-03-31 10:47:25 -04:00
Brandon Thomas	e038a58366	handle fal failures and mark jobs dead	2026-03-31 10:30:53 -04:00
Brandon Thomas	1583b052d6	refactor	2026-03-31 10:09:11 -04:00
Brandon Thomas	91ad023217	refactor	2026-03-31 10:06:47 -04:00
Brandon Thomas	adde8f6260	divide modules	2026-03-31 10:03:57 -04:00