dummy data, rename migrations

this will be useful with an omni-api

.github/workflows/docker-publish-cpu.yml

@@ -10,6 +10,20 @@ on:
       #- $default-branch
       - main
       - test
+    # Only build when files that affect the Docker image change.
+    # This avoids expensive 15-25 min builds for docs-only or config-only changes.
+    paths:
+      # Individual files
+      - '.github/workflows/docker-publish-cpu.yml'
+      - 'Cargo.lock'
+      - 'Cargo.toml'
+      - 'build/service_cpu.Dockerfile'
+      # Directories
+      - '.sqlx/**'
+      - '_database/**'
+      - 'crates/**'
+      - 'includes/**'
+      - 'test_data/**'
 env:
   IMAGE_NAME: storyteller-rust
 

.gitignore

@@ -36,8 +36,9 @@ script/socat_dev_database_connect.sh
 # Python virtual envs (named by convention)
 venv/
 
-# Testing
+# LLM Testing
 /prompts/
+/reports/
 /requests/
 
 # Scratch data

.sqlx/query-08f52f15acf6afc7091a525e3dc88f706c71c3579e5e81aa9903807d85f469ef.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO prompts\nSET\n  token = ?,\n  prompt_type = ?,\n\n  maybe_creator_user_token = ?,\n  \n  maybe_model_type = ?,\n  maybe_generation_provider = ?,\n\n  maybe_positive_prompt = ?,\n  maybe_negative_prompt = ?,\n  \n  maybe_other_args = ?,\n\n  creator_ip_address = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 9
-    },
-    "nullable": []
-  },
-  "hash": "08f52f15acf6afc7091a525e3dc88f706c71c3579e5e81aa9903807d85f469ef"
-}

.sqlx/query-2fe10ae5a2d013e1861f71dcb0afae4048e0d47c5b584c6bbc7df25dde747e87.json

@@ -0,0 +1,168 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    u.id as `id: u64`,\n    u.token as `token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name,\n    u.username_is_not_customized as `username_is_not_customized: bool`,\n    u.email_address,\n    u.email_confirmed as `email_confirmed: bool`,\n    u.is_without_password as `is_without_password: bool`,\n    u.ip_address_creation,\n    u.maybe_source as `maybe_source: enums::by_table::users::user_signup_source::UserSignupSource`,\n    u.maybe_signup_method as `maybe_signup_method: enums::by_table::users::user_signup_method::UserSignupMethod`,\n    u.created_at,\n    u.maybe_referral_url,\n    u.is_temporary as `is_temporary: bool`\nFROM users AS u\nWHERE\n    u.id < ?\n    AND u.user_deleted_at IS NULL\n    AND u.mod_deleted_at IS NULL\nORDER BY u.id DESC\nLIMIT ?\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "username_is_not_customized: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "email_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "email_confirmed: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "is_without_password: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "ip_address_creation",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_source: enums::by_table::users::user_signup_source::UserSignupSource",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_signup_method: enums::by_table::users::user_signup_method::UserSignupMethod",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "maybe_referral_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "is_temporary: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "2fe10ae5a2d013e1861f71dcb0afae4048e0d47c5b584c6bbc7df25dde747e87"
+}

.sqlx/query-4a50b7bf06061f05e769a41e547cb927bd2b3a6f67c8ceb37883b744237ba34c.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n    p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,\n\n    p.maybe_model_type as `maybe_model_type: enums::common::model_type::ModelType`,\n    p.maybe_generation_provider as `maybe_generation_provider: enums::common::generation_provider::GenerationProvider`,\n\n    p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n    p.maybe_positive_prompt,\n    p.maybe_negative_prompt,\n    p.maybe_other_args,\n\n    p.creator_ip_address,\n    p.created_at\n\nFROM prompts as p\nWHERE\n    p.token = ?\n        ",
+  "query": "\nSELECT\n    p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n    p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,\n\n    p.maybe_model_type as `maybe_model_type: enums::common::generation::common_model_type::CommonModelType`,\n    p.maybe_generation_provider as `maybe_generation_provider: enums::common::generation_provider::GenerationProvider`,\n\n    p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n    p.maybe_positive_prompt,\n    p.maybe_negative_prompt,\n\n    p.maybe_generation_mode as `maybe_generation_mode: enums::common::generation::common_generation_mode::CommonGenerationMode`,\n    p.maybe_aspect_ratio as `maybe_aspect_ratio: enums::common::generation::common_aspect_ratio::CommonAspectRatio`,\n    p.maybe_resolution as `maybe_resolution: enums::common::generation::common_resolution::CommonResolution`,\n    p.maybe_batch_count as `maybe_batch_count: u8`,\n    p.maybe_generate_audio as `maybe_generate_audio: bool`,\n    p.maybe_duration_seconds as `maybe_duration_seconds: u32`,\n\n    p.maybe_other_args,\n\n    p.creator_ip_address,\n    p.created_at\n\nFROM prompts as p\nWHERE\n    p.token = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -25,7 +25,7 @@
       },
       {
         "ordinal": 2,
-        "name": "maybe_model_type: enums::common::model_type::ModelType",
+        "name": "maybe_model_type: enums::common::generation::common_model_type::CommonModelType",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -75,6 +75,66 @@
       },
       {
         "ordinal": 7,
+        "name": "maybe_generation_mode: enums::common::generation::common_generation_mode::CommonGenerationMode",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 96
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_aspect_ratio: enums::common::generation::common_aspect_ratio::CommonAspectRatio",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 96
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_resolution: enums::common::generation::common_resolution::CommonResolution",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_batch_count: u8",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 3
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "maybe_generate_audio: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "maybe_duration_seconds: u32",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 13,
         "name": "maybe_other_args",
         "type_info": {
           "type": "Blob",
@@ -84,7 +144,7 @@
         }
       },
       {
-        "ordinal": 8,
+        "ordinal": 14,
         "name": "creator_ip_address",
         "type_info": {
           "type": "VarString",
@@ -94,7 +154,7 @@
         }
       },
       {
-        "ordinal": 9,
+        "ordinal": 15,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -116,9 +176,15 @@
       true,
       true,
       true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
       false,
       false
     ]
   },
-  "hash": "b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630"
+  "hash": "4a50b7bf06061f05e769a41e547cb927bd2b3a6f67c8ceb37883b744237ba34c"
 }

.sqlx/query-83840fa1a0712a326a26ae146a819f67a44fae927f294780d89892270075ebb7.json

@@ -0,0 +1,289 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    u.id as `id: u64`,\n    u.token as `token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name,\n    u.username_is_not_customized as `username_is_not_customized: bool`,\n    u.email_address,\n    u.email_confirmed as `email_confirmed: bool`,\n    u.is_without_password as `is_without_password: bool`,\n    u.ip_address_creation,\n    u.maybe_source as `maybe_source: enums::by_table::users::user_signup_source::UserSignupSource`,\n    u.maybe_signup_method as `maybe_signup_method: enums::by_table::users::user_signup_method::UserSignupMethod`,\n    u.created_at,\n    u.maybe_referral_url,\n    u.is_temporary as `is_temporary: bool`,\n    us.subscription_namespace,\n    us.subscription_product_slug,\n    us.maybe_stripe_subscription_id,\n    us.maybe_stripe_customer_id,\n    us.maybe_stripe_product_id,\n    us.maybe_stripe_price_id,\n    us.maybe_stripe_subscription_status,\n    us.maybe_stripe_recurring_interval,\n    us.maybe_stripe_invoice_is_paid as `maybe_stripe_invoice_is_paid: bool`,\n    us.maybe_cancel_at,\n    us.maybe_canceled_at\nFROM users AS u\nINNER JOIN user_subscriptions AS us ON u.token = us.user_token\nWHERE\n    u.id < ?\n    AND u.user_deleted_at IS NULL\n    AND u.mod_deleted_at IS NULL\nORDER BY u.id DESC\nLIMIT ?\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id: u64",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "username_is_not_customized: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "email_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "email_confirmed: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "is_without_password: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "ip_address_creation",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_source: enums::by_table::users::user_signup_source::UserSignupSource",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_signup_method: enums::by_table::users::user_signup_method::UserSignupMethod",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "maybe_referral_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "is_temporary: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "subscription_namespace",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "subscription_product_slug",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "maybe_stripe_subscription_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "maybe_stripe_customer_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "maybe_stripe_product_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "maybe_stripe_price_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "maybe_stripe_subscription_status",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "maybe_stripe_recurring_interval",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "maybe_stripe_invoice_is_paid: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_cancel_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "maybe_canceled_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "83840fa1a0712a326a26ae146a819f67a44fae927f294780d89892270075ebb7"
+}

.sqlx/query-87d7233bb9a4bcae7c9b7d55bb93fab182343847f0bcf8d8ce849f3a2dcfb704.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n      UPDATE media_files\n      SET maybe_thumbnail_version = ?\n      WHERE token = ?\n      LIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "87d7233bb9a4bcae7c9b7d55bb93fab182343847f0bcf8d8ce849f3a2dcfb704"
+}

.sqlx/query-cbdaa45597de14d1eb6dc0f6a95788d56334757bb3d03eda2eb64df3ba2a0144.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    j.status as `job_status: enums::common::job_status_plus::JobStatusPlus`,\n    j.failure_reason as job_failure_reason,\n    wle.credits_delta,\n    wle.maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`,\n    j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`\nFROM generic_inference_jobs as j\nLEFT OUTER JOIN users as u\n    ON j.maybe_creator_user_token = u.token\nLEFT OUTER JOIN wallet_ledger_entries as wle\n    ON wle.maybe_entity_ref = j.token\nWHERE u.token = ?\nORDER BY j.id DESC\n    ",
+  "query": "\nSELECT\n    j.status as `job_status: enums::common::job_status_plus::JobStatusPlus`,\n    j.failure_reason as job_failure_reason,\n    wle.credits_delta,\n    wle.maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`,\n    j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`,\n    j.maybe_external_third_party as `maybe_external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    j.maybe_external_third_party_id,\n    j.created_at,\n    j.updated_at\nFROM generic_inference_jobs as j\nLEFT OUTER JOIN users as u\n    ON j.maybe_creator_user_token = u.token\nLEFT OUTER JOIN wallet_ledger_entries as wle\n    ON wle.maybe_entity_ref = j.token\nWHERE u.token = ?\nORDER BY j.id DESC\n    ",
   "describe": {
     "columns": [
       {
@@ -82,6 +82,46 @@
           "char_set": 224,
           "max_size": 128
         }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_external_third_party_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
       }
     ],
     "parameters": {
@@ -95,8 +135,12 @@
       true,
       false,
       true,
-      true
+      true,
+      true,
+      true,
+      false,
+      false
     ]
   },
-  "hash": "0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1"
+  "hash": "cbdaa45597de14d1eb6dc0f6a95788d56334757bb3d03eda2eb64df3ba2a0144"
 }

.sqlx/query-ccf92ebe0328d3019ac6b01be4b442df706a183362fa7e5c331f5a4bf1a74a00.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO prompts\nSET\n  token = ?,\n  prompt_type = ?,\n\n  maybe_creator_user_token = ?,\n  \n  maybe_model_type = ?,\n  maybe_generation_provider = ?,\n\n  maybe_positive_prompt = ?,\n  maybe_negative_prompt = ?,\n\n  maybe_generation_mode = ?,\n  maybe_aspect_ratio = ?,\n  maybe_resolution = ?,\n  maybe_batch_count = ?,\n  maybe_generate_audio = ?,\n  maybe_duration_seconds = ?,\n\n  maybe_other_args = ?,\n\n  creator_ip_address = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 15
+    },
+    "nullable": []
+  },
+  "hash": "ccf92ebe0328d3019ac6b01be4b442df706a183362fa7e5c331f5a4bf1a74a00"
+}

.sqlx/query-daed2dcd03b3c9fbdb9057b743df078f43e2af87a2c31f418234f98da5ff979f.json

@@ -0,0 +1,91 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    id,\n    token as `token: MediaFileToken`,\n    created_at as `created_at: DateTime<Utc>`,\n    maybe_thumbnail_version as `maybe_thumbnail_version: u8`,\n    public_bucket_directory_hash,\n    maybe_public_bucket_prefix,\n    maybe_public_bucket_extension\nFROM media_files\nWHERE\n    id >= (SELECT COALESCE(MIN(id), 0) FROM media_files WHERE created_at >= NOW() - INTERVAL ? HOUR)\n    AND id < ?\n    AND media_class = ?\n    AND maybe_thumbnail_version IS NULL\n    AND user_deleted_at IS NULL\n    AND mod_deleted_at IS NULL\nORDER BY id DESC\nLIMIT ?\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "created_at: DateTime<Utc>",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_thumbnail_version: u8",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 3
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "public_bucket_directory_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "daed2dcd03b3c9fbdb9057b743df078f43e2af87a2c31f418234f98da5ff979f"
+}

CLAUDE.md

