prevent proration

.sqlx/query-1e08676857e999a58d3c85474c2a2acec38a413e53ca4207aade690e0bfffe25.json

@@ -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"
-}

.sqlx/query-2be78dc9fada8cda24df59ee9911118aa6f40247b10c6a76e07cfa74fd7f1412.json

@@ -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"
-}

.sqlx/query-2c98facb81a43364997db5558ad0f12300230691b09ce96d49e530f8361c237f.json

@@ -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"
-}

.sqlx/query-46e1cb058bffbea5a5d3ffa5dd904416d6f34ccefdb394030f19cc762b507d68.json

@@ -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"
 }

.sqlx/query-47b14121f41b98b0dc92772e9f58a3f4a3821b11ebb10b768595d7635e472dbb.json

@@ -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"
-}

.sqlx/query-4bfa96682bd1e7576c26c89e3d1a17162193f7df3c1530122ca8e715afc5f385.json

@@ -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"
-}

.sqlx/query-4c2a71386362fb54f38bd6633f8aebe75e0bd8edf1b1b8773c6298c1f6018332.json

@@ -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"
-}

.sqlx/query-4f5100a2cfb465964e77eaacb1ae394daae94de20c56a0966a8222dc9bea63c6.json

@@ -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"
-}

.sqlx/query-6df1b3d2cd145fa3199898fe53565eef28a74206093f4fc6585aad6cc2e9ae71.json

@@ -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"
-}

.sqlx/query-771ebd8c236cc3bfeee2df7168c05f639b666e5d67a46593332ce02a0316b4f9.json

@@ -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"
-}

.sqlx/query-871163ef30d2f6767f836a05f46d2ce7fb4733583eedddbf07732ebb5c1f1b53.json

@@ -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"
-}

.sqlx/query-8d267a609157e6459393ffa32ea83996dcf135c52ee8a930d5be628802d97371.json

@@ -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"
+}

.sqlx/query-9d26917668d4f0ecd2492a94a7775e4561fc5d8b33194274a7715b9853ecea00.json

@@ -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"
-}

.sqlx/query-a28d6de7424b269e64e97692a4c67a12fcfb789a3e5a512a103a78dea60e75ce.json

@@ -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"
-}

.sqlx/query-ac8e3bc9f4e0722ec2f805dbb52b8e43ec8f7a1aa923b9f8f5f6c0770a315ee6.json

@@ -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"
-}

.sqlx/query-b48490837d568002305551353704c8e8a4fc78459e5a9aa754277b989107bc5c.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO analytics_app_active_users\nSET\n  app_namespace = ?,\n  user_token = ?,\n  app_version = ?,\n  os_platform = ?,\n  os_version = ?,\n  session_duration_seconds = ?,\n  ip_address = ?,\n  measurement_count = measurement_count + 1,\n  first_active_at = NOW(),\n  last_active_at = NOW()\nON DUPLICATE KEY UPDATE\n  app_version = ?,\n  os_platform = ?,\n  os_version = ?,\n  session_duration_seconds = ?,\n  ip_address = ?,\n  measurement_count = measurement_count + 1,\n  last_active_at = NOW()\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 12
-    },
-    "nullable": []
-  },
-  "hash": "b48490837d568002305551353704c8e8a4fc78459e5a9aa754277b989107bc5c"
-}

.sqlx/query-b721e3fda6d80df5041c918b1a127236c802ed18ccc961cc6ac96d156bf085da.json

@@ -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"
-}

.sqlx/query-c7f20753f9704d5ff3358586240ecc8a505990f4634ba3af9de6c99c22aa7368.json

@@ -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"
-}

.sqlx/query-ff39576a5ec6a23c67f6f61e7eba8392e70b05c42b540bea260a9a4cdc478a5b.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO analytics_app_sessions\nSET\n  session_token = ?,\n  app_namespace = ?,\n  user_token = ?,\n  app_version = ?,\n  os_platform = ?,\n  os_version = ?,\n  session_duration_seconds = ?,\n  ip_address = ?,\n  measurement_count = measurement_count + 1,\n  first_active_at = NOW(),\n  last_active_at = NOW()\nON DUPLICATE KEY UPDATE\n  app_namespace = ?,\n  user_token = ?,\n  app_version = ?,\n  os_platform = ?,\n  os_version = ?,\n  session_duration_seconds = ?,\n  ip_address = ?,\n  measurement_count = measurement_count + 1,\n  last_active_at = NOW()\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 15
-    },
-    "nullable": []
-  },
-  "hash": "ff39576a5ec6a23c67f6f61e7eba8392e70b05c42b540bea260a9a4cdc478a5b"
-}

