cleanup and fix paging

cleanup
rename variant
2026-10-21 09:22:41 -04:00 · 2026-04-06 20:53:48 -04:00 · 2026-04-06 20:43:26 -04:00 · 2026-04-06 20:36:06 -04:00 · 2026-04-06 20:35:37 -04:00 · 2026-04-06 19:56:10 -04:00
623 changed files with 4325 additions and 41679 deletions
@@ -6,11 +6,7 @@
 - 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; new database queries should use `Result<T, sqlx::Error>` instead
- SQLx queries: prefer `sqlx::query!` and `sqlx::query_as!` compile-time checked macros over 
-  runtime `sqlx::query()` / `sqlx::query_as()`. The macros catch SQL typos, column mismatches, 
-  and type errors at build time. Use runtime queries only when assembling complicated 
-  dynamic/branching queries that cannot be expressed as a compile-time macro.
+- 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)`
@@ -60,14 +56,8 @@ then the story, then the fine print.
  `use artcraft_router::...::CommonResolution as CommonResolutionRouter;`
  This avoids long fully-qualified paths in function signatures and bodies.

-## MySQL 
-
- MySQL tables: primary key `id` columns must be `BIGINT(20) UNSIGNED`. Do not use signed IDs. 
- Always create tables with `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin`.
-
 ## TypeScript / Frontend

 - TypeScript with React, Vite, Zustand, Three.js
 - Nx monorepo under `crates/frontend/`
 - Two spaces for indentation
-
@@ -1,146 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  uir.id,\n  uir.impersonator_user_token as `impersonator_user_token: UserToken`,\n  impersonator.username as impersonator_username,\n  impersonator.display_name as impersonator_display_name,\n  uir.impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonated.username as impersonated_username,\n  impersonated.display_name as impersonated_display_name,\n  uir.is_redeemed as `is_redeemed: bool`,\n  (uir.expires_at < NOW()) as `is_expired: bool`,\n  uir.expires_at,\n  uir.created_at,\n  uir.updated_at\nFROM user_impersonation_requests uir\nJOIN users impersonator ON impersonator.token = uir.impersonator_user_token\nJOIN users impersonated ON impersonated.token = uir.impersonated_user_token\nWHERE uir.impersonated_user_token = ?\n  AND uir.id < ?\nORDER BY uir.id DESC\nLIMIT ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "impersonator_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "impersonator_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "impersonator_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "impersonated_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "impersonated_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "impersonated_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "is_redeemed: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "is_expired: bool",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | BINARY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "expires_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "27cebaa36f0ec873f86cdf8fa994d499db1a5cc84d2c6fceb3587145eb2f9bec"
-}
@@ -1,146 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  uir.id,\n  uir.impersonator_user_token as `impersonator_user_token: UserToken`,\n  impersonator.username as impersonator_username,\n  impersonator.display_name as impersonator_display_name,\n  uir.impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonated.username as impersonated_username,\n  impersonated.display_name as impersonated_display_name,\n  uir.is_redeemed as `is_redeemed: bool`,\n  (uir.expires_at < NOW()) as `is_expired: bool`,\n  uir.expires_at,\n  uir.created_at,\n  uir.updated_at\nFROM user_impersonation_requests uir\nJOIN users impersonator ON impersonator.token = uir.impersonator_user_token\nJOIN users impersonated ON impersonated.token = uir.impersonated_user_token\nWHERE uir.impersonated_user_token = ?\nORDER BY uir.id DESC\nLIMIT ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "impersonator_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "impersonator_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "impersonator_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "impersonated_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "impersonated_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "impersonated_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "is_redeemed: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "is_expired: bool",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | BINARY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "expires_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "381e13ab37a2f4ce39bd6db9d90202c301091376108f645a9bb5264a9cd113d7"
-}
@@ -1,146 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  sal.id,\n  sal.token as `token: StaffAuditLogToken`,\n  sal.audit_action,\n  sal.maybe_entity_type,\n  sal.maybe_entity_token,\n  target_user.username as maybe_target_username,\n  target_user.display_name as maybe_target_display_name,\n  sal.staff_user_token as `staff_user_token: UserToken`,\n  staff_user.username as staff_username,\n  staff_user.display_name as staff_display_name,\n  sal.staff_ip_address,\n  sal.created_at\nFROM staff_audit_logs sal\nLEFT JOIN users target_user ON target_user.token = sal.maybe_entity_token\nLEFT JOIN users staff_user ON staff_user.token = sal.staff_user_token\nORDER BY sal.id DESC\nLIMIT ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "token: StaffAuditLogToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "audit_action",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_entity_type",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_entity_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_target_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_target_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "staff_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "staff_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "staff_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "staff_ip_address",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 160
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "3846628765bd34ea2ce01e15a0db732121ce473c5c542d0e971ad29b2b421193"
-}
@@ -1,146 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  uir.id,\n  uir.impersonator_user_token as `impersonator_user_token: UserToken`,\n  impersonator.username as impersonator_username,\n  impersonator.display_name as impersonator_display_name,\n  uir.impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonated.username as impersonated_username,\n  impersonated.display_name as impersonated_display_name,\n  uir.is_redeemed as `is_redeemed: bool`,\n  (uir.expires_at < NOW()) as `is_expired: bool`,\n  uir.expires_at,\n  uir.created_at,\n  uir.updated_at\nFROM user_impersonation_requests uir\nJOIN users impersonator ON impersonator.token = uir.impersonator_user_token\nJOIN users impersonated ON impersonated.token = uir.impersonated_user_token\nWHERE uir.id < ?\nORDER BY uir.id DESC\nLIMIT ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "impersonator_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "impersonator_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "impersonator_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "impersonated_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "impersonated_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "impersonated_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "is_redeemed: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "is_expired: bool",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | BINARY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "expires_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "5d45897a5d4c326c8d17f105cae81db7f5878c197b55e8ea61c225e739d11234"
-}
@@ -1,146 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  sal.id,\n  sal.token as `token: StaffAuditLogToken`,\n  sal.audit_action,\n  sal.maybe_entity_type,\n  sal.maybe_entity_token,\n  target_user.username as maybe_target_username,\n  target_user.display_name as maybe_target_display_name,\n  sal.staff_user_token as `staff_user_token: UserToken`,\n  staff_user.username as staff_username,\n  staff_user.display_name as staff_display_name,\n  sal.staff_ip_address,\n  sal.created_at\nFROM staff_audit_logs sal\nLEFT JOIN users target_user ON target_user.token = sal.maybe_entity_token\nLEFT JOIN users staff_user ON staff_user.token = sal.staff_user_token\nWHERE sal.id < ?\nORDER BY sal.id DESC\nLIMIT ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "token: StaffAuditLogToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "audit_action",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_entity_type",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_entity_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_target_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_target_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "staff_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "staff_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "staff_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "staff_ip_address",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 160
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "9132f832752ea40736bedf4729c76af7fe019cc69ed5cc280fce87e68c3f4846"
-}
@@ -1,80 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token,\n  impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonator_user_token as `impersonator_user_token: UserToken`,\n  user_impersonation_token,\n  is_redeemed as `is_redeemed: bool`,\n  expires_at\nFROM user_impersonation_requests\nWHERE user_impersonation_token = ?\nLIMIT 1\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "impersonated_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "impersonator_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "user_impersonation_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "is_redeemed: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "expires_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "9dc83df0b7f1cf2716352e947b6b7fcb6c455fb0c12d72e584612f35366831f4"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO user_sessions (\n  token,\n  user_token,\n  maybe_impersonation_user_token,\n  ip_address_creation,\n  expires_at\n)\nVALUES (?, ?, ?, ?, ?)\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "ba5b0a542d4b95b781077b8895529d222dd682eb28c9d00031a820ec6f37e095"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO staff_audit_logs\nSET\n  token = ?,\n  audit_action = ?,\n  maybe_entity_type = ?,\n  maybe_entity_token = ?,\n  staff_user_token = ?,\n  staff_ip_address = ?\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 6
-    },
-    "nullable": []
-  },
-  "hash": "c39800423a5fe0aa324e117e624015f85d039c3ca6833cf6865471345ab0768e"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO user_impersonation_requests\nSET\n  token = ?,\n  impersonated_user_token = ?,\n  impersonator_user_token = ?,\n  user_impersonation_token = ?,\n  ip_address_creation = ?,\n  expires_at = ?\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 6
-    },
-    "nullable": []
-  },
-  "hash": "cc782c807dadcaaaad08f469935f61dc2e9f3217aa01532d6602b8e37cedf92d"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE user_impersonation_requests\nSET\n  is_redeemed = TRUE,\n  ip_address_redemption = ?\nWHERE user_impersonation_token = ?\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "cf4be26ce3a48c7108640faa6c9fc68a48136327a9d374c52c16848c006f0984"
-}
@@ -1,146 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  uir.id,\n  uir.impersonator_user_token as `impersonator_user_token: UserToken`,\n  impersonator.username as impersonator_username,\n  impersonator.display_name as impersonator_display_name,\n  uir.impersonated_user_token as `impersonated_user_token: UserToken`,\n  impersonated.username as impersonated_username,\n  impersonated.display_name as impersonated_display_name,\n  uir.is_redeemed as `is_redeemed: bool`,\n  (uir.expires_at < NOW()) as `is_expired: bool`,\n  uir.expires_at,\n  uir.created_at,\n  uir.updated_at\nFROM user_impersonation_requests uir\nJOIN users impersonator ON impersonator.token = uir.impersonator_user_token\nJOIN users impersonated ON impersonated.token = uir.impersonated_user_token\nORDER BY uir.id DESC\nLIMIT ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "impersonator_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "impersonator_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "impersonator_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "impersonated_user_token: UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "impersonated_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "impersonated_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "is_redeemed: bool",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "is_expired: bool",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | BINARY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "expires_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "e72b3dfdd9df4ee10a696faa4dfc3fb8addc9d2b88017f503c339fb616bef6f1"
-}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nUPDATE users\nSET\n    is_banned = ?,\n    maybe_mod_comments = ?,\n    maybe_mod_user_token  = ?,\n    version = version + 1\n\nWHERE users.token = ?\nLIMIT 1\n    ",
+  "query": "\nUPDATE users\nSET\n    is_banned = ?,\n    maybe_mod_comments = ?,\n    maybe_mod_user_token  = ?,\n    version = version + 1\n\nWHERE users.token = ?\nLIMIT 1\n        ",
  "describe": {
    "columns": [],
    "parameters": {
@@ -8,5 +8,5 @@
    },
    "nullable": []
  },
-  "hash": "3d746dcb479005f1f4ae5e157a5ace7626eda4849d44c6c2d7079fd346eb4edc"
+  "hash": "eab69a8d679b2dcfb06a9ccc79851f6c693d0c372142ff0e7ded89c95e4bcf44"
 }
@@ -58,7 +58,7 @@ artcraft/

 - Rust with no minimum supported version
 - Actix-web for HTTP services
- SQLx for MySQL and SQLite; prefer `sqlx::query!` / `sqlx::query_as!` compile-time checked macros over runtime `sqlx::query()` whenever possible
+- 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;`
@@ -770,7 +770,6 @@ dependencies = [
 "anyhow",
 "artcraft_api_defs",
 "artcraft_client",
- "enums",
 "fal_client",
 "log",
 "muapi_client",
@@ -3877,13 +3876,6 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

-[[package]]
-name = "error_utils"
-version = "0.0.1"
-dependencies = [
- "regex",
-]
-
 [[package]]
 name = "errors"
 version = "0.0.1"
@@ -7751,17 +7743,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

-[[package]]
-name = "opaque_cursors"
-version = "0.0.1"
-dependencies = [
- "base64 0.22.1",
- "magic-crypt",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
 [[package]]
 name = "open"
 version = "5.3.3"
@@ -10191,7 +10172,6 @@ dependencies = [
 "anyhow",
 "bootstrap",
 "bucket_paths",
- "chrono",
 "cloud_storage",
 "concurrency",
 "easyenv",
@@ -11253,7 +11233,6 @@ dependencies = [
 "elasticsearch",
 "elasticsearch_schema",
 "enums",
- "error_utils",
 "errors",
 "fal_client",
 "ffmpeg_utils",
@@ -11281,7 +11260,6 @@ dependencies = [
 "mimetypes",
 "mysql_queries",
 "once_cell",
- "opaque_cursors",
 "pager",
 "password",
 "primitives",
@@ -14793,7 +14771,6 @@ dependencies = [
 "serde",
 "serde_json",
 "strum",
- "test_data",
 "tokio",
 "uuid 1.22.0",
 "workspace-build-acceleration",
@@ -59,7 +59,6 @@ members = [
  "crates/lib/data/primitives",
  "crates/lib/data/web_base64",
  "crates/lib/easyenv", # NB: Vendored version of https://github.com/echelon/easyenv.rs that we'll improve.
-  "crates/lib/error_utils",
  "crates/lib/errors",
  "crates/lib/ffmpeg_utils",
  "crates/lib/files/file_to_base64_url",
@@ -73,7 +72,6 @@ members = [
  "crates/lib/http_headers",
  "crates/lib/jobs_common",
  "crates/lib/jwt_light",
-  "crates/lib/opaque_cursors",
  "crates/lib/jwt_signer",
  "crates/lib/logging",
  "crates/lib/markdown",
@@ -238,7 +236,6 @@ cookie_store = { path = "crates/lib/cookie_store" }
 crockford = { path = "crates/lib/data/crockford" }
 easyenv = { path = "crates/lib/easyenv" }
 enums = { path = "crates/schema/public/enums" }
-error_utils = { path = "crates/lib/error_utils" }
 errors = { path = "crates/lib/errors" }
 fal_client = { path = "crates/api_clients/fal_client" }
 ffmpeg_utils = { path = "crates/lib/ffmpeg_utils" }
@@ -253,7 +250,6 @@ images = { path = "crates/lib/files/images" }
 jobs_common = { path = "crates/lib/jobs_common" }
 jwt_light = { path = "crates/lib/jwt_light" }
 jwt_signer = { path = "crates/lib/jwt_signer" }
-opaque_cursors = { path = "crates/lib/opaque_cursors" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
 memory_store = { path = "crates/lib/caching/memory_store" }
 midjourney_client = { path = "crates/api_clients/midjourney_client" }
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE IF EXISTS staff_audit_logs;
@@ -1,39 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE staff_audit_logs (
-
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Effective "primary key" of the audit log item (in case we add a UI or notes)
-  token VARCHAR(32) NOT NULL,
-
-  -- The type of action taken
-  audit_action VARCHAR(32) NOT NULL,
-
-  -- The type of entity acted upon (if any)
-  maybe_entity_type VARCHAR(16) DEFAULT NULL,
-
-  -- The token of the entity mutated (if any)
-  maybe_entity_token VARCHAR(32) NOT NULL,
-
-  -- The staff user who performed the action.
-  staff_user_token VARCHAR(32) DEFAULT NULL,
-
-  -- For abuse tracking.
-  -- Wide enough for IPv4/6
-  staff_ip_address VARCHAR(40) NOT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  KEY index_maybe_entity_type (maybe_entity_type),
-  KEY index_maybe_entity_token (maybe_entity_token),
-  KEY index_staff_user_token (staff_user_token),
-  KEY index_created_at (created_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,6 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE user_sessions
-  DROP COLUMN maybe_impersonation_user_token;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE user_sessions
-  ADD COLUMN maybe_impersonation_user_token VARCHAR(32) DEFAULT NULL
-  AFTER user_token;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE IF EXISTS user_impersonation_requests;
@@ -1,44 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE user_impersonation_requests (
-
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Internal "primary key"
-  token VARCHAR(32) NOT NULL,
-
-  -- The user being impersonated.
-  impersonated_user_token VARCHAR(32) NOT NULL,
-
-  -- The staff user who initiated the impersonation.
-  impersonator_user_token VARCHAR(32) NOT NULL,
-
-  -- The actual secret that must be presented to redeem the impersonation.
-  user_impersonation_token VARCHAR(32) NOT NULL,
-
-  -- Whether this request has been redeemed (used to create a session).
-  is_redeemed BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- IP address of the staff user who created the request.
-  ip_address_creation VARCHAR(40) NOT NULL,
-
-  -- IP address from which the request was redeemed, if redeemed.
-  ip_address_redemption VARCHAR(40) DEFAULT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- The request expires after this time if not redeemed.
-  expires_at TIMESTAMP NOT NULL,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  UNIQUE KEY (user_impersonation_token),
-  KEY index_impersonated_user_token (impersonated_user_token),
-  KEY index_impersonator_user_token (impersonator_user_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,35 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-- Recreate with the original signed BIGINT id.
-CREATE TABLE user_impersonation_requests (
-
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  token VARCHAR(32) NOT NULL,
-
-  impersonated_user_token VARCHAR(32) NOT NULL,
-
-  impersonator_user_token VARCHAR(32) NOT NULL,
-
-  user_impersonation_token VARCHAR(32) NOT NULL,
-
-  is_redeemed BOOLEAN NOT NULL DEFAULT FALSE,
-
-  ip_address_creation VARCHAR(40) NOT NULL,
-
-  ip_address_redemption VARCHAR(40) DEFAULT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  expires_at TIMESTAMP NOT NULL,
-
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  UNIQUE KEY (user_impersonation_token),
-  KEY index_impersonated_user_token (impersonated_user_token),
-  KEY index_impersonator_user_token (impersonator_user_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE IF EXISTS user_impersonation_requests;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE IF EXISTS user_impersonation_requests;
@@ -1,44 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE user_impersonation_requests (
-
-  -- Not used for anything except replication.
-  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  -- Internal "primary key"
-  token VARCHAR(32) NOT NULL,
-
-  -- The user being impersonated.
-  impersonated_user_token VARCHAR(32) NOT NULL,
-
-  -- The staff user who initiated the impersonation.
-  impersonator_user_token VARCHAR(32) NOT NULL,
-
-  -- The actual secret that must be presented to redeem the impersonation.
-  user_impersonation_token VARCHAR(32) NOT NULL,
-
-  -- Whether this request has been redeemed (used to create a session).
-  is_redeemed BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- IP address of the staff user who created the request.
-  ip_address_creation VARCHAR(40) NOT NULL,
-
-  -- IP address from which the request was redeemed, if redeemed.
-  ip_address_redemption VARCHAR(40) DEFAULT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- The request expires after this time if not redeemed.
-  expires_at TIMESTAMP NOT NULL,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  UNIQUE KEY (user_impersonation_token),
-  KEY index_impersonated_user_token (impersonated_user_token),
-  KEY index_impersonator_user_token (impersonator_user_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,31 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-- Recreate with the original signed BIGINT id.
-CREATE TABLE staff_audit_logs (
-
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  token VARCHAR(32) NOT NULL,
-
-  audit_action VARCHAR(32) NOT NULL,
-
-  maybe_entity_type VARCHAR(16) DEFAULT NULL,
-
-  maybe_entity_token VARCHAR(32) NOT NULL,
-
-  staff_user_token VARCHAR(32) DEFAULT NULL,
-
-  staff_ip_address VARCHAR(40) NOT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  KEY index_maybe_entity_type (maybe_entity_type),
-  KEY index_maybe_entity_token (maybe_entity_token),
-  KEY index_staff_user_token (staff_user_token),
-  KEY index_created_at (created_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE IF EXISTS staff_audit_logs;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE IF EXISTS staff_audit_logs;
@@ -1,39 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE staff_audit_logs (
-
-  -- Not used for anything except replication.
-  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  -- Effective "primary key" of the audit log item (in case we add a UI or notes)
-  token VARCHAR(32) NOT NULL,
-
-  -- The type of action taken
-  audit_action VARCHAR(32) NOT NULL,
-
-  -- The type of entity acted upon (if any)
-  maybe_entity_type VARCHAR(16) DEFAULT NULL,
-
-  -- The token of the entity mutated (if any)
-  maybe_entity_token VARCHAR(32) NOT NULL,
-
-  -- The staff user who performed the action.
-  staff_user_token VARCHAR(32) DEFAULT NULL,
-
-  -- For abuse tracking.
-  -- Wide enough for IPv4/6
-  staff_ip_address VARCHAR(40) NOT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  KEY index_maybe_entity_type (maybe_entity_type),
-  KEY index_maybe_entity_token (maybe_entity_token),
-  KEY index_staff_user_token (staff_user_token),
-  KEY index_created_at (created_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,38 +0,0 @@
-# SQL Migrations
-
-Incremental schema changes applied in order by timestamp prefix.
-
-## Naming Convention
-
-Migration directories follow the format:
-
-```
-YYYY-MM-DD-HHMMSS-NNNN_description_goes_here/
-  up.sql
-  down.sql
-```
-
-These are created with the `diesel` tool, and in particular:
-
-> `diesel migration generate description_goes_here`
-
- `NNNN` is a zero-padded sequence number for ordering multiple migrations on the same timestamp.
- `up.sql` applies the migration forward.
- `down.sql` reverses it.
-
-## Table Conventions
-
- Primary key `id` columns must be `BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT`. Do not use signed IDs.
- Always create tables with `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin`.
- All SQL files should start with the standard IntelliJ noinspection comments:
-  ```sql
-  -- noinspection SqlDialectInspectionForFile
-  -- noinspection SqlNoDataSourceInspectionForFile
-  -- noinspection SqlResolveForFile
-  ```
-
-## Rules
-
- Every `up.sql` must have a corresponding `down.sql` that cleanly reverses the migration.
- For `CREATE TABLE` migrations, the `down.sql` is typically `DROP TABLE IF EXISTS table_name;`.
- For `ALTER TABLE` migrations, the `down.sql` reverses the alteration (e.g. `DROP COLUMN`).
@@ -1,26 +0,0 @@
-# Squashed / Materialized Schemas
-
-Fully materialized table definitions representing the current state of each table
-after all migrations have been applied. These are not executed — they exist as
-human-readable documentation of the current schema.
-
-## When to Update
-
-Update the corresponding squashed file whenever a migration changes a table's schema
-(adding columns, changing types, dropping and recreating, etc.).
-
-## Table Conventions
-
- Primary key `id` columns must be `BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT`. Do not use signed IDs.
- Always create tables with `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin`.
- All SQL files should start with the standard IntelliJ noinspection comments:
-  ```sql
-  -- noinspection SqlDialectInspectionForFile
-  -- noinspection SqlNoDataSourceInspectionForFile
-  -- noinspection SqlResolveForFile
-  ```
-
-## File Organization
-
-Files are named after their table (e.g. `users.sql`, `media_files.sql`).
-Some tables are grouped into subdirectories (e.g. `user_tables/`).
@@ -1,39 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE staff_audit_logs (
-
-  -- Not used for anything except replication.
-  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  -- Effective "primary key" of the audit log item (in case we add a UI or notes)
-  token VARCHAR(32) NOT NULL,
-
-  -- The type of action taken
-  audit_action VARCHAR(32) NOT NULL,
-
-  -- The type of entity acted upon (if any)
-  maybe_entity_type VARCHAR(16) DEFAULT NULL,
-
-  -- The token of the entity mutated (if any)
-  maybe_entity_token VARCHAR(32) NOT NULL,
-
-  -- The staff user who performed the action.
-  staff_user_token VARCHAR(32) DEFAULT NULL,
-
-  -- For abuse tracking.
-  -- Wide enough for IPv4/6
-  staff_ip_address VARCHAR(40) NOT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  KEY index_maybe_entity_type (maybe_entity_type),
-  KEY index_maybe_entity_token (maybe_entity_token),
-  KEY index_staff_user_token (staff_user_token),
-  KEY index_created_at (created_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,44 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE user_impersonation_requests (
-
-  -- Not used for anything except replication.
-  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  -- Internal "primary key"
-  token VARCHAR(32) NOT NULL,
-
-  -- The user being impersonated.
-  impersonated_user_token VARCHAR(32) NOT NULL,
-
-  -- The staff user who initiated the impersonation.
-  impersonator_user_token VARCHAR(32) NOT NULL,
-
-  -- The actual secret that must be presented to redeem the impersonation.
-  user_impersonation_token VARCHAR(32) NOT NULL,
-
-  -- Whether this request has been redeemed (used to create a session).
-  is_redeemed BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- IP address of the staff user who created the request.
-  ip_address_creation VARCHAR(40) NOT NULL,
-
-  -- IP address from which the request was redeemed, if redeemed.
-  ip_address_redemption VARCHAR(40) DEFAULT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- The request expires after this time if not redeemed.
-  expires_at TIMESTAMP NOT NULL,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  UNIQUE KEY (user_impersonation_token),
-  KEY index_impersonated_user_token (impersonated_user_token),
-  KEY index_impersonator_user_token (impersonator_user_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,50 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE user_sessions (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Session primary key
-  token VARCHAR(32) NOT NULL,
-
-  -- The user that the session belongs to.
-  user_token VARCHAR(32) NOT NULL,
-
-  -- NEVER IMPERSONATE A USER'S ACCOUNT WITHOUT THEIR CONSENT!
-  --
-  -- For support requests and inquiries, we can have staff log into user accounts
-  -- to verify and debug possible broken states. The user is always told about
-  -- this if we are to use this for support cases.
-  --
-  -- Every action performed by impersonated sessions is logged for auditing.
-  --
-  -- If this session is impersonating another user, this is the token of
-  -- the staff user who initiated the impersonation.
-  maybe_impersonation_user_token VARCHAR(32) DEFAULT NULL,
-
-  -- Track each session's creation IP.
-  -- Wide enough for IPv4/6
-  ip_address_creation VARCHAR(40) NOT NULL,
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- Session termination time.
-  -- This must be set by the server code, or the session is invalid
-  expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- deletion = session termination
-  -- Typically these are destroyed by users, but if in the future we allow mods to
-  -- delete them, it doesn't really matter who did the deletion: sessions are not
-  -- designed to be recoverable.
-  deleted_at TIMESTAMP NULL,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  KEY fk_user_token (user_token),
-  KEY index_ip_address_creation (ip_address_creation)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -15,7 +15,7 @@ body:
  type: json
  content: |
    {
-        "user_token": "user_rtdhen9kz73kx", // 
+        "user_token": "user_jg7ng4kdt2x5y", // newuser946
        "payments_namespace": "artcraft"
    }
 order: 4100053395280358
@@ -1,11 +0,0 @@
-$kind: http-request
-name: Impersonate User Request
-url: "{{api_host}}/v1/moderation/user_sessions/impersonate"
-method: POST
-body:
-  type: json
-  content: |-
-    {
-        "username": "newuser3"
-    }
-order: 4318829221021218
@@ -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,
@@ -16,8 +16,7 @@ pub struct GenerateVeo2ImageToVideoRequest {
  
  /// Optional text prompt.
  pub prompt: Option<String>,
-
-  /// **NB(bt): ASPECT RATIO IS ACTUALLY NOT USED IN VEO 2 IMAGE-TO-VIDEO**
+  
  /// Optional: aspect ratio of the generated video.
  pub aspect_ratio: Option<GenerateVeo2AspectRatio>,

@@ -25,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,
@@ -34,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,
@@ -21,31 +21,20 @@ pub struct GenerateVeo3FastImageToVideoRequest {
  pub resolution: Option<GenerateVeo3FastResolution>,

  /// Optional: aspect ratio of the generated video.
-  pub aspect_ratio: Option<GenerateVeo3FastAspectRatio>,
-
-  /// Optional: duration of the generated video.
  pub duration: Option<GenerateVeo3FastDuration>,

  /// Optional: Generate an audio track along with the video
  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)]
-#[serde(rename_all = "snake_case")]
-pub enum GenerateVeo3FastAspectRatio {
-  Auto,
-  SixteenByNine,
-  NineBySixteen,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum GenerateVeo3FastDuration {
  EightSeconds,
@@ -37,26 +37,22 @@ 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
  TallNineSixteen, // 9:16
-  
-  /// NB: DO NOT REMOVE. This is an unsupported resolution for Veo 3, but we can't 
-  /// impact existing callers by removing it. The handler will convert this to a 
-  /// supported resolution or 400 the request instead.
  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,
@@ -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,
@@ -40,11 +40,11 @@ pub struct OmniGenImageCostAndGenerateRequest {
  pub image_batch_count: Option<u16>,

  /// Only for angle manipulation models.
-  pub adjust_horizontal_angle: Option<f64>,
+  pub horizontal_angle: Option<f64>,

  /// Only for angle manipulation models.
-  pub adjust_vertical_angle: Option<f64>,
+  pub vertical_angle: Option<f64>,

  /// Only for angle manipulation models.
-  pub adjust_zoom: Option<f64>,
+  pub zoom: Option<f64>,
 }
@@ -5,7 +5,6 @@ use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
 use enums::common::generation::common_quality::CommonQuality;
 use enums::common::generation::common_resolution::CommonResolution;
 use enums::common::generation::common_video_model::CommonVideoModel;
-use tokens::tokens::characters::CharacterToken;
 use tokens::tokens::media_files::MediaFileToken;

 /// Shared request body for both the video cost estimate and video generation endpoints.
@@ -40,10 +39,6 @@ pub struct OmniGenVideoCostAndGenerateRequest {
  /// Reference audio (optional).
  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>>,
-
  /// The resolution to use.
  pub resolution: Option<CommonResolution>,

@@ -2,7 +2,6 @@ use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
 use enums::common::generation::common_image_model::CommonImageModel;
 use enums::common::generation::common_quality::CommonQuality;
 use enums::common::generation::common_resolution::CommonResolution;
-use enums::common::generation::model_creator::ModelCreator;
 use enums::common::generation_provider::GenerationProvider;
 use serde_derive::{Deserialize, Serialize};
 use utoipa::{IntoParams, ToSchema};
@@ -57,9 +56,6 @@ pub struct OmniGenImageProviderModelDetails {
 pub struct OmniGenImageModelDetails {
  pub model: CommonImageModel,

-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub model_creator: Option<ModelCreator>,
-
  #[serde(skip_serializing_if = "Option::is_none")]
  pub full_name: Option<String>,

@@ -107,7 +103,6 @@ pub struct OmniGenImageModelDetails {
  #[serde(skip_serializing_if = "Option::is_none")]
  pub resolution_default: Option<CommonResolution>,

-  #[serde(skip_serializing_if = "Option::is_none")]
  pub quality_options: Option<Vec<CommonQuality>>,

  #[serde(skip_serializing_if = "Option::is_none")]
@@ -124,16 +119,12 @@ pub struct OmniGenImageModelDetails {

  #[serde(skip_serializing_if = "Option::is_none")]
  pub batch_size_default: Option<u16>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub is_disabled: Option<bool>,
 }

 impl Default for OmniGenImageModelDetails {
  fn default() -> Self {
    Self {
      model: CommonImageModel::NanoBananaPro,
-      model_creator: None,
      full_name: None,
      text_prompt_supported: None,
      text_prompt_max_length: None,
@@ -153,7 +144,6 @@ impl Default for OmniGenImageModelDetails {
      batch_size_max: None,
      batch_size_options: None,
      batch_size_default: None,
-      is_disabled: None,
    }
  }
 }
@@ -1,14 +1,10 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
 use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
 use enums::common::generation::common_quality::CommonQuality;
 use enums::common::generation::common_resolution::CommonResolution;
 use enums::common::generation::common_video_model::CommonVideoModel;
-use enums::common::generation::model_creator::ModelCreator;
 use enums::common::generation_provider::GenerationProvider;
-use serde_derive::{Deserialize, Serialize};
-use utoipa::{IntoParams, ToSchema};
-
-/// Video model to default to if none is specified
-const DEFAULT_VIDEO_MODEL : CommonVideoModel = CommonVideoModel::Seedance2p0;

 /// Query string parameters for the video models endpoint.
 #[derive(Deserialize, IntoParams, ToSchema)]
@@ -66,9 +62,6 @@ pub struct OmniGenVideoModelDetails {

  pub model: CommonVideoModel,
  
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub model_creator: Option<ModelCreator>,
-  
  #[serde(skip_serializing_if = "Option::is_none")]
  pub full_name: Option<String>,
  
@@ -117,12 +110,6 @@ pub struct OmniGenVideoModelDetails {
  #[serde(skip_serializing_if = "Option::is_none")]
  pub audio_references_max_total_duration_seconds: Option<u16>,

-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub character_references_supported: Option<bool>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub character_references_max: Option<u16>,
-
  #[serde(skip_serializing_if = "Option::is_none")]
  pub show_generate_with_sound_toggle: Option<bool>,

@@ -167,16 +154,12 @@ pub struct OmniGenVideoModelDetails {
  
  #[serde(skip_serializing_if = "Option::is_none")]
  pub batch_size_default: Option<u16>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub is_disabled: Option<bool>,
 }

 impl Default for OmniGenVideoModelDetails {
  fn default() -> Self {
    Self {
-      model: DEFAULT_VIDEO_MODEL,
-      model_creator: None,
+      model: CommonVideoModel::Seedance2p0,
      full_name: None,
      text_prompt_supported: None,
      text_prompt_max_length: None,
@@ -193,8 +176,6 @@ impl Default for OmniGenVideoModelDetails {
      audio_references_supported: None,
      audio_references_max: None,
      audio_references_max_total_duration_seconds: None,
-      character_references_supported: None,
-      character_references_max: None,
      show_generate_with_sound_toggle: None,
      aspect_ratio_options: None,
      aspect_ratio_default: None,
@@ -210,7 +191,6 @@ impl Default for OmniGenVideoModelDetails {
      batch_size_max: None,
      batch_size_options: None,
      batch_size_default: None,
-      is_disabled: None,
    }
  }
 }
@@ -2,7 +2,6 @@ pub mod analytics;
 pub mod credits;
 pub mod generate;
 pub mod jobs;
-pub mod omni_gen;
 pub mod media_files;
 pub mod prompts;
 pub mod stripe_artcraft;
@@ -1 +0,0 @@
-pub mod video;
@@ -1 +0,0 @@
-pub mod omni_gen_video;
@@ -1,21 +0,0 @@
-use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use crate::error::storyteller_error::StorytellerError;
-use crate::utils::api_host::ApiHost;
-use crate::utils::basic_json_post_request::basic_json_post_request;
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
-use artcraft_api_defs::omni_gen::generate_response::omni_gen_video_generate_response::OmniGenVideoGenerateResponse;
-
-pub const OMNI_GEN_VIDEO_GENERATE_PATH: &str = "/v1/omni_gen/generate/video";
-
-pub async fn omni_gen_video_generate(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: OmniGenVideoCostAndGenerateRequest,
-) -> Result<OmniGenVideoGenerateResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    OMNI_GEN_VIDEO_GENERATE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1 +0,0 @@
-pub mod generate;
@@ -17,7 +17,6 @@ workspace-build-acceleration.workspace = true

 # Internal
 artcraft_api_defs.workspace = true
-enums.workspace = true
 artcraft_client.workspace = true
 fal_client.workspace = true
 muapi_client.workspace = true
@@ -36,11 +36,7 @@ pub enum CommonAspectRatio {

  // Auto values that bake in resolution
  // These are from the Seedream models
-  #[serde(rename = "auto_2k")]
  Auto2k,
-  #[serde(rename = "auto_3k")]
-  Auto3k,
-  #[serde(rename = "auto_4k")]
  Auto4k,

  // Defined aspect ratios that bake in resolution
@@ -13,8 +13,6 @@ pub enum CommonImageModel {
  FluxPro11,
  #[serde(rename = "flux_pro_1p1_ultra")]
  FluxPro11Ultra,
-  #[serde(rename = "gpt_image_1")]
-  GptImage1,
  #[serde(rename = "gpt_image_1p5")]
  GptImage1p5,
  #[serde(rename = "nano_banana")]
@@ -1,11 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-/// Common quality levels you can specify when enqueuing a generation.
-/// Not every model will use this; models that don't simply ignore it.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum CommonQuality {
-  High,
-  Medium,
-  Low,
-}
@@ -38,9 +38,6 @@ pub enum CommonVideoModel {
  #[serde(rename = "seedance_2p0")]
  Seedance2p0,

-  #[serde(rename = "seedance_2p0_fast")]
-  Seedance2p0Fast,
-
  #[serde(rename = "sora_2")]
  Sora2,

@@ -2,7 +2,6 @@ pub mod audio_list_ref;
 pub mod character_list_ref;
 pub mod common_aspect_ratio;
 pub mod common_image_model;
-pub mod common_quality;
 pub mod common_resolution;
 pub mod common_splat_model;
 pub mod common_video_model;
@@ -43,7 +43,6 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -31,7 +31,6 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(1),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -46,7 +46,6 @@ mod tests {
      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      horizontal_angle: None,
      vertical_angle: None,
@@ -6,11 +6,8 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 pub(crate) fn estimate_image_cost_artcraft_flux_pro_1p1(
  plan: &PlanArtcraftFluxPro11<'_>,
 ) -> ImageGenerationCostEstimate {
-  // Fal pricing: $0.04 per megapixel, billed by rounding up to the nearest
-  // megapixel. The default image_size values are ~1MP, so 4 cents per image.
-  // (The legacy `generate_flux_pro_11_text_to_image_handler` charges this same
-  // amount via `FluxPro11Args::calculate_cost_in_cents`.)
-  let cost_per_image: u64 = 4;
+  // NB(bt): Slightly more than 3 cents, weird megapixel maths. We can eat that cost for now.
+  let cost_per_image: u64 = 3;

  let num_images: u64 = match plan.num_images {
    GenerateFluxPro11TextToImageNumImages::One => 1,
@@ -46,7 +43,6 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -64,10 +60,10 @@ mod tests {

  #[test]
  fn test_estimate_cost_usd_cents() {
-    // $0.04/image = 4 cents each (Fal's $0.04/MP at the default ~1MP).
-    assert_eq!(estimate_usd_cents(1), 4);
-    assert_eq!(estimate_usd_cents(2), 8);
-    assert_eq!(estimate_usd_cents(3), 12);
-    assert_eq!(estimate_usd_cents(4), 16);
+    // ~$0.03/image = 3 cents each (slightly more than 3¢ actual, rounded up)
+    assert_eq!(estimate_usd_cents(1), 3);
+    assert_eq!(estimate_usd_cents(2), 6);
+    assert_eq!(estimate_usd_cents(3), 9);
+    assert_eq!(estimate_usd_cents(4), 12);
  }
 }
@@ -43,7 +43,6 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -1,239 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_1::{
-  ArtcraftGptImage1Quality, ArtcraftGptImage1Size, PlanArtcraftGptImage1,
-};
-
-pub(crate) fn estimate_image_cost_artcraft_gpt_image_1(
-  plan: &PlanArtcraftGptImage1<'_>,
-) -> ImageGenerationCostEstimate {
-  // Pricing per the fal-ai GPT Image 1 docs, adapted for our artcraft billing:
-  //
-  //   Output image cost (per output image):
-  //     Low    – $0.011 (1024×1024) / $0.016 (other)  →  2¢ / 2¢
-  //     Medium – $0.042 (1024×1024) / $0.063 (other)  →  5¢ / 7¢
-  //     High   – $0.167 (1024×1024) / $0.250 (other)  → 17¢ / 25¢
-  //
-  //   Input image cost (edit mode only, per input image, high-fidelity assumed):
-  //     3,050 tokens × $0.005/1K tokens ≈ $0.01525 → 2¢ per input image
-  //
-  //   Input text tokens: free (we don't charge for these).
-  //
-  let is_square = matches!(
-    plan.image_size,
-    None | Some(ArtcraftGptImage1Size::Square)
-  );
-
-  let output_cost_per_image: u64 = match (plan.quality, is_square) {
-    (ArtcraftGptImage1Quality::Auto, _) => 17, // Auto treated as High square
-    (ArtcraftGptImage1Quality::Low, true) => 2,
-    (ArtcraftGptImage1Quality::Low, false) => 2,
-    (ArtcraftGptImage1Quality::Medium, true) => 5,
-    (ArtcraftGptImage1Quality::Medium, false) => 7,
-    (ArtcraftGptImage1Quality::High, true) => 17,
-    (ArtcraftGptImage1Quality::High, false) => 25,
-  };
-
-  let num_output_images = plan.num_images.as_u64();
-  let output_cost = output_cost_per_image * num_output_images;
-
-  // Input image token cost: 2¢ per input image (high-fidelity estimate).
-  let input_image_cost: u64 = 2 * plan.num_input_images;
-
-  let cost_in_usd_cents = output_cost + input_image_cost;
-
-  ImageGenerationCostEstimate {
-    cost_in_credits: Some(cost_in_usd_cents),
-    cost_in_usd_cents: Some(cost_in_usd_cents),
-    is_free: false,
-    is_unlimited: false,
-    is_rate_limited: false,
-    has_watermark: false,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::common_image_model::CommonImageModel;
-  use crate::api::common_quality::CommonQuality;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::provider::Provider;
-  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use tokens::tokens::media_files::MediaFileToken;
-
-  fn base() -> GenerateImageRequest<'static> {
-    GenerateImageRequest {
-      model: CommonImageModel::GptImage1,
-      provider: Provider::Artcraft,
-      prompt: None,
-      image_inputs: None,
-      resolution: None,
-      aspect_ratio: None,
-      quality: None,
-      image_batch_count: Some(1),
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      generation_mode_mismatch_strategy: None,
-      idempotency_token: None,
-      horizontal_angle: None,
-      vertical_angle: None,
-      zoom: None,
-    }
-  }
-
-  fn estimate_text(
-    quality: Option<CommonQuality>,
-    aspect_ratio: Option<CommonAspectRatio>,
-    batch: u16,
-  ) -> u64 {
-    let request = GenerateImageRequest {
-      quality,
-      aspect_ratio,
-      image_batch_count: Some(batch),
-      ..base()
-    };
-    request.build().unwrap().estimate_costs()
-      .cost_in_usd_cents.unwrap()
-  }
-
-  fn estimate_edit(
-    quality: Option<CommonQuality>,
-    aspect_ratio: Option<CommonAspectRatio>,
-    batch: u16,
-    num_input_images: usize,
-  ) -> u64 {
-    let tokens: Vec<MediaFileToken> = (0..num_input_images)
-      .map(|i| MediaFileToken::new_from_str(&format!("mf_test{:028}", i)))
-      .collect();
-    let request = GenerateImageRequest {
-      quality,
-      aspect_ratio,
-      image_batch_count: Some(batch),
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
-      ..base()
-    };
-    request.build().unwrap().estimate_costs()
-      .cost_in_usd_cents.unwrap()
-  }
-
-  // ── Default quality (None → High) ───────────────────────────────────────
-
-  #[test]
-  fn default_quality_square_one_image_costs_17_cents() {
-    assert_eq!(estimate_text(None, None, 1), 17);
-  }
-
-  #[test]
-  fn default_quality_square_four_images_costs_68_cents() {
-    assert_eq!(estimate_text(None, None, 4), 68);
-  }
-
-  // ── Low quality (2¢/image regardless of size) ───────────────────────────
-
-  #[test]
-  fn low_square_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::Low), Some(CommonAspectRatio::Square), 1), 2);
-  }
-
-  #[test]
-  fn low_wide_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::Low), Some(CommonAspectRatio::WideSixteenByNine), 1), 2);
-  }
-
-  #[test]
-  fn low_tall_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::Low), Some(CommonAspectRatio::TallNineBySixteen), 1), 2);
-  }
-
-  #[test]
-  fn low_four_images() {
-    assert_eq!(estimate_text(Some(CommonQuality::Low), None, 4), 8);
-  }
-
-  // ── Medium quality (5¢ square, 7¢ wide/tall) ───────────────────────────
-
-  #[test]
-  fn medium_square_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::Medium), Some(CommonAspectRatio::Square), 1), 5);
-  }
-
-  #[test]
-  fn medium_wide_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::Medium), Some(CommonAspectRatio::WideSixteenByNine), 1), 7);
-  }
-
-  #[test]
-  fn medium_tall_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::Medium), Some(CommonAspectRatio::TallNineBySixteen), 1), 7);
-  }
-
-  #[test]
-  fn medium_square_four_images() {
-    assert_eq!(estimate_text(Some(CommonQuality::Medium), Some(CommonAspectRatio::Square), 4), 20);
-  }
-
-  #[test]
-  fn medium_wide_four_images() {
-    assert_eq!(estimate_text(Some(CommonQuality::Medium), Some(CommonAspectRatio::WideSixteenByNine), 4), 28);
-  }
-
-  // ── High quality (17¢ square, 25¢ wide/tall) ───────────────────────────
-
-  #[test]
-  fn high_square_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::High), Some(CommonAspectRatio::Square), 1), 17);
-  }
-
-  #[test]
-  fn high_wide_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::High), Some(CommonAspectRatio::WideSixteenByNine), 1), 25);
-  }
-
-  #[test]
-  fn high_tall_one_image() {
-    assert_eq!(estimate_text(Some(CommonQuality::High), Some(CommonAspectRatio::TallNineBySixteen), 1), 25);
-  }
-
-  #[test]
-  fn high_square_four_images() {
-    assert_eq!(estimate_text(Some(CommonQuality::High), Some(CommonAspectRatio::Square), 4), 68);
-  }
-
-  #[test]
-  fn high_wide_four_images() {
-    assert_eq!(estimate_text(Some(CommonQuality::High), Some(CommonAspectRatio::WideSixteenByNine), 4), 100);
-  }
-
-  // ── Edit mode: adds 2¢ per input image ─────────────────────────────────
-
-  #[test]
-  fn edit_one_input_adds_2_cents() {
-    // High square 1 output = 17¢, plus 1 input × 2¢ = 19¢
-    assert_eq!(estimate_edit(Some(CommonQuality::High), Some(CommonAspectRatio::Square), 1, 1), 19);
-  }
-
-  #[test]
-  fn edit_three_inputs_adds_6_cents() {
-    // High square 1 output = 17¢, plus 3 inputs × 2¢ = 23¢
-    assert_eq!(estimate_edit(Some(CommonQuality::High), Some(CommonAspectRatio::Square), 1, 3), 23);
-  }
-
-  #[test]
-  fn edit_five_inputs_adds_10_cents() {
-    // Medium wide 2 outputs = 7×2 = 14¢, plus 5 inputs × 2¢ = 24¢
-    assert_eq!(estimate_edit(Some(CommonQuality::Medium), Some(CommonAspectRatio::WideSixteenByNine), 2, 5), 24);
-  }
-
-  #[test]
-  fn edit_low_quality_with_inputs() {
-    // Low square 1 output = 2¢, plus 2 inputs × 2¢ = 6¢
-    assert_eq!(estimate_edit(Some(CommonQuality::Low), None, 1, 2), 6);
-  }
-
-  // ── Text mode (no input images) has no input cost ──────────────────────
-
-  #[test]
-  fn text_mode_no_input_cost() {
-    assert_eq!(estimate_text(Some(CommonQuality::High), Some(CommonAspectRatio::Square), 1), 17);
-  }
-}
@@ -9,33 +9,42 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 pub(crate) fn estimate_image_cost_artcraft_gpt_image_1p5(
  plan: &PlanArtcraftGptImage1p5<'_>,
 ) -> ImageGenerationCostEstimate {
-  // Per fal docs (fal-ai/gpt-image-1.5 and fal-ai/gpt-image-1.5/edit):
+  // Pricing varies by quality and image size. 1 credit = 1 USD cent.
+  // Low:    $0.01/image (any size)
+  // Medium: $0.03/image (square/unset), $0.05/image (wide or tall)
+  // High:   $0.13/image (square/unset), $0.20/image (wide or tall)
  //
-  //   Output image cost (per output image), rounded up to whole cents:
-  //     Low:    $0.009 (1024×1024) / $0.013 (other)  →  1¢ / 2¢
-  //     Medium: $0.034 (1024×1024) / $0.050 (1536×1024) / $0.051 (1024×1536)  →  4¢ / 5¢ / 6¢
-  //     High:   $0.133 (1024×1024) / $0.199 (1536×1024) / $0.200 (1024×1536)  → 14¢ / 20¢ / 20¢
+  // From Fal (text to image) -
  //
-  //   Input text tokens: free (we don't charge for these).
+  // Your request will cost different amounts based on the number of images, quality, and size.
  //
-  //   Default quality: High (when request.quality is None).
+  //     You will be charged $0.005 per 1,000 input text tokens. One word is roughly 4 tokens.
+  //     You will be charged $0.010 per 1,000 output text tokens. The model will consume tokens reasoning about your prompt based on it's complexity.
+  //     For low quality, you will be charged $0.009 for 1024x1024 or $0.013 for any other size per image.
+  //     For medium quality, you will be charged $0.034 for 1024x1024, $0.051 for 1024x1536 and $0.050 for 1536x1024 per image.
+  //     For high quality, you will be charged $0.133 for 1024x1024, $0.200 for 1024x1536 or $0.199 for 1536x1024 per image.
  //
-  use GptImage1p5MultiFunctionImageGenQuality as Q;
-  use GptImage1p5MultiFunctionImageGenSize as S;
-
-  let cost_per_image: u64 = match (plan.quality, plan.image_size) {
-    // Low quality
-    (Q::Low, None | Some(S::Square)) => 1,
-    (Q::Low, Some(S::Wide) | Some(S::Tall)) => 2,
-
-    // Medium quality
-    (Q::Medium, None | Some(S::Square)) => 4,
-    (Q::Medium, Some(S::Wide)) => 5,
-    (Q::Medium, Some(S::Tall)) => 6,
-
-    // High quality
-    (Q::High, None | Some(S::Square)) => 14,
-    (Q::High, Some(S::Wide) | Some(S::Tall)) => 20,
+  // From Fal (image to image) -
+  //
+  // Your request will cost different amounts based on the number of images, quality, and size.
+  //
+  //     You will be charged $0.005 per 1,000 input text tokens. One word is roughly 4 tokens.
+  //     You will be charged $0.008 per 1,000 input image tokens. One 1024x1024 image is roughly 135 tokens in low fidelity mode, or 3,050 tokens in high fidelity mode.
+  //     You will be charged $0.010 per 1,000 output text tokens. The model will consume tokens reasoning about your prompt based on it's complexity.
+  //     For low quality, you will be charged $0.009 for 1024x1024 or $0.013 for any other size per image.
+  //     For medium quality, you will be charged $0.034 for 1024x1024, $0.051 for 1024x1536 and $0.050 for 1536x1024 per image.
+  //     For high quality, you will be charged $0.133 for 1024x1024, $0.200 for 1024x1536 or $0.199 for 1536x1024 per image.
+  //
+  let cost_per_image: u64 = match plan.quality {
+    GptImage1p5MultiFunctionImageGenQuality::Low => 1,
+    GptImage1p5MultiFunctionImageGenQuality::Medium => match plan.image_size {
+      Some(GptImage1p5MultiFunctionImageGenSize::Square) | None => 3,
+      Some(GptImage1p5MultiFunctionImageGenSize::Wide) | Some(GptImage1p5MultiFunctionImageGenSize::Tall) => 5,
+    },
+    GptImage1p5MultiFunctionImageGenQuality::High => match plan.image_size {
+      Some(GptImage1p5MultiFunctionImageGenSize::Square) | None => 13,
+      Some(GptImage1p5MultiFunctionImageGenSize::Wide) | Some(GptImage1p5MultiFunctionImageGenSize::Tall) => 20,
+    },
  };

  let num_images: u64 = match plan.num_images {
@@ -61,16 +70,11 @@ pub(crate) fn estimate_image_cost_artcraft_gpt_image_1p5(
 mod tests {
  use crate::api::common_aspect_ratio::CommonAspectRatio;
  use crate::api::common_image_model::CommonImageModel;
-  use crate::api::common_quality::CommonQuality;
  use crate::api::provider::Provider;
  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;

-  fn estimate(
-    quality: Option<CommonQuality>,
-    aspect_ratio: Option<CommonAspectRatio>,
-    batch: u16,
-  ) -> u64 {
+  fn estimate_usd_cents(image_batch_count: u16, aspect_ratio: Option<CommonAspectRatio>) -> u64 {
    let request = GenerateImageRequest {
      model: CommonImageModel::GptImage1p5,
      provider: Provider::Artcraft,
@@ -78,8 +82,7 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio,
-      quality,
-      image_batch_count: Some(batch),
+      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
@@ -87,140 +90,34 @@ mod tests {
      vertical_angle: None,
      zoom: None,
    };
-    request.build().unwrap().estimate_costs()
-      .cost_in_usd_cents.unwrap()
-  }
-
-  // ── Default quality (None → High) ─────────────────────────────────────
-
-  #[test]
-  fn default_quality_square_one_image() {
-    assert_eq!(estimate(None, Some(CommonAspectRatio::Square), 1), 14);
+    request.build()
+      .expect("build should succeed")
+      .estimate_costs()
+      .cost_in_usd_cents
+      .expect("cost_in_usd_cents should be present")
  }

  #[test]
-  fn default_quality_unset_one_image() {
-    assert_eq!(estimate(None, None, 1), 14);
+  fn test_estimate_cost_medium_square() {
+    // Default quality (Medium) + square/unset size = 3 cents each
+    assert_eq!(estimate_usd_cents(1, None), 3);
+    assert_eq!(estimate_usd_cents(1, Some(CommonAspectRatio::Square)), 3);
+    assert_eq!(estimate_usd_cents(2, Some(CommonAspectRatio::Square)), 6);
+    assert_eq!(estimate_usd_cents(3, Some(CommonAspectRatio::Square)), 9);
+    assert_eq!(estimate_usd_cents(4, Some(CommonAspectRatio::Square)), 12);
  }

  #[test]
-  fn default_quality_wide_one_image() {
-    assert_eq!(estimate(None, Some(CommonAspectRatio::WideSixteenByNine), 1), 20);
+  fn test_estimate_cost_medium_wide() {
+    // Medium + wide = 5 cents each
+    assert_eq!(estimate_usd_cents(1, Some(CommonAspectRatio::WideSixteenByNine)), 5);
+    assert_eq!(estimate_usd_cents(4, Some(CommonAspectRatio::WideSixteenByNine)), 20);
  }

  #[test]
-  fn default_quality_tall_one_image() {
-    assert_eq!(estimate(None, Some(CommonAspectRatio::TallNineBySixteen), 1), 20);
-  }
-
-  #[test]
-  fn default_quality_square_four_images() {
-    assert_eq!(estimate(None, Some(CommonAspectRatio::Square), 4), 56);
-  }
-
-  // ── Low quality (1¢ square, 2¢ wide/tall) ─────────────────────────────
-
-  #[test]
-  fn low_square_one() {
-    assert_eq!(estimate(Some(CommonQuality::Low), Some(CommonAspectRatio::Square), 1), 1);
-  }
-
-  #[test]
-  fn low_unset_one() {
-    assert_eq!(estimate(Some(CommonQuality::Low), None, 1), 1);
-  }
-
-  #[test]
-  fn low_wide_one() {
-    assert_eq!(estimate(Some(CommonQuality::Low), Some(CommonAspectRatio::WideSixteenByNine), 1), 2);
-  }
-
-  #[test]
-  fn low_tall_one() {
-    assert_eq!(estimate(Some(CommonQuality::Low), Some(CommonAspectRatio::TallNineBySixteen), 1), 2);
-  }
-
-  #[test]
-  fn low_square_four() {
-    assert_eq!(estimate(Some(CommonQuality::Low), None, 4), 4);
-  }
-
-  #[test]
-  fn low_wide_four() {
-    assert_eq!(estimate(Some(CommonQuality::Low), Some(CommonAspectRatio::WideSixteenByNine), 4), 8);
-  }
-
-  // ── Medium quality (4¢ square, 5¢ wide, 6¢ tall) ─────────────────────
-
-  #[test]
-  fn medium_square_one() {
-    assert_eq!(estimate(Some(CommonQuality::Medium), Some(CommonAspectRatio::Square), 1), 4);
-  }
-
-  #[test]
-  fn medium_unset_one() {
-    assert_eq!(estimate(Some(CommonQuality::Medium), None, 1), 4);
-  }
-
-  #[test]
-  fn medium_wide_one() {
-    assert_eq!(estimate(Some(CommonQuality::Medium), Some(CommonAspectRatio::WideSixteenByNine), 1), 5);
-  }
-
-  #[test]
-  fn medium_tall_one() {
-    assert_eq!(estimate(Some(CommonQuality::Medium), Some(CommonAspectRatio::TallNineBySixteen), 1), 6);
-  }
-
-  #[test]
-  fn medium_square_four() {
-    assert_eq!(estimate(Some(CommonQuality::Medium), Some(CommonAspectRatio::Square), 4), 16);
-  }
-
-  #[test]
-  fn medium_wide_four() {
-    assert_eq!(estimate(Some(CommonQuality::Medium), Some(CommonAspectRatio::WideSixteenByNine), 4), 20);
-  }
-
-  #[test]
-  fn medium_tall_four() {
-    assert_eq!(estimate(Some(CommonQuality::Medium), Some(CommonAspectRatio::TallNineBySixteen), 4), 24);
-  }
-
-  // ── High quality (14¢ square, 20¢ wide/tall) ─────────────────────────
-
-  #[test]
-  fn high_square_one() {
-    assert_eq!(estimate(Some(CommonQuality::High), Some(CommonAspectRatio::Square), 1), 14);
-  }
-
-  #[test]
-  fn high_unset_one() {
-    assert_eq!(estimate(Some(CommonQuality::High), None, 1), 14);
-  }
-
-  #[test]
-  fn high_wide_one() {
-    assert_eq!(estimate(Some(CommonQuality::High), Some(CommonAspectRatio::WideSixteenByNine), 1), 20);
-  }
-
-  #[test]
-  fn high_tall_one() {
-    assert_eq!(estimate(Some(CommonQuality::High), Some(CommonAspectRatio::TallNineBySixteen), 1), 20);
-  }
-
-  #[test]
-  fn high_square_four() {
-    assert_eq!(estimate(Some(CommonQuality::High), Some(CommonAspectRatio::Square), 4), 56);
-  }
-
-  #[test]
-  fn high_wide_four() {
-    assert_eq!(estimate(Some(CommonQuality::High), Some(CommonAspectRatio::WideSixteenByNine), 4), 80);
-  }
-
-  #[test]
-  fn high_tall_four() {
-    assert_eq!(estimate(Some(CommonQuality::High), Some(CommonAspectRatio::TallNineBySixteen), 4), 80);
+  fn test_estimate_cost_medium_tall() {
+    // Medium + tall = 5 cents each
+    assert_eq!(estimate_usd_cents(1, Some(CommonAspectRatio::TallNineBySixteen)), 5);
+    assert_eq!(estimate_usd_cents(4, Some(CommonAspectRatio::TallNineBySixteen)), 20);
  }
 }
@@ -43,7 +43,6 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -8,17 +8,12 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 pub(crate) fn estimate_image_cost_artcraft_nano_banana_2(
  plan: &PlanArtcraftNanaBanana2<'_>,
 ) -> ImageGenerationCostEstimate {
-  // Pricing (USD cents per image), scaled off the 1K base cost of $0.08:
-  //   0.5K → $0.06 (0.75×)
-  //   1K   → $0.08 (1×, default)
-  //   2K   → $0.12 (1.5×)
-  //   4K   → $0.16 (2×)
+  // Pricing: $0.08/image at 0.5K, $0.15/image at 1K or 2K, $0.30/image at 4K.
+  // (Stored as USD cents.)
  let cost_per_image: u64 = match plan.resolution {
-    Some(NanaBanana2MultiFunctionImageGenImageResolution::HalfK) => 6,
-    Some(NanaBanana2MultiFunctionImageGenImageResolution::OneK) => 8,
-    Some(NanaBanana2MultiFunctionImageGenImageResolution::TwoK) => 12,
-    Some(NanaBanana2MultiFunctionImageGenImageResolution::FourK) => 16,
-    None => 8, // default 1K
+    Some(NanaBanana2MultiFunctionImageGenImageResolution::HalfK) => 8,
+    Some(NanaBanana2MultiFunctionImageGenImageResolution::FourK) => 30,
+    _ => 15, // OneK, TwoK, or None (default 1K)
  };

  let num_images: u64 = match plan.num_images {
@@ -56,7 +51,6 @@ mod tests {
      image_inputs: None,
      resolution,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -72,125 +66,17 @@ mod tests {
      .expect("cost_in_usd_cents should be present")
  }

-  // ── Default (None → 1K → 8¢/image) ─────────────────────────────────────────
-
  #[test]
-  fn default_resolution_one_image_costs_8_cents() {
-    assert_eq!(estimate_usd_cents(None, 1), 8);
-  }
+  fn test_estimate_cost_usd_cents() {
+    // 1K/2K: $0.15/image = 15 cents
+    assert_eq!(estimate_usd_cents(None, 1), 15);
+    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 1), 15);
+    assert_eq!(estimate_usd_cents(Some(CommonResolution::TwoK), 1), 15);
+    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 2), 30);
+    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 4), 60);

-  #[test]
-  fn default_resolution_two_images_costs_16_cents() {
-    assert_eq!(estimate_usd_cents(None, 2), 16);
-  }
-
-  #[test]
-  fn default_resolution_three_images_costs_24_cents() {
-    assert_eq!(estimate_usd_cents(None, 3), 24);
-  }
-
-  #[test]
-  fn default_resolution_four_images_costs_32_cents() {
-    assert_eq!(estimate_usd_cents(None, 4), 32);
-  }
-
-  // ── 0.5K → 6¢/image (0.75× base) ───────────────────────────────────────────
-
-  #[test]
-  fn half_k_one_image_costs_6_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::HalfK), 1), 6);
-  }
-
-  #[test]
-  fn half_k_two_images_costs_12_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::HalfK), 2), 12);
-  }
-
-  #[test]
-  fn half_k_three_images_costs_18_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::HalfK), 3), 18);
-  }
-
-  #[test]
-  fn half_k_four_images_costs_24_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::HalfK), 4), 24);
-  }
-
-  // ── 1K → 8¢/image (base) ───────────────────────────────────────────────────
-
-  #[test]
-  fn one_k_one_image_costs_8_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 1), 8);
-  }
-
-  #[test]
-  fn one_k_two_images_costs_16_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 2), 16);
-  }
-
-  #[test]
-  fn one_k_three_images_costs_24_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 3), 24);
-  }
-
-  #[test]
-  fn one_k_four_images_costs_32_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::OneK), 4), 32);
-  }
-
-  // ── 2K → 12¢/image (1.5× base) ─────────────────────────────────────────────
-
-  #[test]
-  fn two_k_one_image_costs_12_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::TwoK), 1), 12);
-  }
-
-  #[test]
-  fn two_k_two_images_costs_24_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::TwoK), 2), 24);
-  }
-
-  #[test]
-  fn two_k_three_images_costs_36_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::TwoK), 3), 36);
-  }
-
-  #[test]
-  fn two_k_four_images_costs_48_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::TwoK), 4), 48);
-  }
-
-  // ── 4K → 16¢/image (2× base) ───────────────────────────────────────────────
-
-  #[test]
-  fn four_k_one_image_costs_16_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 1), 16);
-  }
-
-  #[test]
-  fn four_k_two_images_costs_32_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 2), 32);
-  }
-
-  #[test]
-  fn four_k_three_images_costs_48_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 3), 48);
-  }
-
-  #[test]
-  fn four_k_four_images_costs_64_cents() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 4), 64);
-  }
-
-  // ── 3K (unsupported) falls back to 2K pricing ──────────────────────────────
-
-  #[test]
-  fn three_k_one_image_falls_back_to_two_k_pricing() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::ThreeK), 1), 12);
-  }
-
-  #[test]
-  fn three_k_four_images_falls_back_to_two_k_pricing() {
-    assert_eq!(estimate_usd_cents(Some(CommonResolution::ThreeK), 4), 48);
+    // 4K: $0.30/image = 30 cents
+    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 1), 30);
+    assert_eq!(estimate_usd_cents(Some(CommonResolution::FourK), 2), 60);
  }
 }