@@ -0,0 +1,62 @@
+# CLAUDE.md
+
+This file provides guidance for Claude Code when working with the Artcraft monorepo.
+
+## Project Overview
+
+Artcraft is a web and desktop application for generating AI image and video. It is written in 
+Rust and TypeScript and contains desktop, server, and frontend components.
+
+## Project Structure
+
+```
+artcraft/
+├── _database/                           # Schema definitions and migrations (MySQL, SQLite, Elasticsearch, etc.)
+│   ├── elasticsearch/                   # Elasticsearch schema and queries
+│   └── sql/                             # MySQL and SQLite schema definitions and migrations
+│       ├── artcraft_migrations/         # ArtCraft desktop app SQLite migrations
+│       ├── migrations/                  # Server MySQL migrations
+│       └── migrations_squashed/         # Fully materialized MySQL schema definitions for most tables
+├── build/                               # Dockerfile build instructions for server components
+├── crates/                              # Rust workspace
+│   ├── api_clients/                     # HTTP clients for calling internal and 3rd party services
+│   ├── cli/                             # Command line tools
+│   ├── desktop/                         # Desktop (Tauri) apps
+│   │   └── artcraft/                    # (Important) ArtCraft, the desktop app. This is one of our main pieces of software
+│   ├── lib/                             # Various utility libraries for servers, CLI tools, desktop, etc.
+│   ├── schema/                          # Data definition layer: MySQL, SQlite, Redis, S3/R2 buckets, etc.
+│   │   ├── buckets/                     # Declares R2 cloud bucket topology
+│   │   ├── database/                    # MySQL, SQLite, Elasticsearch, Redis, etc.
+│   │   │   ├── elasticsearch_schema/    # Elasticsearch
+│   │   │   ├── migration/               # (deprecated) Online schema adapters for MySQL 
+│   │   │   ├── mysql_queries/           # Sqlx MySQL queries for our backend monolith `storyteller-web`, jobs, etc.
+│   │   │   ├── redis_common/            # Redis support
+│   │   │   ├── redis_schema/            # Redis key and HKEY topology
+│   │   │   ├── sqlite_queries/          # (deprecated) Sqlite queries
+│   │   │   └── sqlite_tasks/            # Queries for the ArtCraft desktop app's "tasks" database.
+│   │   ├── public/                      # Token identifier and enum variant definitions
+│   │   │   ├── composite_identifier/    # MySQL composite key system
+│   │   │   ├── enums/                   # MySQL "enums" stored in VARCHAR fields.
+│   │   │   └── tokens/                  # Primary database identifiers with Stripe-like ID prefixes, eg. "user_{entropy}"
+│   │   └── service/                     # Backend HTTP services and jobs
+│   │       ├── job/                     # Backend jobs.
+│   │       │   └── video_thumbnail_job/ # Render video thumbnails
+│   │       ├── plugins/                 # Collections of reusable Actix-Web HTTP functions (user and billing systems)
+│   │       └── web/                     # HTTP web servers
+│   │           └── storyteller_web/     # (Important) Our main HTTP API monolith and backend.
+│   └── frontend/                        # Nx typescript monorepo for our websites and Tauri desktop apps
+│       ├── apps/                        # Websites and Tauri desktop apps
+│       │   ├── artcraft/                # ArtCraft the Tauri app's frontend. Used in conjunction with `artcraft` the Rust crate.
+│       │   └── artcraft-website/        # The website for https://getartcraft.com
+│       └── libs/                        # Support libraries, reusable React components, etc.
+└── Cargo.toml                           # Rust monorepo workspace
+```
+
+## Code Style
+
+- Rust with no minimum supported version
+- Actix-web for HTTP services
+- SQLx for MySQL and SQLite
+- A mix of wreq and reqwest for Rust HTTP clients
+- TypeScript with Nx, React, Vite, Zustand, and Three.js
+- Use two spaces for indentation

Cargo.toml

