update queries

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

@@ -10,20 +10,6 @@ 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,9 +36,8 @@ script/socat_dev_database_connect.sh
 # Python virtual envs (named by convention)
 venv/
 
-# LLM Testing
+# Testing
 /prompts/
-/reports/
 /requests/
 
 # Scratch data

.idea/codeStyles/Project.xml

@@ -1,9 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <codeStyleSettings language="Markdown">
-      <option name="RIGHT_MARGIN" value="100" />
-      <option name="WRAP_ON_TYPING" value="1" />
-    </codeStyleSettings>
     <codeStyleSettings language="Rust">
       <option name="RIGHT_MARGIN" value="180" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />

.sqlx/query-0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1.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`,\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    ",
+  "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    ",
   "describe": {
     "columns": [
       {
@@ -82,46 +82,6 @@
           "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": {
@@ -135,12 +95,8 @@
       true,
       false,
       true,
-      true,
-      true,
-      true,
-      false,
-      false
+      true
     ]
   },
-  "hash": "cbdaa45597de14d1eb6dc0f6a95788d56334757bb3d03eda2eb64df3ba2a0144"
+  "hash": "0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1"
 }

.sqlx/query-08f52f15acf6afc7091a525e3dc88f706c71c3579e5e81aa9903807d85f469ef.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_other_args = ?,\n\n  creator_ip_address = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 9
+    },
+    "nullable": []
+  },
+  "hash": "08f52f15acf6afc7091a525e3dc88f706c71c3579e5e81aa9903807d85f469ef"
+}

.sqlx/query-243afe0bc574f9f233c7797add9faf96440e2bafd52032e07951272fb1ec78b1.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    jobs.attempt_count,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n    jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n    jobs.maybe_model_type,\n    jobs.maybe_model_token,\n    jobs.maybe_raw_inference_text,\n    jobs.maybe_inference_args,\n\n    jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,\n    jobs.failure_reason,\n\n    jobs.on_success_result_entity_type as maybe_result_entity_type,\n    jobs.on_success_result_entity_token as maybe_result_entity_token,\n    jobs.on_success_result_batch_token as maybe_result_batch_token,\n\n    model_weights.title as maybe_model_weights_title,\n    tts_models.title as maybe_tts_model_title,\n    voice_conversion_models.title as maybe_voice_conversion_model_title,\n\n    tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,\n    voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,\n\n    media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,\n    media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,\n    media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,\n\n    jobs.assigned_worker as maybe_assigned_worker,\n    jobs.assigned_cluster as maybe_assigned_cluster,\n\n    jobs.is_keepalive_required,\n\n    jobs.created_at,\n    jobs.updated_at,\n\n    jobs.first_started_at as maybe_first_started_at,\n    jobs.successfully_completed_at as maybe_successfully_completed_at,\n\n    NOW() as database_clock\n\nFROM generic_inference_jobs as jobs\n\nLEFT OUTER JOIN model_weights ON jobs.maybe_model_token = model_weights.token\nLEFT OUTER JOIN tts_models ON jobs.maybe_model_token = tts_models.token\nLEFT OUTER JOIN voice_conversion_models ON jobs.maybe_model_token = voice_conversion_models.token\n\nLEFT OUTER JOIN tts_results ON jobs.on_success_result_entity_token = tts_results.token\nLEFT OUTER JOIN voice_conversion_results ON jobs.on_success_result_entity_token = voice_conversion_results.token\nLEFT OUTER JOIN media_files ON jobs.on_success_result_entity_token = media_files.token\n\nWHERE jobs.token = ?\n        ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    jobs.attempt_count,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n    jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n    jobs.maybe_model_type,\n    jobs.maybe_model_token,\n    jobs.maybe_raw_inference_text,\n    jobs.maybe_inference_args,\n\n    jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,\n\n    jobs.on_success_result_entity_type as maybe_result_entity_type,\n    jobs.on_success_result_entity_token as maybe_result_entity_token,\n    jobs.on_success_result_batch_token as maybe_result_batch_token,\n\n    model_weights.title as maybe_model_weights_title,\n    tts_models.title as maybe_tts_model_title,\n    voice_conversion_models.title as maybe_voice_conversion_model_title,\n\n    tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,\n    voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,\n\n    media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,\n    media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,\n    media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,\n\n    jobs.assigned_worker as maybe_assigned_worker,\n    jobs.assigned_cluster as maybe_assigned_cluster,\n\n    jobs.is_keepalive_required,\n\n    jobs.created_at,\n    jobs.updated_at,\n\n    jobs.first_started_at as maybe_first_started_at,\n    jobs.successfully_completed_at as maybe_successfully_completed_at,\n\n    NOW() as database_clock\n\nFROM generic_inference_jobs as jobs\n\nLEFT OUTER JOIN model_weights ON jobs.maybe_model_token = model_weights.token\nLEFT OUTER JOIN tts_models ON jobs.maybe_model_token = tts_models.token\nLEFT OUTER JOIN voice_conversion_models ON jobs.maybe_model_token = voice_conversion_models.token\n\nLEFT OUTER JOIN tts_results ON jobs.on_success_result_entity_token = tts_results.token\nLEFT OUTER JOIN voice_conversion_results ON jobs.on_success_result_entity_token = voice_conversion_results.token\nLEFT OUTER JOIN media_files ON jobs.on_success_result_entity_token = media_files.token\n\nWHERE jobs.token = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -135,16 +135,6 @@
       },
       {
         "ordinal": 13,
-        "name": "failure_reason",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 2048
-        }
-      },
-      {
-        "ordinal": 14,
         "name": "maybe_result_entity_type",
         "type_info": {
           "type": "VarString",
@@ -154,7 +144,7 @@
         }
       },
       {
-        "ordinal": 15,
+        "ordinal": 14,
         "name": "maybe_result_entity_token",
         "type_info": {
           "type": "VarString",
@@ -164,7 +154,7 @@
         }
       },
       {
-        "ordinal": 16,
+        "ordinal": 15,
         "name": "maybe_result_batch_token",
         "type_info": {
           "type": "VarString",
@@ -174,7 +164,7 @@
         }
       },
       {
-        "ordinal": 17,
+        "ordinal": 16,
         "name": "maybe_model_weights_title",
         "type_info": {
           "type": "VarString",
@@ -184,7 +174,7 @@
         }
       },
       {
-        "ordinal": 18,
+        "ordinal": 17,
         "name": "maybe_tts_model_title",
         "type_info": {
           "type": "VarString",
@@ -194,7 +184,7 @@
         }
       },
       {
-        "ordinal": 19,
+        "ordinal": 18,
         "name": "maybe_voice_conversion_model_title",
         "type_info": {
           "type": "VarString",
@@ -204,7 +194,7 @@
         }
       },
       {
-        "ordinal": 20,
+        "ordinal": 19,
         "name": "maybe_tts_public_bucket_path",
         "type_info": {
           "type": "VarString",
@@ -214,7 +204,7 @@
         }
       },
       {
-        "ordinal": 21,
+        "ordinal": 20,
         "name": "maybe_voice_conversion_public_bucket_hash",
         "type_info": {
           "type": "VarString",
@@ -224,7 +214,7 @@
         }
       },
       {
-        "ordinal": 22,
+        "ordinal": 21,
         "name": "maybe_media_file_public_bucket_directory_hash",
         "type_info": {
           "type": "VarString",
@@ -234,7 +224,7 @@
         }
       },
       {
-        "ordinal": 23,
+        "ordinal": 22,
         "name": "maybe_media_file_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
@@ -244,7 +234,7 @@
         }
       },
       {
-        "ordinal": 24,
+        "ordinal": 23,
         "name": "maybe_media_file_public_bucket_extension",
         "type_info": {
           "type": "VarString",
@@ -254,7 +244,7 @@
         }
       },
       {
-        "ordinal": 25,
+        "ordinal": 24,
         "name": "maybe_assigned_worker",
         "type_info": {
           "type": "VarString",
@@ -264,7 +254,7 @@
         }
       },
       {
-        "ordinal": 26,
+        "ordinal": 25,
         "name": "maybe_assigned_cluster",
         "type_info": {
           "type": "VarString",
@@ -274,7 +264,7 @@
         }
       },
       {
-        "ordinal": 27,
+        "ordinal": 26,
         "name": "is_keepalive_required",
         "type_info": {
           "type": "Tiny",
@@ -284,7 +274,7 @@
         }
       },
       {
-        "ordinal": 28,
+        "ordinal": 27,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -294,7 +284,7 @@
         }
       },
       {
-        "ordinal": 29,
+        "ordinal": 28,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -304,7 +294,7 @@
         }
       },
       {
-        "ordinal": 30,
+        "ordinal": 29,
         "name": "maybe_first_started_at",
         "type_info": {
           "type": "Timestamp",
@@ -314,7 +304,7 @@
         }
       },
       {
-        "ordinal": 31,
+        "ordinal": 30,
         "name": "maybe_successfully_completed_at",
         "type_info": {
           "type": "Timestamp",
@@ -324,7 +314,7 @@
         }
       },
       {
-        "ordinal": 32,
+        "ordinal": 31,
         "name": "database_clock",
         "type_info": {
           "type": "Datetime",
@@ -364,7 +354,6 @@
       true,
       true,
       true,
-      true,
       false,
       false,
       false,
@@ -373,5 +362,5 @@
       false
     ]
   },
-  "hash": "a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9"
+  "hash": "243afe0bc574f9f233c7797add9faf96440e2bafd52032e07951272fb1ec78b1"
 }

.sqlx/query-2fe10ae5a2d013e1861f71dcb0afae4048e0d47c5b584c6bbc7df25dde747e87.json

@@ -1,168 +0,0 @@
-{
-  "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-83840fa1a0712a326a26ae146a819f67a44fae927f294780d89892270075ebb7.json

@@ -1,289 +0,0 @@
-{
-  "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

@@ -1,12 +0,0 @@
-{
-  "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-9b99ccd0baf9a4b74d8903f63e3a3dcf4c09b75cad978f0532388cbd743b7516.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n    UPDATE tasks\n    SET task_status = ?,\n    on_failure_type = ?,\n    on_failure_message = ?\n    WHERE id = ?\n  ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "9b99ccd0baf9a4b74d8903f63e3a3dcf4c09b75cad978f0532388cbd743b7516"
-}

.sqlx/query-b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630.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::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        ",
+  "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        ",
   "describe": {
     "columns": [
       {
@@ -25,7 +25,7 @@
       },
       {
         "ordinal": 2,
-        "name": "maybe_model_type: enums::common::generation::common_model_type::CommonModelType",
+        "name": "maybe_model_type: enums::common::model_type::ModelType",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -75,66 +75,6 @@
       },
       {
         "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",
@@ -144,7 +84,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 8,
         "name": "creator_ip_address",
         "type_info": {
           "type": "VarString",
@@ -154,7 +94,7 @@
         }
       },
       {
-        "ordinal": 15,
+        "ordinal": 9,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -176,15 +116,9 @@
       true,
       true,
       true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
       false,
       false
     ]
   },
-  "hash": "4a50b7bf06061f05e769a41e547cb927bd2b3a6f67c8ceb37883b744237ba34c"
+  "hash": "b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630"
 }

.sqlx/query-ccf92ebe0328d3019ac6b01be4b442df706a183362fa7e5c331f5a4bf1a74a00.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_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

@@ -1,91 +0,0 @@
-{
-  "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

@@ -1,62 +0,0 @@
-# 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,28 +6,26 @@ 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",
+  "crates/api_clients/artcraft/artcraft_api_defs", # TODO: api_clients/{artcraft}/{api_defs,client}
   "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_downloader",
+  "crates/api_clients/google_drive_common",
   "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/rootly_client",
+  "crates/api_clients/seedance2pro",
   "crates/api_clients/runwayml_client",
-  "crates/api_clients/seedance2pro_client",
   "crates/api_clients/thumbnail_generator",
-  "crates/api_clients/worldlabs_api_client",
-  "crates/api_clients/worldlabs_consumer_client",
+  "crates/api_clients/world_labs_api",
+  "crates/api_clients/world_labs_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",
@@ -45,6 +43,7 @@ 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,14 +52,19 @@ 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/ffmpeg_utils",
+  "crates/lib/files/archives",
   "crates/lib/files/file_to_base64_url",
   "crates/lib/files/filesys",
   "crates/lib/files/hashing",
@@ -68,42 +72,35 @@ 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/pager",
+  "crates/lib/migration",
   "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/uuid_utils",
+  "crates/lib/web_scrapers",
   #"crates/lib/api_clients/fakeyou_client",
-  #"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",
+  #"crates/lib/machine_learning/ml_models",
 
   # 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",
@@ -118,34 +115,31 @@ 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",
@@ -217,58 +211,49 @@ 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" }
-muapi_client = { path = "crates/api_clients/muapi_client" }
-mysql_queries = { path = "crates/schema/database/mysql_queries" }
-pager = { path = "crates/lib/pager" }
 openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
+seedance2pro = { path = "crates/api_clients/seedance2pro" }
 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" }
-subprocess_common = { path = "crates/lib/deprecated/subprocess_common" }
-test_data = { path = "crates/testing/test_data" }
-test_utils = { path = "crates/testing/test_utils" }
+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" }
 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" }
-worldlabs_api_client = { path = "crates/api_clients/worldlabs_api_client" }
-worldlabs_consumer_client = { path = "crates/api_clients/worldlabs_consumer_client" }
+world_labs_api = { path = "crates/api_clients/world_labs_api" }
+world_labs_client = { path = "crates/api_clients/world_labs_client" }
 
 # External libs
 # Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace
@@ -284,42 +269,32 @@ 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"
-byteorder = "1.5.0"
-bytes = "1.11.1"
-chrono = { version = "0.4.44", features = ["serde"] }
-clap = { version = "=4.5.60", features = ["derive"] }
+bytes = "1.10.1"
+chrono = { version = "0.4.41", 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.32" }
-hex-literal = "1.1.0"
-hostname = "0.4.0"
-indexmap = "2.13.0"
+futures = { version = "0.3.31" }
+hex-literal = "1.0.0"
+indexmap = "2.9.0"
 log = "0.4.29"
 md-5 = "0.10.6" # insecure but used for gravatar
-mockall = "0.12.1"
-once_cell = "1.21.4"
+once_cell = "1.21.3"
 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" }
-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 = { version = "1.0.219", features = ["derive"] }
+serde_derive = "1.0.219"
+serde_json = "1.0.140"
 serde_yaml = "0.9.34+deprecated"
-sha2 = "0.11.0-rc.5"
+sha2 = "0.11.0-rc.2"
 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"
@@ -327,16 +302,12 @@ tauri-plugin-fs = "2.4.2"
 tauri-plugin-log = "2.6.0"
 tauri-plugin-upload = "2.3.1"
 tempdir = "0.3.7"
-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"
+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"
 
 # NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
 #

_database/sql/migrations/2026-03-17-193249-0000_alter_media_files_add_maybe_thumbnail_version/down.sql

@@ -1,7 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE media_files
-DROP COLUMN
-maybe_thumbnail_version;

_database/sql/migrations/2026-03-17-193249-0000_alter_media_files_add_maybe_thumbnail_version/up.sql

@@ -1,7 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE media_files
-ADD COLUMN
-maybe_thumbnail_version TINYINT UNSIGNED DEFAULT NULL;

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

@@ -1,11 +0,0 @@
--- 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

@@ -1,11 +0,0 @@
--- 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

@@ -1,7 +0,0 @@
--- 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

@@ -1,7 +0,0 @@
--- 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

@@ -1,29 +0,0 @@
--- 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

@@ -1,28 +0,0 @@
--- 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

@@ -1,71 +0,0 @@
--- 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

@@ -1,60 +0,0 @@
--- 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,7 +46,6 @@ 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/media_files.sql

@@ -224,12 +224,6 @@ CREATE TABLE media_files (
   -- If so, we may not need to add a watermark downstream in further processing steps.
   has_watermark BOOLEAN NOT NULL DEFAULT FALSE,
 
-  -- Tracks the thumbnail algorithm/type used for this media file.
-  -- NULL = no thumbnail generated yet.
-  -- 1 = video thumbnail.
-  -- Other values are reserved for future thumbnail algorithms or media-specific types.
-  maybe_thumbnail_version TINYINT UNSIGNED DEFAULT NULL,
-
   -- ========== UPLOAD, TRANSCODING, AND TRUNCATION DETAILS ==========
 
   -- The hash for the bucket directory that contains the original upload

_database/sql/migrations_squashed/prompts/prompts.sql

@@ -27,8 +27,6 @@ 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.
@@ -54,29 +52,6 @@ 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,7 +66,6 @@ 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

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

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

@@ -1,55 +0,0 @@
--- 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

@@ -1,5 +0,0 @@
--- 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

@@ -1,60 +0,0 @@
--- 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

@@ -1,5 +0,0 @@
--- 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

@@ -1,26 +0,0 @@
--- 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

@@ -1,5 +0,0 @@
--- 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

@@ -1,25 +0,0 @@
--- 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,20 +130,47 @@ RUN echo "Disk usage at current directory (after tests):"
 RUN pwd
 RUN du -hsc * | sort -hr
 
-# 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.
+# 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
+
 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
@@ -183,7 +210,6 @@ 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/deprecated/download_job/config/download-job.common.env .
-COPY crates/service/job/deprecated/download_job/config/download-job.production.env .
+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/inference_job/config/inference-job.common.env .
-COPY crates/service/job/deprecated/inference_job/config/inference-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 .
 
 # # 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.workspace = true
+utoipa = { version = "4", features = ["chrono", "actix_extras"] }
 
 [dev-dependencies]
 anyhow.workspace = true

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

@@ -1,26 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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,12 +1,11 @@
 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, ToSchema, Debug)]
+#[derive(Serialize, Deserialize, 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,6 +1,5 @@
 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)
@@ -9,7 +8,7 @@ use utoipa::ToSchema;
 /// 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, ToSchema, Debug)]
+#[derive(Serialize, Deserialize, 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.")]
@@ -37,7 +36,7 @@ pub struct MediaFileCoverImageDetails {
 
 /// The default cover is composed of an image and color pair that are
 /// predefined by the frontend.
-#[derive(Serialize, Deserialize, ToSchema, Debug)]
+#[derive(Serialize, Deserialize, 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,9 +1,8 @@
 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, ToSchema, Debug)]
+#[derive(Serialize, Deserialize, Debug)]
 pub struct UserDetailsLight {
   /// The token for the user
   pub user_token: UserToken,
@@ -27,7 +26,7 @@ pub struct UserDetailsLight {
   // In the future, we'll also support user-uploaded avatars that we store on our servers.
 }
 
-#[derive(Serialize, Deserialize, ToSchema, Debug)]
+#[derive(Serialize, Deserialize, 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_resolution::CommonResolution;
+use enums::common::generation::common_video_resolution::CommonVideoResolution;
 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<CommonResolution>,
+  pub resolution: Option<CommonVideoResolution>,
 
   /// 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_resolution::CommonResolution;
+use enums::common::generation::common_video_resolution::CommonVideoResolution;
 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<CommonResolution>,
+  pub resolution: Option<CommonVideoResolution>,
 
   /// Duration in seconds.
   pub duration_seconds: Option<u16>,

crates/api_clients/artcraft/artcraft_api_defs/src/generate/video/multi_function/seedance_2p0_multi_function_video_gen.rs

@@ -23,12 +23,6 @@ pub struct Seedance2p0MultiFunctionVideoGenRequest {
   /// Optional reference images (reference mode). When present, takes priority over start/end frames.
   pub reference_image_media_tokens: Option<Vec<MediaFileToken>>,
 
-  /// Optional reference videos.
-  pub reference_video_media_tokens: Option<Vec<MediaFileToken>>,
-
-  /// Optional reference audio files.
-  pub reference_audio_media_tokens: Option<Vec<MediaFileToken>>,
-
   /// Video aspect ratio / resolution.
   pub aspect_ratio: Option<Seedance2p0AspectRatio>,
 

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

@@ -1,6 +1,7 @@
 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;
@@ -109,9 +110,6 @@ pub struct ListSessionStatusDetailsResponse {
   /// An enum the frontend can use to display localized/I18N error
   /// messages. These pertain to both transient and permanent failures.
   pub maybe_failure_category_updated: Option<FrontendFailureCategoryForApiClients>,
-  
-  /// User-facing failure messages
-  pub maybe_failure_message: Option<String>,
 
   /// This is an integer number between 0 and 100 (both inclusive) that
   /// reports the completeness.

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

@@ -1,12 +1,10 @@
 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

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

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

@@ -1,18 +0,0 @@
-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,5 +1,3 @@
-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};
@@ -32,8 +30,4 @@ 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,4 +1,3 @@
-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

@@ -1,55 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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,4 +1,2 @@
-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

@@ -1,2 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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

@@ -1,62 +0,0 @@
-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

@@ -1,2 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,2 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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

@@ -1,2 +0,0 @@
-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

@@ -1,149 +0,0 @@
-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

@@ -1,196 +0,0 @@
-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,11 +1,8 @@
-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";
 
@@ -17,32 +14,14 @@ pub struct CreatePromptRequest {
   /// OPTIONAL. The positive prompt.
   pub positive_prompt: Option<String>,
 
-  /// OPTIONAL. The negative prompt.
+  /// OPTIONAL. The positive prompt.
   pub negative_prompt: Option<String>,
-
+  
   /// OPTIONAL. The model type.
-  pub model_type: Option<CommonModelType>,
+  pub model_type: Option<ModelType>,
 
   /// 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

@@ -1,149 +0,0 @@
-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,2 +1 @@
-pub mod create_prompt;
-pub mod get_prompt;
+pub mod create_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
-uuid_utils.workspace = true
+idempotency.workspace = true
 mimetypes.workspace = true
 tokens.workspace = true
 

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

@@ -5,6 +5,7 @@ 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,9 +7,16 @@ 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 uuid_utils::uuid::generate_random_uuid;
+use idempotency::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
@@ -45,6 +52,7 @@ 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,8 +7,15 @@ 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 uuid_utils::uuid::generate_random_uuid;
+use idempotency::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,9 +7,16 @@ 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 uuid_utils::uuid::generate_random_uuid;
+use idempotency::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
@@ -45,6 +52,7 @@ 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,8 +5,15 @@ 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 uuid_utils::uuid::generate_random_uuid;
+use idempotency::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,8 +5,15 @@ 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 uuid_utils::uuid::generate_random_uuid;
+use idempotency::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;
@@ -42,6 +49,8 @@ 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

@@ -19,18 +19,14 @@ workspace-build-acceleration.workspace = true
 artcraft_api_defs.workspace = true
 artcraft_client.workspace = true
 fal_client.workspace = true
-muapi_client.workspace = true
-seedance2pro_client.workspace = true
+seedance2pro.workspace = true
 tokens.workspace = true
-url_utils.workspace = true
-worldlabs_api_client.workspace = true
+world_labs_api.workspace = true
 
 # External
 anyhow.workspace = true
 log.workspace = true
-reqwest.workspace = true
 serde.workspace = true
-wreq.workspace = true
 serde_derive.workspace = true
 tokio.workspace = true
 uuid.workspace = true

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

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

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

@@ -14,16 +14,4 @@ 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/api/mod.rs

@@ -1,4 +1,3 @@
-pub mod audio_list_ref;
 pub mod common_aspect_ratio;
 pub mod common_image_model;
 pub mod common_resolution;
@@ -7,4 +6,3 @@ pub mod common_video_model;
 pub mod image_list_ref;
 pub mod image_ref;
 pub mod provider;
-pub mod video_list_ref;

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

@@ -6,6 +6,4 @@ use serde_derive::{Deserialize, Serialize};
 pub enum Provider {
   Artcraft,
   Fal,
-  Muapi,
-  Seedance2Pro,
 }

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

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

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

@@ -5,5 +5,3 @@ pub mod request_mismatch_mitigation_strategy;
 pub mod router_artcraft_client;
 pub mod router_client;
 pub mod router_fal_client;
-pub mod router_muapi_client;
-pub mod router_seedance2pro_client;

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

@@ -1,14 +1,10 @@
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::client::router_fal_client::RouterFalClient;
-use crate::client::router_muapi_client::RouterMuapiClient;
-use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
 use crate::errors::client_error::{ClientError, ClientType};
 
 pub struct MultiRouterClient {
   pub(crate) artcraft_client: Option<RouterArtcraftClient>,
   pub(crate) fal_client: Option<RouterFalClient>,
-  pub(crate) muapi_client: Option<RouterMuapiClient>,
-  pub(crate) seedance2pro_client: Option<RouterSeedance2ProClient>,
 }
 
 impl MultiRouterClient {
@@ -21,14 +17,4 @@ impl MultiRouterClient {
     self.fal_client.as_ref()
       .ok_or(ClientError::ClientNotConfigured(ClientType::Fal))
   }
-
-  pub fn get_muapi_client_ref(&self) -> Result<&RouterMuapiClient, ClientError> {
-    self.muapi_client.as_ref()
-      .ok_or(ClientError::ClientNotConfigured(ClientType::Muapi))
-  }
-
-  pub fn get_seedance2pro_client_ref(&self) -> Result<&RouterSeedance2ProClient, ClientError> {
-    self.seedance2pro_client.as_ref()
-      .ok_or(ClientError::ClientNotConfigured(ClientType::Seedance2Pro))
-  }
 }

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

@@ -1,14 +1,10 @@
 use crate::client::multi_router_client::MultiRouterClient;
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::client::router_fal_client::RouterFalClient;
-use crate::client::router_muapi_client::RouterMuapiClient;
-use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
 
 pub struct MultiRouterClientBuilder {
   artcraft_client: Option<RouterArtcraftClient>,
   fal_client: Option<RouterFalClient>,
-  muapi_client: Option<RouterMuapiClient>,
-  seedance2pro_client: Option<RouterSeedance2ProClient>,
 }
 
 impl MultiRouterClientBuilder {
@@ -16,8 +12,6 @@ impl MultiRouterClientBuilder {
     Self {
       artcraft_client: None,
       fal_client: None,
-      muapi_client: None,
-      seedance2pro_client: None,
     }
   }
 
@@ -31,22 +25,10 @@ impl MultiRouterClientBuilder {
     self
   }
 
-  pub fn set_muapi_client(mut self, client: RouterMuapiClient) -> Self {
-    self.muapi_client = Some(client);
-    self
-  }
-
-  pub fn set_seedance2pro_client(mut self, client: RouterSeedance2ProClient) -> Self {
-    self.seedance2pro_client = Some(client);
-    self
-  }
-
   pub fn build(self) -> MultiRouterClient {
     MultiRouterClient {
       artcraft_client: self.artcraft_client,
       fal_client: self.fal_client,
-      muapi_client: self.muapi_client,
-      seedance2pro_client: self.seedance2pro_client,
     }
   }
 }

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

@@ -1,16 +1,12 @@
 use crate::client::multi_router_client::MultiRouterClient;
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::client::router_fal_client::RouterFalClient;
-use crate::client::router_muapi_client::RouterMuapiClient;
-use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
 use crate::errors::client_error::{ClientError, ClientType};
 
 pub enum RouterClient {
   Multi(MultiRouterClient),
   Artcraft(RouterArtcraftClient),
   Fal(RouterFalClient),
-  Muapi(RouterMuapiClient),
-  Seedance2Pro(RouterSeedance2ProClient),
 }
 
 impl RouterClient {
@@ -29,20 +25,4 @@ impl RouterClient {
       _ => Err(ClientError::ClientNotConfigured(ClientType::Fal)),
     }
   }
-
-  pub fn get_muapi_client_ref(&self) -> Result<&RouterMuapiClient, ClientError> {
-    match self {
-      RouterClient::Muapi(client) => Ok(client),
-      RouterClient::Multi(multi) => multi.get_muapi_client_ref(),
-      _ => Err(ClientError::ClientNotConfigured(ClientType::Muapi)),
-    }
-  }
-
-  pub fn get_seedance2pro_client_ref(&self) -> Result<&RouterSeedance2ProClient, ClientError> {
-    match self {
-      RouterClient::Seedance2Pro(client) => Ok(client),
-      RouterClient::Multi(multi) => multi.get_seedance2pro_client_ref(),
-      _ => Err(ClientError::ClientNotConfigured(ClientType::Seedance2Pro)),
-    }
-  }
 }

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

@@ -1,11 +0,0 @@
-use muapi_client::creds::muapi_session::MuapiSession;
-
-pub struct RouterMuapiClient {
-  pub(crate) session: MuapiSession,
-}
-
-impl RouterMuapiClient {
-  pub fn new(session: MuapiSession) -> Self {
-    RouterMuapiClient { session }
-  }
-}

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

@@ -1,11 +0,0 @@
-use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
-
-pub struct RouterSeedance2ProClient {
-  pub(crate) session: Seedance2ProSession,
-}
-
-impl RouterSeedance2ProClient {
-  pub fn new(session: Seedance2ProSession) -> Self {
-    RouterSeedance2ProClient { session }
-  }
-}

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

@@ -1,5 +1,4 @@
 use crate::errors::client_error::ClientError;
-use crate::errors::download_error::DownloadError;
 use crate::errors::provider_error::ProviderError;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
@@ -9,9 +8,6 @@ pub enum ArtcraftRouterError {
   /// A client configuration error.
   Client(ClientError),
 
-  /// Failed to download a file from a URL (e.g. when re-uploading to a provider's CDN).
-  Download(DownloadError),
-
   /// The requested model is not yet supported by the router.
   UnsupportedModel(String),
 
@@ -28,7 +24,6 @@ impl Display for ArtcraftRouterError {
   fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
     match self {
       Self::Client(e) => write!(f, "Client error: {}", e),
-      Self::Download(e) => write!(f, "Download error: {}", e),
       Self::UnsupportedModel(model) => write!(f, "Unsupported model: {}", model),
       Self::InvalidInput(msg) => write!(f, "Invalid input: {}", msg),
       Self::Provider(e) => write!(f, "Provider error: {}", e),
@@ -42,12 +37,6 @@ impl From<ClientError> for ArtcraftRouterError {
   }
 }
 
-impl From<DownloadError> for ArtcraftRouterError {
-  fn from(error: DownloadError) -> Self {
-    Self::Download(error)
-  }
-}
-
 impl From<ProviderError> for ArtcraftRouterError {
   fn from(error: ProviderError) -> Self {
     Self::Provider(error)

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

@@ -5,8 +5,6 @@ use std::fmt::{Display, Formatter};
 pub enum ClientType {
   Artcraft,
   Fal,
-  Muapi,
-  Seedance2Pro,
 }
 
 impl Display for ClientType {
@@ -14,8 +12,6 @@ impl Display for ClientType {
     match self {
       Self::Artcraft => write!(f, "Artcraft"),
       Self::Fal => write!(f, "Fal"),
-      Self::Muapi => write!(f, "Muapi"),
-      Self::Seedance2Pro => write!(f, "Seedance2Pro"),
     }
   }
 }
@@ -37,12 +33,6 @@ pub enum ClientError {
 
   /// Fal only accepts image URLs for image inputs, not media tokens.
   FalOnlySupportsUrls,
-
-  /// Muapi only accepts URLs for image inputs, not media tokens.
-  MuapiOnlySupportsUrls,
-
-  /// Seedance2Pro only accepts URLs for media inputs, not media tokens.
-  Seedance2ProOnlySupportsUrls,
 }
 
 impl Error for ClientError {}
@@ -65,12 +55,6 @@ impl Display for ClientError {
       Self::FalOnlySupportsUrls => {
         write!(f, "Fal only supports image URLs for image inputs, not media tokens")
       }
-      Self::MuapiOnlySupportsUrls => {
-        write!(f, "Muapi only supports URLs for image inputs; resolve media tokens to URLs before calling this provider")
-      }
-      Self::Seedance2ProOnlySupportsUrls => {
-        write!(f, "Seedance2Pro only supports URLs for media inputs; resolve media tokens to URLs before calling this provider")
-      }
     }
   }
 }

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

@@ -1,40 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug)]
-pub enum DownloadError {
-  BadStatus {
-    url: String,
-    status_code: u16,
-  },
-
-  ReqwestDownload {
-    url: String,
-    error: reqwest::Error,
-    maybe_status: Option<reqwest::StatusCode>,
-  },
-
-  WreqDownload {
-    url: String,
-    error: wreq::Error,
-    maybe_status: Option<wreq::StatusCode>,
-  },
-}
-
-impl Error for DownloadError {}
-
-impl Display for DownloadError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::BadStatus { url, status_code } => {
-        write!(f, "Download failed for {} with status {}", url, status_code)
-      }
-      Self::ReqwestDownload { url, error, maybe_status } => {
-        write!(f, "Reqwest download error for {}: {} (status: {:?})", url, error, maybe_status)
-      }
-      Self::WreqDownload { url, error, maybe_status } => {
-        write!(f, "Wreq download error for {}: {} (status: {:?})", url, error, maybe_status)
-      }
-    }
-  }
-}