@@ -50,7 +50,6 @@ mod tests {
      image_inputs: None,
      resolution,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -46,7 +46,6 @@ mod tests {
      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -43,7 +43,6 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -43,7 +43,6 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -43,7 +43,6 @@ mod tests {
      image_inputs: None,
      resolution: None,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
@@ -2,7 +2,6 @@ pub mod estimate_image_cost_artcraft_flux_1_dev;
 pub mod estimate_image_cost_artcraft_flux_1_schnell;
 pub mod estimate_image_cost_artcraft_flux_pro_1p1;
 pub mod estimate_image_cost_artcraft_flux_pro_1p1_ultra;
-pub mod estimate_image_cost_artcraft_gpt_image_1;
 pub mod estimate_image_cost_artcraft_gpt_image_1p5;
 pub mod estimate_image_cost_artcraft_nano_banana;
 pub mod estimate_image_cost_artcraft_nano_banana_2;
@@ -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,245 +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_1::{
-  FalGptImage1ImageSize, FalGptImage1Quality, PlanFalGptImage1,
-};
-
-pub(crate) fn estimate_image_cost_fal_gpt_image_1(
-  plan: &PlanFalGptImage1<'_>,
-) -> ImageGenerationCostEstimate {
-  // Per fal docs (fal-ai/gpt-image-1/{text-to-image,edit-image}):
-  //
-  //   Output image cost (per output image):
-  //     Low:    $0.011 (1024×1024) / $0.016 (other) →  2¢ / 2¢
-  //     Medium: $0.042 (1024×1024) / $0.063 (other) →  5¢ / 7¢
-  //     High:   $0.167 (1024×1024) / $0.250 (other) → 17¢ / 25¢
-  //
-  //   Input image tokens (edit mode, per input image, high-fidelity assumed):
-  //     3,050 tokens × $0.005/1K tokens ≈ $0.01525 → 2¢ per input image
-  //
-  //   Input text tokens: free (we don't charge for these).
-  //
-  let is_square = matches!(plan.image_size, None | Some(FalGptImage1ImageSize::Square));
-  let output_cost_per_image: u64 = match (plan.quality, is_square) {
-    (FalGptImage1Quality::Low, true) => 2,
-    (FalGptImage1Quality::Low, false) => 2,
-    (FalGptImage1Quality::Medium, true) => 5,
-    (FalGptImage1Quality::Medium, false) => 7,
-    (FalGptImage1Quality::High, true) => 17,
-    (FalGptImage1Quality::High, false) => 25,
-  };
-
-  let num_output_images = plan.num_images.as_u64();
-  let output_cost = output_cost_per_image * num_output_images;
-
-  // Input image token cost: 2¢ per input image (high-fidelity estimate).
-  let input_image_cost: u64 = if plan.image_urls.is_empty() {
-    0
-  } else {
-    2 * plan.image_urls.len() as u64
-  };
-
-  let cost_in_usd_cents = output_cost + input_image_cost;
-
-  ImageGenerationCostEstimate {
-    cost_in_credits: Some(cost_in_usd_cents),
-    cost_in_usd_cents: Some(cost_in_usd_cents),
-    is_free: false,
-    is_unlimited: false,
-    is_rate_limited: false,
-    has_watermark: false,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1::FalGptImage1NumImages;
-
-  fn text_plan(
-    quality: FalGptImage1Quality,
-    image_size: Option<FalGptImage1ImageSize>,
-    num_images: FalGptImage1NumImages,
-  ) -> PlanFalGptImage1<'static> {
-    PlanFalGptImage1 {
-      prompt: Some("p"),
-      image_urls: vec![],
-      image_size,
-      quality,
-      num_images,
-    }
-  }
-
-  fn edit_plan(
-    quality: FalGptImage1Quality,
-    image_size: Option<FalGptImage1ImageSize>,
-    num_images: FalGptImage1NumImages,
-    num_input_images: usize,
-  ) -> PlanFalGptImage1<'static> {
-    let image_urls = (0..num_input_images)
-      .map(|i| format!("https://fake.example.com/img{}.png", i))
-      .collect();
-    PlanFalGptImage1 {
-      prompt: Some("p"),
-      image_urls,
-      image_size,
-      quality,
-      num_images,
-    }
-  }
-
-  fn cents_text(
-    quality: FalGptImage1Quality,
-    image_size: Option<FalGptImage1ImageSize>,
-    num_images: FalGptImage1NumImages,
-  ) -> u64 {
-    estimate_image_cost_fal_gpt_image_1(&text_plan(quality, image_size, num_images))
-      .cost_in_usd_cents
-      .unwrap()
-  }
-
-  fn cents_edit(
-    quality: FalGptImage1Quality,
-    image_size: Option<FalGptImage1ImageSize>,
-    num_images: FalGptImage1NumImages,
-    num_input_images: usize,
-  ) -> u64 {
-    estimate_image_cost_fal_gpt_image_1(&edit_plan(quality, image_size, num_images, num_input_images))
-      .cost_in_usd_cents
-      .unwrap()
-  }
-
-  // ── Low quality text-to-image (2¢/image, both sizes) ──────────────────
-
-  #[test]
-  fn low_square_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::Low, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::One), 2);
-  }
-
-  #[test]
-  fn low_horizontal_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::Low, Some(FalGptImage1ImageSize::Horizontal), FalGptImage1NumImages::One), 2);
-  }
-
-  #[test]
-  fn low_vertical_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::Low, Some(FalGptImage1ImageSize::Vertical), FalGptImage1NumImages::One), 2);
-  }
-
-  #[test]
-  fn low_unset_size_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::Low, None, FalGptImage1NumImages::One), 2);
-  }
-
-  #[test]
-  fn low_four_images() {
-    assert_eq!(cents_text(FalGptImage1Quality::Low, None, FalGptImage1NumImages::Four), 8);
-  }
-
-  // ── Medium quality text-to-image (5¢ square, 7¢ wide/tall) ────────────
-
-  #[test]
-  fn medium_square_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::Medium, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::One), 5);
-  }
-
-  #[test]
-  fn medium_horizontal_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::Medium, Some(FalGptImage1ImageSize::Horizontal), FalGptImage1NumImages::One), 7);
-  }
-
-  #[test]
-  fn medium_vertical_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::Medium, Some(FalGptImage1ImageSize::Vertical), FalGptImage1NumImages::One), 7);
-  }
-
-  #[test]
-  fn medium_square_four_images() {
-    assert_eq!(cents_text(FalGptImage1Quality::Medium, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::Four), 20);
-  }
-
-  #[test]
-  fn medium_horizontal_four_images() {
-    assert_eq!(cents_text(FalGptImage1Quality::Medium, Some(FalGptImage1ImageSize::Horizontal), FalGptImage1NumImages::Four), 28);
-  }
-
-  // ── High quality text-to-image (17¢ square, 25¢ wide/tall) ────────────
-
-  #[test]
-  fn high_square_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::One), 17);
-  }
-
-  #[test]
-  fn high_horizontal_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Horizontal), FalGptImage1NumImages::One), 25);
-  }
-
-  #[test]
-  fn high_vertical_one_image() {
-    assert_eq!(cents_text(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Vertical), FalGptImage1NumImages::One), 25);
-  }
-
-  #[test]
-  fn high_square_two_images() {
-    assert_eq!(cents_text(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::Two), 34);
-  }
-
-  #[test]
-  fn high_horizontal_four_images() {
-    assert_eq!(cents_text(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Horizontal), FalGptImage1NumImages::Four), 100);
-  }
-
-  // ── Edit mode adds 2¢ per input image ─────────────────────────────────
-
-  #[test]
-  fn edit_high_square_one_output_one_input() {
-    // 17¢ output + 2¢ input = 19¢
-    assert_eq!(cents_edit(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::One, 1), 19);
-  }
-
-  #[test]
-  fn edit_high_square_one_output_three_inputs() {
-    // 17¢ output + 3×2¢ input = 23¢
-    assert_eq!(cents_edit(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::One, 3), 23);
-  }
-
-  #[test]
-  fn edit_medium_wide_two_outputs_five_inputs() {
-    // 2×7¢ output + 5×2¢ input = 24¢
-    assert_eq!(cents_edit(FalGptImage1Quality::Medium, Some(FalGptImage1ImageSize::Horizontal), FalGptImage1NumImages::Two, 5), 24);
-  }
-
-  #[test]
-  fn edit_low_square_one_output_two_inputs() {
-    // 2¢ output + 2×2¢ input = 6¢
-    assert_eq!(cents_edit(FalGptImage1Quality::Low, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::One, 2), 6);
-  }
-
-  #[test]
-  fn edit_high_vertical_four_outputs_one_input() {
-    // 4×25¢ output + 1×2¢ input = 102¢
-    assert_eq!(cents_edit(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Vertical), FalGptImage1NumImages::Four, 1), 102);
-  }
-
-  // ── Text mode has no input image cost ─────────────────────────────────
-
-  #[test]
-  fn text_mode_no_input_cost() {
-    assert_eq!(cents_text(FalGptImage1Quality::High, Some(FalGptImage1ImageSize::Square), FalGptImage1NumImages::One), 17);
-  }
-
-  // ── Metadata flags ────────────────────────────────────────────────────
-
-  #[test]
-  fn metadata_flags_are_default() {
-    let estimate = estimate_image_cost_fal_gpt_image_1(&text_plan(
-      FalGptImage1Quality::Medium,
-      None,
-      FalGptImage1NumImages::One,
-    ));
-    assert!(!estimate.is_free);
-    assert!(!estimate.is_unlimited);
-    assert!(!estimate.is_rate_limited);
-    assert!(!estimate.has_watermark);
-  }
-}
@@ -1,180 +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 (fal-ai/gpt-image-1.5 and fal-ai/gpt-image-1.5/edit):
-  //
-  //   Output image cost (per output image), rounded up to whole cents:
-  //     Low:    $0.009 (1024×1024) / $0.013 (other)  →  1¢ / 2¢
-  //     Medium: $0.034 (1024×1024) / $0.050 (1536×1024) / $0.051 (1024×1536)  →  4¢ / 5¢ / 6¢
-  //     High:   $0.133 (1024×1024) / $0.199 (1536×1024) / $0.200 (1024×1536)  → 14¢ / 20¢ / 20¢
-  //
-  use FalGptImage1p5ImageSize as S;
-
-  let cost_per_image: u64 = match (plan.quality, plan.image_size) {
-    // Low quality
-    (FalGptImage1p5Quality::Low, None | Some(S::Square)) => 1,
-    (FalGptImage1p5Quality::Low, Some(S::Wide) | Some(S::Tall)) => 2,
-
-    // Medium quality
-    (FalGptImage1p5Quality::Medium, None | Some(S::Square)) => 4,
-    (FalGptImage1p5Quality::Medium, Some(S::Wide)) => 5,
-    (FalGptImage1p5Quality::Medium, Some(S::Tall)) => 6,
-
-    // High quality
-    (FalGptImage1p5Quality::High, None | Some(S::Square)) => 14,
-    (FalGptImage1p5Quality::High, Some(S::Wide) | Some(S::Tall)) => 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,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1p5::FalGptImage1p5NumImages;
-
-  fn plan(
-    quality: FalGptImage1p5Quality,
-    image_size: Option<FalGptImage1p5ImageSize>,
-    num_images: FalGptImage1p5NumImages,
-  ) -> PlanFalGptImage1p5<'static> {
-    PlanFalGptImage1p5 {
-      prompt: Some("p"),
-      image_urls: vec![],
-      image_size,
-      quality,
-      num_images,
-    }
-  }
-
-  fn cents(
-    quality: FalGptImage1p5Quality,
-    image_size: Option<FalGptImage1p5ImageSize>,
-    num_images: FalGptImage1p5NumImages,
-  ) -> u64 {
-    estimate_image_cost_fal_gpt_image_1p5(&plan(quality, image_size, num_images))
-      .cost_in_usd_cents.unwrap()
-  }
-
-  // ── Low quality (1¢ square, 2¢ wide/tall) ─────────────────────────────
-
-  #[test]
-  fn low_square() {
-    assert_eq!(cents(FalGptImage1p5Quality::Low, Some(FalGptImage1p5ImageSize::Square), FalGptImage1p5NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_unset() {
-    assert_eq!(cents(FalGptImage1p5Quality::Low, None, FalGptImage1p5NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_wide() {
-    assert_eq!(cents(FalGptImage1p5Quality::Low, Some(FalGptImage1p5ImageSize::Wide), FalGptImage1p5NumImages::One), 2);
-  }
-
-  #[test]
-  fn low_tall() {
-    assert_eq!(cents(FalGptImage1p5Quality::Low, Some(FalGptImage1p5ImageSize::Tall), FalGptImage1p5NumImages::One), 2);
-  }
-
-  #[test]
-  fn low_four() {
-    assert_eq!(cents(FalGptImage1p5Quality::Low, None, FalGptImage1p5NumImages::Four), 4);
-  }
-
-  // ── Medium quality (4¢ square, 5¢ wide, 6¢ tall) ─────────────────────
-
-  #[test]
-  fn medium_square() {
-    assert_eq!(cents(FalGptImage1p5Quality::Medium, Some(FalGptImage1p5ImageSize::Square), FalGptImage1p5NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_unset() {
-    assert_eq!(cents(FalGptImage1p5Quality::Medium, None, FalGptImage1p5NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_wide() {
-    assert_eq!(cents(FalGptImage1p5Quality::Medium, Some(FalGptImage1p5ImageSize::Wide), FalGptImage1p5NumImages::One), 5);
-  }
-
-  #[test]
-  fn medium_tall() {
-    assert_eq!(cents(FalGptImage1p5Quality::Medium, Some(FalGptImage1p5ImageSize::Tall), FalGptImage1p5NumImages::One), 6);
-  }
-
-  #[test]
-  fn medium_square_four() {
-    assert_eq!(cents(FalGptImage1p5Quality::Medium, Some(FalGptImage1p5ImageSize::Square), FalGptImage1p5NumImages::Four), 16);
-  }
-
-  #[test]
-  fn medium_wide_four() {
-    assert_eq!(cents(FalGptImage1p5Quality::Medium, Some(FalGptImage1p5ImageSize::Wide), FalGptImage1p5NumImages::Four), 20);
-  }
-
-  #[test]
-  fn medium_tall_four() {
-    assert_eq!(cents(FalGptImage1p5Quality::Medium, Some(FalGptImage1p5ImageSize::Tall), FalGptImage1p5NumImages::Four), 24);
-  }
-
-  // ── High quality (14¢ square, 20¢ wide/tall) ─────────────────────────
-
-  #[test]
-  fn high_square() {
-    assert_eq!(cents(FalGptImage1p5Quality::High, Some(FalGptImage1p5ImageSize::Square), FalGptImage1p5NumImages::One), 14);
-  }
-
-  #[test]
-  fn high_unset() {
-    assert_eq!(cents(FalGptImage1p5Quality::High, None, FalGptImage1p5NumImages::One), 14);
-  }
-
-  #[test]
-  fn high_wide() {
-    assert_eq!(cents(FalGptImage1p5Quality::High, Some(FalGptImage1p5ImageSize::Wide), FalGptImage1p5NumImages::One), 20);
-  }
-
-  #[test]
-  fn high_tall() {
-    assert_eq!(cents(FalGptImage1p5Quality::High, Some(FalGptImage1p5ImageSize::Tall), FalGptImage1p5NumImages::One), 20);
-  }
-
-  #[test]
-  fn high_square_four() {
-    assert_eq!(cents(FalGptImage1p5Quality::High, Some(FalGptImage1p5ImageSize::Square), FalGptImage1p5NumImages::Four), 56);
-  }
-
-  #[test]
-  fn high_wide_four() {
-    assert_eq!(cents(FalGptImage1p5Quality::High, Some(FalGptImage1p5ImageSize::Wide), FalGptImage1p5NumImages::Four), 80);
-  }
-
-  // ── Metadata flags ────────────────────────────────────────────────────
-
-  #[test]
-  fn metadata_flags_are_default() {
-    let estimate = estimate_image_cost_fal_gpt_image_1p5(&plan(
-      FalGptImage1p5Quality::Medium, None, FalGptImage1p5NumImages::One,
-    ));
-    assert!(!estimate.is_free);
-    assert!(!estimate.is_unlimited);
-    assert!(!estimate.is_rate_limited);
-    assert!(!estimate.has_watermark);
-  }
-}
@@ -48,7 +48,6 @@ mod tests {
      image_inputs: None,
      resolution,
      aspect_ratio: None,
-      quality: None,
      image_batch_count: Some(image_batch_count),
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: 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,12 +1,5 @@
 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_1;
-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;
@@ -47,7 +47,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      quality: None,
      image_batch_count: Some(1),
      prompt: Some("a cat walking through a cyberpunk city at night"),
      ..base_flux_1_dev_image_request()
@@ -70,7 +69,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::Square),
-      quality: None,
      image_batch_count: Some(4),
      prompt: Some("a dog surfing a wave, cinematic"),
      ..base_flux_1_dev_image_request()
@@ -96,7 +94,6 @@ mod tests {
      println!("--- text-to-image aspect ratio: {:?} ---", ar);
      let request = GenerateImageRequest {
        aspect_ratio: Some(ar),
-        quality: None,
        image_batch_count: Some(1),
        prompt: Some("a bear walking through an abandoned desert city at night"),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
@@ -37,6 +37,7 @@ mod tests {
  use crate::api::common_aspect_ratio::CommonAspectRatio;
  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
  use crate::test_helpers::{base_flux_1_schnell_image_request, get_artcraft_client};
  use strum::IntoEnumIterator;

@@ -46,7 +47,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      quality: None,
      image_batch_count: Some(1),
      prompt: Some("a man and woman walking through a cyberpunk city at night"),
      ..base_flux_1_schnell_image_request()
@@ -69,7 +69,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::Square),
-      quality: None,
      image_batch_count: Some(4),
      prompt: Some("a dog surfing a wave, cinematic"),
      ..base_flux_1_schnell_image_request()
@@ -95,7 +94,6 @@ mod tests {
      println!("--- text-to-image aspect ratio: {:?} ---", ar);
      let request = GenerateImageRequest {
        aspect_ratio: Some(ar),
-        quality: None,
        image_batch_count: Some(1),
        prompt: Some("a man and woman walking through a futuristic city at evening"),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
@@ -51,7 +51,6 @@ mod tests {
    let tokens = vec![MediaFileToken::new_from_str("m_r45apt2swza6wp8j2z10237t92kkr8")];
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::SquareHd),
-      quality: None,
      image_batch_count: Some(1),
      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
      horizontal_angle: Some(30.0),
@@ -47,7 +47,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      quality: None,
      image_batch_count: Some(1),
      prompt: Some("a cat walking through a cyberpunk city at night"),
      ..base_flux_pro_1p1_image_request()
@@ -70,7 +69,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::Square),
-      quality: None,
      image_batch_count: Some(4),
      prompt: Some("a dog surfing a wave, cinematic"),
      ..base_flux_pro_1p1_image_request()
@@ -96,7 +94,6 @@ mod tests {
      println!("--- text-to-image aspect ratio: {:?} ---", ar);
      let request = GenerateImageRequest {
        aspect_ratio: Some(ar),
-        quality: None,
        image_batch_count: Some(1),
        prompt: Some("a bear walking through an abandoned desert city at night"),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
@@ -47,7 +47,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      quality: None,
      image_batch_count: Some(1),
      prompt: Some("a cat walking through a cyberpunk city at night"),
      ..base_flux_pro_1p1_ultra_image_request()
@@ -70,7 +69,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::Square),
-      quality: None,
      image_batch_count: Some(4),
      prompt: Some("a dog surfing a wave, cinematic"),
      ..base_flux_pro_1p1_ultra_image_request()
@@ -96,7 +94,6 @@ mod tests {
      println!("--- text-to-image aspect ratio: {:?} ---", ar);
      let request = GenerateImageRequest {
        aspect_ratio: Some(ar),
-        quality: None,
        image_batch_count: Some(1),
        prompt: Some("a t-rex walking through an abandoned desert city at night"),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
@@ -1,147 +0,0 @@
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::provider_error::ProviderError;
-use crate::generate::generate_image::generate_image_response::{
-  ArtcraftImageResponsePayload, GenerateImageResponse,
-};
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_1::PlanArtcraftGptImage1;
-use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::GptImage1EditImageRequest;
-use artcraft_api_defs::generate::image::text::generate_gpt_image_1_text_to_image::GenerateGptImage1TextToImageRequest;
-use artcraft_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
-use artcraft_client::endpoints::generate::image::text::generate_gpt_image_1_text_to_image::generate_gpt_image_1_text_to_image;
-
-/// GPT Image 1 has two distinct legacy storyteller-web endpoints (one for
-/// text-to-image, one for image-edit), so we dispatch on whether image refs
-/// are present rather than calling a single multi-function endpoint.
-pub async fn execute_artcraft_gpt_image_1(
-  plan: &PlanArtcraftGptImage1<'_>,
-  artcraft_client: &RouterArtcraftClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let inference_job_token = match plan.image_inputs {
-    Some(image_inputs) => {
-      let request = GptImage1EditImageRequest {
-        uuid_idempotency_token: plan.idempotency_token.clone(),
-        prompt: plan.prompt.map(|p| p.to_string()),
-        image_media_tokens: Some(image_inputs.to_owned()),
-        image_size: plan.image_size.map(|s| s.to_edit()),
-        num_images: Some(plan.num_images.to_edit()),
-        image_quality: Some(plan.quality.to_edit()),
-      };
-      let response = gpt_image_1_edit_image(
-        &artcraft_client.api_host,
-        Some(&artcraft_client.credentials),
-        request,
-      )
-      .await
-      .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Storyteller(err)))?;
-      response.inference_job_token
-    }
-    None => {
-      let request = GenerateGptImage1TextToImageRequest {
-        uuid_idempotency_token: plan.idempotency_token.clone(),
-        prompt: plan.prompt.map(|p| p.to_string()),
-        image_size: plan.image_size.map(|s| s.to_t2i()),
-        num_images: Some(plan.num_images.to_t2i()),
-        image_quality: Some(plan.quality.to_t2i()),
-      };
-      let response = generate_gpt_image_1_text_to_image(
-        &artcraft_client.api_host,
-        Some(&artcraft_client.credentials),
-        request,
-      )
-      .await
-      .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Storyteller(err)))?;
-      response.inference_job_token
-    }
-  };
-
-  Ok(GenerateImageResponse::Artcraft(ArtcraftImageResponsePayload {
-    inference_job_token,
-  }))
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-  use crate::test_helpers::{base_gpt_image_1_image_request, get_artcraft_client};
-  use tokens::tokens::media_files::MediaFileToken;
-
-  // Build-only smoke test that exercises the full text-to-image plan path
-  // (no network I/O — we never call generate_image).
-  #[test]
-  fn build_text_to_image_plan_smoke() {
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::Square),
-      image_batch_count: Some(1),
-      ..base_gpt_image_1_image_request()
-    };
-    let plan = request.build().expect("plan should build");
-    assert!(matches!(plan, ImageGenerationPlan::ArtcraftGptImage1(_)));
-  }
-
-  // Build-only smoke test for the edit path. We can't actually fire the
-  // request without an authenticated client, but we want to make sure the
-  // dispatcher recognizes media-token inputs as edit-mode.
-  #[test]
-  fn build_edit_image_plan_smoke() {
-    let tokens = vec![MediaFileToken::new_from_str("mf_test00000000000000000000000000")];
-    let request = GenerateImageRequest {
-      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
-      ..base_gpt_image_1_image_request()
-    };
-    let plan = request.build().expect("plan should build");
-    let ImageGenerationPlan::ArtcraftGptImage1(plan) = plan else {
-      panic!("expected ArtcraftGptImage1")
-    };
-    assert!(plan.image_inputs.is_some(), "edit mode must carry image_inputs");
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_image_gpt_image_1() {
-    let client = get_artcraft_client();
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      image_batch_count: Some(1),
-      prompt: Some("a horse walking through a cyberpunk city at night"),
-      ..base_gpt_image_1_image_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_image(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_image request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_edit_image_gpt_image_1() {
-    let client = get_artcraft_client();
-
-    let image_tokens = vec![
-      MediaFileToken::new_from_str("m_r45apt2swza6wp8j2z10237t92kkr8"),
-    ];
-
-    let request = GenerateImageRequest {
-      prompt: Some("Change the background to a desert with cacti"),
-      image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
-      aspect_ratio: Some(CommonAspectRatio::Square),
-      image_batch_count: Some(1),
-      ..base_gpt_image_1_image_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_image(&client).await;
-
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_image request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-  }
-}
@@ -50,7 +50,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      quality: None,
      image_batch_count: Some(1),
      prompt: Some("a cat walking through a cyberpunk city at night"),
      ..base_nano_banana_image_request()
@@ -80,7 +79,6 @@ mod tests {
      prompt: Some("Change the background to a sunny beach"),
      image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
      aspect_ratio: Some(CommonAspectRatio::Auto),
-      quality: None,
      image_batch_count: Some(1),
      ..base_nano_banana_image_request()
    };
@@ -105,7 +103,6 @@ mod tests {
      println!("--- text-to-image aspect ratio: {:?} ---", ar);
      let request = GenerateImageRequest {
        aspect_ratio: Some(ar),
-        quality: None,
        image_batch_count: Some(1),
        prompt: Some("a shiba walking through a cyberpunk city at night"),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
@@ -141,7 +138,6 @@ mod tests {
        prompt: Some("Change the background to a sunny beach"),
        image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
        aspect_ratio: Some(ar),
-        quality: None,
        image_batch_count: Some(1),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
        ..base_nano_banana_image_request()
@@ -49,7 +49,6 @@ mod tests {
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
      resolution: Some(CommonResolution::OneK),
-      quality: None,
      image_batch_count: Some(1),
      prompt: Some("a cat walking through a cyberpunk city at night"),
      ..base_nano_banana_2_image_request()
@@ -51,7 +51,6 @@ mod tests {
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
      resolution: Some(CommonResolution::OneK),
-      quality: None,
      image_batch_count: Some(1),
      prompt: Some("a cat walking through a cyberpunk city at night"),
      ..base_image_request()
@@ -75,7 +74,6 @@ mod tests {
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::Square),
      resolution: Some(CommonResolution::OneK),
-      quality: None,
      image_batch_count: Some(4),
      prompt: Some("a dog surfing a wave, cinematic"),
      ..base_image_request()
@@ -108,7 +106,6 @@ mod tests {
      image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
      aspect_ratio: Some(CommonAspectRatio::Auto), // edit mode: preserve source dimensions
      resolution: Some(CommonResolution::OneK),
-      quality: None,
      image_batch_count: Some(1),
      ..base_image_request()
    };
@@ -52,7 +52,6 @@ mod tests {
    let tokens = vec![MediaFileToken::new_from_str("m_r45apt2swza6wp8j2z10237t92kkr8")];
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::SquareHd),
-      quality: None,
      image_batch_count: Some(1),
      prompt: None,
      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
@@ -51,7 +51,6 @@ mod tests {
    let client = get_artcraft_client();
    let request = GenerateImageRequest {
      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      quality: None,
      image_batch_count: Some(1),
      prompt: Some("a cat walking through a cyberpunk city at night"),
      ..base_seedream_4_image_request()
@@ -81,7 +80,6 @@ mod tests {
      prompt: Some("Change the background to a sunny beach"),
      image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
      aspect_ratio: Some(CommonAspectRatio::Auto),
-      quality: None,
      image_batch_count: Some(1),
      ..base_seedream_4_image_request()
    };
@@ -106,7 +104,6 @@ mod tests {
      println!("--- text-to-image aspect ratio: {:?} ---", ar);
      let request = GenerateImageRequest {
        aspect_ratio: Some(ar),
-        quality: None,
        image_batch_count: Some(1),
        prompt: Some("a shiba walking through a cyberpunk city at night"),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
@@ -142,7 +139,6 @@ mod tests {
        prompt: Some("Change the background to a sunny beach"),
        image_inputs: Some(ImageListRef::MediaFileTokens(&image_tokens)),
        aspect_ratio: Some(ar),
-        quality: None,
        image_batch_count: Some(1),
        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
        ..base_seedream_4_image_request()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brandon Thomas	2aa1e762d5	cleanup and fix paging	2026-04-06 20:53:48 -04:00
Brandon Thomas	28a0725f34	cleanup	2026-04-06 20:43:26 -04:00
Brandon Thomas	b68d24040f	rename variant	2026-04-06 20:36:06 -04:00
Brandon Thomas	3792cf82f2	rename	2026-04-06 20:35:37 -04:00
Brandon Thomas	f73add81ef	usage	2026-04-06 19:56:10 -04:00
Brandon Thomas	7465da6092	refactor wip	2026-04-06 19:53:36 -04:00
Brandon Thomas	fc5fda42cf	refactor	2026-04-06 18:47:49 -04:00
Brandon Thomas	0eb4ceed70	refactor	2026-04-06 18:40:27 -04:00
Brandon Thomas	6f1045e58a	fix session errors	2026-04-06 18:24:08 -04:00