@@ -6,27 +6,28 @@ resolver = "2"
 members = [
   # API clients for external services
   # These might be custom implementations or wrappers over other client libraries.
-  "crates/api_clients/artcraft/artcraft_api_defs", # TODO: api_clients/{artcraft}/{api_defs,client}
+  "crates/api_clients/artcraft/artcraft_api_defs",
   "crates/api_clients/artcraft/artcraft_client",
+  "crates/api_clients/artcraft/artcraft_router",
   "crates/api_clients/cloud_storage",
   "crates/api_clients/fal_client",
-  "crates/api_clients/google_drive_common",
+  "crates/api_clients/google_drive_downloader",
   "crates/api_clients/google_sign_in",
   "crates/api_clients/grok_client",
   "crates/api_clients/midjourney_client",
+  "crates/api_clients/muapi_client",
   "crates/api_clients/openai_sora_client",
   "crates/api_clients/openart_client",
-  "crates/api_clients/muapi_client",
-  "crates/api_clients/seedance2pro",
+  "crates/api_clients/rootly_client",
   "crates/api_clients/runwayml_client",
+  "crates/api_clients/seedance2pro_client",
   "crates/api_clients/thumbnail_generator",
-  "crates/api_clients/world_labs_api",
-  "crates/api_clients/world_labs_client",
+  "crates/api_clients/worldlabs_api_client",
+  "crates/api_clients/worldlabs_consumer_client",
 
   # CLI tools for operations, etc.
   "crates/cli/devenv/dev-database-seed",
   "crates/cli/devenv/dev-upload-media-file",
-  "crates/cli/devenv/scrape-test",
   "crates/cli/production/db-backfill",
   "crates/cli/production/db-backup",
   "crates/cli/production/db-cleanup",
@@ -44,7 +45,6 @@ members = [
   "crates/lib/actix_cors_configs",
   "crates/lib/actix_helpers",
   "crates/lib/bootstrap",
-  "crates/lib/bucket_paths",
   "crates/lib/build_metadata",
   "crates/lib/caching/memory_caching",
   "crates/lib/caching/memory_store",
@@ -53,19 +53,14 @@ members = [
   "crates/lib/cloudflare_mitigation",
   "crates/lib/concurrency",
   "crates/lib/cookie_store",
-  "crates/lib/cookies",
   "crates/lib/data/collections",
   "crates/lib/data/crockford",
   "crates/lib/data/datetimes",
   "crates/lib/data/primitives",
   "crates/lib/data/web_base64",
-  "crates/lib/deprecated/config", # TODO(bt, 2023-02-13): Deprecate or repurpose
-  "crates/lib/deprecated/http_server_common", # TODO(bt, 2023-03-20): Move useful pieces to actix_helpers
-  "crates/lib/dimensions",
   "crates/lib/easyenv", # NB: Vendored version of https://github.com/echelon/easyenv.rs that we'll improve.
-  "crates/lib/email_sender",
   "crates/lib/errors",
-  "crates/lib/files/archives",
+  "crates/lib/ffmpeg_utils",
   "crates/lib/files/file_to_base64_url",
   "crates/lib/files/filesys",
   "crates/lib/files/hashing",
@@ -73,35 +68,42 @@ members = [
   "crates/lib/files/media",
   "crates/lib/files/mimetypes",
   "crates/lib/files/videos",
+  "crates/lib/files/zip_archives",
   "crates/lib/http_headers",
-  "crates/lib/idempotency",
-  "crates/api_clients/artcraft/artcraft_router",
-  "crates/lib/image_algorithms",
   "crates/lib/jobs_common",
   "crates/lib/jwt_light",
+  "crates/lib/jwt_signer",
   "crates/lib/logging",
-  "crates/lib/machine_learning/ml_weights_registry",
-  "crates/lib/machine_learning/prompt_engineering",
   "crates/lib/markdown",
-  "crates/lib/migration",
+  "crates/lib/pager",
   "crates/lib/password",
   "crates/lib/server_environment",
   "crates/lib/sqlx_mysql_helpers",
   "crates/lib/storyteller_root",
-  "crates/lib/subprocess_common",
-  "crates/lib/test_data",
-  "crates/lib/testing",
-  "crates/lib/tts_common",
   "crates/lib/url_config",
   "crates/lib/url_utils",
   "crates/lib/user_input_common",
   "crates/lib/users",
-  "crates/lib/web_scrapers",
+  "crates/lib/uuid_utils",
   #"crates/lib/api_clients/fakeyou_client",
-  #"crates/lib/machine_learning/ml_models",
+  #"crates/lib/deprecated/machine_learning/ml_models",
+
+  # Shared libraries (Deprecated)
+  "crates/lib/deprecated/config", # TODO(bt, 2023-02-13): Deprecate or repurpose
+  "crates/lib/deprecated/email_sender",
+  "crates/lib/deprecated/http_server_common", # TODO(bt, 2023-03-20): Move useful pieces to actix_helpers
+  "crates/lib/deprecated/image_algorithms",
+  "crates/lib/deprecated/machine_learning/ml_weights_registry",
+  "crates/lib/deprecated/machine_learning/prompt_engineering",
+  "crates/lib/deprecated/subprocess_common",
+  "crates/lib/deprecated/tts_common",
+
+  # Schema (buckets): S3/R2 topology
+  "crates/schema/buckets/bucket_paths",
 
   # Schema (database): queries, database layouts, Redis keys, etc.
   "crates/schema/database/elasticsearch_schema",
+  "crates/schema/database/migration",
   "crates/schema/database/mysql_queries",
   "crates/schema/database/redis_common",
   "crates/schema/database/redis_schema",
@@ -116,31 +118,34 @@ members = [
   "crates/schema/public/tokens",
 
   # Services: API servers, jobs, workers, etc.
-  "crates/service/job/analytics_job",
-  "crates/service/job/download_job",
-  "crates/service/job/email_sender_job",
-  "crates/service/job/es-update-job",
-  "crates/service/job/inference_job",
   "crates/service/job/seedance2_pro_job",
+  "crates/service/job/video_thumbnail_job",
   "crates/service/job/worldlabs_job",
-  "crates/service/job/tts_download_job",
-  "crates/service/job/tts_inference_job",
-  "crates/service/job/w2l_download_job",
-  "crates/service/job/w2l_inference_job",
   "crates/service/web/dummy_service",
   "crates/service/web/storyteller_web",
 
+  # Services (Deprecated) - may still have some use
+  "crates/service/job/deprecated/analytics_job",
+  "crates/service/job/deprecated/download_job",
+  "crates/service/job/deprecated/email_sender_job",
+  "crates/service/job/deprecated/es-update-job",
+  "crates/service/job/deprecated/inference_job",
+  "crates/service/job/deprecated/tts_download_job",
+  "crates/service/job/deprecated/tts_inference_job",
+  "crates/service/job/deprecated/w2l_download_job",
+  "crates/service/job/deprecated/w2l_inference_job",
+
   # 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",
 
+  # Testing code
+  "crates/testing/test_data",
+  "crates/testing/test_utils",
+
   # Vendored code
-  "crates/vendor/fal-rs",
-  "crates/vendor/fal-rs/fal-derive",
-  "crates/vendor/fal-rs/generate",
   "crates/vendor/limitation",
   "crates/vendor/tauri-plugin-http",
   "crates/vendor/Symphonia/symphonia",
@@ -212,50 +217,58 @@ workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }
 # Setting paths here ensures we don't need to do so in every crate's Cargo.toml
 # It makes refactoring much easier.
 actix_artcraft = { path = "crates/lib/actix_artcraft" }
-artcraft_router = { path = "crates/api_clients/artcraft/artcraft_router" }
 actix_helpers = { path = "crates/lib/actix_helpers" }
 artcraft_api_defs = { path = "crates/api_clients/artcraft/artcraft_api_defs" }
+artcraft_client = { path = "crates/api_clients/artcraft/artcraft_client" }
+artcraft_router = { path = "crates/api_clients/artcraft/artcraft_router" }
+bootstrap = { path = "crates/lib/bootstrap" }
+bucket_paths = { path = "crates/schema/buckets/bucket_paths" }
 build_metadata = { path = "crates/lib/build_metadata" }
 cloud_storage = { path = "crates/api_clients/cloud_storage" }
 cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
 cloudflare_mitigation = { path = "crates/lib/cloudflare_mitigation" }
 collections = { path = "crates/lib/data/collections" }
 component_traits = { path = "crates/service/plugins/component_traits" }
+concurrency = { path = "crates/lib/concurrency" }
 cookie_store = { path = "crates/lib/cookie_store" }
-cookies = { path = "crates/lib/cookies" }
 crockford = { path = "crates/lib/data/crockford" }
 easyenv = { path = "crates/lib/easyenv" }
 enums = { path = "crates/schema/public/enums" }
 enums_public = { path = "crates/schema/public/enums_public" }
 errors = { path = "crates/lib/errors" }
 fal_client = { path = "crates/api_clients/fal_client" }
+ffmpeg_utils = { path = "crates/lib/ffmpeg_utils" }
 file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
 filesys = { path = "crates/lib/files/filesys" }
 grok_client = { path = "crates/api_clients/grok_client" }
+rootly_client = { path = "crates/api_clients/rootly_client" }
 http_headers = { path = "crates/lib/http_headers" }
-idempotency = { path = "crates/lib/idempotency" }
 images = { path = "crates/lib/files/images" }
+jobs_common = { path = "crates/lib/jobs_common" }
 jwt_light = { path = "crates/lib/jwt_light" }
+jwt_signer = { path = "crates/lib/jwt_signer" }
 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" }
 muapi_client = { path = "crates/api_clients/muapi_client" }
-seedance2pro = { path = "crates/api_clients/seedance2pro" }
+mysql_queries = { path = "crates/schema/database/mysql_queries" }
+pager = { path = "crates/lib/pager" }
+openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }
+seedance2pro_client = { path = "crates/api_clients/seedance2pro_client" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
 sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
-artcraft_client = { path = "crates/api_clients/artcraft/artcraft_client" }
-subprocess_common = { path = "crates/lib/subprocess_common" }
-test_data = { path = "crates/lib/test_data" }
-testing = { path = "crates/lib/testing" }
+subprocess_common = { path = "crates/lib/deprecated/subprocess_common" }
+test_data = { path = "crates/testing/test_data" }
+test_utils = { path = "crates/testing/test_utils" }
 tokens = { path = "crates/schema/public/tokens" }
 url_utils = { path = "crates/lib/url_utils" }
 users = { path = "crates/lib/users" }
+uuid_utils = { path = "crates/lib/uuid_utils" }
 web_base64 = { path = "crates/lib/data/web_base64" }
-world_labs_api = { path = "crates/api_clients/world_labs_api" }
-world_labs_client = { path = "crates/api_clients/world_labs_client" }
+worldlabs_api_client = { path = "crates/api_clients/worldlabs_api_client" }
+worldlabs_consumer_client = { path = "crates/api_clients/worldlabs_consumer_client" }
 
 # External libs
 # Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace
@@ -271,32 +284,42 @@ actix-web = "4.7.0" # TODO(bt): We're behind and need to bump versions.
 actix-web-actors = "4.3.1+deprecated"
 actix-web-lab = "0.20.2"
 anyhow = "1.0.102"
+assertor = "0.0.3"
 base64 = "0.22.1"
+bcrypt = "0.15"
 bstr = "1.12.1"
-bytes = "1.10.1"
-chrono = { version = "0.4.41", features = ["serde"] }
-clap = { version = "4.5.60", features = ["derive"] }
+byteorder = "1.5.0"
+bytes = "1.11.1"
+chrono = { version = "0.4.44", features = ["serde"] }
+clap = { version = "=4.5.60", features = ["derive"] }
 cookie = "0.18.1"
+dotenv = "0.15.0"
+elasticsearch = { version = "8.5.0-alpha.1", default-features = false, features = ["rustls-tls"] }
 env = "1.0.1"
 env_logger = "0.11.9"
-futures = { version = "0.3.31" }
-hex-literal = "1.0.0"
-indexmap = "2.9.0"
+futures = { version = "0.3.32" }
+hex-literal = "1.1.0"
+hostname = "0.4.0"
+indexmap = "2.13.0"
 log = "0.4.29"
 md-5 = "0.10.6" # insecure but used for gravatar
-once_cell = "1.21.3"
+mockall = "0.12.1"
+once_cell = "1.21.4"
 r2d2 = "0.8.10"
+r2d2_redis = "0.14.0"
 rand = "0.9.1"
 redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp", "tokio-comp", "cluster-async", "aio"] }
 regex = "1.12.3"
 reqwest = { version = "0.12.23", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls", "gzip" ] }
 reqwest-websocket = {  version = "0.5.0" }
-serde = { version = "1.0.219", features = ["derive"] }
-serde_derive = "1.0.219"
-serde_json = "1.0.140"
+rust-s3 = { version = "0.36.0-beta.2", default-features = false, features = ["fail-on-err", "tags", "tokio-rustls-tls"] }
+serde = { version = "1.0.228", features = ["derive"] }
+serde_derive = "1.0.228"
+serde_json = "1.0.149"
 serde_yaml = "0.9.34+deprecated"
-sha2 = "0.11.0-rc.2"
+sha2 = "0.11.0-rc.5"
 sha3 = "0.10.8"
+speculoos = "0.11.0"
 strum = { version = "0.28.0", features = ["derive"] }
 tauri = { version = "2.8.3", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution; "ubstable" is needed for window access
 tauri-plugin-dialog = "2.3.3"
@@ -304,12 +327,16 @@ tauri-plugin-fs = "2.4.2"
 tauri-plugin-log = "2.6.0"
 tauri-plugin-upload = "2.3.1"
 tempdir = "0.3.7"
-tempfile = "3.20.0"
-thiserror = "2.0.12"
-tokio = { version = "1.45.1", features = ["macros"] }
-toml = "0.8.23"
-url = { version = "2.5.4", features = ["serde"] }
-uuid = "1.18.1"
+tempfile = "3.27.0"
+thiserror = "2.0.18"
+time = "0.3.36"
+tokio = { version = "1.50.0", features = ["macros"] }
+tokio-util = "0.7.12"
+toml = "1.0.7+spec-1.1.0"
+url = { version = "2.5.8", features = ["serde"] }
+utoipa = { version = "5.4.0", features = ["chrono", "actix_extras", "url"] }
+uuid = "1.22.0"
+walkdir = "2.4.0"
 
 # NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
 #

_database/sql/migrations/2026-03-23-191518-0000_alter_prompts_add_fields/down.sql

@@ -0,0 +1,11 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE prompts
+DROP COLUMN maybe_generation_mode,
+DROP COLUMN maybe_aspect_ratio,
+DROP COLUMN maybe_resolution,
+DROP COLUMN maybe_duration,
+DROP COLUMN maybe_batch_count,
+DROP COLUMN maybe_generate_audio;

_database/sql/migrations/2026-03-23-191518-0000_alter_prompts_add_fields/up.sql

@@ -0,0 +1,11 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE prompts
+ADD COLUMN maybe_generation_mode VARCHAR(24) DEFAULT NULL,
+ADD COLUMN maybe_aspect_ratio VARCHAR(24) DEFAULT NULL,
+ADD COLUMN maybe_resolution VARCHAR(16) DEFAULT NULL,
+ADD COLUMN maybe_duration VARCHAR(8) DEFAULT NULL,
+ADD COLUMN maybe_batch_count TINYINT UNSIGNED DEFAULT NULL,
+ADD COLUMN maybe_generate_audio BOOLEAN DEFAULT NULL;

_database/sql/migrations/2026-03-24-065550-0000_alter_prompts_change_fields/down.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE prompts
+DROP COLUMN maybe_duration_seconds,
+ADD COLUMN maybe_duration VARCHAR(8) DEFAULT NULL;

_database/sql/migrations/2026-03-24-065550-0000_alter_prompts_change_fields/up.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE prompts
+DROP COLUMN maybe_duration,
+ADD COLUMN maybe_duration_seconds INT UNSIGNED DEFAULT NULL;

_database/sql/migrations_squashed/characters/character_creation_assets.sql

@@ -0,0 +1,29 @@
+-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
+-- with comments attached to the fields for centralized documentation.
+
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Stores the media files (images) used as input when creating a character.
+CREATE TABLE character_creation_assets (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Foreign key to the characters table.
+  character_token VARCHAR(32) NOT NULL,
+
+  -- The media file used as a creation input (e.g. reference image).
+  asset_media_file_token VARCHAR(32) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- ========== INDICES ==========
+
+  PRIMARY KEY (id),
+  KEY index_character_token (character_token),
+  KEY index_asset_media_file_token (asset_media_file_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_squashed/characters/character_creation_prompts.sql

@@ -0,0 +1,28 @@
+-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
+-- with comments attached to the fields for centralized documentation.
+
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Stores prompts/descriptions used when creating a character.
+CREATE TABLE character_creation_prompts (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Foreign key to the characters table.
+  character_token VARCHAR(32) NOT NULL,
+
+  -- The prompt or description used during character creation.
+  prompt TEXT DEFAULT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- ========== INDICES ==========
+
+  PRIMARY KEY (id),
+  KEY index_character_token (character_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_squashed/characters/character_third_party_entities.sql

@@ -0,0 +1,71 @@
+-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
+-- with comments attached to the fields for centralized documentation.
+
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Maps our characters to their representations in third-party systems.
+-- A single character may have entries in multiple third-party systems
+-- (e.g. Kinovi for Seedance, Runway for Gen-3, etc.).
+-- If a third-party character needs to be recreated, a new row is inserted.
+CREATE TABLE character_third_party_entities (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Effective "primary key" (PUBLIC)
+  -- We may need to recreate the character in a third party, so this gets its own token.
+  token VARCHAR(32) NOT NULL,
+
+  -- Foreign key to the characters table.
+  character_token VARCHAR(32) NOT NULL,
+
+  -- Whether this third-party entity is active and usable.
+  is_active BOOLEAN NOT NULL DEFAULT false,
+
+  -- ========== THIRD PARTY DETAILS ==========
+
+  -- Which third-party system the character lives in (enum crate type).
+  -- e.g. "kinovi", "runway", etc.
+  third_party VARCHAR(32) NOT NULL,
+
+  -- Which types of models can use this character (enum crate type).
+  -- e.g. "seedance_2_pro", "seedance_2_fast", etc.
+  third_party_scopes VARCHAR(32) NOT NULL,
+
+  -- The identifier in the third-party system.
+  -- e.g. Kinovi's "char_1774752056469_2wlxoq"
+  third_party_id VARCHAR(64) NOT NULL,
+
+  -- The name used by the third party.
+  -- Important for Kinovi since characters are referenced by name in prompts.
+  third_party_name VARCHAR(255) NOT NULL,
+
+  -- An upstream third party of the third party (if any).
+  -- e.g. Kinovi's assetId "asset-20260329104101-kk5kl"
+  maybe_fourth_party_id VARCHAR(64) DEFAULT NULL,
+
+  -- ========== JOB TRACKING ==========
+
+  -- Our job system token (if the character was created via a job).
+  maybe_origin_job_token VARCHAR(32) DEFAULT NULL,
+
+  -- Third party's job system token (if any).
+  maybe_origin_third_party_job_id VARCHAR(64) DEFAULT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  deleted_at TIMESTAMP DEFAULT NULL,
+
+  -- ========== INDICES ==========
+
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_character_token (character_token),
+  KEY index_third_party (third_party),
+  KEY index_third_party_id (third_party_id),
+  KEY index_is_active (is_active)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_squashed/characters/characters.sql

@@ -0,0 +1,60 @@
+-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
+-- with comments attached to the fields for centralized documentation.
+
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Characters are reusable entities that can be referenced in video/image generations.
+-- A character is created from one or more reference images and registered with third-party
+-- systems (e.g. Kinovi/Seedance) that support character-based generation.
+CREATE TABLE characters (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Effective "primary key" (PUBLIC)
+  token VARCHAR(32) NOT NULL,
+
+  -- Whether the character has been fully created and is available for use.
+  -- A character may exist in the database before its creation job completes.
+  is_active BOOLEAN NOT NULL DEFAULT false,
+
+  -- ========== CHARACTER DETAILS ==========
+
+  -- Display name for the character.
+  name VARCHAR(255) NOT NULL,
+
+  -- Optional description of the character.
+  maybe_description VARCHAR(512) DEFAULT NULL,
+
+  -- ========== MEDIA ==========
+
+  -- Avatar image (small/thumbnail).
+  maybe_avatar_media_token VARCHAR(32) DEFAULT NULL,
+
+  -- Full-size reference image.
+  maybe_full_image_media_token VARCHAR(32) DEFAULT NULL,
+
+  -- ========== CREATOR ==========
+
+  -- The user who created this character.
+  maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
+
+  -- For abuse tracking.
+  creator_ip_address VARCHAR(40) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  deleted_at TIMESTAMP DEFAULT NULL,
+
+  -- ========== INDICES ==========
+
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_maybe_creator_user_token (maybe_creator_user_token),
+  KEY index_is_active (is_active),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_squashed/generic_inference_jobs.sql

@@ -46,6 +46,7 @@ CREATE TABLE generic_inference_jobs (
   --  * background_removal
   inference_category VARCHAR(32) NOT NULL,
 
+  -- Enum: InferenceJobExternalThirdParty
   -- If the job is externally enqueued, this is the third-party service
   -- responsible for the job. Typically, we won't run an inference job for
   -- jobs being run on a third party.

_database/sql/migrations_squashed/prompts/prompts.sql

@@ -27,6 +27,8 @@ CREATE TABLE prompts (
   -- What type of model was used to generate the result.
   -- NB: We're conflating prompts with outputs, but in a
   -- sense the model is inextricably part of the prompt.
+  --
+  -- Represented by the `CommonModelType` enum.
   maybe_model_type VARCHAR(32) DEFAULT NULL,
 
   -- What service provided the generation.
@@ -52,6 +54,29 @@ CREATE TABLE prompts (
   -- TEXT = 65,535 bytes (64 KiB), ~= 4 bytes per UTF-8 character, ~ 16383 characters.
   maybe_other_args TEXT DEFAULT NULL,
 
+  -- ========== GENERATION PARAMETERS ==========
+
+  -- Represented by the enum `CommonGenerationMode`.
+  -- The generation mode (eg. keyframe, reference, inpaint, etc.)
+  maybe_generation_mode VARCHAR(24) DEFAULT NULL,
+
+  -- Represented by the enum `CommonAspectRatio`.
+  -- The aspect ratio for the prompt (eg. square, auto, wide_three_by_two, etc.)
+  maybe_aspect_ratio VARCHAR(24) DEFAULT NULL,
+
+  -- Represented by the enum `CommonResolution`.
+  -- The resolution for the prompt (eg. four_k, 720p, etc.)
+  maybe_resolution VARCHAR(16) DEFAULT NULL,
+
+  -- The duration in seconds
+  maybe_duration_seconds INT UNSIGNED DEFAULT NULL,
+
+  -- The number of outputs to generate (0-255)
+  maybe_batch_count TINYINT UNSIGNED DEFAULT NULL,
+
+  -- Whether to generate audio
+  maybe_generate_audio BOOLEAN DEFAULT NULL,
+
   -- ========== ABUSE TRACKING ==========
 
   -- For abuse tracking.

_database/sql/migrations_squashed/user_tables/users.sql

@@ -66,6 +66,7 @@ CREATE TABLE users (
   --   - "explore_media"
   --   - "studio"
   --   - "video_style_transfer"
+  --   - "sd_wl" (seedance whitelist)
   maybe_feature_flags VARCHAR(255) DEFAULT NULL,
 
   -- DEPRECATED

_database/sql/migrations_todo/2026-03-29-150019-0000_characters/down.sql

@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS characters;

_database/sql/migrations_todo/2026-03-29-150019-0000_characters/up.sql

@@ -0,0 +1,55 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE characters (
+  -- Not used for anything except replication (private, not even used in queries)
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Public-facing "primary key" (PUBLIC)
+  token VARCHAR(32) NOT NULL,
+
+  -- Whether the character has been fully created and is available for use.
+  -- A character may exist in the database before its creation job completes.
+  is_active BOOLEAN NOT NULL DEFAULT false,
+
+  -- ========== CHARACTER DETAILS ==========
+
+  -- User's display name for the character.
+  name VARCHAR(255) NOT NULL,
+
+  -- Optional user description of the character.
+  maybe_description VARCHAR(512) DEFAULT NULL,
+
+  -- ========== MEDIA ==========
+
+  -- Avatar image (cropped to face, ideally).
+  maybe_avatar_media_token VARCHAR(32) DEFAULT NULL,
+
+  -- Full-size reference image.
+  maybe_full_image_media_token VARCHAR(32) DEFAULT NULL,
+
+  -- ========== CREATOR ==========
+
+  -- The user who created this character.
+  maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
+
+  -- For abuse tracking.
+  creator_ip_address VARCHAR(40) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  deleted_at TIMESTAMP DEFAULT NULL,
+
+  -- ========== INDICES ==========
+
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_maybe_creator_user_token (maybe_creator_user_token),
+  KEY index_is_active (is_active),
+  KEY index_created_at (created_at),
+  KEY index_deleted_at (deleted_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_todo/2026-03-29-150026-0000_character_third_party_entities/down.sql

@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS character_third_party_entities;

_database/sql/migrations_todo/2026-03-29-150026-0000_character_third_party_entities/up.sql

@@ -0,0 +1,60 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE character_third_party_entities (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Foreign key to the characters table.
+  character_token VARCHAR(32) NOT NULL,
+
+  -- Whether this third-party entity is active and usable.
+  is_active BOOLEAN NOT NULL DEFAULT false,
+
+  -- ========== THIRD PARTY DETAILS ==========
+
+  -- Which third-party system the character lives in (enum crate type).
+  -- e.g. "kinovi", "runway", etc.
+  third_party VARCHAR(32) NOT NULL,
+
+  -- The identifier in the third-party system.
+  -- e.g. Kinovi's "char_1774752056469_2wlxoq"
+  third_party_id VARCHAR(64) NOT NULL,
+
+  -- Which types of models can use this character (enum crate type).
+  -- e.g. "kinovi_seedance_2_pro", "kinovi_seedance_2_fast", etc.
+  third_party_scopes VARCHAR(32) NOT NULL,
+
+  -- The name used by the third party.
+  -- Important for Kinovi since characters are referenced by name in prompts.
+  third_party_name VARCHAR(255) NOT NULL,
+
+  -- An upstream third party of the third party (if any).
+  -- e.g. Kinovi's assetId "asset-20260329104101-kk5kl"
+  maybe_fourth_party_id VARCHAR(64) DEFAULT NULL,
+
+  -- ========== JOB TRACKING ==========
+
+  -- Our job system token (if the character was created via a job).
+  maybe_origin_job_token VARCHAR(32) DEFAULT NULL,
+
+  -- Third party's job system token (if any).
+  maybe_origin_third_party_job_id VARCHAR(64) DEFAULT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  deleted_at TIMESTAMP DEFAULT NULL,
+
+  -- ========== INDICES ==========
+
+  PRIMARY KEY (id),
+  UNIQUE KEY unique_third_party_id (third_party, third_party_id),
+  KEY index_character_token (character_token),
+  KEY index_third_party (third_party),
+  KEY index_third_party_id (third_party_id),
+  KEY index_is_active (is_active)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_todo/2026-03-29-150034-0000_character_creation_assets/down.sql

@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS character_creation_assets;

_database/sql/migrations_todo/2026-03-29-150034-0000_character_creation_assets/up.sql

@@ -0,0 +1,26 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Stores the media files (images) used as input when creating a character.
+CREATE TABLE character_creation_assets (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Foreign key to the characters table.
+  character_token VARCHAR(32) NOT NULL,
+
+  -- The media file used as a creation input (e.g. reference image).
+  asset_media_file_token VARCHAR(32) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- ========== INDICES ==========
+
+  PRIMARY KEY (id),
+  KEY index_character_token (character_token),
+  KEY index_asset_media_file_token (asset_media_file_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_todo/2026-03-29-150042-0000_character_creation_prompts/down.sql

@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE IF EXISTS character_creation_prompts;

_database/sql/migrations_todo/2026-03-29-150042-0000_character_creation_prompts/up.sql

@@ -0,0 +1,25 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Stores prompts/descriptions used when creating a character.
+CREATE TABLE character_creation_prompts (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Foreign key to the characters table.
+  character_token VARCHAR(32) NOT NULL,
+
+  -- The prompt or description used during character creation.
+  prompt TEXT DEFAULT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- ========== INDICES ==========
+
+  PRIMARY KEY (id),
+  KEY index_character_token (character_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

build/service_cpu.Dockerfile

@@ -130,47 +130,20 @@ RUN echo "Disk usage at current directory (after tests):"
 RUN pwd
 RUN du -hsc * | sort -hr
 
-# Build all the binaries.
-RUN SQLX_OFFLINE=true \
-  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
-  $HOME/.cargo/bin/cargo build \
-  --release \
-  --bin storyteller-web
-
-RUN SQLX_OFFLINE=true \
-  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
-  $HOME/.cargo/bin/cargo build \
-  --release \
-  --bin seedance2-pro-job
-
-RUN SQLX_OFFLINE=true \
-  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
-  $HOME/.cargo/bin/cargo build \
-  --release \
-  --bin worldlabs-job
-    
-RUN SQLX_OFFLINE=true \
-  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
-  $HOME/.cargo/bin/cargo build \
-  --release \
-  --bin dummy-service
-
-RUN SQLX_OFFLINE=true \
-  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
-  $HOME/.cargo/bin/cargo build \
-  --release \
-  --bin analytics-job
-
-RUN SQLX_OFFLINE=true \
-  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
-  $HOME/.cargo/bin/cargo build \
-  --release \
-  --bin email-sender-job
-
+# Build all the binaries in a single cargo invocation.
+# This lets cargo parallelize shared dependency compilation across all targets,
+# which is significantly faster than building each binary sequentially.
 RUN SQLX_OFFLINE=true \
   LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
   $HOME/.cargo/bin/cargo build \
   --release \
+  --bin storyteller-web \
+  --bin seedance2-pro-job \
+  --bin worldlabs-job \
+  --bin video-thumbnail-job \
+  --bin dummy-service \
+  --bin analytics-job \
+  --bin email-sender-job \
   --bin es-update-job
 
 # Print a report on disk space
@@ -210,6 +183,7 @@ RUN echo -n ${GIT_SHA} > GIT_SHA
 COPY --from=builder /tmp/target/release/storyteller-web /
 COPY --from=builder /tmp/target/release/seedance2-pro-job /
 COPY --from=builder /tmp/target/release/worldlabs-job /
+COPY --from=builder /tmp/target/release/video-thumbnail-job /
 COPY --from=builder /tmp/target/release/dummy-service /
 COPY --from=builder /tmp/target/release/analytics-job /
 COPY --from=builder /tmp/target/release/email-sender-job  /

build/service_gpu.Dockerfile

@@ -178,11 +178,11 @@ RUN touch .env-secrets
 
 # Some services have default env files that live under their code directories
 # These should also be readable from the relative current path
-COPY crates/service/job/download_job/config/download-job.common.env .
-COPY crates/service/job/download_job/config/download-job.production.env .
+COPY crates/service/job/deprecated/download_job/config/download-job.common.env .
+COPY crates/service/job/deprecated/download_job/config/download-job.production.env .
 
-COPY crates/service/job/inference_job/config/inference-job.common.env .
-COPY crates/service/job/inference_job/config/inference-job.production.env .
+COPY crates/service/job/deprecated/inference_job/config/inference-job.common.env .
+COPY crates/service/job/deprecated/inference_job/config/inference-job.production.env .
 
 # # Need python to make use of other containers' venv
 # # TODO(bt,2023-04-26): This is only necessary for download-job and inference-job

crates/api_clients/artcraft/artcraft_api_defs/Cargo.toml

@@ -33,7 +33,7 @@ serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 
-utoipa = { version = "4", features = ["chrono", "actix_extras"] }
+utoipa.workspace = true
 
 [dev-dependencies]
 anyhow.workspace = true

crates/api_clients/artcraft/artcraft_api_defs/src/characters/create_character.rs

@@ -0,0 +1,26 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use enums::common::generation::common_model_type::CommonModelType;
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use tokens::tokens::media_files::MediaFileToken;
+
+/// Request body for creating a character.
+#[derive(Deserialize, ToSchema)]
+pub struct CreateCharacterRequest {
+  /// Idempotency token to prevent duplicate requests.
+  pub uuid_idempotency_token: String,
+
+  /// The model to create the character for.
+  pub model: CommonModelType,
+
+  /// The reference image media file token.
+  pub image_media_token: MediaFileToken,
+}
+
+/// Response body for creating a character.
+#[derive(Serialize, ToSchema)]
+pub struct CreateCharacterResponse {
+  pub success: bool,
+  pub inference_job_token: InferenceJobToken,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/characters/delete_character.rs

@@ -0,0 +1,16 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use tokens::tokens::characters::CharacterToken;
+
+/// Path parameters for deleting a character.
+#[derive(Deserialize, ToSchema)]
+pub struct DeleteCharacterPathInfo {
+  pub character_token: CharacterToken,
+}
+
+/// Response body for deleting a character.
+#[derive(Serialize, ToSchema)]
+pub struct DeleteCharacterResponse {
+  pub success: bool,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/characters/edit_character.rs

@@ -0,0 +1,23 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use tokens::tokens::characters::CharacterToken;
+
+/// Request body for editing a character.
+#[derive(Deserialize, ToSchema)]
+pub struct EditCharacterRequest {
+  /// The character to edit.
+  pub token: CharacterToken,
+
+  /// Updated name (if changing).
+  pub updated_name: Option<String>,
+
+  /// Updated description (if changing).
+  pub updated_description: Option<String>,
+}
+
+/// Response body for editing a character.
+#[derive(Serialize, ToSchema)]
+pub struct EditCharacterResponse {
+  pub success: bool,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/characters/get_character.rs

@@ -0,0 +1,36 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use crate::common::responses::media_links::MediaLinks;
+use enums::common::generation::common_model_type::CommonModelType;
+use tokens::tokens::characters::CharacterToken;
+
+/// Path parameters for getting a character.
+#[derive(Deserialize, ToSchema)]
+pub struct GetCharacterPathInfo {
+  pub character_token: CharacterToken,
+}
+
+/// Response body for getting a character.
+#[derive(Serialize, ToSchema)]
+pub struct GetCharacterResponse {
+  pub success: bool,
+  pub character: GetCharacterDetails,
+}
+
+/// Full character details returned by the get endpoint.
+#[derive(Serialize, ToSchema)]
+pub struct GetCharacterDetails {
+  pub token: CharacterToken,
+
+  /// Which models this character can be used with.
+  pub models: Vec<CommonModelType>,
+
+  pub name: String,
+
+  pub maybe_description: Option<String>,
+
+  pub maybe_avatar: Option<MediaLinks>,
+
+  pub maybe_full_image: Option<MediaLinks>,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/characters/list_characters.rs

@@ -0,0 +1,38 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
+
+use crate::common::responses::media_links::MediaLinks;
+use enums::common::generation::common_model_type::CommonModelType;
+use tokens::tokens::characters::CharacterToken;
+
+/// Query string parameters for listing characters.
+#[derive(Deserialize, IntoParams)]
+pub struct ListCharactersQuery {
+  /// Optional cursor for pagination.
+  pub cursor: Option<u64>,
+}
+
+/// Response body for listing characters in the current session.
+#[derive(Serialize, ToSchema)]
+pub struct ListCharactersResponse {
+  pub success: bool,
+  pub characters: Vec<ListCharactersEntry>,
+  pub next_cursor: Option<u64>,
+}
+
+/// A character entry in the list response.
+#[derive(Serialize, ToSchema)]
+pub struct ListCharactersEntry {
+  pub token: CharacterToken,
+
+  /// Which models this character can be used with.
+  pub models: Vec<CommonModelType>,
+
+  pub name: String,
+
+  pub maybe_description: Option<String>,
+
+  pub maybe_avatar: Option<MediaLinks>,
+
+  pub maybe_full_image: Option<MediaLinks>,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/characters/mod.rs

@@ -0,0 +1,5 @@
+pub mod create_character;
+pub mod delete_character;
+pub mod edit_character;
+pub mod get_character;
+pub mod list_characters;

crates/api_clients/artcraft/artcraft_api_defs/src/common/responses/cover_image_links.rs

@@ -1,11 +1,12 @@
 use serde_derive::{Deserialize, Serialize};
 use url::Url;
+use utoipa::ToSchema;
 
 // TODO(bt,2025-08-20): Replace the storyteller-web version of this.
 //  All it needs is the impl ported into a builder.
 
 /// Cover image links can only be jpg, png, etc. No videos.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
 pub struct CoverImageLinks {
   /// Primary link to the cover image via the CDN.
   pub cdn_url: Url,

crates/api_clients/artcraft/artcraft_api_defs/src/common/responses/media_file_cover_image_details.rs

@@ -1,5 +1,6 @@
 use crate::common::responses::cover_image_links::CoverImageLinks;
 use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
 
 // TODO(bt,2025-08-20): Replace the storyteller-web version of this.
 //  We can't drop the old version just yet due to the `impl` (easy)
@@ -8,7 +9,7 @@ use serde_derive::{Deserialize, Serialize};
 /// Everything we need to create a cover image.
 /// Cover images are small descriptive images that can be set for any media file.
 /// If a cover image is set, this is the path to the asset.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
 pub struct MediaFileCoverImageDetails {
   // /// (DEPRECATED) URL path to the media file
   // #[deprecated(note="This field doesn't point to the full URL. Use media_links instead to leverage the CDN.")]
@@ -36,7 +37,7 @@ pub struct MediaFileCoverImageDetails {
 
 /// The default cover is composed of an image and color pair that are
 /// predefined by the frontend.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
 pub struct MediaFileDefaultCover {
   pub image_index: u8,
   pub color_index: u8,

crates/api_clients/artcraft/artcraft_api_defs/src/common/responses/user_details_light.rs

@@ -1,8 +1,9 @@
 use serde_derive::{Deserialize, Serialize};
 use tokens::tokens::users::UserToken;
+use utoipa::ToSchema;
 
 /// Everything we need to refer to a user on the public web interface.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
 pub struct UserDetailsLight {
   /// The token for the user
   pub user_token: UserToken,
@@ -26,7 +27,7 @@ pub struct UserDetailsLight {
   // In the future, we'll also support user-uploaded avatars that we store on our servers.
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
 pub struct UserDefaultAvatarInfo {
   pub image_index: u8,
   pub color_index: u8,

crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs

@@ -3,7 +3,7 @@ use utoipa::ToSchema;
 
 use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
 use enums::common::generation::common_image_model::CommonImageModel;
-use enums::common::generation::common_video_resolution::CommonVideoResolution;
+use enums::common::generation::common_resolution::CommonResolution;
 use enums::common::generation_provider::GenerationProvider;
 
 pub const ESTIMATE_IMAGE_COST_PATH: &str = "/v1/generate/cost_estimate/image";
@@ -27,7 +27,7 @@ pub struct EstimateImageCostRequest {
   pub aspect_ratio: Option<CommonAspectRatio>,
 
   /// Optional resolution.
-  pub resolution: Option<CommonVideoResolution>,
+  pub resolution: Option<CommonResolution>,
 
   /// Number of images to generate in parallel.
   pub image_batch_count: Option<u16>,

crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_video_cost.rs

@@ -3,7 +3,7 @@ use utoipa::ToSchema;
 
 use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
 use enums::common::generation::common_video_model::CommonVideoModel;
-use enums::common::generation::common_video_resolution::CommonVideoResolution;
+use enums::common::generation::common_resolution::CommonResolution;
 use enums::common::generation_provider::GenerationProvider;
 
 pub const ESTIMATE_VIDEO_COST_PATH: &str = "/v1/generate/cost_estimate/video";
@@ -30,7 +30,7 @@ pub struct EstimateVideoCostRequest {
   pub aspect_ratio: Option<CommonAspectRatio>,
 
   /// Optional resolution.
-  pub resolution: Option<CommonVideoResolution>,
+  pub resolution: Option<CommonResolution>,
 
   /// Duration in seconds.
   pub duration_seconds: Option<u16>,

crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs

@@ -1,7 +1,6 @@
 use crate::common::responses::job_details::{JobDetailsLipsyncRequest, JobDetailsLivePortraitRequest};
 use crate::common::responses::media_links::MediaLinks;
 use chrono::{DateTime, Utc};
-use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
 use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
 use enums::common::job_status_plus::JobStatusPlus;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;

crates/api_clients/artcraft/artcraft_api_defs/src/lib.rs

@@ -1,10 +1,12 @@
 pub mod analytics;
+pub mod characters;
 pub mod common;
 pub mod credits;
 pub mod generate;
 pub mod jobs;
 pub mod media_file;
 pub mod moderation;
+pub mod omni_gen;
 pub mod prompts;
 pub mod stripe_artcraft;
 pub mod subscriptions;

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/alerts/mod.rs

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

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/alerts/moderation_send_alert.rs

@@ -0,0 +1,18 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+pub const MODERATION_SEND_ALERT_PATH: &str = "/v1/moderation/alerts/send";
+
+#[derive(Deserialize, ToSchema)]
+pub struct ModerationSendAlertRequest {
+  /// Optional title for the alert. Defaults to "Test Moderation Alert".
+  pub title: Option<String>,
+
+  /// Optional description for the alert. Defaults to "This is a test moderation alert."
+  pub description: Option<String>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ModerationSendAlertResponse {
+  pub success: bool,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs

@@ -1,3 +1,5 @@
+use chrono::{DateTime, Utc};
+use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
 use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType;
 use enums::common::job_status_plus::JobStatusPlus;
 use serde_derive::{Deserialize, Serialize};
@@ -30,4 +32,8 @@ pub struct ListUserJobsEntry {
   pub job_token: InferenceJobToken,
   pub wallet_ledger_entry_token: Option<WalletLedgerEntryToken>,
   pub wallet_ledger_entry_type: Option<WalletLedgerEntryType>,
+  pub maybe_external_third_party: Option<InferenceJobExternalThirdParty>,
+  pub maybe_external_third_party_id: Option<String>,
+  pub created_at: DateTime<Utc>,
+  pub updated_at: DateTime<Utc>,
 }

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/mod.rs

@@ -1,3 +1,4 @@
+pub mod alerts;
 pub mod jobs;
 pub mod user;
 pub mod wallet_ledger_entries;

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/list_subscribing_users_by_signup_date.rs

@@ -0,0 +1,55 @@
+use chrono::{DateTime, Utc};
+use enums::by_table::users::user_signup_method::UserSignupMethod;
+use enums::by_table::users::user_signup_source::UserSignupSource;
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::users::UserToken;
+use utoipa::ToSchema;
+
+pub const MODERATOR_LIST_SUBSCRIBING_USERS_BY_SIGNUP_DATE_PATH: &str = "/v1/moderation/users/list_subscribers_by_signup_date";
+
+#[derive(Deserialize, ToSchema)]
+pub struct ModeratorListSubscribingUsersBySignupDateRequest {
+  /// Optional cursor for pagination. Pass the `next_cursor` from a previous response.
+  pub id_cursor: Option<u64>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ModeratorListSubscribingUsersBySignupDateResponse {
+  pub success: bool,
+  pub users: Vec<ModeratorListSubscribingUsersBySignupDateEntry>,
+  /// The cursor for the next page. `None` if there are no more results.
+  pub next_cursor: Option<u64>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ModeratorListSubscribingUsersBySignupDateEntry {
+  // -- User fields --
+  pub id: u64,
+  pub token: UserToken,
+  pub username: String,
+  pub display_name: String,
+  pub username_is_not_customized: bool,
+  pub email_address: String,
+  pub email_confirmed: bool,
+  pub is_without_password: bool,
+  pub ip_address_creation: String,
+  pub maybe_source: Option<UserSignupSource>,
+  pub maybe_signup_method: Option<UserSignupMethod>,
+  pub created_at: DateTime<Utc>,
+  pub maybe_referral_url: Option<String>,
+  pub is_temporary: bool,
+
+  // TODO: Use enum types/strong types - 
+  // -- Subscription fields --
+  pub subscription_namespace: String,
+  pub subscription_product_slug: String,
+  pub maybe_stripe_subscription_id: Option<String>,
+  pub maybe_stripe_customer_id: Option<String>,
+  pub maybe_stripe_product_id: Option<String>,
+  pub maybe_stripe_price_id: Option<String>,
+  pub maybe_stripe_subscription_status: Option<String>,
+  pub maybe_stripe_recurring_interval: Option<String>,
+  pub maybe_stripe_invoice_is_paid: Option<bool>,
+  pub maybe_cancel_at: Option<DateTime<Utc>>,
+  pub maybe_canceled_at: Option<DateTime<Utc>>,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/list_users_by_signup_date.rs

@@ -0,0 +1,40 @@
+use chrono::{DateTime, Utc};
+use enums::by_table::users::user_signup_method::UserSignupMethod;
+use enums::by_table::users::user_signup_source::UserSignupSource;
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::users::UserToken;
+use utoipa::ToSchema;
+
+pub const MODERATOR_LIST_USERS_BY_SIGNUP_DATE_PATH: &str = "/v1/moderation/users/list_all_by_signup_date";
+
+#[derive(Deserialize, ToSchema)]
+pub struct ModeratorListUsersBySignupDateRequest {
+  /// Optional cursor for pagination. Pass the `next_cursor` from a previous response.
+  pub id_cursor: Option<u64>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ModeratorListUsersBySignupDateResponse {
+  pub success: bool,
+  pub users: Vec<ModeratorListUsersBySignupDateEntry>,
+  /// The cursor for the next page. `None` if there are no more results.
+  pub next_cursor: Option<u64>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ModeratorListUsersBySignupDateEntry {
+  pub id: u64,
+  pub token: UserToken,
+  pub username: String,
+  pub display_name: String,
+  pub username_is_not_customized: bool,
+  pub email_address: String,
+  pub email_confirmed: bool,
+  pub is_without_password: bool,
+  pub ip_address_creation: String,
+  pub maybe_source: Option<UserSignupSource>,
+  pub maybe_signup_method: Option<UserSignupMethod>,
+  pub created_at: DateTime<Utc>,
+  pub maybe_referral_url: Option<String>,
+  pub is_temporary: bool,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user/mod.rs

@@ -1,2 +1,4 @@
+pub mod list_subscribing_users_by_signup_date;
+pub mod list_users_by_signup_date;
 pub mod user_lookup;
-pub mod user_lookup_by_stripe_customer_id;
+pub mod user_lookup_by_stripe_customer_id;

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/cost_and_generate_requests/mod.rs

@@ -0,0 +1,2 @@
+pub mod omni_gen_image_cost_and_generate_request;
+pub mod omni_gen_video_cost_and_generate_request;

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/cost_and_generate_requests/omni_gen_image_cost_and_generate_request.rs

@@ -0,0 +1,50 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
+use enums::common::generation::common_image_model::CommonImageModel;
+use enums::common::generation::common_quality::CommonQuality;
+use enums::common::generation::common_resolution::CommonResolution;
+use tokens::tokens::media_files::MediaFileToken;
+
+/// Shared request body for both the image cost estimate and image generation endpoints.
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
+pub struct OmniGenImageCostAndGenerateRequest {
+  /// REQUIRED (even if marked optional)
+  /// Idempotency token to prevent duplicate requests.
+  /// If not supplied, we'll generate one for the required providers.
+  pub idempotency_token: Option<String>,
+
+  /// REQUIRED (even if marked optional)
+  /// Which model to use.
+  pub model: Option<CommonImageModel>,
+
+  /// The prompt for the image generation.
+  pub prompt: Option<String>,
+
+  /// Input images for image editing.
+  /// If present, we're doing image editing (image-to-image).
+  /// If absent, we're doing text-to-image.
+  pub image_media_tokens: Option<Vec<MediaFileToken>>,
+
+  /// The resolution to use.
+  pub resolution: Option<CommonResolution>,
+
+  /// The aspect ratio to use.
+  pub aspect_ratio: Option<CommonAspectRatio>,
+
+  /// The quality to use.
+  pub quality: Option<CommonQuality>,
+
+  /// How many images to generate.
+  pub image_batch_count: Option<u16>,
+
+  /// Only for angle manipulation models.
+  pub horizontal_angle: Option<f64>,
+
+  /// Only for angle manipulation models.
+  pub vertical_angle: Option<f64>,
+
+  /// Only for angle manipulation models.
+  pub zoom: Option<f64>,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/cost_and_generate_requests/omni_gen_video_cost_and_generate_request.rs

@@ -0,0 +1,62 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
+use enums::common::generation::common_quality::CommonQuality;
+use enums::common::generation::common_resolution::CommonResolution;
+use enums::common::generation::common_video_model::CommonVideoModel;
+use tokens::tokens::media_files::MediaFileToken;
+
+/// Shared request body for both the video cost estimate and video generation endpoints.
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
+pub struct OmniGenVideoCostAndGenerateRequest {
+  /// REQUIRED (even if marked optional)
+  /// Idempotency token to prevent duplicate requests.
+  pub idempotency_token: Option<String>,
+
+  /// REQUIRED (even if marked optional)
+  /// Which model to use.
+  pub model: Option<CommonVideoModel>,
+
+  /// The text prompt for the video generation.
+  pub prompt: Option<String>,
+
+  /// Some models support negative text prompts.
+  pub negative_prompt: Option<String>,
+
+  /// Starting keyframe (optional).
+  pub start_frame_image_media_token: Option<MediaFileToken>,
+
+  /// Ending keyframe (optional).
+  pub end_frame_image_media_token: Option<MediaFileToken>,
+
+  /// Reference images (optional).
+  pub reference_image_media_tokens: Option<Vec<MediaFileToken>>,
+
+  /// Reference videos (optional).
+  pub reference_video_media_tokens: Option<Vec<MediaFileToken>>,
+
+  /// Reference audio (optional).
+  pub reference_audio_media_tokens: Option<Vec<MediaFileToken>>,
+
+  /// The resolution to use.
+  pub resolution: Option<CommonResolution>,
+
+  /// The aspect ratio to use.
+  pub aspect_ratio: Option<CommonAspectRatio>,
+
+  /// The quality to use.
+  pub quality: Option<CommonQuality>,
+
+  /// How many seconds to generate.
+  pub duration_seconds: Option<u16>,
+
+  /// How many videos to generate.
+  pub video_batch_count: Option<u16>,
+
+  /// Whether to turn on/off audio.
+  /// Not all models support audio, not all models have a choice.
+  /// Some models will default this to true, others will default it to false,
+  /// so it's best to be explicit.
+  pub generate_audio: Option<bool>,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/cost_response/mod.rs

@@ -0,0 +1,2 @@
+pub mod omni_gen_image_cost_response;
+pub mod omni_gen_video_cost_response;

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/cost_response/omni_gen_image_cost_response.rs

@@ -0,0 +1,26 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+/// Response body for the omni-gen image cost estimate endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct OmniGenImageCostResponse {
+  pub success: bool,
+
+  /// Estimated cost in credits.
+  pub cost_in_credits: Option<u64>,
+
+  /// Estimated cost in USD cents.
+  pub cost_in_usd_cents: Option<u64>,
+
+  /// Whether the generation is free for this user/plan.
+  pub is_free: bool,
+
+  /// Whether the user has unlimited generations.
+  pub is_unlimited: bool,
+
+  /// Whether the user is rate limited.
+  pub is_rate_limited: bool,
+
+  /// Whether the output will have a watermark.
+  pub has_watermark: bool,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/cost_response/omni_gen_video_cost_response.rs

@@ -0,0 +1,26 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+/// Response body for the omni-gen video cost estimate endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct OmniGenVideoCostResponse {
+  pub success: bool,
+
+  /// Estimated cost in credits.
+  pub cost_in_credits: Option<u64>,
+
+  /// Estimated cost in USD cents.
+  pub cost_in_usd_cents: Option<u64>,
+
+  /// Whether the generation is free for this user/plan.
+  pub is_free: bool,
+
+  /// Whether the user has unlimited generations.
+  pub is_unlimited: bool,
+
+  /// Whether the user is rate limited.
+  pub is_rate_limited: bool,
+
+  /// Whether the output will have a watermark.
+  pub has_watermark: bool,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/generate_response/mod.rs

@@ -0,0 +1,2 @@
+pub mod omni_gen_image_generate_response;
+pub mod omni_gen_video_generate_response;

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/generate_response/omni_gen_image_generate_response.rs

@@ -0,0 +1,10 @@
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use utoipa::ToSchema;
+
+/// Response body for the omni-gen image generation endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct OmniGenImageGenerateResponse {
+  pub success: bool,
+  pub inference_job_token: InferenceJobToken,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/generate_response/omni_gen_video_generate_response.rs

@@ -0,0 +1,10 @@
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use utoipa::ToSchema;
+
+/// Response body for the omni-gen video generation endpoint.
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct OmniGenVideoGenerateResponse {
+  pub success: bool,
+  pub inference_job_token: InferenceJobToken,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/mod.rs

@@ -0,0 +1,4 @@
+pub mod cost_and_generate_requests;
+pub mod cost_response;
+pub mod generate_response;
+pub mod models;

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/models/mod.rs

@@ -0,0 +1,2 @@
+pub mod omni_gen_image_models;
+pub mod omni_gen_video_models;

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/models/omni_gen_image_models.rs

@@ -0,0 +1,149 @@
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
+use enums::common::generation::common_image_model::CommonImageModel;
+use enums::common::generation::common_quality::CommonQuality;
+use enums::common::generation::common_resolution::CommonResolution;
+use enums::common::generation_provider::GenerationProvider;
+use serde_derive::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
+
+/// Query string parameters for the image models endpoint.
+#[derive(Deserialize, IntoParams, ToSchema)]
+pub struct OmniGenImageModelsQuery {
+  /// Which provider's models to list. Defaults to "artcraft" if absent.
+  pub provider: Option<OmniGenImageModelsProvider>,
+}
+
+/// The provider filter for the models endpoint.
+#[derive(Serialize, Deserialize, ToSchema, Debug, Clone, Copy)]
+#[serde(rename_all = "snake_case")]
+pub enum OmniGenImageModelsProvider {
+  /// Only models available through ArtCraft.
+  Artcraft,
+  /// All known models across all providers.
+  All,
+}
+
+impl Default for OmniGenImageModelsProvider {
+  fn default() -> Self {
+    Self::Artcraft
+  }
+}
+
+/// Response body for the image models endpoint.
+/// TBD — fields will be added later.
+#[derive(Serialize, ToSchema, Clone)]
+pub struct OmniGenImageModelsResponse {
+  pub success: bool,
+  pub models: Vec<OmniGenImageModelDetails>,
+  pub providers: Vec<OmniGenImageModelProviderDetails>,
+}
+
+#[derive(Serialize, ToSchema, Clone)]
+pub struct OmniGenImageModelProviderDetails {
+  pub provider: GenerationProvider,
+  pub models: Vec<OmniGenImageProviderModelDetails>,
+}
+
+#[derive(Serialize, ToSchema, Clone)]
+pub struct OmniGenImageProviderModelDetails {
+  pub model: CommonImageModel,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub overrides: Option<OmniGenImageModelDetails>,
+}
+
+#[derive(Serialize, ToSchema, Clone)]
+pub struct OmniGenImageModelDetails {
+  pub model: CommonImageModel,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub full_name: Option<String>,
+
+  // TODO: model_creator: ModelCreator,
+
+  // TODO: Types of UI to show up in (list or bools)
+  //  eg. can use in image editing UI, 3d editor, etc.
+
+  // TODO: sub-features like inpainting masking,
+  // TODO: angle edit models
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub text_prompt_supported: Option<bool>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub text_prompt_max_length: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub negative_text_prompt_supported: Option<bool>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub negative_text_prompt_max_length: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub image_refs_supported: Option<bool>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub image_refs_max: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub has_fixed_editing_aspect_ratio: Option<bool>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub aspect_ratio_options: Option<Vec<CommonAspectRatio>>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub aspect_ratio_default: Option<CommonAspectRatio>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub aspect_ratio_default_when_editing: Option<CommonAspectRatio>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub resolution_options: Option<Vec<CommonResolution>>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub resolution_default: Option<CommonResolution>,
+
+  pub quality_options: Option<Vec<CommonQuality>>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub default_quality: Option<CommonQuality>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub batch_size_min: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub batch_size_max: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub batch_size_options: Option<Vec<u16>>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub batch_size_default: Option<u16>,
+}
+
+impl Default for OmniGenImageModelDetails {
+  fn default() -> Self {
+    Self {
+      model: CommonImageModel::NanaBananaPro,
+      full_name: None,
+      text_prompt_supported: None,
+      text_prompt_max_length: None,
+      negative_text_prompt_supported: None,
+      negative_text_prompt_max_length: None,
+      image_refs_supported: None,
+      image_refs_max: None,
+      has_fixed_editing_aspect_ratio: None,
+      aspect_ratio_options: None,
+      aspect_ratio_default: None,
+      aspect_ratio_default_when_editing: None,
+      resolution_options: None,
+      resolution_default: None,
+      quality_options: None,
+      default_quality: None,
+      batch_size_min: None,
+      batch_size_max: None,
+      batch_size_options: None,
+      batch_size_default: None,
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/models/omni_gen_video_models.rs

@@ -0,0 +1,196 @@
+use serde_derive::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
+use enums::common::generation::common_quality::CommonQuality;
+use enums::common::generation::common_resolution::CommonResolution;
+use enums::common::generation::common_video_model::CommonVideoModel;
+use enums::common::generation_provider::GenerationProvider;
+
+/// Query string parameters for the video models endpoint.
+#[derive(Deserialize, IntoParams, ToSchema)]
+pub struct OmniGenVideoModelsQuery {
+  /// Which provider's models to list. Defaults to "artcraft" if absent.
+  pub provider: Option<OmniGenVideoModelsProvider>,
+}
+
+/// The provider filter for the models endpoint.
+#[derive(Serialize, Deserialize, ToSchema, Debug, Clone, Copy)]
+#[serde(rename_all = "snake_case")]
+pub enum OmniGenVideoModelsProvider {
+  /// Only models available through ArtCraft.
+  Artcraft,
+  /// All known models across all providers.
+  All,
+}
+
+impl Default for OmniGenVideoModelsProvider {
+  fn default() -> Self {
+    Self::Artcraft
+  }
+}
+
+/// Response body for the video models endpoint.
+/// TBD — fields will be added later.
+#[derive(Serialize, ToSchema, Clone)]
+pub struct OmniGenVideoModelsResponse {
+  pub success: bool,
+  
+  /// A list of all models: details, features, and capabilities
+  pub models: Vec<OmniGenVideoModelDetails>,
+  
+  /// Provider-by-provider model offering and capability list, 
+  /// with possible capability overrides (future)
+  pub providers: Vec<OmniGenVideoModelProviderDetails>,
+}
+
+#[derive(Serialize, ToSchema, Clone)]
+pub struct OmniGenVideoModelProviderDetails {
+  pub provider: GenerationProvider,
+  pub models: Vec<OmniGenVideoProviderModelDetails>,
+}
+
+#[derive(Serialize, ToSchema, Clone)]
+pub struct OmniGenVideoProviderModelDetails {
+  pub model: CommonVideoModel,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub overrides: Option<OmniGenVideoModelDetails>,
+}
+
+#[derive(Serialize, ToSchema, Clone)]
+pub struct OmniGenVideoModelDetails {
+
+  pub model: CommonVideoModel,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub full_name: Option<String>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub text_prompt_supported: Option<bool>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub text_prompt_max_length: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub negative_text_prompt_supported: Option<bool>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub negative_text_prompt_max_length: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub starting_keyframe_supported: Option<bool>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub starting_keyframe_required: Option<bool>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub ending_keyframe_supported: Option<bool>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub image_references_supported: Option<bool>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub image_references_max: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub video_references_supported: Option<bool>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub video_references_max: Option<u16>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub video_references_max_total_duration_seconds: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub audio_references_supported: Option<bool>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub audio_references_max: Option<u16>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub audio_references_max_total_duration_seconds: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub show_generate_with_sound_toggle: Option<bool>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub aspect_ratio_options: Option<Vec<CommonAspectRatio>>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub aspect_ratio_default: Option<CommonAspectRatio>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub resolution_options: Option<Vec<CommonResolution>>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub resolution_default: Option<CommonResolution>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub quality_options: Option<Vec<CommonQuality>>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub default_quality: Option<CommonQuality>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub duration_seconds_min: Option<u16>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub duration_seconds_max: Option<u16>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub duration_seconds_options: Option<Vec<u16>>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub duration_seconds_default: Option<u16>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub batch_size_min: Option<u16>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub batch_size_max: Option<u16>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub batch_size_options: Option<Vec<u16>>,
+  
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub batch_size_default: Option<u16>,
+}
+
+impl Default for OmniGenVideoModelDetails {
+  fn default() -> Self {
+    Self {
+      model: CommonVideoModel::Seedance2p0,
+      full_name: None,
+      text_prompt_supported: None,
+      text_prompt_max_length: None,
+      negative_text_prompt_supported: None,
+      negative_text_prompt_max_length: None,
+      starting_keyframe_supported: None,
+      starting_keyframe_required: None,
+      ending_keyframe_supported: None,
+      image_references_supported: None,
+      image_references_max: None,
+      video_references_supported: None,
+      video_references_max: None,
+      video_references_max_total_duration_seconds: None,
+      audio_references_supported: None,
+      audio_references_max: None,
+      audio_references_max_total_duration_seconds: None,
+      show_generate_with_sound_toggle: None,
+      aspect_ratio_options: None,
+      aspect_ratio_default: None,
+      resolution_options: None,
+      resolution_default: None,
+      quality_options: None,
+      default_quality: None,
+      duration_seconds_min: None,
+      duration_seconds_max: None,
+      duration_seconds_options: None,
+      duration_seconds_default: None,
+      batch_size_min: None,
+      batch_size_max: None,
+      batch_size_options: None,
+      batch_size_default: None,
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_api_defs/src/prompts/create_prompt.rs

@@ -1,8 +1,11 @@
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
+use enums::common::generation::common_generation_mode::CommonGenerationMode;
+use enums::common::generation::common_model_type::CommonModelType;
+use enums::common::generation::common_resolution::CommonResolution;
+use enums::common::generation_provider::GenerationProvider;
 use serde_derive::{Deserialize, Serialize};
 use tokens::tokens::prompts::PromptToken;
 use utoipa::ToSchema;
-use enums::common::generation_provider::GenerationProvider;
-use enums::common::model_type::ModelType;
 
 pub const CREATE_PROMPT_PATH: &str = "/v1/prompts/create";
 
@@ -14,14 +17,32 @@ pub struct CreatePromptRequest {
   /// OPTIONAL. The positive prompt.
   pub positive_prompt: Option<String>,
 
-  /// OPTIONAL. The positive prompt.
+  /// OPTIONAL. The negative prompt.
   pub negative_prompt: Option<String>,
-  
+
   /// OPTIONAL. The model type.
-  pub model_type: Option<ModelType>,
+  pub model_type: Option<CommonModelType>,
 
   /// OPTIONAL. The service used.
   pub generation_provider: Option<GenerationProvider>,
+
+  /// OPTIONAL. The generation mode (eg. keyframe, reference, inpaint, etc.)
+  pub maybe_generation_mode: Option<CommonGenerationMode>,
+
+  /// OPTIONAL. The aspect ratio (eg. square, auto, wide_three_by_two, etc.)
+  pub maybe_aspect_ratio: Option<CommonAspectRatio>,
+
+  /// OPTIONAL. The resolution (eg. one_k, two_k, four_k, etc.)
+  pub maybe_resolution: Option<CommonResolution>,
+
+  /// OPTIONAL. The number of outputs to generate (0-255).
+  pub maybe_batch_count: Option<u8>,
+
+  /// OPTIONAL. Whether to generate audio.
+  pub maybe_generate_audio: Option<bool>,
+
+  /// OPTIONAL. The duration in seconds.
+  pub maybe_duration_seconds: Option<u32>,
 }
 
 #[derive(Serialize, Deserialize, ToSchema)]

crates/api_clients/artcraft/artcraft_api_defs/src/prompts/get_prompt.rs

@@ -0,0 +1,149 @@
+use crate::common::responses::media_links::MediaLinks;
+use chrono::{DateTime, Utc};
+use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType;
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
+use enums::common::generation::common_generation_mode::CommonGenerationMode;
+use enums::common::generation::common_model_type::CommonModelType;
+use enums::common::generation::common_resolution::CommonResolution;
+use enums::common::generation_provider::GenerationProvider;
+use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::media_files::MediaFileToken;
+use tokens::tokens::prompts::PromptToken;
+use utoipa::ToSchema;
+use enums::common::generation::common_model_class::CommonModelClass;
+
+pub const GET_PROMPT_PATH: &str = "/v1/prompts/{token}";
+
+#[derive(Deserialize, ToSchema)]
+pub struct GetPromptPathInfo {
+  pub token: PromptToken,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct GetPromptSuccessResponse {
+  pub success: bool,
+  pub prompt: PromptInfo,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct GetPromptImageContextItem {
+  pub media_token: MediaFileToken,
+  pub semantic: PromptContextSemanticType,
+  pub media_links: MediaLinks,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct PromptInfo {
+  pub token: PromptToken,
+
+  /// The type of prompt.
+  /// Note: Prompts may or may not be compatible across systems.
+  pub prompt_type: PromptType,
+
+  /// The type of model used
+  pub maybe_model_type: Option<CommonModelType>,
+
+  /// The class of model used
+  pub maybe_model_class: Option<CommonModelClass>,
+
+  /// The service provider used
+  pub maybe_generation_provider: Option<GenerationProvider>,
+
+  /// Positive prompt (technically optional, but usually present)
+  pub maybe_positive_prompt: Option<String>,
+
+  /// Negative prompt (optional)
+  pub maybe_negative_prompt: Option<String>,
+
+  /// OPTIONAL. The generation mode (eg. keyframe, reference, inpaint, etc.)
+  pub maybe_generation_mode: Option<CommonGenerationMode>,
+
+  /// OPTIONAL. The aspect ratio (eg. square, auto, wide_three_by_two, etc.)
+  pub maybe_aspect_ratio: Option<CommonAspectRatio>,
+
+  /// OPTIONAL. The resolution (eg. one_k, two_k, four_k, etc.)
+  pub maybe_resolution: Option<CommonResolution>,
+
+  /// OPTIONAL. The number of outputs to generate (0-255).
+  pub maybe_batch_count: Option<u8>,
+
+  /// OPTIONAL. Whether to generate audio.
+  pub maybe_generate_audio: Option<bool>,
+
+  /// OPTIONAL. The duration in seconds.
+  pub maybe_duration_seconds: Option<u32>,
+
+  /// Context images (optional)
+  pub maybe_context_images: Option<Vec<GetPromptImageContextItem>>,
+
+  /// Scheduled / travel prompt (optional)
+  pub maybe_travel_prompt: Option<String>,
+
+  /// If a "style" was used, this is the name of it.
+  /// This might not be present for all types of inference
+  /// and typically only applies to video style transfer.
+  pub maybe_style_name: Option<StyleTransferName>,
+
+  /// How many milliseconds it took to run generation.
+  pub maybe_inference_duration_millis: Option<u64>,
+
+  /// If a "strength" was used.
+  /// Typically only for video style transfer.
+  pub maybe_strength: Option<f32>,
+
+  /// If a frame skip setting was used.
+  pub maybe_frame_skip: Option<u8>,
+
+  /// If a face detailer was used.
+  /// This might not be present for all types of inference
+  /// and typically only applies to video style transfer.
+  pub used_face_detailer: bool,
+
+  /// If an upscaling pass was used.
+  /// This might not be present for all types of inference
+  /// and typically only applies to video style transfer.
+  pub used_upscaler: bool,
+
+  /// If lipsync was enabled.
+  /// This might not be present for all types of inference
+  /// and typically only applies to video style transfer.
+  pub lipsync_enabled: bool,
+
+  /// If LCM was disabled.
+  /// Only staff can do this for now.
+  pub lcm_disabled: bool,
+
+  /// If the cinematic workflow was used.
+  /// Only staff can do this for now.
+  pub use_cinematic: bool,
+
+  /// If a global IP Adapter Image was used, this is the details.
+  /// NB: We can't easily query for this without another DB round trip,
+  /// so the frontend should query for it instead.
+  pub maybe_global_ipa_image_token: Option<MediaFileToken>,
+
+  /// Fields that only moderators should see.
+  pub maybe_moderator_fields: Option<PromptInfoModeratorFields>,
+
+  pub created_at: DateTime<Utc>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct PromptInfoModeratorFields {
+  /// How many milliseconds it took to run generation.
+  pub maybe_inference_duration_millis: Option<u64>,
+
+  /// Version of Yae's workflow
+  /// Used for logging and debugging by the art team.
+  pub main_ipa_workflow: Option<String>,
+
+  /// Version of Yae's face detailer workflow
+  /// Used for logging and debugging by the art team.
+  pub face_detailer_workflow: Option<String>,
+
+  /// Version of Yae's upscaler workflow
+  /// Used for logging and debugging by the art team.
+  pub upscaler_workflow: Option<String>,
+}

crates/api_clients/artcraft/artcraft_api_defs/src/prompts/mod.rs

@@ -1 +1,2 @@
-pub mod create_prompt;
+pub mod create_prompt;
+pub mod get_prompt;

crates/api_clients/artcraft/artcraft_client/Cargo.toml

@@ -28,7 +28,7 @@ cloudflare_errors.workspace = true
 enums.workspace = true
 enums_public.workspace = true
 errors.workspace = true
-idempotency.workspace = true
+uuid_utils.workspace = true
 mimetypes.workspace = true
 tokens.workspace = true
 

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/delete_media_file.rs

@@ -5,7 +5,6 @@ use crate::utils::basic_json_delete_request::basic_json_delete_request;
 use artcraft_api_defs::common::responses::simple_generic_json_success::SimpleGenericJsonSuccess;
 use artcraft_api_defs::media_file::delete_media_file::DeleteMediaFileRequest;
 use artcraft_api_defs::subscriptions::get_session_subscription::GetSessionSubscriptionResponse;
-use enums::common::payments_namespace::PaymentsNamespace;
 use log::debug;
 use tokens::tokens::media_files::MediaFileToken;
 

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs

@@ -7,16 +7,9 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
-use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
-use enums::by_table::media_files::media_file_class::MediaFileClass;
-use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
-use enums::by_table::media_files::media_file_type::MediaFileType;
-use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::generation_provider::GenerationProvider;
-use enums::common::visibility::Visibility;
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
@@ -52,7 +45,6 @@ pub struct LegacyUploadMediaFileFromFileArgs<'a, P: AsRef<Path>> {
   // pub maybe_batch_token: Option<&'a BatchGenerationToken>,
 }
 
-
 /// Upload using the legacy endpoint (spz, etc.)
 pub async fn legacy_upload_media_file_from_file<P: AsRef<Path>>(
   args: LegacyUploadMediaFileFromFileArgs<'_, P>,

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs

@@ -7,15 +7,8 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
-use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
-use enums::by_table::media_files::media_file_class::MediaFileClass;
-use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
-use enums::by_table::media_files::media_file_type::MediaFileType;
-use enums::by_table::model_weights::weights_category::WeightsCategory;
-use enums::common::visibility::Visibility;
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs

@@ -7,16 +7,9 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
-use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
-use enums::by_table::media_files::media_file_class::MediaFileClass;
-use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
-use enums::by_table::media_files::media_file_type::MediaFileType;
-use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::generation_provider::GenerationProvider;
-use enums::common::visibility::Visibility;
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
@@ -52,7 +45,6 @@ pub struct UploadImageFromFileArgs<'a, P: AsRef<Path>> {
   pub maybe_batch_token: Option<&'a BatchGenerationToken>,
 }
 
-
 /// Upload an image media file from a file.
 pub async fn upload_image_media_file_from_file<P: AsRef<Path>>(
   args: UploadImageFromFileArgs<'_, P>,

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs

@@ -5,15 +5,8 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
-use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
-use enums::by_table::media_files::media_file_class::MediaFileClass;
-use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
-use enums::by_table::media_files::media_file_type::MediaFileType;
-use enums::by_table::model_weights::weights_category::WeightsCategory;
-use enums::common::visibility::Visibility;
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs

@@ -5,15 +5,8 @@ use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
 use chrono::{DateTime, Utc};
-use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
-use enums::by_table::media_files::media_file_class::MediaFileClass;
-use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
-use enums::by_table::media_files::media_file_type::MediaFileType;
-use enums::by_table::model_weights::weights_category::WeightsCategory;
-use enums::common::visibility::Visibility;
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
@@ -49,8 +42,6 @@ pub struct UploadVideoFromFileArgs<'a, P: AsRef<Path>> {
   // pub maybe_batch_token: Option<&'a BatchGenerationToken>,
 }
 
-
-
 // TODO(bt,2025-04-22): Share API definitions between client and server in common crate.
 
 #[derive(Deserialize, Debug)]

crates/api_clients/artcraft/artcraft_router/Cargo.toml

@@ -20,10 +20,10 @@ artcraft_api_defs.workspace = true
 artcraft_client.workspace = true
 fal_client.workspace = true
 muapi_client.workspace = true
-seedance2pro.workspace = true
+seedance2pro_client.workspace = true
 tokens.workspace = true
 url_utils.workspace = true
-world_labs_api.workspace = true
+worldlabs_api_client.workspace = true
 
 # External
 anyhow.workspace = true

crates/api_clients/artcraft/artcraft_router/src/api/common_resolution.rs

@@ -14,4 +14,16 @@ pub enum CommonResolution {
   ThreeK,
   /// Models: Nano Banana Pro
   FourK,
+
+  /// Used by Nano Banana 2 (and others)
+  HalfK,
+
+  /// Used by the Seedance family (and others)
+  FourEightyP,
+
+  /// Used by the Seedance family (and others)
+  SevenTwentyP,
+
+  /// Used by the Seedance family (and others)
+  TenEightyP,
 }

crates/api_clients/artcraft/artcraft_router/src/client/router_seedance2pro_client.rs

@@ -1,4 +1,4 @@
-use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
 
 pub struct RouterSeedance2ProClient {
   pub(crate) session: Seedance2ProSession,

crates/api_clients/artcraft/artcraft_router/src/errors/provider_error.rs

@@ -3,7 +3,7 @@ use std::fmt::{Display, Formatter};
 use artcraft_client::error::storyteller_error::StorytellerError;
 use fal_client::error::fal_error_plus::FalErrorPlus;
 use muapi_client::error::muapi_error::MuapiError;
-use seedance2pro::error::seedance2pro_error::Seedance2ProError;
+use seedance2pro_client::error::seedance2pro_error::Seedance2ProError;
 
 #[derive(Debug)]
 pub enum ProviderError {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_nano_banana_2.rs

@@ -135,6 +135,8 @@ fn plan_resolution(
       // No 3K option; default to 2K
       Ok(Some(Nb2Res::TwoK))
     }
+    // HalfK, FourEightyP, SevenTwentyP, TenEightyP — nearest supported is OneK
+    Some(R::HalfK | R::FourEightyP | R::SevenTwentyP | R::TenEightyP) => Ok(Some(Nb2Res::OneK)),
   }
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_nano_banana_pro.rs

@@ -135,6 +135,8 @@ fn plan_resolution(
       // No 3K option; default to 2K
       Ok(Some(NbpRes::TwoK))
     }
+    // HalfK, FourEightyP, SevenTwentyP, TenEightyP — nearest supported is OneK
+    Some(R::HalfK | R::FourEightyP | R::SevenTwentyP | R::TenEightyP) => Ok(Some(NbpRes::OneK)),
   }
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_nano_banana_pro.rs

@@ -202,6 +202,11 @@ fn plan_resolution(
     Some(CommonResolution::FourK) => Ok(Some(FalNbpResolution::FourK)),
     // No 3K option; fall back to 2K
     Some(CommonResolution::ThreeK) => Ok(Some(FalNbpResolution::TwoK)),
+    // Fall back to nearest supported resolution
+    Some(CommonResolution::HalfK) => Ok(Some(FalNbpResolution::OneK)),
+    Some(CommonResolution::FourEightyP) => Ok(Some(FalNbpResolution::OneK)),
+    Some(CommonResolution::SevenTwentyP) => Ok(Some(FalNbpResolution::OneK)),
+    Some(CommonResolution::TenEightyP) => Ok(Some(FalNbpResolution::OneK)),
   }
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_mini.rs

@@ -1,7 +1,7 @@
 use crate::generate::generate_splat::plan::artcraft::plan_generate_splat_artcraft_marble_0p1_mini::PlanArtcraftMarble0p1Mini;
 use crate::generate::generate_splat::splat_generation_cost_estimate::SplatGenerationCostEstimate;
-use world_labs_api::api::api_types::world_labs_model::WorldLabsModel;
-use world_labs_api::pricing::check_pricing::{calculate_cost, InputType};
+use worldlabs_api_client::api::api_types::world_labs_model::WorldLabsModel;
+use worldlabs_api_client::pricing::check_pricing::{calculate_cost, InputType};
 
 pub(crate) fn estimate_splat_cost_artcraft_marble_0p1_mini(
   plan: &PlanArtcraftMarble0p1Mini<'_>,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_plus.rs

@@ -1,7 +1,7 @@
 use crate::generate::generate_splat::plan::artcraft::plan_generate_splat_artcraft_marble_0p1_plus::PlanArtcraftMarble0p1Plus;
 use crate::generate::generate_splat::splat_generation_cost_estimate::SplatGenerationCostEstimate;
-use world_labs_api::api::api_types::world_labs_model::WorldLabsModel;
-use world_labs_api::pricing::check_pricing::{calculate_cost, InputType};
+use worldlabs_api_client::api::api_types::world_labs_model::WorldLabsModel;
+use worldlabs_api_client::pricing::check_pricing::{calculate_cost, InputType};
 
 pub(crate) fn estimate_splat_cost_artcraft_marble_0p1_plus(
   plan: &PlanArtcraftMarble0p1Plus<'_>,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance2p0.rs

@@ -1,6 +1,6 @@
 use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount;
-use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
-use seedance2pro::requests::generate_video::generate_video::{BatchCount, GenerateVideoArgs, Resolution};
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::generate_video::generate_video::{BatchCount, GenerateVideoArgs, ModelType, Resolution};
 
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
@@ -22,6 +22,7 @@ pub (crate) fn estimate_video_cost_artcraft_seedance2p0(
 
   let args = GenerateVideoArgs {
     session: &dummy_session,
+    model_type: ModelType::Seedance2Pro,
     prompt: String::new(),
     resolution: Resolution::Square1x1,
     duration_seconds,
@@ -34,6 +35,7 @@ pub (crate) fn estimate_video_cost_artcraft_seedance2p0(
     reference_video_urls: None,
     reference_audio_urls: None,
     use_face_blur_hack: None,
+    host_override: None,
   };
 
   let cost_in_usd_cents = args.estimate_cost_in_usd_cents();
@@ -95,9 +97,9 @@ mod tests {
     assert_eq!(estimate_usd_cents(5, 2), 160);
     assert_eq!(estimate_usd_cents(15, 2), 480);
 
-    // Batch 4 = 3× (not 4×)
-    assert_eq!(estimate_usd_cents(4, 4), 192);
-    assert_eq!(estimate_usd_cents(5, 4), 240);
-    assert_eq!(estimate_usd_cents(15, 4), 720);
+    // Batch 4 = 4×
+    assert_eq!(estimate_usd_cents(4, 4), 256);
+    assert_eq!(estimate_usd_cents(5, 4), 320);
+    assert_eq!(estimate_usd_cents(15, 4), 960);
   }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/seedance2pro/estimate_video_cost_seedance2pro_seedance2p0.rs

@@ -1,5 +1,5 @@
-use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
-use seedance2pro::requests::generate_video::generate_video::{GenerateVideoArgs, Resolution};
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::generate_video::generate_video::{GenerateVideoArgs, ModelType, Resolution};
 
 use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0::PlanSeedance2proSeedance2p0;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
@@ -12,6 +12,7 @@ pub(crate) fn estimate_video_cost_seedance2pro_seedance2p0(
 
   let args = GenerateVideoArgs {
     session: &dummy_session,
+    model_type: ModelType::Seedance2Pro,
     prompt: String::new(),
     resolution: Resolution::Square1x1, // Resolution does not affect cost
     duration_seconds: plan.duration_seconds,
@@ -22,6 +23,7 @@ pub(crate) fn estimate_video_cost_seedance2pro_seedance2p0(
     reference_video_urls: None,
     reference_audio_urls: None,
     use_face_blur_hack: None,
+    host_override: None,
   };
 
   let cost_in_credits = args.estimate_credits();

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/seedance2pro/execute_seedance2pro_seedance2p0.rs

@@ -6,13 +6,13 @@ use crate::generate::generate_video::generate_video_response::{
 };
 use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0::PlanSeedance2proSeedance2p0;
 use crate::utils::download_file::download_file;
-use seedance2pro::requests::generate_video::generate_video::{
-  generate_video, GenerateVideoArgs,
+use seedance2pro_client::requests::generate_video::generate_video::{
+  generate_video, GenerateVideoArgs, ModelType,
 };
-use seedance2pro::requests::prepare_file_upload::prepare_file_upload::{
+use seedance2pro_client::requests::prepare_file_upload::prepare_file_upload::{
   prepare_file_upload, PrepareFileUploadArgs,
 };
-use seedance2pro::requests::upload_file::upload_file::{
+use seedance2pro_client::requests::upload_file::upload_file::{
   upload_file, UploadFileArgs,
 };
 use url_utils::extension::extract_extension_from_url::{
@@ -34,6 +34,7 @@ pub async fn execute_seedance2pro_seedance2p0(
 
   let args = GenerateVideoArgs {
     session,
+    model_type: ModelType::Seedance2Pro,
     prompt: plan.prompt.clone().unwrap_or_default(),
     resolution: plan.resolution,
     duration_seconds: plan.duration_seconds,
@@ -44,6 +45,7 @@ pub async fn execute_seedance2pro_seedance2p0(
     reference_video_urls,
     reference_audio_urls,
     use_face_blur_hack: None,
+    host_override: None,
   };
 
   let response = generate_video(args)
@@ -58,7 +60,7 @@ pub async fn execute_seedance2pro_seedance2p0(
 
 /// Downloads a file from a source URL and re-uploads it to seedance2pro CDN.
 async fn upload_to_seedance2pro(
-  session: &seedance2pro::creds::seedance2pro_session::Seedance2ProSession,
+  session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
   source_url: &str,
 ) -> Result<String, ArtcraftRouterError> {
   let extension = extract_extension_from_url_str(source_url, &ExtractExtensions::All)
@@ -70,6 +72,7 @@ async fn upload_to_seedance2pro(
   let prepare_response = prepare_file_upload(PrepareFileUploadArgs {
     session,
     extension,
+    host_override: None,
   })
     .await
     .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
@@ -77,6 +80,7 @@ async fn upload_to_seedance2pro(
   let upload_response = upload_file(UploadFileArgs {
     upload_url: prepare_response.upload_url,
     file_bytes,
+    host_override: None,
   })
     .await
     .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
@@ -85,7 +89,7 @@ async fn upload_to_seedance2pro(
 }
 
 async fn upload_optional_url(
-  session: &seedance2pro::creds::seedance2pro_session::Seedance2ProSession,
+  session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
   url: Option<&str>,
 ) -> Result<Option<String>, ArtcraftRouterError> {
   match url {
@@ -95,7 +99,7 @@ async fn upload_optional_url(
 }
 
 async fn upload_optional_url_list(
-  session: &seedance2pro::creds::seedance2pro_session::Seedance2ProSession,
+  session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
   urls: Option<&[String]>,
 ) -> Result<Option<Vec<String>>, ArtcraftRouterError> {
   match urls {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/artcraft/plan_generate_video_artcraft_seedance1p5_pro.rs

@@ -167,6 +167,10 @@ fn plan_resolution(
     Some(CommonResolution::TwoK) => Ok(Some(Seedance1p5ProMultiFunctionVideoGenResolution::TenEightyP)),
     Some(CommonResolution::ThreeK) => Ok(Some(Seedance1p5ProMultiFunctionVideoGenResolution::TenEightyP)),
     Some(CommonResolution::FourK) => Ok(Some(Seedance1p5ProMultiFunctionVideoGenResolution::TenEightyP)),
+    // HalfK and FourEightyP map to the lowest supported resolution
+    Some(CommonResolution::HalfK | CommonResolution::FourEightyP) => Ok(Some(Seedance1p5ProMultiFunctionVideoGenResolution::FourEightyP)),
+    Some(CommonResolution::SevenTwentyP) => Ok(Some(Seedance1p5ProMultiFunctionVideoGenResolution::SevenTwentyP)),
+    Some(CommonResolution::TenEightyP) => Ok(Some(Seedance1p5ProMultiFunctionVideoGenResolution::TenEightyP)),
   }
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/seedance2pro/plan_generate_video_seedance2pro_seedance2p0.rs

@@ -8,7 +8,7 @@ use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
 use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
-use seedance2pro::requests::generate_video::generate_video::{BatchCount, Resolution};
+use seedance2pro_client::requests::generate_video::generate_video::{BatchCount, Resolution};
 
 #[derive(Debug, Clone)]
 pub struct PlanSeedance2proSeedance2p0 {

crates/api_clients/cloud_storage/Cargo.toml

@@ -16,13 +16,13 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
-# Workspace hack (faster compile times)
+# cargo-hakari workspace hack (faster compile times)
 workspace-build-acceleration.workspace = true
 
 # Internal
-bucket_paths = { path = "../../lib/bucket_paths" }
+bucket_paths.workspace = true
 crockford.workspace = true
-easyenv = { path = "../../lib/easyenv" }
+easyenv.workspace = true
 errors.workspace = true
 filesys.workspace = true
 hashing = { path = "../../lib/files/hashing" }
@@ -31,12 +31,11 @@ storyteller_root = { path = "../../lib/storyteller_root" }
 
 # External
 anyhow.workspace = true
-log.workspace = true
-env_logger = "0.11.3"
 async-trait = "0.1.75"
+env_logger.workspace = true
+log.workspace = true
+tokio.workspace = true
+
 # The "never-encode-slash" feature seems to have been removed:
 # https://github.com/durch/rust-s3/pull/254
-rust-s3 = { version = "0.36.0-beta.2", default-features = false, features = ["fail-on-err", "tags", "tokio-rustls-tls"] }
-
-# Runtime
-tokio.workspace = true
+rust-s3.workspace = true

crates/api_clients/fal_client/Cargo.toml

@@ -12,7 +12,7 @@ name = "fal_client"
 path = "src/lib.rs"
 
 [dependencies]
-# Workspace hack (faster compile times)
+# cargo-hakari workspace hack (faster compile times)
 workspace-build-acceleration.workspace = true
 
 # Internal
@@ -25,15 +25,16 @@ futures.workspace = true
 log.workspace = true
 reqwest.workspace = true
 serde.workspace = true
+serde_json.workspace = true
 strum.workspace = true
+thiserror.workspace = true
 tokio.workspace = true
 url.workspace = true
 
-# For now, we'll vendor in fal.
-# We need to implement webhooks and the upstream doesn't support them yet.
-#fal = { version = "0.3.6", features = ["endpoints"] }
-fal = { path = "../../vendor/fal-rs", features = ["endpoints"] }
-
 [dev-dependencies]
-testing = { path = "../../lib/testing" }
+# Internal Dev
+test_utils.workspace = true
 test_data.workspace = true
+
+# External Dev
+# (None yet)

crates/api_clients/fal_client/src/error/classify_fal_error.rs

@@ -1,16 +1,14 @@
+use crate::error::fal_error::FalError;
 use crate::error::fal_error_plus::FalErrorPlus;
 
 const BILLING_ERROR : &str = "{\"detail\": \"User is locked. Reason: Exhausted balance. Top up your balance at fal.ai/dashboard/billing.\"}";
 
-/// Better classify the `fal::FalError` into a more user-friendly `FalErrorPlus`.
-pub fn classify_fal_error(err: fal::FalError) -> FalErrorPlus {
-  // Other("{\"detail\": \"User is locked. Reason: Exhausted balance. Top up your balance at fal.ai/dashboard/billing.\"}")
+/// Better classify the `FalError` into a more user-friendly `FalErrorPlus`.
+pub fn classify_fal_error(err: FalError) -> FalErrorPlus {
   match err {
-    fal::FalError::RequestError(_) => FalErrorPlus::FalError(err),
-    fal::FalError::ImageError(_) => FalErrorPlus::FalError(err),
-    fal::FalError::SerializeError(_) => FalErrorPlus::FalError(err),
-    fal::FalError::StreamError(_) => FalErrorPlus::FalError(err),
-    fal::FalError::Other(ref inner) => {
+    FalError::RequestError(_) => FalErrorPlus::FalError(err),
+    FalError::SerializeError(_) => FalErrorPlus::FalError(err),
+    FalError::Other(ref inner) => {
       if inner == BILLING_ERROR {
         FalErrorPlus::FalBillingError(inner.to_string())
       } else if inner.contains("billing") {

crates/api_clients/fal_client/src/error/fal_error.rs

@@ -0,0 +1,21 @@
+/// Error type for Fal API interactions.
+///
+/// Originally from the vendored `fal` crate (`fal::FalError`).
+/// Copied here so `fal_client` can be independent of the vendored crate.
+#[derive(Debug, thiserror::Error)]
+pub enum FalError {
+  #[error("fal request failed: {0}")]
+  RequestError(#[from] reqwest::Error),
+
+  #[error("serialization error: {0}")]
+  SerializeError(#[from] serde_json::Error),
+
+  #[error("error: {0}")]
+  Other(String),
+}
+
+impl From<String> for FalError {
+  fn from(s: String) -> Self {
+    FalError::Other(s)
+  }
+}

crates/api_clients/fal_client/src/error/fal_error_plus.rs

@@ -1,12 +1,13 @@
 use crate::error::classify_fal_error::classify_fal_error;
+use crate::error::fal_error::FalError;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
 
-/// Additional errors that aren't included in `fal::FalError`.
+/// Additional errors that aren't included in `crate::error::fal_error::FalError`.
 #[derive(Debug)]
 pub enum FalErrorPlus {
   /// An error arising in the `fal` crate.
-  FalError(fal::FalError),
+  FalError(crate::error::fal_error::FalError),
   /// The fal API key is invalid.
   FalApiKeyError(String),
   /// The fal account has a billing issue
@@ -37,8 +38,8 @@ impl Display for FalErrorPlus {
 
 impl Error for FalErrorPlus {}
 
-impl From<fal::FalError> for FalErrorPlus {
-  fn from(err: fal::FalError) -> Self {
+impl From<FalError> for FalErrorPlus {
+  fn from(err: FalError) -> Self {
     classify_fal_error(err)
   }
 }

crates/api_clients/fal_client/src/error/mod.rs

@@ -1,2 +1,3 @@
 pub mod classify_fal_error;
+pub mod fal_error;
 pub mod fal_error_plus;

crates/api_clients/fal_client/src/lib.rs

@@ -1,11 +1,4 @@
-//! A wrapper for the "fal" crate that bakes in a few extra recipes and utilities.
-
-extern crate fal;
-
-// Re-export
-pub mod export {
-  pub use fal::*;
-}
+//! A fal wrapper
 
 pub mod creds;
 pub mod error;

crates/api_clients/fal_client/src/model/enqueued_request.rs

@@ -1,8 +1,9 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::model::fal_endpoint::FalEndpoint;
 use crate::model::fal_request_id::FalRequestId;
+use crate::requests::api::queue::Queue;
+use crate::requests::api::queue_response::QueueResponse;
 use errors::AnyhowResult;
-use fal::queue::{Queue, QueueResponse};
 use reqwest::Client;
 use serde::de::DeserializeOwned;