Fix history missing from gallery edit

2026-10-25 11:19:29 -04:00 · 2025-08-27 15:56:59 -07:00
916 changed files with 10927 additions and 19371 deletions
@@ -1,168 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n  user_token as `user_token: tokens::tokens::users::UserToken`,\n  subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n  subscription_product_slug,\n  maybe_stripe_customer_id,\n  maybe_stripe_product_id,\n  maybe_stripe_subscription_id,\n  maybe_stripe_subscription_status,\n  maybe_stripe_invoice_is_paid,\n  subscription_start_at,\n  subscription_expires_at,\n  current_billing_period_end_at,\n  maybe_cancel_at,\n  maybe_canceled_at\n\nFROM user_subscriptions\n\nWHERE\n  user_token = ?\n  AND subscription_namespace = ?\n  AND maybe_stripe_customer_id IS NOT NULL\n  AND maybe_stripe_subscription_id IS NOT NULL\n  AND maybe_stripe_subscription_status IS NOT NULL\n  AND maybe_stripe_subscription_status NOT IN ('canceled', 'incomplete_expired')\n  AND subscription_expires_at > CURRENT_TIMESTAMP\n  ORDER BY id ASC\n  LIMIT 1\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::user_subscriptions::UserSubscriptionToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "subscription_product_slug",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_stripe_customer_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_stripe_product_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_stripe_subscription_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_stripe_subscription_status",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_stripe_invoice_is_paid",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "subscription_start_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "subscription_expires_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "current_billing_period_end_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 12,
-        "name": "maybe_cancel_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "BINARY",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 13,
-        "name": "maybe_canceled_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "BINARY",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      true,
-      true
-    ]
-  },
-  "hash": "1e08676857e999a58d3c85474c2a2acec38a413e53ca4207aade690e0bfffe25"
-}
@@ -1,69 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token as `token: tokens::tokens::wallets::WalletToken`,\n  wallet_namespace as `namespace: enums::common::payments_namespace::PaymentsNamespace`,\n  owner_user_token as `owner_user_token: tokens::tokens::users::UserToken`,\n  banked_credits,\n  monthly_credits\nFROM wallets\nWHERE token = ?\nLIMIT 1\nFOR UPDATE\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::wallets::WalletToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "namespace: enums::common::payments_namespace::PaymentsNamespace",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "owner_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "banked_credits",
-        "type_info": {
-          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
-          "char_set": 63,
-          "max_size": 10
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "monthly_credits",
-        "type_info": {
-          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
-          "char_set": 63,
-          "max_size": 10
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "2be78dc9fada8cda24df59ee9911118aa6f40247b10c6a76e07cfa74fd7f1412"
-}
@@ -1,25 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\n      SELECT\n        token as `token: tokens::tokens::wallets::WalletToken`\n      FROM wallets\n      WHERE owner_user_token = ?\n      AND wallet_namespace = ?\n      ORDER BY id ASC\n      LIMIT 1\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::wallets::WalletToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "2c98facb81a43364997db5558ad0f12300230691b09ce96d49e530f8361c237f"
-}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nSELECT\n  user_token,\n  subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n  subscription_product_slug,\n  subscription_expires_at\n\nFROM user_subscriptions\n\nWHERE\n  user_token = ?\n  AND subscription_expires_at > CURRENT_TIMESTAMP\n  ORDER BY id ASC\n        ",
+  "query": "\nSELECT\n  user_token,\n  subscription_namespace,\n  subscription_product_slug,\n  subscription_expires_at\n\nFROM user_subscriptions\n\nWHERE\n  user_token = ?\n  AND subscription_expires_at > CURRENT_TIMESTAMP\n  ORDER BY id ASC\n        ",
  "describe": {
    "columns": [
      {
@@ -15,7 +15,7 @@
      },
      {
        "ordinal": 1,
-        "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace",
+        "name": "subscription_namespace",
        "type_info": {
          "type": "VarString",
          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
@@ -54,5 +54,5 @@
      false
    ]
  },
-  "hash": "680d60fcda0f6fdf269f3525a3fe582db847e56ca7380c0ff5696cbd6efb7db3"
+  "hash": "46e1cb058bffbea5a5d3ffa5dd904416d6f34ccefdb394030f19cc762b507d68"
 }
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\n    UPDATE wallets\n    SET\n        monthly_credits = ?,\n        version = version + 1\n    WHERE token = ?\n    LIMIT 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "47b14121f41b98b0dc92772e9f58a3f4a3821b11ebb10b768595d7635e472dbb"
-}
@@ -1,102 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n  user_token as `user_token: tokens::tokens::users::UserToken`,\n  subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n  subscription_product_slug,\n  maybe_stripe_subscription_status,\n  maybe_stripe_customer_id,\n  maybe_stripe_product_id,\n  maybe_stripe_subscription_id\n\nFROM user_subscriptions\n\nWHERE\n  user_token = ?\n  AND subscription_namespace = ?\n  AND maybe_stripe_customer_id IS NOT NULL\n  AND maybe_stripe_subscription_id IS NOT NULL\n  AND maybe_stripe_subscription_status IS NOT NULL\n  AND maybe_stripe_subscription_status NOT IN ('canceled', 'incomplete_expired')\n  AND subscription_expires_at > CURRENT_TIMESTAMP\n  ORDER BY id ASC\n  LIMIT 1\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::user_subscriptions::UserSubscriptionToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "subscription_product_slug",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_stripe_subscription_status",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_stripe_customer_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_stripe_product_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_stripe_subscription_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "4bfa96682bd1e7576c26c89e3d1a17162193f7df3c1530122ca8e715afc5f385"
-}
@@ -1,102 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token as `token: tokens::tokens::user_subscriptions::UserSubscriptionToken`,\n  user_token as `user_token: tokens::tokens::users::UserToken`,\n  subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n  subscription_product_slug,\n  maybe_stripe_subscription_status,\n  maybe_stripe_customer_id,\n  maybe_stripe_product_id,\n  maybe_stripe_subscription_id\n\nFROM user_subscriptions\n\nWHERE\n  user_token = ?\n  AND subscription_namespace = ?\n  AND maybe_stripe_customer_id IS NOT NULL\n  AND maybe_stripe_subscription_id IS NOT NULL\n  AND maybe_stripe_subscription_status IS NOT NULL\n  ORDER BY id ASC\n  LIMIT 1\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::user_subscriptions::UserSubscriptionToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "subscription_product_slug",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_stripe_subscription_status",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_stripe_customer_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_stripe_product_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_stripe_subscription_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "4c2a71386362fb54f38bd6633f8aebe75e0bd8edf1b1b8773c6298c1f6018332"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO wallets\nSET\n  token = ?,\n  wallet_namespace = ?,\n\n  owner_user_token = ?,\n  \n  banked_credits = 0,\n  monthly_credits = 0\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "4f5100a2cfb465964e77eaacb1ae394daae94de20c56a0966a8222dc9bea63c6"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO user_stripe_customer_links\nSET\n  user_token = ?,\n  payments_namespace = ?,\n  stripe_customer_id = ?\n\nON DUPLICATE KEY UPDATE\n  updated_at = CURRENT_TIMESTAMP\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "6df1b3d2cd145fa3199898fe53565eef28a74206093f4fc6585aad6cc2e9ae71"
-}
@@ -1,47 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  user_token as `user_token: tokens::tokens::users::UserToken`,\n  payments_namespace as `payments_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n  stripe_customer_id\n\nFROM user_stripe_customer_links\n\nWHERE\n  user_token = ?\n  AND payments_namespace = ?\n  ORDER BY id ASC\n  LIMIT 1\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "payments_namespace: enums::common::payments_namespace::PaymentsNamespace",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "stripe_customer_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "771ebd8c236cc3bfeee2df7168c05f639b666e5d67a46593332ce02a0316b4f9"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO user_subscriptions\nSET\n  token = ?,\n\n  maybe_stripe_invoice_is_paid = ?,\n\n  user_token = ?,\n  subscription_namespace = ?,\n  subscription_product_slug = ?,\n\n  maybe_stripe_subscription_id = ?,\n  maybe_stripe_customer_id = ?,\n\n  maybe_stripe_product_id = ?,\n  maybe_stripe_price_id = ?,\n\n  maybe_stripe_recurring_interval = ?,\n  maybe_stripe_subscription_status = ?,\n  maybe_stripe_is_production = ?,\n  \n  maybe_stripe_billing_cycle_anchor = ?,\n\n  subscription_start_at = ?,\n  current_billing_period_start_at = ?,\n  current_billing_period_end_at = ?,\n  subscription_expires_at = ?,\n  maybe_cancel_at = ?,\n  maybe_canceled_at = ?,\n\n  version = version + 1\n\nON DUPLICATE KEY UPDATE\n  maybe_stripe_invoice_is_paid = ?,\n\n  subscription_namespace = ?,\n  subscription_product_slug= ?,\n\n  maybe_stripe_product_id = ?,\n  maybe_stripe_price_id = ?,\n\n  maybe_stripe_recurring_interval = ?,\n  maybe_stripe_subscription_status = ?,\n    \n  maybe_stripe_billing_cycle_anchor = ?,\n\n  current_billing_period_start_at = ?,\n  current_billing_period_end_at = ?,\n  subscription_expires_at = ?,\n  maybe_cancel_at = ?,\n  maybe_canceled_at = ?,\n\n  version = version + 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 32
-    },
-    "nullable": []
-  },
-  "hash": "871163ef30d2f6767f836a05f46d2ce7fb4733583eedddbf07732ebb5c1f1b53"
-}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO user_subscriptions\nSET\n  token = ?,\n  user_token = ?,\n  subscription_namespace = ?,\n  subscription_product_slug = ?,\n\n  maybe_stripe_subscription_id = ?,\n  maybe_stripe_customer_id = ?,\n\n  maybe_stripe_product_id = ?,\n  maybe_stripe_price_id = ?,\n\n  maybe_stripe_recurring_interval = ?,\n  maybe_stripe_subscription_status = ?,\n  maybe_stripe_is_production = ?,\n\n  subscription_start_at = ?,\n  current_billing_period_start_at = ?,\n  current_billing_period_end_at = ?,\n  subscription_expires_at = ?,\n  maybe_cancel_at = ?,\n  maybe_canceled_at = ?,\n\n  version = version + 1\n\nON DUPLICATE KEY UPDATE\n  subscription_namespace = ?,\n  subscription_product_slug= ?,\n\n  maybe_stripe_product_id = ?,\n  maybe_stripe_price_id = ?,\n\n  maybe_stripe_recurring_interval = ?,\n  maybe_stripe_subscription_status = ?,\n\n  current_billing_period_start_at = ?,\n  current_billing_period_end_at = ?,\n  subscription_expires_at = ?,\n  maybe_cancel_at = ?,\n  maybe_canceled_at = ?,\n\n  version = version + 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 28
+    },
+    "nullable": []
+  },
+  "hash": "8d267a609157e6459393ffa32ea83996dcf135c52ee8a930d5be628802d97371"
+}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO wallet_ledger_entries\nSET\n  token = ?,\n  wallet_token = ?,\n  entry_type = ?,\n  maybe_entity_ref = ?,\n  credits_delta = ?,\n  banked_credits_before = ?,\n  banked_credits_after = ?,\n  monthly_credits_before = ?,\n  monthly_credits_after = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 9
-    },
-    "nullable": []
-  },
-  "hash": "9d26917668d4f0ecd2492a94a7775e4561fc5d8b33194274a7715b9853ecea00"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO user_subscriptions\nSET\n  token = ?,\n  user_token = ?,\n  subscription_namespace = ?,\n  subscription_product_slug = ?,\n\n  maybe_stripe_subscription_id = ?,\n  maybe_stripe_customer_id = ?,\n\n  maybe_stripe_product_id = ?,\n  maybe_stripe_price_id = ?,\n\n  maybe_stripe_recurring_interval = ?,\n  maybe_stripe_subscription_status = ?,\n  maybe_stripe_is_production = ?,\n  \n  maybe_stripe_billing_cycle_anchor = ?,\n\n  subscription_start_at = ?,\n  current_billing_period_start_at = ?,\n  current_billing_period_end_at = ?,\n  subscription_expires_at = ?,\n  maybe_cancel_at = ?,\n  maybe_canceled_at = ?,\n\n  version = version + 1\n\nON DUPLICATE KEY UPDATE\n  subscription_namespace = ?,\n  subscription_product_slug= ?,\n\n  maybe_stripe_product_id = ?,\n  maybe_stripe_price_id = ?,\n\n  maybe_stripe_recurring_interval = ?,\n  maybe_stripe_subscription_status = ?,\n    \n  maybe_stripe_billing_cycle_anchor = ?,\n\n  current_billing_period_start_at = ?,\n  current_billing_period_end_at = ?,\n  subscription_expires_at = ?,\n  maybe_cancel_at = ?,\n  maybe_canceled_at = ?,\n\n  version = version + 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 30
-    },
-    "nullable": []
-  },
-  "hash": "a28d6de7424b269e64e97692a4c67a12fcfb789a3e5a512a103a78dea60e75ce"
-}
@@ -1,58 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\n      SELECT\n        token as `token: tokens::tokens::wallets::WalletToken`,\n        wallet_namespace as `namespace: enums::common::payments_namespace::PaymentsNamespace`,\n        banked_credits,\n        monthly_credits\n      FROM wallets\n      WHERE owner_user_token = ?\n      AND wallet_namespace = ?\n      ORDER BY id ASC\n      LIMIT 1\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::wallets::WalletToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "namespace: enums::common::payments_namespace::PaymentsNamespace",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "banked_credits",
-        "type_info": {
-          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
-          "char_set": 63,
-          "max_size": 10
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "monthly_credits",
-        "type_info": {
-          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
-          "char_set": 63,
-          "max_size": 10
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "ac8e3bc9f4e0722ec2f805dbb52b8e43ec8f7a1aa923b9f8f5f6c0770a315ee6"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\n    UPDATE wallets\n    SET\n        banked_credits = ?,\n        version = version + 1\n    WHERE token = ?\n    LIMIT 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "b721e3fda6d80df5041c918b1a127236c802ed18ccc961cc6ac96d156bf085da"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\n    UPDATE wallets\n    SET\n        banked_credits = ?,\n        monthly_credits = ?,\n        version = version + 1\n    WHERE token = ?\n    LIMIT 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "c7f20753f9704d5ff3358586240ecc8a505990f4634ba3af9de6c99c22aa7368"
-}
@@ -926,155 +926,11 @@ dependencies = [
 "serde_qs 0.10.1",
 "sha2 0.10.8",
 "smart-default 0.6.0",
- "smol_str 0.1.24",
+ "smol_str",
 "thiserror 1.0.63",
 "tokio",
 ]

-[[package]]
-name = "async-stripe"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecbddf002ad7a13d2041eadf1b234cb3f57653ffdd901a01bc3f1c65aa77440"
-dependencies = [
- "chrono",
- "futures-util",
- "hex",
- "hmac 0.12.1",
- "http-types",
- "hyper 0.14.28",
- "hyper-tls 0.5.0",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_qs 0.10.1",
- "sha2 0.10.8",
- "smart-default 0.6.0",
- "smol_str 0.1.24",
- "thiserror 1.0.63",
- "tokio",
-]
-
-[[package]]
-name = "async-stripe"
-version = "1.0.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92140fa7152f9dcde7554cb1da37c7ae93b0c724db5214c754c55a9765afbe8"
-dependencies = [
- "async-stripe-client-core",
- "async-stripe-shared",
- "bytes 1.10.1",
- "http-body-util",
- "hyper 1.6.0",
- "hyper-tls 0.6.0",
- "hyper-util",
- "miniserde",
- "thiserror 2.0.12",
- "tokio",
-]
-
-[[package]]
-name = "async-stripe-billing"
-version = "1.0.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c4cd0ac61e0dcb39da4f3c04b049c0d8a3a98868ca976e18ff56ecac1b6e08"
-dependencies = [
- "async-stripe-client-core",
- "async-stripe-shared",
- "async-stripe-types",
- "miniserde",
- "serde",
- "smol_str 0.3.2",
-]
-
-[[package]]
-name = "async-stripe-checkout"
-version = "1.0.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b115740c799730d4caac099d48be4908d2d99611d56a874d2d3555b5d4306a97"
-dependencies = [
- "async-stripe-client-core",
- "async-stripe-shared",
- "async-stripe-types",
- "miniserde",
- "serde",
- "smol_str 0.3.2",
-]
-
-[[package]]
-name = "async-stripe-client-core"
-version = "1.0.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1f6b6693946e650a9361feb319389a1408534ec1b618cd9239f1e2e20b8668"
-dependencies = [
- "async-stripe-shared",
- "async-stripe-types",
- "bytes 1.10.1",
- "futures-util",
- "miniserde",
- "serde",
- "serde_json",
- "serde_qs 0.13.0",
- "thiserror 2.0.12",
- "tracing",
-]
-
-[[package]]
-name = "async-stripe-core"
-version = "1.0.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81d0445a38170bcc3e4adf52fd80c94b70b02dc73a102afcd0bc9d6051eada18"
-dependencies = [
- "async-stripe-client-core",
- "async-stripe-shared",
- "async-stripe-types",
- "miniserde",
- "serde",
- "smol_str 0.3.2",
-]
-
-[[package]]
-name = "async-stripe-shared"
-version = "1.0.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b4328e5c0deeacd7cd5a95286d4f5dce045791b30be87583dd706c2342236c3"
-dependencies = [
- "async-stripe-types",
- "miniserde",
- "serde",
- "serde_json",
- "smol_str 0.3.2",
-]
-
-[[package]]
-name = "async-stripe-types"
-version = "1.0.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "985b4f00fd57ce9cbd015c6410d05dfbe5d2bf90513e20b417e70b6f022e3f88"
-dependencies = [
- "miniserde",
- "serde",
- "serde_json",
- "smol_str 0.3.2",
-]
-
-[[package]]
-name = "async-stripe-webhook"
-version = "1.0.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f8382af92463fa8e0b86e825d7d08eecbcd8715c197f1a66173fcc18e35774"
-dependencies = [
- "async-stripe-shared",
- "async-stripe-types",
- "chrono",
- "hex",
- "hmac 0.12.1",
- "miniserde",
- "serde",
- "sha2 0.10.8",
- "thiserror 1.0.63",
-]
-
 [[package]]
 name = "async-task"
 version = "4.7.1"
@@ -1345,41 +1201,6 @@ dependencies = [
 "num-traits",
 ]

-[[package]]
-name = "billing_artcraft_component"
-version = "0.0.1"
-dependencies = [
- "actix-http",
- "actix-web",
- "anyhow",
- "artcraft_api_defs",
- "async-stripe 1.0.0-alpha.2",
- "async-stripe-billing",
- "async-stripe-checkout",
- "async-stripe-core",
- "async-stripe-shared",
- "async-stripe-types",
- "async-stripe-webhook",
- "chrono",
- "component_traits",
- "enums",
- "errors",
- "http_server_common",
- "log",
- "mockall",
- "mysql_queries",
- "once_cell",
- "reusable_types",
- "serde",
- "serde_derive",
- "serde_json",
- "sqlx",
- "tokens",
- "tokio",
- "user_traits_component",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "billing_component"
 version = "0.0.1"
@@ -1387,11 +1208,9 @@ dependencies = [
 "actix-http",
 "actix-web",
 "anyhow",
- "async-stripe 0.26.0",
+ "async-stripe",
 "async-trait",
 "chrono",
- "component_traits",
- "enums",
 "errors",
 "http_server_common",
 "log",
@@ -2270,34 +2089,6 @@ dependencies = [
 "workspace-build-acceleration",
 ]

-[[package]]
-name = "component_traits"
-version = "0.0.1"
-dependencies = [
- "actix-http",
- "actix-web",
- "anyhow",
- "artcraft_api_defs",
- "async-trait",
- "chrono",
- "enums",
- "errors",
- "http_server_common",
- "log",
- "mockall",
- "mysql_queries",
- "once_cell",
- "reusable_types",
- "serde",
- "serde_derive",
- "serde_json",
- "sqlx",
- "tokens",
- "tokio",
- "user_traits_component",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "composite_identifiers"
 version = "0.0.1"
@@ -6607,17 +6398,6 @@ dependencies = [
 "workspace-build-acceleration",
 ]

-[[package]]
-name = "mini-internal"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c74ab4f1a0c0ab045260ee4727b23c00cc17e5eff5095262d08eef8c3c8d49"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "minidom"
 version = "0.16.0"
@@ -6633,17 +6413,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

-[[package]]
-name = "miniserde"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08ec68bf2ad170a53a6efa92c3df7187968d6e475fe7a935725868154074ca0f"
-dependencies = [
- "itoa 1.0.11",
- "mini-internal",
- "ryu",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.2"
@@ -9759,17 +9528,6 @@ dependencies = [
 "thiserror 1.0.63",
 ]

-[[package]]
-name = "serde_qs"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6"
-dependencies = [
- "percent-encoding",
- "serde",
- "thiserror 1.0.63",
-]
-
 [[package]]
 name = "serde_repr"
 version = "0.1.19"
@@ -10146,16 +9904,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "smol_str"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9676b89cd56310a87b93dec47b11af744f34d5fc9f367b829474eec0a891350d"
-dependencies = [
- "borsh",
- "serde",
-]
-
 [[package]]
 name = "socket2"
 version = "0.5.10"
@@ -10544,11 +10292,9 @@ dependencies = [
 "actix_helpers",
 "anyhow",
 "artcraft_api_defs",
- "async-stripe 0.26.0",
- "async-stripe 0.41.0",
+ "async-stripe",
 "async-trait",
 "base64 0.22.1",
- "billing_artcraft_component",
 "billing_component",
 "bootstrap",
 "bucket_paths",
@@ -10556,7 +10302,6 @@ dependencies = [
 "chrono",
 "cloud_storage",
 "collections",
- "component_traits",
 "composite_identifiers",
 "config",
 "cookies",
@@ -6,7 +6,6 @@ resolver = "2"
 members = [
  # API clients for external services
  # These might be custom implementations or wrappers over other client libraries.
-  "crates/api_clients/artcraft_api_defs", # TODO: api_clients/{artcraft}/{api_defs,client}
  "crates/api_clients/cloud_storage",
  "crates/api_clients/fal_client",
  "crates/api_clients/google_drive_common",
@@ -98,6 +97,7 @@ members = [
  #"crates/schema/database/sqlite_queries",

  # Schema (public): common strongly-typed tokens, ids, payloads, etc.
+  "crates/schema/public/api/artcraft_api_defs",
  "crates/schema/public/composite_identifiers",
  "crates/schema/public/enums",
  "crates/schema/public/enums_public",
@@ -119,8 +119,6 @@ members = [

  # Service Plugins: complete subsystems that can be plugged into services (users, billing, etc.)
  "crates/service/plugins/billing",
-  "crates/service/plugins/billing_artcraft",
-  "crates/service/plugins/component_traits",
  "crates/service/plugins/inference_workloads",
  "crates/service/plugins/user_traits_component",

@@ -178,40 +176,6 @@ publish = false
 #
 workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }

-# Internal libs
-# Setting paths here ensures we don't need to do so in every crate's Cargo.toml
-# It makes refactoring much easier.
-artcraft_api_defs = { path = "crates/api_clients/artcraft_api_defs" }
-build_metadata = { path = "crates/lib/build_metadata" }
-cloud_storage = { path = "crates/api_clients/cloud_storage" }
-cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
-component_traits = { path = "crates/service/plugins/component_traits" }
-cookie_store = { path = "crates/lib/cookie_store" }
-crockford = { path = "crates/lib/data/crockford" }
-enums = { path = "crates/schema/public/enums" }
-enums_public = { path = "crates/schema/public/enums_public" }
-errors = { path = "crates/lib/errors" }
-fal_client = { path = "crates/api_clients/fal_client" }
-file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
-filesys = { path = "crates/lib/files/filesys" }
-idempotency = { path = "crates/lib/idempotency" }
-images = { path = "crates/lib/files/images" }
-jwt_light = { path = "crates/lib/jwt_light" }
-memory_caching = { path = "crates/lib/caching/memory_caching" }
-memory_store = { path = "crates/lib/caching/memory_store" }
-midjourney_client = { path = "crates/api_clients/midjourney_client" }
-mimetypes = { path = "crates/lib/files/mimetypes" }
-openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
-primitives = { path = "crates/lib/data/primitives" }
-shared_service_components = { path = "crates/lib/shared_service_components" }
-sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
-storyteller_client = { path = "crates/api_clients/storyteller_client" }
-subprocess_common = { path = "crates/lib/subprocess_common" }
-test_data = { path = "crates/lib/test_data" }
-testing = { path = "crates/lib/testing" }
-tokens = { path = "crates/schema/public/tokens" }
-web_base64 = { path = "crates/lib/data/web_base64" }
-
 # External libs
 # Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace
 # If a crate needs to use an older/newer version, the dependency should be managed in that crate's own Cargo.toml
@@ -255,3 +219,34 @@ thiserror = "2.0.12"
 tokio = { version = "1.45.1", features = ["macros"] }
 toml = "0.8.22"
 url = { version = "2.5.4", features = ["serde"] }
+
+# Internal libs
+artcraft_api_defs = { path = "crates/schema/public/api/artcraft_api_defs" }
+build_metadata = { path = "crates/lib/build_metadata" }
+cloud_storage = { path = "crates/api_clients/cloud_storage" }
+cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
+cookie_store = { path = "crates/lib/cookie_store" }
+crockford = { path = "crates/lib/data/crockford" }
+enums = { path = "crates/schema/public/enums" }
+enums_public = { path = "crates/schema/public/enums_public" }
+errors = { path = "crates/lib/errors" }
+fal_client = { path = "crates/api_clients/fal_client" }
+file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
+filesys = { path = "crates/lib/files/filesys" }
+idempotency = { path = "crates/lib/idempotency" }
+images = { path = "crates/lib/files/images" }
+jwt_light = { path = "crates/lib/jwt_light" }
+memory_caching = { path = "crates/lib/caching/memory_caching" }
+memory_store = { path = "crates/lib/caching/memory_store" }
+midjourney_client = { path = "crates/api_clients/midjourney_client" }
+mimetypes = { path = "crates/lib/files/mimetypes" }
+openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
+primitives = { path = "crates/lib/data/primitives" }
+shared_service_components = { path = "crates/lib/shared_service_components" }
+sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
+storyteller_client = { path = "crates/api_clients/storyteller_client" }
+subprocess_common = { path = "crates/lib/subprocess_common" }
+test_data = { path = "crates/lib/test_data" }
+testing = { path = "crates/lib/testing" }
+tokens = { path = "crates/schema/public/tokens" }
+web_base64 = { path = "crates/lib/data/web_base64" }
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE user_subscriptions DROP COLUMN maybe_stripe_invoice_is_paid;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE user_subscriptions
-    ADD COLUMN maybe_stripe_invoice_is_paid BOOLEAN DEFAULT NULL
-    AFTER maybe_stripe_subscription_status;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE wallets;
@@ -1,66 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE wallets (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Effective "primary key" (PUBLIC)
-  token VARCHAR(32) NOT NULL,
-
-  -- If we host multiple sites with distinct categories, this will enable us to
-  -- segregate wallets. This is effectively a wallet namespace.
-  -- NB: Uses the `PaymentsNamespace` enum, which is also shared with subscriptions.
-  wallet_namespace VARCHAR(32) NOT NULL,
-
-  -- Who owns the wallet
-  -- In the future, we might allow other users to use the same wallet,
-  -- but the wallet would still have an owner.
-  -- For now, we'll keep this 1:1 with users, but we may want 1:n in the future.
-  owner_user_token VARCHAR(32) NOT NULL,
-
-  -- The durable credits bucket.
-  -- This bucket is persistent and is refilled by user credit purchases.
-  -- Max value unsigned: 4,294,967,295 (U32)
-  banked_credits INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- The monthly credits bucket.
-  -- This bucket is ephemeral and is refilled monthly.
-  -- Max value unsigned: 4,294,967,295 (U32)
-  monthly_credits INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- Whether the stripe subscription is active.
-  -- subscription_is_active BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- Whether the stripe subscription is paid.
-  -- If the subscription is not paid, we should not allow usage of monthly credits.
-  -- subscription_is_paid BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- ========== VECTOR CLOCK ==========
-
-  -- Incremented with every update.
-  version INT NOT NULL DEFAULT 0,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- ========== PAYMENTS AND SUBSCRIPTIONS TIMESTAMPS ==========
-
-  -- When the user last purchased banked (durable) credits.
-  -- banked_credits_last_purchased_at TIMESTAMP DEFAULT NULL,
-
-  -- When we last refilled the monthly bucket.
-  -- This has to do with subscription logic.
-  -- monthly_wallet_refilled_at TIMESTAMP DEFAULT NULL,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  UNIQUE KEY (wallet_namespace, owner_user_token), -- For now
-  INDEX idx_wallet_namespace (wallet_namespace),
-  INDEX idx_owner_user_token (owner_user_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE wallet_ledger_entries;
@@ -1,52 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE wallet_ledger_entries (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Effective "primary key" (PUBLIC)
-  token VARCHAR(32) NOT NULL,
-
-  -- Which wallet this entry corresponds to.
-  wallet_token VARCHAR(32) NOT NULL,
-
-  -- The type of ledger entry this is.
-  entry_type VARCHAR(32) NOT NULL,
-
-  -- A record we can look up to attribute the credit or deduction against
-  -- This could be an internal entity token (prompt_token, job token) or an
-  -- external token (stripe event_id, stripe invoice.id, etc.)
-  -- Length is VARCHAR(255) to accommodate Stripe IDs.
-  maybe_entity_ref VARCHAR(255) DEFAULT NULL,
-
-  -- Signed integer that shows the delta of credits for this event.
-  -- This combines impacts to both banked_credits and monthly_credits.
-  -- This is less authoritative than the before/after fields, but is useful
-  credits_delta INTEGER NOT NULL DEFAULT 0,
-
-  -- Balance of banked credits before the event.
-  -- Max value unsigned: 4,294,967,295 (U32)
-  banked_credits_before INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- Balance of banked credits after the event.
-  banked_credits_after INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- Balance of monthly credits before the event.
-  -- Max value unsigned: 4,294,967,295 (U32)
-  monthly_credits_before INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- Balance of monthly credits after the event.
-  monthly_credits_after INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  KEY index_wallet_token (wallet_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE user_subscriptions DROP COLUMN maybe_stripe_billing_cycle_anchor;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE user_subscriptions
-    ADD COLUMN maybe_stripe_billing_cycle_anchor TIMESTAMP DEFAULT NULL
-    AFTER maybe_stripe_invoice_is_paid;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE stripe_webhook_event_logs DROP COLUMN maybe_internal_entity_token;
@@ -1,7 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE stripe_webhook_event_logs
-    ADD COLUMN maybe_internal_entity_token VARCHAR(32) DEFAULT NULL
-    AFTER maybe_user_token;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE user_stripe_customer_links;
@@ -1,36 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-- 1:1 links between a user and a stripe customer (per payments namespace)
-- We can hard delete records if we have to.
-- If users need a new stripe customer ID, we need to hard delete the existing record.
-CREATE TABLE user_stripe_customer_links (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Composite primary key
-  user_token VARCHAR(32) NOT NULL,
-
-  -- Composite primary key
-  -- If we host multiple sites with distinct categories, this will enable us to
-  -- segregate accounts.
-  -- NB: Uses the `PaymentsNamespace` enum, which is also shared with subscriptions.
-  payments_namespace VARCHAR(32) NOT NULL,
-
-  -- Unique key. (We can loosen to `stripe_customer_id, wallet_namespace` later if
-  -- we want to share billing.)
-  stripe_customer_id VARCHAR(255) NOT NULL,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (user_token, payments_namespace),
-  -- UNIQUE KEY (stripe_customer_id, payments_namespace)
-  UNIQUE KEY (stripe_customer_id)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,66 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE stripe_webhook_event_logs (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- ========== STRIPE DATA ==========
-
-  -- You can safely assume object IDs we generate will never exceed 255 characters,
-  -- but you should be able to handle IDs of up to that length. If for example you’re using MySQL,
-  -- you should store IDs in a VARCHAR(255) COLLATE utf8_bin column (the COLLATE configuration ensures
-  -- case-sensitivity in lookups).
-  -- https://stackoverflow.com/a/61809494
-  stripe_event_id VARCHAR(255) NOT NULL,
-
-  -- The type of webhook event
-  stripe_event_type VARCHAR(255) NOT NULL,
-
-  -- The id of the entity that was the subject of the event.
-  -- We don't always extract this.
-  maybe_stripe_event_entity_id VARCHAR(255) DEFAULT NULL,
-
-  -- The id of the entity that was the subject of the event.
-  -- We don't always extract this.
-  maybe_stripe_customer_id VARCHAR(255) DEFAULT NULL,
-
-  -- Whether this is in production or test mode in Stripe.
-  -- This is controlled by which API keys are used.
-  -- "livemode"=true in production.
-  stripe_is_production BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- ========== INTERNAL SYSTEM METADATA ==========
-
-  -- Whether we handled the event with any sort of action
-  action_was_taken BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- Whether we should ignore any future retries by Stripe replaying the event.
-  -- This helps us treat events with idempotency.
-  should_ignore_retry BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- Some event types may attach a user token
-  maybe_user_token VARCHAR(32) DEFAULT NULL,
-
-  -- An internal optional entity token this resolves to.
-  --  eg. `wallets.token` or `user_subscriptions.token`.
-  maybe_internal_entity_token VARCHAR(32) DEFAULT NULL,
-
-  -- ========== TIMESTAMPS ==========
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- When the event was created on Stripe's end
-  stripe_event_created_at TIMESTAMP NOT NULL,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (stripe_event_id),
-  KEY index_stripe_event_type (stripe_event_type),
-  KEY index_maybe_stripe_event_entity_id (maybe_stripe_event_entity_id),
-  KEY index_maybe_stripe_customer_id (maybe_stripe_customer_id),
-  KEY fk_maybe_user_token (maybe_user_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,36 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-- 1:1 links between a user and a stripe customer (per payments namespace)
-- We can hard delete records if we have to.
-- If users need a new stripe customer ID, we need to hard delete the existing record.
-CREATE TABLE user_stripe_customer_links (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Composite primary key
-  user_token VARCHAR(32) NOT NULL,
-
-  -- Composite primary key
-  -- If we host multiple sites with distinct categories, this will enable us to
-  -- segregate accounts.
-  -- NB: Uses the `PaymentsNamespace` enum, which is also shared with subscriptions.
-  payments_namespace VARCHAR(32) NOT NULL,
-
-  -- Unique key. (We can loosen to `stripe_customer_id, wallet_namespace` later if
-  -- we want to share billing.)
-  stripe_customer_id VARCHAR(255) NOT NULL,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (user_token, payments_namespace),
-  -- UNIQUE KEY (stripe_customer_id, payments_namespace)
-  UNIQUE KEY (stripe_customer_id)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -53,18 +53,6 @@ CREATE TABLE user_subscriptions (
  -- Subscription object status enum as string
  maybe_stripe_subscription_status VARCHAR(32) DEFAULT NULL,

-  -- Primarily managed by the `invoice.paid` and `invoice.payment_failed` webhooks.
-  -- NB: Not applicable to FakeYou subscriptions!
-  maybe_stripe_invoice_is_paid BOOLEAN DEFAULT NULL,
-
-  -- Which day of the month, or month of the year, etc. to anchor the subscription to.
-  -- See docs on the subscription object.
-  -- Stripe: 
-  --   "The reference point that aligns future billing cycle dates. It sets the day 
-  --    of week for week intervals, the day of month for month and year intervals, and 
-  --    the month of year for year intervals. The timestamp is in UTC format."
-  maybe_stripe_billing_cycle_anchor TIMESTAMP DEFAULT NULL,
-
  maybe_stripe_is_production BOOLEAN DEFAULT NULL,

  -- ========== VECTOR CLOCK ==========
@@ -76,8 +64,6 @@ CREATE TABLE user_subscriptions (

  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
- -- NB(bt, 2025-09-16): I don't think we write to the soft deleted_at field for user_subscriptions.
  deleted_at TIMESTAMP DEFAULT NULL,

  -- ========== SUBSCRIPTION TIMESTAMPS ==========
@@ -86,10 +72,7 @@ CREATE TABLE user_subscriptions (
  -- This may predate the Stripe object `created` timestamp due to backdating.
  subscription_start_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,

-  -- Our synthetic "expire" date. Moved forward for active subscriptions,
-  -- backdated for canceled subscriptions.
-  --
-  -- TODO: We'll (maybe?) use this to determine if the subscription is active.
+  -- We'll use this to determine if the subscription is active.
  --
  -- Always compare against MySQL's clock rather than the app's clock so that we
  -- don't get weird clock skew behaviors across multiple requests.
@@ -99,12 +82,8 @@ CREATE TABLE user_subscriptions (
  subscription_expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,

  -- Billing periods.
-  -- Stripe API: subscription.items[0].data.current_period_start
+  -- Maybe useful for debugging.
  current_billing_period_start_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- Stripe API: subscription.items[0].data.current_period_end
-  -- current_period_end is when the subscription renews (or cancels, if the
-  -- subscription is set to cancel).
  current_billing_period_end_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,

  -- Subscription cancellation (future and past)
@@ -1,52 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE wallet_ledger_entries (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Effective "primary key" (PUBLIC)
-  token VARCHAR(32) NOT NULL,
-
-  -- Which wallet this entry corresponds to.
-  wallet_token VARCHAR(32) NOT NULL,
-
-  -- The type of ledger entry this is.
-  entry_type VARCHAR(16) NOT NULL,
-
-  -- A record we can look up to attribute the credit or deduction against
-  -- This could be an internal entity token (prompt_token, job token) or an
-  -- external token (stripe event_id, stripe invoice.id, etc.)
-  -- Length is VARCHAR(255) to accommodate Stripe IDs.
-  maybe_entity_ref VARCHAR(255) DEFAULT NULL,
-
-  -- Signed integer that shows the delta of credits for this event.
-  -- This combines impacts to both banked_credits and monthly_credits.
-  -- This is less authoritative than the before/after fields, but is useful
-  credits_delta INTEGER NOT NULL DEFAULT 0,
-
-  -- Balance of banked credits before the event.
-  -- Max value unsigned: 4,294,967,295 (U32)
-  banked_credits_before INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- Balance of banked credits after the event.
-  banked_credits_after INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- Balance of monthly credits before the event.
-  -- Max value unsigned: 4,294,967,295 (U32)
-  monthly_credits_before INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- Balance of monthly credits after the event.
-  monthly_credits_after INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  KEY index_wallet_token (wallet_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,66 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-CREATE TABLE wallets (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Effective "primary key" (PUBLIC)
-  token VARCHAR(32) NOT NULL,
-
-  -- If we host multiple sites with distinct categories, this will enable us to
-  -- segregate wallets. This is effectively a wallet namespace.
-  -- NB: Uses the `PaymentsNamespace` enum, which is also shared with subscriptions.
-  wallet_namespace VARCHAR(32) NOT NULL,
-
-  -- Who owns the wallet
-  -- In the future, we might allow other users to use the same wallet,
-  -- but the wallet would still have an owner.
-  -- For now, we'll keep this 1:1 with users, but we may want 1:n in the future.
-  owner_user_token VARCHAR(32) NOT NULL,
-
-  -- The durable credits bucket.
-  -- This bucket is persistent and is refilled by user credit purchases.
-  -- Max value unsigned: 4,294,967,295 (U32)
-  banked_credits INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- The monthly credits bucket.
-  -- This bucket is ephemeral and is refilled monthly.
-  -- Max value unsigned: 4,294,967,295 (U32)
-  monthly_credits INTEGER UNSIGNED NOT NULL DEFAULT 0,
-
-  -- Whether the stripe subscription is active.
-  -- subscription_is_active BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- Whether the stripe subscription is paid.
-  -- If the subscription is not paid, we should not allow usage of monthly credits.
-  -- subscription_is_paid BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- ========== VECTOR CLOCK ==========
-
-  -- Incremented with every update.
-  version INT NOT NULL DEFAULT 0,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-
-  -- ========== PAYMENTS AND SUBSCRIPTIONS TIMESTAMPS ==========
-
-  -- When the user last purchased banked (durable) credits.
-  -- banked_credits_last_purchased_at TIMESTAMP DEFAULT NULL,
-
-  -- When we last refilled the monthly bucket.
-  -- This has to do with subscription logic.
-  -- monthly_wallet_refilled_at TIMESTAMP DEFAULT NULL,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (token),
-  UNIQUE KEY (wallet_namespace, owner_user_token), -- For now
-  INDEX idx_wallet_namespace (wallet_namespace),
-  INDEX idx_owner_user_token (owner_user_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,20 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct GetSessionCreditsResponse {
-  pub success: bool,
-
-  /// Any free credits the user might have
-  /// We might support daily free credits.
-  pub free_credits: u64,
-
-  /// Any monthly refilling credits the user might have
-  pub monthly_credits: u64,
-
-  /// Any banked credits the user might have.
-  pub banked_credits: u64,
-
-  /// All the credit amounts added together.
-  pub sum_total_credits: u64,
-}
@@ -1 +0,0 @@
-pub mod get_session_credits;
@@ -1,50 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use utoipa::ToSchema;
-
-pub const GEMINI_25_FLASH_EDIT_IMAGE_PATH: &str = "/v1/generate/image/edit/gemini_25_flash";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct Gemini25FlashEditImageRequest {
-  /// Idempotency token to prevent duplicate requests.
-  pub uuid_idempotency_token: String,
-
-  /// Text prompt to generate the image from.
-  pub prompt: Option<String>,
-
-  // TODO: OneOf for image_urls or image_media_tokens
-  /// Image media tokens to include in the editing context.
-  pub image_media_tokens: Option<Vec<MediaFileToken>>,
-
-  /// Number of images to generate. Default is one.
-  pub num_images: Option<Gemini25FlashEditImageNumImages>,
-
-  /// Quality of the image to generate. Default is High.
-  pub image_quality: Option<Gemini25FlashEditImageImageQuality>,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum Gemini25FlashEditImageNumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum Gemini25FlashEditImageImageQuality {
-  Auto,
-  Low,
-  Medium,
-  High, // Default
-}
-
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct Gemini25FlashEditImageResponse {
-  pub success: bool,
-  pub inference_job_token: InferenceJobToken,
-}
@@ -1,6 +0,0 @@
-pub mod flux_pro_kontext_max_edit_image;
-pub mod gpt_image_1_edit_image;
-pub mod gemini_25_flash_edit_image;
-pub mod qwen_edit_image;
-pub mod seededit_3_edit_image;
-
@@ -1,51 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use utoipa::ToSchema;
-
-pub const QWEN_EDIT_IMAGE_PATH: &str = "/v1/generate/image/edit/qwen";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct QwenEditImageRequest {
-  /// Idempotency token to prevent duplicate requests.
-  pub uuid_idempotency_token: String,
-
-  /// The image we're editing.
-  pub image_media_token: MediaFileToken,
-
-  /// Text prompt to generate the image from.
-  pub prompt: Option<String>,
-
-  /// Text prompt to generate the image from.
-  pub negative_prompt: Option<String>,
-
-  /// Acceleration level for image generation.
-  /// Options: 'none', 'regular'. Higher acceleration increases speed.
-  /// 'regular' balances speed and quality. Default value: "none"
-  pub acceleration: Option<QwenEditImageAcceleration>,
-
-  /// Number of images to generate. Default is one.
-  pub num_images: Option<QwenEditImageNumImages>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub enum QwenEditImageAcceleration {
-  None,
-  Regular,
-  High,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum QwenEditImageNumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct QwenEditImageResponse {
-  pub success: bool,
-  pub inference_job_token: InferenceJobToken,
-}
@@ -1,24 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use utoipa::ToSchema;
-
-pub const SEEDEDIT_3_EDIT_IMAGE_PATH: &str = "/v1/generate/image/edit/seededit_3";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct SeedEdit3EditImageRequest {
-  /// Idempotency token to prevent duplicate requests.
-  pub uuid_idempotency_token: String,
-
-  /// The image we're editing.
-  pub image_media_token: MediaFileToken,
-
-  /// Text prompt to generate the image from.
-  pub prompt: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct SeedEdit3EditImageResponse {
-  pub success: bool,
-  pub inference_job_token: InferenceJobToken,
-}
@@ -1,54 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use utoipa::ToSchema;
-
-pub const GENERATE_SEEDANCE_1_0_PRO_IMAGE_TO_VIDEO_URL_PATH: &str = "/v1/generate/video/seedance_1.0_pro_image_to_video";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct GenerateSeedance10ProImageToVideoRequest {
-  /// Idempotency token to prevent duplicate requests.
-  pub uuid_idempotency_token: String,
-  
-  /// Source of the image file to convert to video.
-  /// It must be an image.
-  pub media_file_token: Option<MediaFileToken>,
-
-  /// Optional text prompt.
-  pub prompt: Option<String>,
-  
-  /// Optional: aspect ratio of the generated video.
-  pub resolution: Option<GenerateSeedance10ProResolution>,
-
-  /// Optional: aspect ratio of the generated video.
-  pub duration: Option<GenerateSeedance10ProDuration>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum GenerateSeedance10ProResolution {
-  FourEightyP,
-  SevenTwentyP,
-  TenEightyP,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum GenerateSeedance10ProDuration {
-  ThreeSeconds,
-  FourSeconds,
-  FiveSeconds,
-  SixSeconds,
-  SevenSeconds,
-  EightSeconds,
-  NineSeconds,
-  TenSeconds,
-  ElevenSeconds,
-  TwelveSeconds,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct GenerateSeedance10ProImageToVideoResponse {
-  pub success: bool,
-  pub inference_job_token: InferenceJobToken,
-}
@@ -1,47 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use utoipa::ToSchema;
-
-pub const GENERATE_VEO_3_FAST_IMAGE_TO_VIDEO_URL_PATH: &str = "/v1/generate/video/veo_3_fast_image_to_video";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct GenerateVeo3FastImageToVideoRequest {
-  /// Idempotency token to prevent duplicate requests.
-  pub uuid_idempotency_token: String,
-  
-  /// Source of the image file to convert to video.
-  /// It must be an image.
-  pub media_file_token: Option<MediaFileToken>,
-  
-  /// Optional text prompt.
-  pub prompt: Option<String>,
-
-  /// Optional: resolution of the generated video.
-  pub resolution: Option<GenerateVeo3FastResolution>,
-
-  /// Optional: aspect ratio of the generated video.
-  pub duration: Option<GenerateVeo3FastDuration>,
-
-  /// Optional: Generate an audio track along with the video
-  pub generate_audio: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum GenerateVeo3FastResolution {
-  SevenTwentyP, // 720p
-  TenEightyP, // 1080p
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum GenerateVeo3FastDuration {
-  EightSeconds,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct GenerateVeo3FastImageToVideoResponse {
-  pub success: bool,
-  pub inference_job_token: InferenceJobToken,
-}
@@ -1,65 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use utoipa::ToSchema;
-
-pub const GENERATE_VEO_3_IMAGE_TO_VIDEO_URL_PATH: &str = "/v1/generate/video/veo_3_image_to_video";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct GenerateVeo3ImageToVideoRequest {
-  /// Idempotency token to prevent duplicate requests.
-  pub uuid_idempotency_token: String,
-  
-  /// Source of the image file to convert to video.
-  /// It must be an image.
-  pub media_file_token: Option<MediaFileToken>,
-  
-  /// Optional text prompt.
-  pub prompt: Option<String>,
-
-  /// Optional: aspect ratio of the generated video.
-  pub aspect_ratio: Option<GenerateVeo3AspectRatio>,
-
-  /// Optional: resolution of the generated video.
-  pub resolution: Option<GenerateVeo3Resolution>,
-
-  /// Optional: aspect ratio of the generated video.
-  pub duration: Option<GenerateVeo3Duration>,
-
-  /// Optional: Generate an audio track along with the video
-  pub generate_audio: Option<bool>,
-
-  // /// Optional.
-  // pub enhance_prompt: Option<bool>,
-  // /// Optional. Whether to automatically attempt to fix prompts that fail
-  // /// content policy or other validation checks by rewriting them
-  // /// Default value: true
-  // pub auto_fix: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum GenerateVeo3AspectRatio {
-  WideSixteenNine, // 16:9
-  TallNineSixteen, // 9:16
-  Square, // 1:1
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum GenerateVeo3Resolution {
-  SevenTwentyP, // 720p
-  TenEightyP, // 1080p
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum GenerateVeo3Duration {
-  EightSeconds,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct GenerateVeo3ImageToVideoResponse {
-  pub success: bool,
-  pub inference_job_token: InferenceJobToken,
-}
@@ -1,8 +0,0 @@
-pub mod common;
-pub mod credits;
-pub mod generate;
-pub mod jobs;
-pub mod media_file;
-pub mod prompts;
-pub mod stripe_artcraft;
-pub mod subscriptions;
@@ -1,17 +0,0 @@
-use enums::common::artcraft_credits_pack_slug::ArtcraftCreditsPackSlug;
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-pub const CREATE_CREDITS_PACK_CHECKOUT_URL_PATH: &str = "/v1/stripe_artcraft/checkout/credits_pack";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCreateCreditsPackCheckoutRequest {
-  pub credits_pack: Option<ArtcraftCreditsPackSlug>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCreateCreditsPackCheckoutResponse {
-  pub success: bool,
-  pub stripe_checkout_redirect_url: String,
-}
-
@@ -1,30 +0,0 @@
-use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug;
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-pub const CREATE_SUBSCRIPTION_CHECKOUT_URL_PATH: &str = "/v1/stripe_artcraft/checkout/subscription";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCreateSubscriptionCheckoutRequest {
-  /// The (non-Stripe) internal identifier for the product or subscription.
-  /// This will be translated into a Stripe identifier.
-  pub plan: Option<ArtcraftSubscriptionSlug>,
-
-  pub cadence: Option<PlanBillingCadence>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema, Debug, Copy, Clone)]
-pub enum PlanBillingCadence {
-  #[serde(rename = "monthly")]
-  Monthly,
-
-  #[serde(rename = "yearly")]
-  Yearly,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCreateSubscriptionCheckoutResponse {
-  pub success: bool,
-  pub stripe_checkout_redirect_url: String,
-}
-
@@ -1,17 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-pub const CUSTOMER_PORTAL_CANCEL_PLAN_URL_PATH: &str = "/v1/stripe_artcraft/portal/cancel_plan";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCustomerPortalCancelPlanRequest {
-  // TODO: Not sure if this is needed
-  pub portal_config_id: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCustomerPortalCancelPlanResponse {
-  pub success: bool,
-  pub stripe_portal_url: String,
-}
-
@@ -1,17 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-pub const CUSTOMER_PORTAL_MANAGE_PLAN_URL_PATH: &str = "/v1/stripe_artcraft/portal/manage_plan";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCustomerPortalManagePlanRequest {
-  // TODO: Not sure if this is needed
-  pub portal_config_id: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCustomerPortalManagePlanResponse {
-  pub success: bool,
-  pub stripe_portal_url: String,
-}
-
@@ -1,37 +0,0 @@
-use enums::common::artcraft_subscription_slug::ArtcraftSubscriptionSlug;
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-pub const CUSTOMER_PORTAL_SWITCH_PLAN_URL_PATH: &str = "/v1/stripe_artcraft/portal/switch_plan";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCustomerPortalSwitchPlanRequest {
-  // TODO: Not sure if this is needed
-  pub portal_config_id: Option<String>,
-
-  /// REQUIRED
-  /// The plan we're switching to.
-  pub plan: Option<ArtcraftSubscriptionSlug>,
-  
-  /// REQUIRED
-  /// The cadence for the plan billing.
-  pub cadence: Option<PlanBillingCadenceConfirmation>,
-}
-
-
-#[derive(Serialize, Deserialize, ToSchema, Debug, Copy, Clone)]
-pub enum PlanBillingCadenceConfirmation {
-  #[serde(rename = "monthly")]
-  Monthly,
-
-  #[serde(rename = "yearly")]
-  Yearly,
-}
-
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCustomerPortalSwitchPlanResponse {
-  pub success: bool,
-  pub stripe_portal_url: String,
-}
-
@@ -1,17 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-pub const CUSTOMER_PORTAL_UPDATE_PAYMENT_METHOD_URL_PATH: &str = "/v1/stripe_artcraft/portal/update_payment_method";
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCustomerPortalUpdatePaymentMethodRequest {
-  // TODO: Not sure if this is needed
-  pub portal_config_id: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct StripeArtcraftCustomerPortalUpdatePaymentMethodResponse {
-  pub success: bool,
-  pub stripe_portal_url: String,
-}
-
@@ -1,6 +0,0 @@
-pub mod create_credits_pack_checkout;
-pub mod create_subscription_checkout;
-pub mod customer_portal_cancel_plan;
-pub mod customer_portal_manage_plan;
-pub mod customer_portal_switch_plan;
-pub mod customer_portal_update_payment_method;
@@ -1,37 +0,0 @@
-use chrono::{DateTime, Utc};
-use enums::common::payments_namespace::PaymentsNamespace;
-use serde_derive::{Deserialize, Serialize};
-use tokens::tokens::user_subscriptions::UserSubscriptionToken;
-use utoipa::ToSchema;
-
-// TODO: Maybe make "artcraft_subscription" or "fakeyou_subscription" with strongly typed slugs?
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct GetSessionSubscriptionResponse {
-  pub success: bool,
-
-  /// Information about the user's subscription, if any.
-  pub active_subscription: Option<SubscriptionInfo>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct SubscriptionInfo {
-  /// Unique token for the subscription.
-  pub subscription_token: UserSubscriptionToken,
-
-  /// Namespace for the subscription.
-  pub namespace: PaymentsNamespace,
-
-  /// Local key for the subscription.
-  pub product_slug: String,
-  
-  /// If the subscription is currently active, this is the next billing date.
-  pub next_bill_at: Option<DateTime<Utc>>,
-  
-  /// If the subscription is set to cancel, this is the end date of the subscription.
-  pub subscription_end_at: Option<DateTime<Utc>>,
-  
-  ///// When the current billing period ends (either 
-  ///// auto-renew/rebill date or auto-cancel/cancellation date).
-  //pub current_billing_period_end_at: DateTime<Utc>,
-}
@@ -1 +0,0 @@
-pub mod get_session_subscription;
@@ -1,87 +0,0 @@
-use crate::creds::fal_api_key::FalApiKey;
-use crate::error::classify_fal_error::classify_fal_error;
-use crate::error::fal_error_plus::FalErrorPlus;
-use fal::endpoints::fal_ai::gemini_25_flash_image::edit::gemini_25_flash_image_edit;
-use fal::prelude::fal_ai::gemini_25_flash_image::edit::Gemini25FlashImageEditInput;
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Gemini25FlashEditArgs<'a, R: IntoUrl> {
-  // Request required
-  pub prompt: &'a str,
-  pub image_urls: Vec<String>,
-  pub num_images: Gemini25FlashEditNumImages,
-
-  // Fulfillment
-  pub webhook_url: R,
-  pub api_key: &'a FalApiKey,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Gemini25FlashEditNumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-
-pub async fn enqueue_gemini_25_flash_edit_webhook<R: IntoUrl>(
-  args: Gemini25FlashEditArgs<'_, R>
-) -> Result<WebhookResponse, FalErrorPlus> {
-
-  let num_images = match args.num_images {
-    Gemini25FlashEditNumImages::One => 1,
-    Gemini25FlashEditNumImages::Two => 2,
-    Gemini25FlashEditNumImages::Three => 3,
-    Gemini25FlashEditNumImages::Four => 4,
-  };
-
-  let request = Gemini25FlashImageEditInput {
-    prompt: args.prompt.to_string(),
-    image_urls: args.image_urls,
-    // Constants
-    num_images: Some(num_images),
-    output_format: Some("png".to_string()),
-  };
-
-  let result = gemini_25_flash_image_edit(request)
-      .with_api_key(&args.api_key.0)
-      .queue_webhook(args.webhook_url)
-      .await;
-
-  result.map_err(|err| classify_fal_error(err))
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::creds::fal_api_key::FalApiKey;
-  use crate::requests::webhook::image::edit::enqueue_gemini_25_flash_edit_webhook::{enqueue_gemini_25_flash_edit_webhook, Gemini25FlashEditArgs, Gemini25FlashEditNumImages};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-  use test_data::web::image_urls::{GHOST_IMAGE_URL, TREX_SKELETON_IMAGE_URL};
-
-  #[tokio::test]
-  #[ignore]
-  async fn test() -> AnyhowResult<()> {
-    // XXX: Don't commit secrets!
-    let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?;
-
-    let api_key = FalApiKey::from_str(&secret);
-
-    let args = Gemini25FlashEditArgs {
-      image_urls: vec![
-        GHOST_IMAGE_URL.to_string(),
-        TREX_SKELETON_IMAGE_URL.to_string(),
-      ],
-      num_images: Gemini25FlashEditNumImages::Two,
-      prompt: "add the ghost to the image of the t-rex skeleton, make it look spooky but friendly",
-      api_key: &api_key,
-      webhook_url: "https://example.com/webhook",
-    };
-
-    let result = enqueue_gemini_25_flash_edit_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -14,13 +14,6 @@ pub struct QwenImageEditArgs<'a, U: IntoUrl, R: IntoUrl> {
  pub num_images: Option<QwenImageEditNumImages>,
  pub image_size: Option<QwenImageEditSize>,

-  pub negative_prompt: Option<String>,
-
-  /// Acceleration level for image generation.
-  /// Options: 'none', 'regular'. Higher acceleration increases speed.
-  /// 'regular' balances speed and quality. Default value: "none"
-  pub acceleration: Option<String>,
-
  // Fulfillment
  pub webhook_url: R,
  pub api_key: &'a FalApiKey,
@@ -116,8 +109,6 @@ mod tests {
      prompt: "put christmas lights on the tree, add snow to the mountains",
      num_images: Some(QwenImageEditNumImages::One),
      image_size: None,
-      negative_prompt: None,
-      acceleration: None,
      api_key: &api_key,
      webhook_url: "https://example.com/webhook",
    };
@@ -1,5 +1,3 @@
 pub mod enqueue_flux_pro_kontext_max_edit_webhook;
-pub mod enqueue_gemini_25_flash_edit_webhook;
-pub mod enqueue_gpt_image_1_edit_image_webhook;
 pub mod enqueue_qwen_image_edit_webhook;
 pub mod enqueue_seededit_v3_edit_webhook;
@@ -21,7 +21,7 @@ pub struct GptEditImageByokArgs<'a, V: IntoUrl> {
 }

 #[derive(Copy, Clone, Debug)]
-pub enum GptEditImageSize {
+pub enum GptEditImageSize{
  Auto,
  Square,
  Horizontal,
@@ -92,7 +92,7 @@ pub async fn enqueue_gpt_image_1_edit_image_webhook<V: IntoUrl>(
 mod tests {
  use crate::creds::fal_api_key::FalApiKey;
  use crate::creds::open_ai_api_key::OpenAiApiKey;
-  use crate::requests::webhook::image::edit::enqueue_gpt_image_1_edit_image_webhook::{enqueue_gpt_image_1_edit_image_webhook, GptEditImageByokArgs, GptEditImageNumImages, GptEditImageQuality, GptEditImageSize};
+  use crate::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::{enqueue_gpt_image_1_edit_image_webhook, GptEditImageByokArgs, GptEditImageNumImages, GptEditImageQuality, GptEditImageSize};
  use errors::AnyhowResult;
  use std::fs::read_to_string;
  use test_data::web::image_urls::{ERNEST_SCARED_STUPID_IMAGE_URL, GHOST_IMAGE_URL, GRASSY_HILL_TRANSPARENT_IMAGE_URL};
@@ -3,6 +3,7 @@ pub mod enqueue_flux_1_dev_text_to_image_webhook;
 pub mod enqueue_flux_1_schnell_text_to_image_webhook;
 pub mod enqueue_flux_pro_11_text_to_image_webhook;
 pub mod enqueue_flux_pro_11_ultra_text_to_image_webhook;
+pub mod enqueue_gpt_image_1_edit_image_webhook;
 pub mod enqueue_gpt_image_1_text_to_image_webhook;
 pub mod infill;
 pub mod remove_background_rembg_webhook;
@@ -57,8 +57,6 @@ pub async fn enqueue_seedance_1_lite_image_to_video_webhook<U: IntoUrl, T: IntoU
    // TODO: Add these later
    camera_fixed: None,
    seed: -1,
-    // Static
-    enable_safety_checker: Some(false),
  };

  let result = image_to_video(request)
@@ -1,115 +0,0 @@
-use crate::creds::fal_api_key::FalApiKey;
-use crate::error::classify_fal_error::classify_fal_error;
-use crate::error::fal_error_plus::FalErrorPlus;
-use fal::endpoints::fal_ai::bytedance::seedance::v1::pro::image_to_video::{seedance_v1_pro_image_to_video, SeedanceImageToVideoProRequest};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Seedance1ProArgs<'a, U: IntoUrl, V: IntoUrl> {
-  pub image_url: U,
-  pub webhook_url: V,
-  pub prompt: &'a str,
-  pub api_key: &'a FalApiKey,
-  pub camera_fixed: bool,
-  pub duration: Seedance1ProDuration,
-  pub resolution: Seedance1ProResolution,
-  pub seed: Option<u32>,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Seedance1ProDuration {
-  ThreeSeconds,
-  FourSeconds,
-  FiveSeconds,
-  SixSeconds,
-  SevenSeconds,
-  EightSeconds,
-  NineSeconds,
-  TenSeconds,
-  ElevenSeconds,
-  TwelveSeconds,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Seedance1ProResolution {
-  FourEightyP, // 480p
-  SevenTwentyP, // 720p
-  TenEightyP, // 1080p
-}
-
-pub async fn enqueue_seedance_1_pro_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
-  args: Seedance1ProArgs<'_, U, V>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  let duration = match args.duration {
-    Seedance1ProDuration::ThreeSeconds => Some("3".to_string()),
-    Seedance1ProDuration::FourSeconds => Some("4".to_string()),
-    Seedance1ProDuration::FiveSeconds => Some("5".to_string()),
-    Seedance1ProDuration::SixSeconds => Some("6".to_string()),
-    Seedance1ProDuration::SevenSeconds => Some("7".to_string()),
-    Seedance1ProDuration::EightSeconds => Some("8".to_string()),
-    Seedance1ProDuration::NineSeconds => Some("9".to_string()), 
-    Seedance1ProDuration::TenSeconds => Some("10".to_string()),
-    Seedance1ProDuration::ElevenSeconds => Some("11".to_string()),
-    Seedance1ProDuration::TwelveSeconds => Some("12".to_string()),
-  };
-  
-  let resolution = match args.resolution {
-    Seedance1ProResolution::FourEightyP => Some("480p".to_string()),
-    Seedance1ProResolution::SevenTwentyP => Some("720p".to_string()),
-    Seedance1ProResolution::TenEightyP => Some("1080p".to_string()),
-  };
-
-  let image_url = args.image_url.as_str().to_string();
-
-  let request = SeedanceImageToVideoProRequest {
-    image_url,
-    prompt: args.prompt.to_string(),
-    duration,
-    resolution,
-    // TODO: Add these later
-    camera_fixed: None,
-    // Static
-    enable_safety_checker: Some(false),
-  };
-
-  let result = seedance_v1_pro_image_to_video(request)
-      .with_api_key(&args.api_key.0)
-      .queue_webhook(args.webhook_url)
-      .await;
-
-  result.map_err(|err| classify_fal_error(err))
-}
-
-
-#[cfg(test)]
-mod tests {
-  use crate::creds::fal_api_key::FalApiKey;
-  use crate::requests::webhook::video::enqueue_seedance_1_pro_image_to_video_webhook::{enqueue_seedance_1_pro_image_to_video_webhook, Seedance1ProArgs, Seedance1ProDuration, Seedance1ProResolution};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-  use test_data::web::image_urls::TALL_MOCHI_WITH_GLASSES_IMAGE_URL;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test() -> AnyhowResult<()> {
-    // XXX: Don't commit secrets!
-    let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?;
-
-    let api_key = FalApiKey::from_str(&secret);
-
-    let args = Seedance1ProArgs {
-      image_url: TALL_MOCHI_WITH_GLASSES_IMAGE_URL,
-      prompt: "shiba in glasses runs to the lake and stands by the shore",
-      api_key: &api_key,
-      camera_fixed: false,
-      duration: Seedance1ProDuration::FiveSeconds,
-      resolution: Seedance1ProResolution::SevenTwentyP,
-      seed: None,
-      webhook_url: "https://example.com/webhook",
-    };
-
-    let result = enqueue_seedance_1_pro_image_to_video_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -6,13 +6,12 @@ use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;

 pub struct Veo3Args<'a, U: IntoUrl, V: IntoUrl> {
-  pub image_url: U,
  pub prompt: &'a str,
+  pub image_url: U,
  pub duration: Veo3Duration,
-  pub aspect_ratio: Veo3AspectRatio,
+  pub api_key: &'a FalApiKey,
  pub resolution: Veo3Resolution,
  pub generate_audio: bool,
-  pub api_key: &'a FalApiKey,
  pub webhook_url: V,
 }

@@ -22,14 +21,6 @@ pub enum Veo3Duration {
  EightSeconds,
 }

-#[derive(Copy, Clone, Debug)]
-pub enum Veo3AspectRatio {
-  Default,
-  WideSixteenNine,
-  TallNineSixteen,
-  Square,
-}
-
 #[derive(Copy, Clone, Debug)]
 pub enum Veo3Resolution {
  Default,
@@ -44,13 +35,6 @@ pub async fn enqueue_veo_3_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
    Veo3Duration::Default => None,
    Veo3Duration::EightSeconds => Some("8s".to_string()),
  };
-
-  let aspect_ratio = match args.aspect_ratio {
-    Veo3AspectRatio::Default => None,
-    Veo3AspectRatio::WideSixteenNine => Some("16:9".to_string()),
-    Veo3AspectRatio::TallNineSixteen => Some("9:16".to_string()),
-    Veo3AspectRatio::Square => Some("1:1".to_string()),
-  };
  
  let resolution= match args.resolution {
    Veo3Resolution::Default => None,
@@ -63,7 +47,6 @@ pub async fn enqueue_veo_3_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
  let request = ImageToVideoInput {
    image_url,
    prompt: args.prompt.to_string(),
-    aspect_ratio,
    resolution,
    duration,
    generate_audio: Some(args.generate_audio),
@@ -81,27 +64,28 @@ pub async fn enqueue_veo_3_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
 #[cfg(test)]
 mod tests {
  use crate::creds::fal_api_key::FalApiKey;
-  use crate::requests::webhook::video::enqueue_veo_3_image_to_video_webhook::{enqueue_veo_3_image_to_video_webhook, Veo3Args, Veo3AspectRatio, Veo3Duration, Veo3Resolution};
+  use crate::requests::webhook::video::enqueue_veo_3_image_to_video_webhook::{enqueue_veo_3_image_to_video_webhook, Veo3Args, Veo3Duration, Veo3Resolution};
  use errors::AnyhowResult;
  use std::fs::read_to_string;
-  use test_data::web::image_urls::{JUNO_AT_LAKE_IMAGE_URL, TREX_SKELETON_IMAGE_URL};
+  use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;

  #[tokio::test]
  #[ignore]
  async fn test() -> AnyhowResult<()> {
+    let image_url = JUNO_AT_LAKE_IMAGE_URL;
+
    // XXX: Don't commit secrets!
    let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?;

    let api_key = FalApiKey::from_str(&secret);

    let args = Veo3Args {
-      image_url: TREX_SKELETON_IMAGE_URL,
-      prompt: "the t-rex skeleton starts walking towards the camera and roars",
+      image_url: image_url,
+      prompt: "corgi at the lake. the corgi barks. camera pulls back to show a wider shot of the lake as the corgi jumps into the water. there are sounds of barking and splashing. cinematic, 8k, ultra wide shot",
      api_key: &api_key,
      duration: Veo3Duration::EightSeconds,
-      aspect_ratio: Veo3AspectRatio::WideSixteenNine,
-      resolution: Veo3Resolution::TenEightyP,
      generate_audio: true,
+      resolution: Veo3Resolution::TenEightyP,
      webhook_url: "https://example.com/webhook",
    };

@@ -2,7 +2,6 @@ pub mod enqueue_kling_16_pro_image_to_video_webhook;
 pub mod enqueue_kling_21_master_image_to_video_webhook;
 pub mod enqueue_kling_21_pro_image_to_video_webhook;
 pub mod enqueue_seedance_1_lite_image_to_video_webhook;
-pub mod enqueue_seedance_1_pro_image_to_video_webhook;
 pub mod enqueue_veo_2_image_to_video_webhook;
 pub mod enqueue_veo_3_fast_image_to_video_webhook;
 pub mod enqueue_veo_3_image_to_video_webhook;
@@ -1,27 +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_get_request::basic_json_get_request;
-use artcraft_api_defs::credits::get_session_credits::GetSessionCreditsResponse;
-use enums::common::payments_namespace::PaymentsNamespace;
-
-pub async fn get_session_credits(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  payments_namespace: PaymentsNamespace
-) -> Result<GetSessionCreditsResponse, StorytellerError> {
-  let url_path = get_url_path(payments_namespace);
-
-  Ok(basic_json_get_request(
-    api_host,
-    &url_path,
-    maybe_creds,
-  ).await?)
-}
-
-
-fn get_url_path(payments_namespace: PaymentsNamespace) -> String {
-  let payments_namespace = payments_namespace.to_str();
-  format!("/v1/credits/namespace/{}", payments_namespace)
-}
-
@@ -1 +0,0 @@
-pub mod get_session_credits;
@@ -11,9 +11,6 @@ pub enum ApiError {

  /// 401. The request was not authorized.
  Unauthorized(String),
-  
-  // 402. Payment required.
-  PaymentRequired(String),

  /// 403. The request was forbidden.
  Forbidden(String),
@@ -59,7 +56,6 @@ impl Display for ApiError {
    match self {
      // Server response code errors
      ApiError::InvalidRequest(msg) => write!(f, "Invalid request: {}", msg),
-      ApiError::PaymentRequired(msg) => write!(f, "Payment required: {}", msg),
      ApiError::Unauthorized(msg) => write!(f, "Unauthorized: {}", msg),
      ApiError::Forbidden(msg) => write!(f, "Forbidden: {}", msg),
      ApiError::NotFound(msg) => write!(f, "Not found: {}", msg),
@@ -84,13 +80,6 @@ impl Display for ApiError {

 impl From<reqwest::Error> for ApiError {
  fn from(error: reqwest::Error) -> Self {
-    if let Some(status) = error.status() {
-      let status = status.as_u16();
-      match status {
-        402 => return ApiError::PaymentRequired(error.to_string()),
-        _ => {} // NB: Fallthrough.
-      }
-    }
    if error.is_timeout() {
      ApiError::Timeout(error.to_string())
    } else if error.is_connect() {
@@ -1,18 +0,0 @@
-use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use crate::error::storyteller_error::StorytellerError;
-use crate::utils::api_host::ApiHost;
-use crate::utils::basic_json_post_request::basic_json_post_request;
-use artcraft_api_defs::generate::image::edit::gemini_25_flash_edit_image::{Gemini25FlashEditImageRequest, Gemini25FlashEditImageResponse, GEMINI_25_FLASH_EDIT_IMAGE_PATH};
-
-pub async fn gemini_25_flash_edit_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: Gemini25FlashEditImageRequest,
-) -> Result<Gemini25FlashEditImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GEMINI_25_FLASH_EDIT_IMAGE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,3 +1,2 @@
 pub mod flux_pro_kontext_max_edit_image;
-pub mod gemini_25_flash_edit_image;
 pub mod gpt_image_1_edit_image;
@@ -1,13 +1,10 @@
 //! An API client for Storyteller / FakeYou

 pub mod credentials;
-pub mod credits;
 pub mod error;
 pub mod generate;
 pub mod jobs;
 pub mod media_files;
 pub mod prompts;
 pub mod recipes;
-pub mod stripe_artcraft;
-pub mod subscriptions;
 pub mod utils;
@@ -1,18 +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::stripe_artcraft::create_credits_pack_checkout::{StripeArtcraftCreateCreditsPackCheckoutRequest, StripeArtcraftCreateCreditsPackCheckoutResponse, CREATE_CREDITS_PACK_CHECKOUT_URL_PATH};
-
-pub async fn create_credits_pack_checkout(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: StripeArtcraftCreateCreditsPackCheckoutRequest,
-) -> Result<StripeArtcraftCreateCreditsPackCheckoutResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    CREATE_CREDITS_PACK_CHECKOUT_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,18 +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::stripe_artcraft::create_subscription_checkout::{StripeArtcraftCreateSubscriptionCheckoutRequest, StripeArtcraftCreateSubscriptionCheckoutResponse, CREATE_SUBSCRIPTION_CHECKOUT_URL_PATH};
-
-pub async fn create_subscription_checkout(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: StripeArtcraftCreateSubscriptionCheckoutRequest,
-) -> Result<StripeArtcraftCreateSubscriptionCheckoutResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    CREATE_SUBSCRIPTION_CHECKOUT_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,18 +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::stripe_artcraft::customer_portal_cancel_plan::{StripeArtcraftCustomerPortalCancelPlanRequest, StripeArtcraftCustomerPortalCancelPlanResponse, CUSTOMER_PORTAL_CANCEL_PLAN_URL_PATH};
-
-pub async fn customer_portal_cancel_plan(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: StripeArtcraftCustomerPortalCancelPlanRequest,
-) -> Result<StripeArtcraftCustomerPortalCancelPlanResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    CUSTOMER_PORTAL_CANCEL_PLAN_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,18 +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::stripe_artcraft::customer_portal_manage_plan::{StripeArtcraftCustomerPortalManagePlanRequest, StripeArtcraftCustomerPortalManagePlanResponse, CUSTOMER_PORTAL_MANAGE_PLAN_URL_PATH};
-
-pub async fn customer_portal_manage_plan(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: StripeArtcraftCustomerPortalManagePlanRequest,
-) -> Result<StripeArtcraftCustomerPortalManagePlanResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    CUSTOMER_PORTAL_MANAGE_PLAN_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,18 +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::stripe_artcraft::customer_portal_switch_plan::{StripeArtcraftCustomerPortalSwitchPlanRequest, StripeArtcraftCustomerPortalSwitchPlanResponse, CUSTOMER_PORTAL_SWITCH_PLAN_URL_PATH};
-
-pub async fn customer_portal_switch_plan(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: StripeArtcraftCustomerPortalSwitchPlanRequest,
-) -> Result<StripeArtcraftCustomerPortalSwitchPlanResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    CUSTOMER_PORTAL_SWITCH_PLAN_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,18 +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::stripe_artcraft::customer_portal_update_payment_method::{StripeArtcraftCustomerPortalUpdatePaymentMethodRequest, StripeArtcraftCustomerPortalUpdatePaymentMethodResponse, CUSTOMER_PORTAL_UPDATE_PAYMENT_METHOD_URL_PATH};
-
-pub async fn customer_portal_update_payment_method(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: StripeArtcraftCustomerPortalUpdatePaymentMethodRequest,
-) -> Result<StripeArtcraftCustomerPortalUpdatePaymentMethodResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    CUSTOMER_PORTAL_UPDATE_PAYMENT_METHOD_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,6 +0,0 @@
-pub mod create_credits_pack_checkout;
-pub mod create_subscription_checkout;
-pub mod customer_portal_cancel_plan;
-pub mod customer_portal_manage_plan;
-pub mod customer_portal_switch_plan;
-pub mod customer_portal_update_payment_method;
@@ -1,28 +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_get_request::basic_json_get_request;
-use artcraft_api_defs::subscriptions::get_session_subscription::GetSessionSubscriptionResponse;
-use enums::common::payments_namespace::PaymentsNamespace;
-use log::debug;
-
-pub async fn get_session_subscription(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  payments_namespace: PaymentsNamespace
-) -> Result<GetSessionSubscriptionResponse, StorytellerError> {
-  let url_path = get_url_path(api_host, payments_namespace);
-
-  debug!("Requesting {:?}", &url_path);
-
-  Ok(basic_json_get_request(
-    api_host,
-    &url_path,
-    maybe_creds,
-  ).await?)
-}
-
-fn get_url_path(api_host: &ApiHost, payments_namespace: PaymentsNamespace) -> String {
-  let payments_namespace = payments_namespace.to_str();
-  format!("/v1/subscriptions/namespace/{}", payments_namespace)
-}
@@ -1 +0,0 @@
-pub mod get_session_subscription;
@@ -38,7 +38,6 @@ pub async fn filter_bad_response(response: reqwest::Response) -> Result<reqwest:

  match status_code {
    STATUS_401_UNAUTHORIZED => Err(ApiError::Unauthorized(response_body)),
-    STATUS_402_PAYMENT_REQUIRED => Err(ApiError::PaymentRequired(response_body)),
    STATUS_403_FORBIDDEN => Err(ApiError::Forbidden(response_body)),
    STATUS_404_NOT_FOUND => Err(ApiError::NotFound(response_body)),
    STATUS_429_TOO_MANY_REQUESTS => Err(ApiError::TooManyRequests(response_body)),
@@ -1,6 +1,5 @@
 pub const STATUS_401_UNAUTHORIZED : u16 = 401u16;

-pub const STATUS_402_PAYMENT_REQUIRED : u16 = 402u16;
 pub const STATUS_403_FORBIDDEN : u16 = 403u16;

 pub const STATUS_404_NOT_FOUND : u16 = 404u16;
@@ -16,7 +15,6 @@ mod tests {
  #[test]
  pub fn test_codes() {
    assert_eq!(STATUS_401_UNAUTHORIZED, 401);
-    assert_eq!(STATUS_402_PAYMENT_REQUIRED, 402);
    assert_eq!(STATUS_403_FORBIDDEN, 403);
    assert_eq!(STATUS_404_NOT_FOUND, 404);
    assert_eq!(STATUS_429_TOO_MANY_REQUESTS, 429);
@@ -1,57 +0,0 @@
-use crate::core::commands::enqueue::generate_error::{BillingIssueReason, BillingProvider, GenerateError, ProviderFailureReason};
-use crate::core::events::functional_events::show_provider_billing_modal_event::ShowProviderBillingModalEvent;
-use enums::common::generation_provider::GenerationProvider;
-use log::warn;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::error::storyteller_error::StorytellerError;
-use tauri::AppHandle;
-
-pub async fn maybe_notify_frontend_of_billing_errors(
-  app: &AppHandle,
-  error: &GenerateError,
-) {
-  match error {
-    GenerateError::BillingIssue(reason) => {
-      billing_error(app, reason);
-    }
-    GenerateError::ProviderFailure(reason) => {
-      provider_billing_error(app, reason);
-    }
-    _ => {
-      // Do nothing for other types of errors
-    }
-  }
-}
-
-fn billing_error(
-  app: &AppHandle,
-  reason: &BillingIssueReason,
-) {
-  let provider = match reason.provider {
-    BillingProvider::Fal => GenerationProvider::Fal,
-    BillingProvider::Midjourney => GenerationProvider::Midjourney,
-    BillingProvider::Sora => GenerationProvider::Sora,
-    BillingProvider::Storyteller => GenerationProvider::Artcraft,
-  };
-  warn!("Billing issue with: {:?}", provider);
-  ShowProviderBillingModalEvent::send_for_provider(provider, app);
-}
-
-fn provider_billing_error(
-  app: &AppHandle,
-  error: &ProviderFailureReason,
-) {
-  let provider;
-  
-  match error {
-    ProviderFailureReason::StorytellerError(StorytellerError::Api(ApiError::PaymentRequired(reason))) => {
-      warn!("Billing issue with Artcraft/Storyteller: {}", reason);
-      provider = GenerationProvider::Artcraft;
-    }
-    _ => {
-      return;
-    }
-  }
-  
-  ShowProviderBillingModalEvent::send_for_provider(provider, app);
-}
@@ -1,2 +0,0 @@
-pub mod notify_frontend_of_errors;
-mod maybe_notify_frontend_of_billing_errors;
@@ -1,10 +0,0 @@
-use crate::core::commands::enqueue::common::maybe_notify_frontend_of_billing_errors::maybe_notify_frontend_of_billing_errors;
-use crate::core::commands::enqueue::generate_error::GenerateError;
-use tauri::AppHandle;
-
-pub async fn notify_frontend_of_errors(
-  app: &AppHandle,
-  errors: &GenerateError,
-) {
-  maybe_notify_frontend_of_billing_errors(app, errors).await;
-}
@@ -1,166 +0,0 @@
-use crate::core::artcraft_error::ArtcraftError;
-use base64::DecodeError;
-use errors::AnyhowError;
-use fal_client::error::fal_error_plus::FalErrorPlus;
-use midjourney_client::error::midjourney_error::MidjourneyError;
-use openai_sora_client::sora_error::SoraError;
-use storyteller_client::error::storyteller_error::StorytellerError;
-
-#[derive(Debug)]
-pub enum GenerateError {
-  BadInput(BadInputReason),
-  MissingCredentials(MissingCredentialsReason),
-  ProviderFailure(ProviderFailureReason),
-
-  /// We couldn't find a provider to dispatch the request to.
-  NoProviderAvailable,
-
-  /// There was a billing, credits, or payments issue.
-  BillingIssue(BillingIssueReason),
-
-  /// The feature is not yet implemented.
-  NotYetImplemented(String),
-
-  // Misc error buckets
-  AnyhowError(AnyhowError),
-  DecodeError(DecodeError),
-  IoError(std::io::Error),
-}
-
-#[derive(Debug)]
-pub enum BadInputReason {
-  Base64DecodeError,
-  BothImageMaskMediaTokenAndBytesSupplied,
-  CannotDetermineImageMimeType,
-  InvalidNumberOfInputImages {
-    provided: u32,
-    min: u32,
-    max: u32,
-  },
-  InvalidNumberOfRequestedImages {
-    requested: u32,
-    min: u32,
-    max: u32,
-  },
-  NoModelSpecified,
-  RequiredSourceImageMaskNotProvided,
-  RequiredSourceImageNotProvided,
-  WrongImageArguments(String),
-}
-
-#[derive(Debug)]
-pub enum MissingCredentialsReason {
-  NeedsFalApiKey,
-  NeedsMidjourneyCredentials,
-  NeedsMidjourneyUserId,
-  NeedsMidjourneyUserInfo,
-  NeedsSoraCredentials,
-  NeedsStorytellerCredentials,
-}
-
-#[derive(Debug)]
-pub struct BillingIssueReason {
-  pub provider: BillingProvider,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum BillingProvider {
-  Fal,
-  Midjourney,
-  Sora,
-  Storyteller,
-}
-
-#[derive(Debug)]
-pub enum ProviderFailureReason {
-  Fal(FalErrorPlus),
-  MidjourneyError(MidjourneyError),
-  /// NB: The midjourney client doesn't categorize all errors, so we have to do so on our end.
-  MidjourneyJobEnqueueFailed,
-  SoraError(SoraError),
-  StorytellerError(StorytellerError),
-}
-
-impl GenerateError {
-
-  //
-  // Bad input
-  //
-
-  pub fn both_image_mask_media_token_and_bytes_supplied() -> Self {
-    Self::BadInput(BadInputReason::BothImageMaskMediaTokenAndBytesSupplied)
-  }
-
-  pub fn no_model_specified() -> Self {
-    Self::BadInput(BadInputReason::NoModelSpecified)
-  }
-
-  pub fn required_source_image_mask_not_provided() -> Self {
-    Self::BadInput(BadInputReason::RequiredSourceImageMaskNotProvided)
-  }
-
-  pub fn required_source_image_not_provided() -> Self {
-    Self::BadInput(BadInputReason::RequiredSourceImageNotProvided)
-  }
-
-  //
-  // Missing credentials
-  //
-
-  pub fn needs_fal_api_key() -> Self {
-    Self::MissingCredentials(MissingCredentialsReason::NeedsFalApiKey)
-  }
-
-  pub fn needs_midjourney_credentials() -> Self {
-    Self::MissingCredentials(MissingCredentialsReason::NeedsMidjourneyCredentials)
-  }
-
-  pub fn needs_sora_credentials() -> Self {
-    Self::MissingCredentials(MissingCredentialsReason::NeedsSoraCredentials)
-  }
-
-  pub fn needs_storyteller_credentials() -> Self {
-    Self::MissingCredentials(MissingCredentialsReason::NeedsStorytellerCredentials)
-  }
-}
-
-impl From<AnyhowError> for GenerateError {
-  fn from(value: AnyhowError) -> Self {
-    Self::AnyhowError(value)
-  }
-}
-
-impl From<ArtcraftError> for GenerateError {
-  fn from(value: ArtcraftError) -> Self {
-    match value {
-      ArtcraftError::AnyhowError(e) => Self::AnyhowError(e),
-      ArtcraftError::DecodeError(e) => Self::DecodeError(e),
-      ArtcraftError::IoError(e) => Self::IoError(e),
-      ArtcraftError::StorytellerError(e) => Self::ProviderFailure(ProviderFailureReason::StorytellerError(e)),
-    }
-  }
-}
-
-impl From<FalErrorPlus> for GenerateError {
-  fn from(value: FalErrorPlus) -> Self {
-    Self::ProviderFailure(ProviderFailureReason::Fal(value))
-  }
-}
-
-impl From<MidjourneyError> for GenerateError {
-  fn from(value: MidjourneyError) -> Self {
-    Self::ProviderFailure(ProviderFailureReason::MidjourneyError(value))
-  }
-}
-
-impl From<SoraError> for GenerateError {
-  fn from(value: SoraError) -> Self {
-    Self::ProviderFailure(ProviderFailureReason::SoraError(value))
-  }
-}
-
-impl From<StorytellerError> for GenerateError {
-  fn from(value: StorytellerError) -> Self {
-    Self::ProviderFailure(ProviderFailureReason::StorytellerError(value))
-  }
-}
@@ -1,6 +1,6 @@
-use crate::core::commands::enqueue::common::notify_frontend_of_errors::notify_frontend_of_errors;
-use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
+use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
 use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal::handle_generic_bg_removal;
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit::handle_gpt_image_1_edit;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
@@ -41,7 +41,6 @@ use storyteller_client::media_files::get_media_file::get_media_file;
 use storyteller_client::utils::api_host::ApiHost;
 use tauri::{AppHandle, Manager, State};
 use tokens::tokens::media_files::MediaFileToken;
-use crate::core::events::functional_events::credits_balance_changed_event::CreditsBalanceChangedEvent;

 #[derive(Deserialize, Debug)]
 pub struct EnqueueImageBgRemovalCommand {
@@ -125,8 +124,6 @@ pub async fn enqueue_image_bg_removal_command(
  match result {
    Err(err) => {
      error!("Error removing background: {:?}", err);
-      
-      notify_frontend_of_errors(&app, &err).await;

      // TODO: Derive from err. Make service provider optional.
      let event = GenerationEnqueueFailureEvent {
@@ -140,7 +137,7 @@ pub async fn enqueue_image_bg_removal_command(
        error!("Failed to emit event: {:?}", err); // Fail open.
      }

-      Err(error_to_tauri_response(err))
+      Err(err.to_tauri_response())
    }
    Ok(event) => {
      let event = GenerationEnqueueSuccessEvent {
@@ -153,8 +150,6 @@ pub async fn enqueue_image_bg_removal_command(
        error!("Failed to emit event: {:?}", err); // Fail open.
      }

-      CreditsBalanceChangedEvent{}.send_infallible(&app);
-
      Ok(EnqueueImageBgRemovalSuccessResponse {}.into())
    }
  }
@@ -170,7 +165,7 @@ pub async fn handle_request(
  storyteller_creds_manager: &StorytellerCredentialManager,
  fal_creds_manager: &FalCredentialManager,
  fal_task_queue: &FalTaskQueue,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
+) -> Result<TaskEnqueueSuccess, InternalBgRemovalError> {
  
  // TODO(bt,2025-07-07): Other model/provider routing...
  
@@ -201,35 +196,3 @@ pub async fn handle_request(

  Ok(success_event)
 }
-
-fn error_to_tauri_response(error: GenerateError) -> CommandErrorResponseWrapper<EnqueueImageBgRemovalErrorType, ()> {
-  let mut status = CommandErrorStatus::ServerError;
-  let mut error_type = EnqueueImageBgRemovalErrorType::ServerError;
-  let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
-
-  match error {
-    GenerateError::NoProviderAvailable => {
-      status = CommandErrorStatus::ServerError;
-      error_type = EnqueueImageBgRemovalErrorType::NoProviderAvailable;
-      error_message = "No configured provider available for background removal".to_string();
-    }
-    GenerateError::BadInput(BadInputReason::RequiredSourceImageNotProvided) => {
-      status = CommandErrorStatus::BadRequest;
-      error_type = EnqueueImageBgRemovalErrorType::MissingImage;
-      error_message = "No image provided for background removal".to_string();
-    }
-    GenerateError::BadInput(BadInputReason::Base64DecodeError) => {
-      status = CommandErrorStatus::BadRequest;
-      error_type = EnqueueImageBgRemovalErrorType::Base64DecodeError;
-      error_message = "Failed to decode base64 image data".to_string();
-    }
-    _ => {}, // Other cases fall through.
-  }
-
-  CommandErrorResponseWrapper {
-    status,
-    error_message: Some(error_message.to_string()),
-    error_type: Some(error_type),
-    error_details: None,
-  }
-}
@@ -0,0 +1,71 @@
+use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalErrorType;
+use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
+use errors::AnyhowError;
+use serde::Serialize;
+use storyteller_client::error::storyteller_error::StorytellerError;
+
+#[derive(Debug)]
+pub enum InternalBgRemovalError {
+  /// No provider is configured for the model type.
+  NoProviderAvailable,
+  
+  /// No storyteller credentials are set.
+  NeedsStorytellerCredentials,
+  
+  /// No image was provided for background removal.
+  MissingImage,
+  
+  /// Could not decode the base64 image data.
+  Base64DecodeError,
+  
+  AnyhowError(AnyhowError),
+  StorytellerError(StorytellerError),
+}
+
+impl From<AnyhowError> for InternalBgRemovalError {
+  fn from(value: AnyhowError) -> Self {
+    Self::AnyhowError(value)
+  }
+}
+
+impl From<StorytellerError> for InternalBgRemovalError {
+  fn from(value: StorytellerError) -> Self {
+    Self::StorytellerError(value)
+  }
+}
+
+impl InternalBgRemovalError {
+  pub fn to_tauri_response<E: Serialize>(&self) -> CommandErrorResponseWrapper<EnqueueImageBgRemovalErrorType, E> {
+    let mut status = CommandErrorStatus::ServerError;
+    let mut error_type = EnqueueImageBgRemovalErrorType::ServerError;
+    let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
+    
+    match self {
+      InternalBgRemovalError::NoProviderAvailable => {
+        status = CommandErrorStatus::ServerError;
+        error_type = EnqueueImageBgRemovalErrorType::NoProviderAvailable;
+        error_message = "No configured provider available for background removal".to_string();
+      }
+      InternalBgRemovalError::MissingImage => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueImageBgRemovalErrorType::MissingImage;
+        error_message = "No image provided for background removal".to_string();
+      }
+      InternalBgRemovalError::Base64DecodeError => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueImageBgRemovalErrorType::Base64DecodeError;
+        error_message = "Failed to decode base64 image data".to_string();
+      }
+      InternalBgRemovalError::AnyhowError(_) => {}
+      InternalBgRemovalError::StorytellerError(_) => {}
+      InternalBgRemovalError::NeedsStorytellerCredentials => {}
+    }
+    
+    CommandErrorResponseWrapper {
+      status,
+      error_message: Some(error_message.to_string()),
+      error_type: Some(error_type),
+      error_details: None,
+    }
+  }
+}
@@ -1,8 +1,9 @@
-use crate::core::commands::enqueue::generate_error::GenerateError;
 use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
+use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
 use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal_artcraft::handle_generic_bg_removal_artcraft;
 use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal_fal::handle_generic_bg_removal_fal;
 use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_artcraft::handle_gpt_image_1_edit_artcraft;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_sora::handle_gpt_image_1_edit_sora;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
@@ -26,7 +27,7 @@ pub async fn handle_generic_bg_removal(
  storyteller_creds_manager: &StorytellerCredentialManager,
  fal_creds_manager: &FalCredentialManager,
  fal_task_queue: &FalTaskQueue,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
+) -> Result<TaskEnqueueSuccess, InternalBgRemovalError> {

  let priority = provider_priority_store.get_priority()?;

@@ -64,5 +65,5 @@ pub async fn handle_generic_bg_removal(
    }
  }

-  Err(GenerateError::NoProviderAvailable)
+  Err(InternalBgRemovalError::NoProviderAvailable)
 }
@@ -1,6 +1,7 @@
-use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError, MissingCredentialsReason, ProviderFailureReason};
 use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
+use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
 use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
@@ -24,6 +25,7 @@ use artcraft_api_defs::generate::image::remove_image_background::RemoveImageBack
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
+use fal_client::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::GptEditImageQuality;
 use idempotency::uuid::generate_random_uuid;
 use log::{error, info};
 use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
@@ -43,12 +45,12 @@ pub async fn handle_generic_bg_removal_artcraft(
  app_data_root: &AppDataRoot,
  app_env_configs: &AppEnvConfigs,
  storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
+) -> Result<TaskEnqueueSuccess, InternalBgRemovalError> {

  let creds = match storyteller_creds_manager.get_credentials()? {
    Some(creds) => creds,
    None => {
-      return Err(GenerateError::MissingCredentials(MissingCredentialsReason::NeedsStorytellerCredentials));
+      return Err(InternalBgRemovalError::NeedsStorytellerCredentials);
    },
  };

@@ -83,7 +85,7 @@ pub async fn handle_generic_bg_removal_artcraft(
    }
    Err(err) => {
      error!("Failed to use Artcraft background removal: {:?}", err);
-      return Err(GenerateError::ProviderFailure(ProviderFailureReason::StorytellerError(err)));
+      return Err(InternalBgRemovalError::StorytellerError(err));
    }
  };

@@ -100,7 +102,7 @@ async fn upload_image_from_base64_bytes(
  app_data_root: &AppDataRoot, 
  app_env_configs: &AppEnvConfigs, 
  creds: &StorytellerCredentialSet
-) -> Result<MediaFileToken, GenerateError> {
+) -> Result<MediaFileToken, InternalBgRemovalError> {
  let temp_file;
  
  if let Some(base64_bytes) = &request.base64_image {
@@ -109,10 +111,10 @@ async fn upload_image_from_base64_bytes(
        .await
        .map_err(|err| {
          error!("Failed to save base64 image to temp dir: {:?}", err);
-          GenerateError::BadInput(BadInputReason::Base64DecodeError)
+          InternalBgRemovalError::Base64DecodeError
        })?;
  } else {
-    return Err(GenerateError::BadInput(BadInputReason::RequiredSourceImageNotProvided));
+    return Err(InternalBgRemovalError::MissingImage);
  };

  info!("Uploading image media file from temp file: {:?}", temp_file.path());
@@ -128,7 +130,7 @@ async fn upload_image_from_base64_bytes(
      }).await
          .map_err(|err| {
            error!("Failed to upload image media file: {:?}", err);
-            GenerateError::ProviderFailure(ProviderFailureReason::StorytellerError(err))
+            InternalBgRemovalError::StorytellerError(err)
          })?;
  
  Ok(result.media_file_token)
@@ -1,5 +1,5 @@
-use crate::core::commands::enqueue::generate_error::GenerateError;
 use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
+use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
@@ -14,6 +14,6 @@ pub async fn handle_generic_bg_removal_fal(
  app_env_configs: &AppEnvConfigs,
  fal_creds_manager: &FalCredentialManager,
  fal_task_queue: &FalTaskQueue,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
-  Err(GenerateError::NotYetImplemented("TODO: Implement fal background removal handling".to_string()))
+) -> Result<TaskEnqueueSuccess, InternalBgRemovalError> {
+  unimplemented!("TODO: Implement fal background removal handling");
 }
@@ -1,2 +1,3 @@
 pub mod enqueue_image_bg_removal_command;
+pub mod errors;
 pub mod generic;
@@ -1,14 +1,11 @@
-use crate::core::commands::enqueue::common::notify_frontend_of_errors::notify_frontend_of_errors;
-use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
 use crate::core::commands::enqueue::image_edit::flux_kontext::handle_flux_kontext_edit::handle_flux_kontext_edit;
-use crate::core::commands::enqueue::image_edit::gemini_25_flash::handle_gemini_25_flash_edit::handle_gemini_25_flash_edit;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit::handle_gpt_image_1_edit;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
 use crate::core::commands::response::shorthand::{Response, ResponseOrErrorType};
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::functional_events::credits_balance_changed_event::CreditsBalanceChangedEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
@@ -45,25 +42,16 @@ use storyteller_client::utils::api_host::ApiHost;
 use tauri::{AppHandle, Manager, State};
 use tokens::tokens::media_files::MediaFileToken;

-/// This is used in the Tauri command bridge.
+/// This is used in the Tauri command bridge. 
 /// Don't change the serializations without coordinating with the frontend.
 #[derive(Deserialize, Debug, Copy, Clone)]
 #[serde(rename_all = "snake_case")]
 pub enum ContextualImageEditModel {
-  #[serde(rename = "flux_pro_kontext_max")]
-  FluxProKontextMax,
-
-  #[serde(rename = "gemini_25_flash")]
-  Gemini25Flash,
-
  #[serde(rename = "gpt_image_1")]
  GptImage1,
-  
-//  #[serde(rename = "qwen")]
-//  Qwen,
-//  
-//  #[serde(rename = "seededit_3")]
-//  SeedEdit3,
+
+  #[serde(rename = "flux_pro_kontext_max")]
+  FluxProKontextMax,
 }

 #[derive(Deserialize, Debug)]
@@ -196,8 +184,6 @@ pub async fn enqueue_contextual_edit_image_command(
  match result {
    Err(err) => {
      error!("Error enqueuing contextual edit image: {:?}", err);
-      
-      notify_frontend_of_errors(&app, &err).await;

      // TODO: Derive from err. Make service provider optional.
      let event = GenerationEnqueueFailureEvent {
@@ -211,7 +197,7 @@ pub async fn enqueue_contextual_edit_image_command(
        error!("Failed to emit event: {:?}", err); // Fail open.
      }

-      Err(error_to_tauri_response(err))
+      Err(err.to_tauri_response())
    }
    Ok(event) => {
      let event = GenerationEnqueueSuccessEvent {
@@ -223,8 +209,6 @@ pub async fn enqueue_contextual_edit_image_command(
      if let Err(err) = event.send(&app) {
        error!("Failed to emit event: {:?}", err); // Fail open.
      }
-      
-      CreditsBalanceChangedEvent{}.send_infallible(&app);

      Ok(EnqueueContextualEditImageSuccessResponse {}.into())
    }
@@ -243,10 +227,10 @@ pub async fn handle_request(
  fal_task_queue: &FalTaskQueue,
  sora_creds_manager: &SoraCredentialManager,
  sora_task_queue: &SoraTaskQueue,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {
  let success_event= match request.model {
    None => {
-      return Err(GenerateError::no_model_specified())
+      return Err(InternalContextualEditImageError::NoModelSpecified)
    }
    Some(ContextualImageEditModel::FluxProKontextMax) => {
      handle_flux_kontext_edit(
@@ -262,20 +246,6 @@ pub async fn handle_request(
        sora_task_queue,
      ).await?
    }
-    Some(ContextualImageEditModel::Gemini25Flash) => {
-      handle_gemini_25_flash_edit(
-        request,
-        app,
-        app_data_root,
-        app_env_configs,
-        provider_priority_store,
-        storyteller_creds_manager,
-        fal_creds_manager,
-        fal_task_queue,
-        sora_creds_manager,
-        sora_task_queue,
-      ).await?
-    }
    Some(ContextualImageEditModel::GptImage1) => {
      handle_gpt_image_1_edit(
        request,
@@ -308,41 +278,3 @@ pub async fn handle_request(
  
  Ok(success_event)
 }
-
-fn error_to_tauri_response(error: GenerateError) -> CommandErrorResponseWrapper<EnqueueContextualEditImageErrorType, ()> {
-  let mut status = CommandErrorStatus::ServerError;
-  let mut error_type = EnqueueContextualEditImageErrorType::ServerError;
-  let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
-
-  match error {
-    GenerateError::BadInput(BadInputReason::NoModelSpecified) => {
-      status = CommandErrorStatus::BadRequest;
-      error_type = EnqueueContextualEditImageErrorType::ModelNotSpecified;
-      error_message = "No model specified for image generation".to_string();
-    }
-    GenerateError::NoProviderAvailable => {
-      status = CommandErrorStatus::ServerError;
-      error_type = EnqueueContextualEditImageErrorType::NoProviderAvailable;
-      error_message = "No configured provider available for image generation".to_string();
-    }
-    GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages { min, max, requested }) => {
-      status = CommandErrorStatus::BadRequest;
-      error_type = EnqueueContextualEditImageErrorType::BadRequest;
-      error_message = format!("Invalid number of images requested ({}). Must be between {} and {}", requested, min, max);
-
-    }
-    GenerateError::BadInput(BadInputReason::InvalidNumberOfInputImages{  min, max, provided }) => {
-      status = CommandErrorStatus::BadRequest;
-      error_type = EnqueueContextualEditImageErrorType::BadRequest;
-      error_message = format!("Invalid number of input images ({}). Must be between {} and {}", provided, min, max);
-    }
-    _ => {} // Fall-through for now
-  }
-
-  CommandErrorResponseWrapper {
-    status,
-    error_message: Some(error_message.to_string()),
-    error_type: Some(error_type),
-    error_details: None,
-  }
-}
@@ -0,0 +1,112 @@
+use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageErrorType;
+use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
+use errors::AnyhowError;
+use openai_sora_client::sora_error::SoraError;
+use serde::Serialize;
+use storyteller_client::error::storyteller_error::StorytellerError;
+
+#[derive(Debug)]
+pub enum InternalContextualEditImageError {
+  /// Request did not specify a model.
+  NoModelSpecified,
+
+  /// No provider is configured for the model type.
+  NoProviderAvailable,
+  
+  /// No storyteller credentials are set.
+  NeedsStorytellerCredentials,
+  
+  /// An invalid number of images was requested.
+  InvalidNumberOfRequestedImages {
+    min: u32,
+    max: u32,
+    requested: u32,
+  },
+  
+  /// An invalid number of input images was requested.
+  InvalidNumberOfInputImages {
+    min: u32,
+    max: u32,
+    requested: u32,
+  },
+
+  // TODO: Maybe just reuse the other error enum variant
+  /// An invalid number of input images was requested for Flux Kontext.
+  InvalidNumberOfInputImagesForFluxKontext {
+    message: String,
+  },
+
+  /// No sora credentials are set.
+  NeedsSoraCredentials,
+  
+  SoraError(SoraError),
+  AnyhowError(AnyhowError),
+  StorytellerError(StorytellerError),
+}
+
+impl From<AnyhowError> for InternalContextualEditImageError {
+  fn from(value: AnyhowError) -> Self {
+    Self::AnyhowError(value)
+  }
+}
+
+impl From<SoraError> for InternalContextualEditImageError {
+  fn from(value: SoraError) -> Self {
+    Self::SoraError(value)
+  }
+}
+
+impl From<StorytellerError> for InternalContextualEditImageError {
+  fn from(value: StorytellerError) -> Self {
+    Self::StorytellerError(value)
+  }
+}
+
+impl InternalContextualEditImageError {
+  pub fn to_tauri_response<E: Serialize>(&self) -> CommandErrorResponseWrapper<EnqueueContextualEditImageErrorType, E> {
+    let mut status = CommandErrorStatus::ServerError;
+    let mut error_type = EnqueueContextualEditImageErrorType::ServerError;
+    let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
+    
+    match self {
+      InternalContextualEditImageError::NoModelSpecified => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueContextualEditImageErrorType::ModelNotSpecified;
+        error_message = "No model specified for image generation".to_string();
+      }
+      InternalContextualEditImageError::NoProviderAvailable => {
+        status = CommandErrorStatus::ServerError;
+        error_type = EnqueueContextualEditImageErrorType::NoProviderAvailable;
+        error_message = "No configured provider available for image generation".to_string();
+      }
+      InternalContextualEditImageError::InvalidNumberOfRequestedImages { min, max, requested } => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueContextualEditImageErrorType::BadRequest;
+        error_message = format!("Invalid number of images requested ({}). Must be between {} and {}", requested, min, max);
+        
+      }
+      InternalContextualEditImageError::InvalidNumberOfInputImages { min, max, requested } => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueContextualEditImageErrorType::BadRequest;
+        error_message = format!("Invalid number of input images ({}). Must be between {} and {}", requested, min, max);
+      }
+      InternalContextualEditImageError::InvalidNumberOfInputImagesForFluxKontext { message } => {
+        status = CommandErrorStatus::BadRequest;
+        error_type = EnqueueContextualEditImageErrorType::BadRequest;
+        error_message = message.clone();
+      }
+      InternalContextualEditImageError::SoraError(_) => {}
+      InternalContextualEditImageError::AnyhowError(_) => {}
+      InternalContextualEditImageError::StorytellerError(_) => {}
+      InternalContextualEditImageError::NeedsStorytellerCredentials => {}
+      InternalContextualEditImageError::NeedsSoraCredentials => {}
+    }
+    
+    CommandErrorResponseWrapper {
+      status,
+      error_message: Some(error_message.to_string()),
+      error_type: Some(error_type),
+      error_details: None,
+    }
+  }
+}
@@ -1,5 +1,5 @@
-use crate::core::commands::enqueue::generate_error::GenerateError;
 use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
 use crate::core::commands::enqueue::image_edit::flux_kontext::handle_flux_kontext_edit_artcraft::handle_flux_kontext_edit_artcraft;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_artcraft::handle_gpt_image_1_edit_artcraft;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_sora::handle_gpt_image_1_edit_sora;
@@ -26,7 +26,7 @@ pub async fn handle_flux_kontext_edit(
  fal_task_queue: &FalTaskQueue,
  sora_creds_manager: &SoraCredentialManager,
  sora_task_queue: &SoraTaskQueue,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {

  let priority = provider_priority_store.get_priority()?;
  
@@ -55,5 +55,5 @@ pub async fn handle_flux_kontext_edit(
    }
  }
  
-  Err(GenerateError::NoProviderAvailable)
+  Err(InternalContextualEditImageError::NoProviderAvailable)
 }
@@ -1,5 +1,5 @@
-use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
 use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
@@ -23,6 +23,7 @@ use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use fal_client::requests::webhook::image::edit::enqueue_flux_pro_kontext_max_edit_webhook::FluxProKontextMaxNumImages;
+use fal_client::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::GptEditImageQuality;
 use idempotency::uuid::generate_random_uuid;
 use log::{error, info};
 use storyteller_client::generate::image::edit::flux_pro_kontext_max_edit_image::flux_pro_kontext_max_edit_image;
@@ -39,12 +40,12 @@ pub async fn handle_flux_kontext_edit_artcraft(
  app_data_root: &AppDataRoot,
  app_env_configs: &AppEnvConfigs,
  storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {

  let creds = match storyteller_creds_manager.get_credentials()? {
    Some(creds) => creds,
    None => {
-      return Err(GenerateError::needs_storyteller_credentials());
+      return Err(InternalContextualEditImageError::NeedsStorytellerCredentials);
    },
  };

@@ -59,11 +60,11 @@ pub async fn handle_flux_kontext_edit_artcraft(
    Some(3) => Some(FluxProKontextMaxEditImageNumImages::Three),
    Some(4) => Some(FluxProKontextMaxEditImageNumImages::Four),
    Some(other) => {
-      return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages {
+      return Err(InternalContextualEditImageError::InvalidNumberOfRequestedImages {
        min: 1,
        max: 4,
        requested: other,
-      }));
+      });
    },
  };
  
@@ -75,13 +76,15 @@ pub async fn handle_flux_kontext_edit_artcraft(
      .unwrap_or(0);

  if request.scene_image_media_token.is_some() && list_count > 0 {
-    return Err(GenerateError::BadInput(BadInputReason::WrongImageArguments(
-      "Cannot specify both scene_image_media_token and image_media_tokens for Flux Kontext Max".to_string())));
+    return Err(InternalContextualEditImageError::InvalidNumberOfInputImagesForFluxKontext {
+      message: "Cannot specify both scene_image_media_token and image_media_tokens for Flux Kontext Max".to_string()
+    });
  }

  if list_count > 1 {
-    return Err(GenerateError::BadInput(BadInputReason::WrongImageArguments(
-      "Cannot specify more than one image in image_media_tokens for Flux Kontext Max".to_string())));
+    return Err(InternalContextualEditImageError::InvalidNumberOfInputImagesForFluxKontext {
+      message: "Cannot specify more than one image in image_media_tokens for Flux Kontext Max".to_string()
+    });
  }

  if let Some(media_token) = &request.scene_image_media_token {
@@ -100,8 +103,9 @@ pub async fn handle_flux_kontext_edit_artcraft(
  let media_token = match maybe_media_token {
    Some(token) => token,
    None => {
-      return Err(GenerateError::BadInput(BadInputReason::WrongImageArguments(
-        "No input image specified for Flux Kontext Max edit".to_string())));
+      return Err(InternalContextualEditImageError::InvalidNumberOfInputImagesForFluxKontext {
+        message: "No input image specified for Flux Kontext Max edit".to_string(),
+      });
    },
  };

@@ -127,7 +131,7 @@ pub async fn handle_flux_kontext_edit_artcraft(
    }
    Err(err) => {
      error!("Failed to use Artcraft gpt-image-1: {:?}", err);
-      return Err(GenerateError::from(err));
+      return Err(InternalContextualEditImageError::StorytellerError(err));
    }
  };
  
@@ -1,59 +0,0 @@
-use crate::core::commands::enqueue::generate_error::GenerateError;
-use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
-use crate::core::commands::enqueue::image_edit::gemini_25_flash::handle_gemini_25_flash_edit_artcraft::handle_gemini_25_flash_edit_artcraft;
-use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_artcraft::handle_gpt_image_1_edit_artcraft;
-use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_sora::handle_gpt_image_1_edit_sora;
-use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use log::info;
-use tauri::AppHandle;
-
-pub async fn handle_gemini_25_flash_edit(
-  request: &EnqueueContextualEditImageCommand,
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  app_env_configs: &AppEnvConfigs,
-  provider_priority_store: &ProviderPriorityStore,
-  storyteller_creds_manager: &StorytellerCredentialManager,
-  fal_creds_manager: &FalCredentialManager,
-  fal_task_queue: &FalTaskQueue,
-  sora_creds_manager: &SoraCredentialManager,
-  sora_task_queue: &SoraTaskQueue,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
-
-  let priority = provider_priority_store.get_priority()?;
-  
-  // TODO: Check if providers are available before proceeding.
-
-  info!("Providers by priority: {:?}", priority);
-
-  for provider in priority.iter() {
-    match provider {
-      Provider::Fal => {
-        // Fallthrough (TODO)
-      }
-      Provider::Sora => {
-        // Fallthrough
-      }
-      Provider::Artcraft => {
-        info!("Dispatching gemini 2.5 flash (edit) via Artcraft...");
-        return handle_gemini_25_flash_edit_artcraft(
-          request, 
-          app,
-          app_data_root,
-          app_env_configs, 
-          storyteller_creds_manager
-        ).await;
-      }
-    }
-  }
-  
-  Err(GenerateError::NoProviderAvailable)
-}
@@ -1,119 +0,0 @@
-use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
-use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
-use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
-use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
-use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::provider_priority::ProviderPriorityStore;
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
-use artcraft_api_defs::generate::image::edit::flux_pro_kontext_max_edit_image::{FluxProKontextMaxEditImageNumImages, FluxProKontextMaxEditImageRequest};
-use artcraft_api_defs::generate::image::edit::gemini_25_flash_edit_image::{Gemini25FlashEditImageNumImages, Gemini25FlashEditImageRequest};
-use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest};
-use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::GenerateFlux1DevTextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest;
-use enums::common::generation_provider::GenerationProvider;
-use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
-use log::{error, info};
-use storyteller_client::generate::image::edit::flux_pro_kontext_max_edit_image::flux_pro_kontext_max_edit_image;
-use storyteller_client::generate::image::edit::gemini_25_flash_edit_image::gemini_25_flash_edit_image;
-use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
-use tauri::AppHandle;
-
-pub(super) const MAX_IMAGES: usize = 10;
-
-pub async fn handle_gemini_25_flash_edit_artcraft(
-  request: &EnqueueContextualEditImageCommand,
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  app_env_configs: &AppEnvConfigs,
-  storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
-
-  let creds = match storyteller_creds_manager.get_credentials()? {
-    Some(creds) => creds,
-    None => {
-      return Err(GenerateError::needs_storyteller_credentials());
-    },
-  };
-
-  info!("Calling Artcraft gemini 2.5 flash (edit) ...");
-
-  let uuid_idempotency_token = generate_random_uuid();
-  
-  let num_images = match request.image_count {
-    None => None,
-    Some(1) => Some(Gemini25FlashEditImageNumImages::One),
-    Some(2) => Some(Gemini25FlashEditImageNumImages::Two),
-    Some(3) => Some(Gemini25FlashEditImageNumImages::Three),
-    Some(4) => Some(Gemini25FlashEditImageNumImages::Four),
-    Some(other) => {
-      return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages {
-        min: 1,
-        max: 4,
-        requested: other,
-      }));
-    },
-  };
-
-  let mut media_tokens = Vec::with_capacity(10);
-
-  if let Some(scene_image_media_token) = request.scene_image_media_token.clone() {
-    media_tokens.push(scene_image_media_token);
-  }
-
-  if let Some(image_media_tokens) = request.image_media_tokens.as_ref() {
-    media_tokens.extend_from_slice(image_media_tokens);
-  }
-
-  if media_tokens.len() > MAX_IMAGES {
-    return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfInputImages {
-      min: 1,
-      max: MAX_IMAGES as u32,
-      provided: media_tokens.len() as u32, 
-    }));
-  }
-
-  let request = Gemini25FlashEditImageRequest {
-    uuid_idempotency_token,
-    prompt: Some(request.prompt.clone()),
-    image_media_tokens: Some(media_tokens),
-    num_images,
-    image_quality: None,
-  };
-
-  let result = gemini_25_flash_edit_image(
-    &app_env_configs.storyteller_host,
-    Some(&creds),
-    request,
-  ).await;
-  
-  let job_id = match result {
-    Ok(enqueued) => {
-      // TODO(bt,2025-07-05): Enqueue job token?
-      info!("Successfully enqueued Artcraft gpt-image-1. Job token: {}", 
-        enqueued.inference_job_token);
-      enqueued.inference_job_token
-    }
-    Err(err) => {
-      error!("Failed to use Artcraft gpt-image-1: {:?}", err);
-      return Err(GenerateError::from(err));
-    }
-  };
-  
-  Ok(TaskEnqueueSuccess {
-    provider: GenerationProvider::Artcraft,
-    model: Some(GenerationModel::Gemini25Flash),
-    provider_job_id: Some(job_id.to_string()),
-    task_type: TaskType::ImageGeneration,
-  })
-}
@@ -1,2 +0,0 @@
-pub (super) mod handle_gemini_25_flash_edit;
-pub (super) mod handle_gemini_25_flash_edit_artcraft;
@@ -1,5 +1,5 @@
-use crate::core::commands::enqueue::generate_error::GenerateError;
 use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_artcraft::handle_gpt_image_1_edit_artcraft;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_sora::handle_gpt_image_1_edit_sora;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
@@ -27,7 +27,7 @@ pub async fn handle_gpt_image_1_edit(
  fal_task_queue: &FalTaskQueue,
  sora_creds_manager: &SoraCredentialManager,
  sora_task_queue: &SoraTaskQueue,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {

  let priority = provider_priority_store.get_priority()?;
  
@@ -67,5 +67,5 @@ pub async fn handle_gpt_image_1_edit(
    }
  }
  
-  Err(GenerateError::NoProviderAvailable)
+  Err(InternalContextualEditImageError::NoProviderAvailable)
 }
@@ -1,5 +1,5 @@
-use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
 use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
+use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
 use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit::MAX_IMAGES;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
@@ -22,7 +22,7 @@ use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1_edit_image_webhook::GptEditImageQuality;
+use fal_client::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::GptEditImageQuality;
 use idempotency::uuid::generate_random_uuid;
 use log::{error, info};
 use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
@@ -38,12 +38,12 @@ pub async fn handle_gpt_image_1_edit_artcraft(
  app_data_root: &AppDataRoot,
  app_env_configs: &AppEnvConfigs,
  storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
+) -> Result<TaskEnqueueSuccess, InternalContextualEditImageError> {

  let creds = match storyteller_creds_manager.get_credentials()? {
    Some(creds) => creds,
    None => {
-      return Err(GenerateError::needs_storyteller_credentials());
+      return Err(InternalContextualEditImageError::NeedsStorytellerCredentials);
    },
  };

@@ -74,11 +74,11 @@ pub async fn handle_gpt_image_1_edit_artcraft(
    Some(3) => Some(GptImage1EditImageNumImages::Three),
    Some(4) => Some(GptImage1EditImageNumImages::Four),
    Some(other) => {
-      return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages {
+      return Err(InternalContextualEditImageError::InvalidNumberOfRequestedImages {
        min: 1,
        max: 4,
        requested: other,
-      }));
+      });
    },
  };
  
@@ -93,11 +93,11 @@ pub async fn handle_gpt_image_1_edit_artcraft(
  }
  
  if media_tokens.len() > MAX_IMAGES {
-    return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfInputImages { 
+    return Err(InternalContextualEditImageError::InvalidNumberOfInputImages { 
      min: 1,
      max: MAX_IMAGES as u32,
-      provided: media_tokens.len() as u32,
-    }));
+      requested: media_tokens.len() as u32,
+    });
  }

  let request = GptImage1EditImageRequest {
@@ -124,7 +124,7 @@ pub async fn handle_gpt_image_1_edit_artcraft(
    }
    Err(err) => {
      error!("Failed to use Artcraft gpt-image-1: {:?}", err);
-      return Err(GenerateError::from(err));
+      return Err(InternalContextualEditImageError::StorytellerError(err));
    }
  };
  
--- a/Show More
+++ b/Show More