Cargo.lock

@@ -366,7 +366,6 @@ dependencies = [
  "cidr-utils",
  "errors",
  "futures-util",
- "log",
  "num-traits",
  "serde",
  "serde_json",
@@ -679,7 +678,6 @@ dependencies = [
  "mimetypes",
  "once_cell",
  "openai_sora_client",
- "os_info",
  "primitives",
  "rand 0.9.1",
  "reqwest 0.12.22",
@@ -7611,17 +7609,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "os_info"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3"
-dependencies = [
- "log",
- "plist",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -10674,7 +10661,6 @@ dependencies = [
  "tokens",
  "tokio",
  "url",
- "url-builder",
  "uuid 1.8.0",
  "workspace-build-acceleration",
 ]
@@ -12448,12 +12434,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "url-builder"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c560d19163937c53680c515b82a9311c5a796691c67890b8ad579423123e194"
-
 [[package]]
 name = "url_config"
 version = "0.0.1"

_sql/migrations/2025-09-24-055943_analytics_app_active_users/down.sql

@@ -1,5 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-drop table analytics_app_active_users;

_sql/migrations/2025-09-24-055943_analytics_app_active_users/up.sql

@@ -1,59 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
--- Track user activity over time
--- User clients ping the endpoint that writes this data.
-CREATE TABLE analytics_app_active_users (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- If we host multiple sites with distinct categories, this will enable us to
-  -- segregate analytics.
-  app_namespace VARCHAR(32) NOT NULL,
-
-  -- Who sent the event.
-  user_token VARCHAR(32) NOT NULL,
-
-  -- Updated on every write.
-  -- The "user agent" or app version string of the client.
-  app_version VARCHAR(255) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The OS platform for the client.
-  os_platform VARCHAR(16) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The OS platform version for the client.
-  os_version VARCHAR(64) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- How long the current user's session has been open
-  session_duration_seconds INT(10) UNSIGNED DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The user's last known IP address.
-  ip_address VARCHAR(40) NOT NULL,
-
-  -- Incrementing count of events.
-  -- NB: This is kind of an "hours spent" measure, but will lose information if we ever
-  -- change the ping cadence (eg. 1 minute pings --> 5 minute pings).
-  measurement_count BIGINT UNSIGNED NOT NULL DEFAULT 0,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  -- Written at create only.
-  first_active_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- Updated on every ping.
-  last_active_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (app_namespace, user_token), -- For now
-  INDEX idx_os_platform (os_platform),
-  INDEX idx_os_version (os_version),
-  INDEX idx_app_version (app_version),
-  INDEX idx_last_active_at (last_active_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations/2025-09-27-211355_analytics_app_sessions/down.sql

@@ -1,5 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-drop table analytics_app_sessions;

_sql/migrations/2025-09-27-211355_analytics_app_sessions/up.sql

@@ -1,65 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
--- Track user session durations
--- User clients ping the endpoint that writes this data.
-CREATE TABLE analytics_app_sessions (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Generated client-side
-  -- Wide enough for a UUID, but typically one of our internal tokens.
-  session_token VARCHAR(36) NOT NULL,
-
-  -- If we host multiple sites with distinct categories, this will enable us to
-  -- segregate analytics.
-  app_namespace VARCHAR(32) NOT NULL,
-
-  -- Who sent the event.
-  user_token VARCHAR(32) NOT NULL,
-
-  -- Updated on every write.
-  -- The "user agent" or app version string of the client.
-  app_version VARCHAR(255) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The OS platform for the client.
-  os_platform VARCHAR(16) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The OS platform version for the client.
-  os_version VARCHAR(64) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- How long the current user's session has been open
-  session_duration_seconds INT(10) UNSIGNED DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The user's last known IP address.
-  ip_address VARCHAR(40) NOT NULL,
-
-  -- Incrementing count of events.
-  -- NB: This is kind of an "hours spent" measure, but will lose information if we ever
-  -- change the ping cadence (eg. 1 minute pings --> 5 minute pings).
-  measurement_count BIGINT UNSIGNED NOT NULL DEFAULT 0,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  -- Written at create only.
-  first_active_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- Updated on every ping.
-  last_active_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (session_token),
-  INDEX idx_app_namespace (app_namespace),
-  INDEX idx_user_token (user_token),
-  INDEX idx_os_platform (os_platform),
-  INDEX idx_os_version (os_version),
-  INDEX idx_app_version (app_version),
-  INDEX idx_last_active_at (last_active_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/analytics/analytics_app_active_users.sql

@@ -1,57 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-CREATE TABLE analytics_app_active_users (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- If we host multiple sites with distinct categories, this will enable us to
-  -- segregate analytics.
-  app_namespace VARCHAR(32) NOT NULL,
-
-  -- Who sent the event.
-  user_token VARCHAR(32) NOT NULL,
-
-  -- Updated on every write.
-  -- The "user agent" or app version string of the client.
-  app_version VARCHAR(255) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The OS platform for the client.
-  os_platform VARCHAR(16) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The OS platform version for the client.
-  os_version VARCHAR(64) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- How long the current user's session has been open
-  session_duration_seconds INT(10) UNSIGNED DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The user's last known IP address.
-  ip_address VARCHAR(40) NOT NULL,
-
-  -- Incrementing count of events.
-  -- NB: This is kind of an "hours spent" measure, but will lose information if we ever
-  -- change the ping cadence (eg. 1 minute pings --> 5 minute pings).
-  measurement_count BIGINT UNSIGNED NOT NULL DEFAULT 0,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  -- Written at create only.
-  first_active_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- Updated on every ping.
-  last_active_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (app_namespace, user_token), -- For now
-  INDEX idx_app_version (app_version),
-  INDEX idx_os_platform (os_platform),
-  INDEX idx_os_version (os_version),
-  INDEX idx_last_active_at (last_active_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/analytics/analytics_app_sessions.sql

@@ -1,65 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
--- Track user session durations
--- User clients ping the endpoint that writes this data.
-CREATE TABLE analytics_app_sessions (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Generated client-side
-  -- Wide enough for a UUID, but typically one of our internal tokens.
-  session_token VARCHAR(36) NOT NULL,
-
-  -- If we host multiple sites with distinct categories, this will enable us to
-  -- segregate analytics.
-  app_namespace VARCHAR(32) NOT NULL,
-
-  -- Who sent the event.
-  user_token VARCHAR(32) NOT NULL,
-
-  -- Updated on every write.
-  -- The "user agent" or app version string of the client.
-  app_version VARCHAR(255) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The OS platform for the client.
-  os_platform VARCHAR(16) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The OS platform version for the client.
-  os_version VARCHAR(64) DEFAULT NULL,
-
-  -- Updated on every write.
-  -- How long the current user's session has been open
-  session_duration_seconds INT(10) UNSIGNED DEFAULT NULL,
-
-  -- Updated on every write.
-  -- The user's last known IP address.
-  ip_address VARCHAR(40) NOT NULL,
-
-  -- Incrementing count of events.
-  -- NB: This is kind of an "hours spent" measure, but will lose information if we ever
-  -- change the ping cadence (eg. 1 minute pings --> 5 minute pings).
-  measurement_count BIGINT UNSIGNED NOT NULL DEFAULT 0,
-
-  -- ========== RECORD TIMESTAMPS ==========
-
-  -- Written at create only.
-  first_active_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- Updated on every ping.
-  last_active_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- ========== INDICES ==========
-  PRIMARY KEY (id),
-  UNIQUE KEY (session_token),
-  INDEX idx_app_namespace (app_namespace),
-  INDEX idx_user_token (user_token),
-  INDEX idx_os_platform (os_platform),
-  INDEX idx_os_version (os_version),
-  INDEX idx_app_version (app_version),
-  INDEX idx_last_active_at (last_active_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/user_tables/users.sql

@@ -186,8 +186,8 @@ CREATE TABLE users (
   -- ========== TRACKING ==========
 
   -- Where the user signed up from (NOT NECESSARILY AN ENUM!)
-  -- For now this will be "artcraft", "fakeyou", or "storyteller", 
-  -- though we may extend or overload this to handle other cases or metadata.
+  -- For now this will be "fakeyou" and "storyteller", but we may extend
+  -- or overload this to handle other cases or metadata.
   maybe_source VARCHAR(255) DEFAULT NULL,
 
   -- How users created their account

crates/api_clients/artcraft_api_defs/src/analytics/log_active_user.rs

@@ -1,40 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use tokens::tokens::app_session::AppSessionToken;
-use utoipa::ToSchema;
-
-pub const LOG_ACTIVE_USER_PATH: &str = "/v1/analytics/active_user";
-
-#[derive(Serialize, Deserialize, ToSchema, Debug)]
-pub struct LogAppActiveUserRequest {
-  /// Clientside-generated session token.
-  /// If present, it'll be validated against an expected format.
-  pub maybe_app_session_token: Option<AppSessionToken>,
-  
-  /// An override for the application platform/OS (windows, mac, linux).
-  pub maybe_os_platform: Option<String>,
-
-  /// An override for the version of the OS (e.g. 10.15.7, 11, 22.04).
-  pub maybe_os_version: Option<String>,
-
-  /// An override for the application name.
-  /// If set together with `maybe_app_version`, the two will be 
-  /// concatenated as `{maybe_app_name}/{maybe_app_version}`.
-  pub maybe_app_name: Option<String>,
-
-  /// An override for the application version.
-  /// If set together with `maybe_app_name`, the two will be 
-  /// concatenated as `{maybe_app_name}/{maybe_app_version}`.
-  pub maybe_app_version: Option<String>,
-  
-  /// How long the user has been active in the app, in seconds.
-  pub maybe_session_duration_seconds: Option<u64>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct LogAppActiveUserResponse {
-  pub success: bool,
-  
-  /// How long to wait until the next analytics event, in milliseconds.
-  /// The client should honor this and is free to add jitter.
-  pub wait_for_retry_millis: u64,
-}

crates/api_clients/artcraft_api_defs/src/analytics/mod.rs

@@ -1 +0,0 @@
-pub mod log_active_user;

crates/api_clients/artcraft_api_defs/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod analytics;
 pub mod common;
 pub mod credits;
 pub mod generate;

crates/api_clients/storyteller_client/Cargo.toml

@@ -46,11 +46,8 @@ serde_derive.workspace = true
 serde_json.workspace = true
 
 # HTTP
-backoff = { version = "0.4.0", features = ["futures"] }  # Exponential backoff retry
-uuid = { version = "1.8.0", features = ["v4"] }
-
-# TODO: This is not a very mature, safe, or intuitive URL builder library. Please replace it!
-url-builder = "0.1.1"
+backoff = { version = "0.4.0", features = ["futures"] }
+uuid = { version = "1.8.0", features = ["v4"] } # Exponential backoff retry
 
 [dev-dependencies]
 tokio.workspace = true

crates/api_clients/storyteller_client/src/endpoints/analytics/log_active_user.rs

@@ -1,48 +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_query_string_post_request::basic_query_string_post_request;
-use artcraft_api_defs::analytics::log_active_user::{LogAppActiveUserRequest, LogAppActiveUserResponse, LOG_ACTIVE_USER_PATH};
-use std::collections::HashMap;
-
-pub async fn log_active_user(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: LogAppActiveUserRequest,
-) -> Result<LogAppActiveUserResponse, StorytellerError> {
-
-  // TODO(bt): This is gross and doesn't automatically handle field changes.
-  
-  let mut query = HashMap::new();
-
-  if let Some(token) = request.maybe_app_session_token {
-    query.insert("maybe_app_session_token".to_string(), token.to_string());
-  }
-
-  if let Some(os_platform) = request.maybe_os_platform {
-    query.insert("maybe_os_platform".to_string(), os_platform);
-  }
-  
-  if let Some(os_version) = request.maybe_os_version {
-    query.insert("maybe_os_version".to_string(), os_version);
-  }
-  
-  if let Some(app_name) = request.maybe_app_name {
-    query.insert("maybe_app_name".to_string(), app_name);
-  }
-  
-  if let Some(app_version) = request.maybe_app_version {
-    query.insert("maybe_app_version".to_string(), app_version);
-  }
-  
-  if let Some(maybe_session_duration_seconds) = request.maybe_session_duration_seconds {
-    query.insert("maybe_session_duration_seconds".to_string(), maybe_session_duration_seconds.to_string());
-  }
-
-  Ok(basic_query_string_post_request(
-    api_host,
-    LOG_ACTIVE_USER_PATH,
-    maybe_creds,
-    &query,
-  ).await?)
-}

crates/api_clients/storyteller_client/src/endpoints/analytics/mod.rs

@@ -1 +0,0 @@
-pub mod log_active_user;

crates/api_clients/storyteller_client/src/endpoints/generate/video/generate_veo_3_fast_image_to_video.rs

@@ -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::video::generate_veo_3_fast_image_to_video::{GenerateVeo3FastImageToVideoRequest, GenerateVeo3FastImageToVideoResponse, GENERATE_VEO_3_FAST_IMAGE_TO_VIDEO_URL_PATH};
-
-pub async fn generate_veo_3_fast_image_to_video(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateVeo3FastImageToVideoRequest,
-) -> Result<GenerateVeo3FastImageToVideoResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_VEO_3_FAST_IMAGE_TO_VIDEO_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}

crates/api_clients/storyteller_client/src/endpoints/generate/video/generate_veo_3_image_to_video.rs

@@ -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::video::generate_veo_3_image_to_video::{GenerateVeo3ImageToVideoRequest, GenerateVeo3ImageToVideoResponse, GENERATE_VEO_3_IMAGE_TO_VIDEO_URL_PATH};
-
-pub async fn generate_veo_3_image_to_video(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateVeo3ImageToVideoRequest,
-) -> Result<GenerateVeo3ImageToVideoResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_VEO_3_IMAGE_TO_VIDEO_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}

crates/api_clients/storyteller_client/src/endpoints/mod.rs

@@ -1,8 +0,0 @@
-pub mod analytics;
-pub mod credits;
-pub mod generate;
-pub mod jobs;
-pub mod media_files;
-pub mod prompts;
-pub mod stripe_artcraft;
-pub mod subscriptions;

crates/api_clients/storyteller_client/src/generate/video/mod.rs

@@ -2,6 +2,4 @@ pub mod generate_kling_16_pro_image_to_video;
 pub mod generate_kling_21_master_image_to_video;
 pub mod generate_kling_21_pro_image_to_video;
 pub mod generate_seedance_1_0_lite_image_to_video;
-pub mod generate_veo_2_image_to_video;
-pub mod generate_veo_3_fast_image_to_video;
-pub mod generate_veo_3_image_to_video;
+pub mod generate_veo_2_image_to_video;

crates/api_clients/storyteller_client/src/lib.rs

@@ -1,7 +1,13 @@
-//! An API client for Artcraft / Storyteller / FakeYou
+//! An API client for Storyteller / FakeYou
 
 pub mod credentials;
-pub mod endpoints;
+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;

crates/api_clients/storyteller_client/src/media_files/get_media_file.rs

@@ -208,7 +208,7 @@ pub struct GetMediaFileModelInfo {
 
 #[cfg(test)]
 mod tests {
-  use crate::endpoints::media_files::get_media_file::get_media_file;
+  use crate::media_files::get_media_file::get_media_file;
   use crate::utils::api_host::ApiHost;
   use tokens::tokens::media_files::MediaFileToken;
 

crates/api_clients/storyteller_client/src/recipes/upload_media_file_from_file.rs

@@ -1,9 +1,9 @@
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use crate::endpoints::media_files::upload_image_media_file_from_file::{upload_image_media_file_from_file, UploadImageFromFileArgs};
-use crate::endpoints::media_files::upload_new_engine_asset_from_file::upload_new_engine_asset_from_file;
-use crate::endpoints::media_files::upload_video_media_file_from_file::upload_video_media_file_from_file;
 use crate::error::client_error::ClientError;
 use crate::error::storyteller_error::StorytellerError;
+use crate::media_files::upload_image_media_file_from_file::{upload_image_media_file_from_file, UploadImageFromFileArgs};
+use crate::media_files::upload_new_engine_asset_from_file::upload_new_engine_asset_from_file;
+use crate::media_files::upload_video_media_file_from_file::upload_video_media_file_from_file;
 use crate::utils::api_host::ApiHost;
 use mimetypes::mimetype_info::file_extension::FileExtension;
 use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;

crates/api_clients/storyteller_client/src/utils/api_host.rs

@@ -1,8 +1,4 @@
 
-const HTTP_SCHEME: &str = "http";
-
-const HTTPS_SCHEME: &str = "https";
-
 #[derive(Clone, Debug)]
 pub enum ApiHost {
   Storyteller,
@@ -26,12 +22,4 @@ impl ApiHost {
       ApiHost::Localhost { port } => format!("http://localhost:{}", port),
     }
   }
-  
-  pub fn scheme(&self) -> &'static str {
-    match self {
-      ApiHost::Storyteller => HTTPS_SCHEME,
-      ApiHost::FakeYou => HTTPS_SCHEME,
-      ApiHost::Localhost { .. } => HTTP_SCHEME,
-    }
-  }
 }

crates/api_clients/storyteller_client/src/utils/basic_query_string_post_request.rs

@@ -1,137 +0,0 @@
-use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use crate::error::api_error::ApiError;
-use crate::error::client_error::ClientError;
-use crate::error::storyteller_error::StorytellerError;
-use crate::utils::api_host::ApiHost;
-use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
-use crate::utils::filter_bad_response::filter_bad_response;
-use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::{GenerateFlux1SchnellTextToImageRequest, GenerateFlux1SchnellTextToImageResponse, GENERATE_FLUX_1_SCHNELL_TEXT_TO_IMAGE_PATH};
-use errors::AnyhowResult;
-use log::{debug, info};
-use reqwest::Client;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use url::Url;
-use url_builder::URLBuilder;
-
-pub async fn basic_query_string_post_request<Res: DeserializeOwned>(
-  api_host: &ApiHost,
-  route_path: &str,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  query_params: &HashMap<String, String>,
-) -> Result<Res, StorytellerError> {
-
-  // TODO: Please stop using this URL Builder library. It's not very safe or intuitive.
-  let url = get_route(api_host, route_path, query_params);
-
-  debug!("Requesting {:?}", &url);
-
-  let client = Client::builder()
-      .gzip(true)
-      .build()
-      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
-
-  let mut request_builder = client.post(url)
-      .header("User-Agent", USER_AGENT)
-      .header("Accept", APPLICATION_JSON);
-
-  if let Some(creds) = maybe_creds {
-    if let Some(header) = &creds.maybe_as_cookie_header() {
-      request_builder = request_builder.header("Cookie", header);
-    }
-  }
-
-  let response = request_builder
-      .send()
-      .await
-      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
-
-  let response = filter_bad_response(response)
-      .await
-      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
-
-  let response_body = &response.text()
-      .await
-      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
-
-  debug!("Response body: {:?}", response_body);
-
-  let response = serde_json::from_str(&response_body)
-      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
-
-  Ok(response)
-}
-
-// TODO: Please stop using this URL Builder library. It's not very safe or intuitive.
-fn get_route(api_host: &ApiHost, route_path: &str, query_params: &HashMap<String, String>) -> String {
-  let mut builder = URLBuilder::new();
-
-  builder.set_protocol(api_host.scheme())
-      .set_host(&api_host.to_api_hostname());
-
-  // NB: This stupid library auto-inserts a starting slash, so we need to remove it.
-  // This is a bad code smell. I shouldn't be using this thing.
-  match route_path.split_once("/") {
-    None => {
-      builder.add_route(route_path);
-    }
-    Some((_slash, rest)) => {
-      builder.add_route(rest);
-    }
-  }
-
-  // NB: This is not safe. It doesn't handle URL encoding, "?", "&", etc.
-  for (key, value) in query_params {
-    let value = filter_string(value);
-    builder.add_param(key, &value);
-  }
-
-  // NB: This isn't very safe.
-  builder.build()
-}
-
-// TODO: Please stop using this URL Builder library. It's not very safe or intuitive.
-fn filter_string(string: &str) -> String {
-  string.trim()
-      .replace(" ", "")
-      .replace("&", "")
-      .replace("=", "")
-      .replace("?", "")
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use std::collections::HashMap;
-
-  #[test]
-  fn test_get_route() {
-    let api_host = ApiHost::Storyteller;
-    let route_path = "/v1/test";
-    let mut query_params = HashMap::new();
-    query_params.insert("param1".to_string(), "value1".to_string());
-    query_params.insert("param2".to_string(), "value2".to_string());
-
-    let url = get_route(&api_host, route_path, &query_params);
-
-    assert!(url.starts_with("https://api.storyteller.ai/v1/test?"));
-    assert!(url.contains("param1=value1"));
-    assert!(url.contains("param2=value2"));
-  }
-
-  #[test]
-  fn test_get_localhost_route() {
-    let api_host = ApiHost::Localhost { port: 12345 };
-    let route_path = "/v1/test";
-    let mut query_params = HashMap::new();
-    query_params.insert("param1".to_string(), "value1".to_string());
-    query_params.insert("param2".to_string(), "value2".to_string());
-
-    let url = get_route(&api_host, route_path, &query_params);
-
-    assert!(url.starts_with("http://localhost:12345/v1/test?"));
-    assert!(url.contains("param1=value1"));
-    assert!(url.contains("param2=value2"));
-  }
-}

crates/api_clients/storyteller_client/src/utils/mod.rs

@@ -1,7 +1,6 @@
 pub mod api_host;
 pub mod basic_json_get_request;
 pub mod basic_json_post_request;
-pub mod basic_query_string_post_request;
 pub mod constants;
 pub mod filter_bad_response;
 pub mod http_get_anonymous;

crates/desktop/artcraft/Cargo.toml

@@ -57,16 +57,15 @@ image = "0.25.5"
 indexmap.workspace = true
 log.workspace = true
 once_cell.workspace = true
-os_info = { version = "3.12.0", default-features = false }
 rand.workspace = true
 reqwest = { workspace = true, features = ["multipart", "stream"], default-features = false } # NB(bt,2025-03-10): default-features = false on Windows while I debug openssl / rustls
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+tauri.workspace = true
 tauri-plugin-dialog.workspace = true
 tauri-plugin-log.workspace = true
 tauri-plugin-upload.workspace = true
-tauri.workspace = true
 tempdir.workspace = true
 tempfile.workspace = true
 tokio = { version = "1.42", features = ["rt", "rt-multi-thread", "fs"] }

crates/desktop/artcraft/src/core/commands/app_state/mod.rs

@@ -1 +0,0 @@
-mod reset_artcraft_command;

crates/desktop/artcraft/src/core/commands/app_state/reset_artcraft_command.rs

@@ -1,34 +0,0 @@
-use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageSuccessResponse;
-use crate::core::commands::response::shorthand::ResponseOrErrorMessage;
-use crate::core::commands::response::success_response_wrapper::SerializeMarker;
-use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::services::storyteller::windows::clear_main_webview_window_storyteller_cookies::clear_main_webview_window_storyteller_cookies;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use log::{error, info};
-use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
-
-#[derive(Serialize)]
-pub struct ResetArtcraftCommandResponse {
-  pub success: bool,
-}
-
-impl SerializeMarker for ResetArtcraftCommandResponse {}
-
-#[tauri::command]
-pub async fn reset_artcraft_command(
-  app: AppHandle,
-) -> ResponseOrErrorMessage<ResetArtcraftCommandResponse> {
-  info!("reset_artcraft_command called");
-
-  // TODO: Reset local vs. production
-
-  Ok(ResetArtcraftCommandResponse {
-    success: true,
-  }.into())
-}
-

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/enqueue_image_bg_removal_command.rs

@@ -37,7 +37,7 @@ use serde_derive::{Deserialize, Serialize};
 use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs};
 use std::time::Duration;
 use storyteller_client::error::storyteller_error::StorytellerError;
-use storyteller_client::endpoints::media_files::get_media_file::get_media_file;
+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;

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/generic/handle_generic_bg_removal_artcraft.rs

@@ -27,13 +27,13 @@ use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_im
 use idempotency::uuid::generate_random_uuid;
 use log::{error, info};
 use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
-use storyteller_client::endpoints::generate::image::remove_image_background::remove_image_background;
-use storyteller_client::endpoints::media_files::upload_image_media_file_from_file::{upload_image_media_file_from_file, UploadImageFromFileArgs};
+use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
+use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
+use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
+use storyteller_client::generate::image::remove_image_background::remove_image_background;
+use storyteller_client::media_files::upload_image_media_file_from_file::{upload_image_media_file_from_file, UploadImageFromFileArgs};
 use tauri::AppHandle;
 use tokens::tokens::media_files::MediaFileToken;
 

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_contextual_edit_image_command.rs

@@ -40,7 +40,7 @@ use serde_derive::{Deserialize, Serialize};
 use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs};
 use std::time::Duration;
 use storyteller_client::error::storyteller_error::StorytellerError;
-use storyteller_client::endpoints::media_files::get_media_file::get_media_file;
+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;

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/flux_kontext/handle_flux_kontext_edit_artcraft.rs

@@ -25,12 +25,12 @@ use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_im
 use fal_client::requests::webhook::image::edit::enqueue_flux_pro_kontext_max_edit_webhook::FluxProKontextMaxNumImages;
 use idempotency::uuid::generate_random_uuid;
 use log::{error, info};
-use storyteller_client::endpoints::generate::image::edit::flux_pro_kontext_max_edit_image::flux_pro_kontext_max_edit_image;
-use storyteller_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
+use storyteller_client::generate::image::edit::flux_pro_kontext_max_edit_image::flux_pro_kontext_max_edit_image;
+use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
+use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
+use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
 use tauri::AppHandle;
 
 pub async fn handle_flux_kontext_edit_artcraft(

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/gemini_25_flash/handle_gemini_25_flash_edit_artcraft.rs

@@ -24,9 +24,9 @@ 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::endpoints::generate::image::edit::flux_pro_kontext_max_edit_image::flux_pro_kontext_max_edit_image;
-use storyteller_client::endpoints::generate::image::edit::gemini_25_flash_edit_image::gemini_25_flash_edit_image;
-use storyteller_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
+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;

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/gpt_image_1/handle_gpt_image_1_edit_artcraft.rs

@@ -25,11 +25,11 @@ use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_im
 use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1_edit_image_webhook::GptEditImageQuality;
 use idempotency::uuid::generate_random_uuid;
 use log::{error, info};
-use storyteller_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
+use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
+use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
+use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
 use tauri::AppHandle;
 
 pub async fn handle_gpt_image_1_edit_artcraft(

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/gpt_image_1/handle_gpt_image_1_edit_sora.rs

@@ -36,7 +36,7 @@ use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_o
 use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
 use openai_sora_client::sora_error::SoraError;
 use std::time::Duration;
-use storyteller_client::endpoints::media_files::get_media_file::get_media_file;
+use storyteller_client::media_files::get_media_file::get_media_file;
 use tauri::AppHandle;
 
 const SORA_IMAGE_UPLOAD_TIMEOUT: Duration = Duration::from_millis(1000 * 30); // 30 seconds

crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/enqueue_image_inpaint_command.rs

@@ -42,7 +42,7 @@ use serde_derive::{Deserialize, Serialize};
 use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs};
 use std::time::Duration;
 use storyteller_client::error::storyteller_error::StorytellerError;
-use storyteller_client::endpoints::media_files::get_media_file::get_media_file;
+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;

crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/flux_dev_juggernaut_inpaint/handle_flux_dev_juggernaut_inpaint_artcraft.rs

@@ -32,16 +32,16 @@ use images::mask_images::normalize_image_bytes_to_flux_mask::normalize_image_byt
 use log::{error, info};
 use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
 use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
-use storyteller_client::endpoints::generate::image::inpaint::flux_dev_juggernaut_inpaint_image::flux_dev_juggernaut_inpaint_image;
-use storyteller_client::endpoints::generate::image::inpaint::flux_pro_1_inpaint_image::flux_pro_1_inpaint_image;
-use storyteller_client::endpoints::media_files::get_media_file::get_media_file;
-use storyteller_client::endpoints::media_files::upload_image_media_file_from_bytes::{upload_image_media_file_from_bytes, ImageType, UploadImageBytesArgs};
-use storyteller_client::endpoints::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
+use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
+use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
+use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
+use storyteller_client::generate::image::inpaint::flux_dev_juggernaut_inpaint_image::flux_dev_juggernaut_inpaint_image;
+use storyteller_client::generate::image::inpaint::flux_pro_1_inpaint_image::flux_pro_1_inpaint_image;
+use storyteller_client::media_files::get_media_file::get_media_file;
+use storyteller_client::media_files::upload_image_media_file_from_bytes::{upload_image_media_file_from_bytes, ImageType, UploadImageBytesArgs};
+use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
 use tauri::AppHandle;
 use tokens::tokens::media_files::MediaFileToken;
 

crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/flux_pro_1_inpaint/handle_flux_pro_1_inpaint_artcraft.rs

@@ -32,15 +32,15 @@ use images::mask_images::normalize_image_bytes_to_flux_mask::normalize_image_byt
 use log::{error, info};
 use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
 use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
-use storyteller_client::endpoints::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
-use storyteller_client::endpoints::generate::image::inpaint::flux_pro_1_inpaint_image::flux_pro_1_inpaint_image;
-use storyteller_client::endpoints::media_files::get_media_file::get_media_file;
-use storyteller_client::endpoints::media_files::upload_image_media_file_from_bytes::{upload_image_media_file_from_bytes, ImageType, UploadImageBytesArgs};
-use storyteller_client::endpoints::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
+use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
+use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
+use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
+use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
+use storyteller_client::generate::image::inpaint::flux_pro_1_inpaint_image::flux_pro_1_inpaint_image;
+use storyteller_client::media_files::get_media_file::get_media_file;
+use storyteller_client::media_files::upload_image_media_file_from_bytes::{upload_image_media_file_from_bytes, ImageType, UploadImageBytesArgs};
+use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
 use tauri::AppHandle;
 use tokens::tokens::media_files::MediaFileToken;