Merge branch 'master' into feature/comfyui-sidecar

Editor added self by accident removing

.idea/dictionaries/bt.xml

@@ -9,6 +9,7 @@
       <w>cheermote</w>
       <w>cidrs</w>
       <w>crockford</w>
+      <w>csam</w>
       <w>culted</w>
       <w>dalle</w>
       <w>demuxer</w>

.sqlx/query-09a1a654d1493a700e89bf7d828d96864593642ef495335c135d8356dc9ac2c5.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n    m.maybe_text_transcript,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n    model_weights.title as maybe_model_weights_title,\n    model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n    model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n    model_weight_creator.username as maybe_model_weight_creator_username,\n    model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n    model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n    entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n    entity_stats.bookmark_count as maybe_bookmark_count,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n    ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n    ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n    ON entity_stats.entity_type = \"media_file\"\n    AND entity_stats.entity_token = m.token\nWHERE\n    m.token = ?\n        ",
+  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n    m.maybe_media_subtype as `maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n    m.maybe_text_transcript,\n\n    m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n    model_weights.title as maybe_model_weights_title,\n    model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n    model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n    model_weight_creator.username as maybe_model_weight_creator_username,\n    model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n    model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n    entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n    entity_stats.bookmark_count as maybe_bookmark_count,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n    ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n    ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n    ON entity_stats.entity_type = \"media_file\"\n    AND entity_stats.entity_token = m.token\nWHERE\n    m.token = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -25,6 +25,16 @@
       },
       {
         "ordinal": 2,
+        "name": "maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
         "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
         "type_info": {
           "type": "VarString",
@@ -34,7 +44,7 @@
         }
       },
       {
-        "ordinal": 3,
+        "ordinal": 4,
         "name": "maybe_creator_username",
         "type_info": {
           "type": "VarString",
@@ -44,7 +54,7 @@
         }
       },
       {
-        "ordinal": 4,
+        "ordinal": 5,
         "name": "maybe_creator_display_name",
         "type_info": {
           "type": "VarString",
@@ -54,7 +64,7 @@
         }
       },
       {
-        "ordinal": 5,
+        "ordinal": 6,
         "name": "maybe_creator_gravatar_hash",
         "type_info": {
           "type": "String",
@@ -64,7 +74,7 @@
         }
       },
       {
-        "ordinal": 6,
+        "ordinal": 7,
         "name": "maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken",
         "type_info": {
           "type": "VarString",
@@ -74,7 +84,7 @@
         }
       },
       {
-        "ordinal": 7,
+        "ordinal": 8,
         "name": "maybe_text_transcript",
         "type_info": {
           "type": "Blob",
@@ -84,7 +94,17 @@
         }
       },
       {
-        "ordinal": 8,
+        "ordinal": 9,
+        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
         "name": "creator_set_visibility: enums::common::visibility::Visibility",
         "type_info": {
           "type": "String",
@@ -94,7 +114,7 @@
         }
       },
       {
-        "ordinal": 9,
+        "ordinal": 11,
         "name": "maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken",
         "type_info": {
           "type": "VarString",
@@ -104,7 +124,7 @@
         }
       },
       {
-        "ordinal": 10,
+        "ordinal": 12,
         "name": "maybe_model_weights_title",
         "type_info": {
           "type": "VarString",
@@ -114,7 +134,7 @@
         }
       },
       {
-        "ordinal": 11,
+        "ordinal": 13,
         "name": "maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType",
         "type_info": {
           "type": "VarString",
@@ -124,7 +144,7 @@
         }
       },
       {
-        "ordinal": 12,
+        "ordinal": 14,
         "name": "maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
         "type_info": {
           "type": "VarString",
@@ -134,7 +154,7 @@
         }
       },
       {
-        "ordinal": 13,
+        "ordinal": 15,
         "name": "maybe_model_cover_image_public_bucket_hash",
         "type_info": {
           "type": "VarString",
@@ -144,7 +164,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 16,
         "name": "maybe_model_cover_image_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
@@ -154,7 +174,7 @@
         }
       },
       {
-        "ordinal": 15,
+        "ordinal": 17,
         "name": "maybe_model_cover_image_public_bucket_extension",
         "type_info": {
           "type": "VarString",
@@ -164,7 +184,7 @@
         }
       },
       {
-        "ordinal": 16,
+        "ordinal": 18,
         "name": "maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken",
         "type_info": {
           "type": "VarString",
@@ -174,7 +194,7 @@
         }
       },
       {
-        "ordinal": 17,
+        "ordinal": 19,
         "name": "maybe_model_weight_creator_username",
         "type_info": {
           "type": "VarString",
@@ -184,7 +204,7 @@
         }
       },
       {
-        "ordinal": 18,
+        "ordinal": 20,
         "name": "maybe_model_weight_creator_display_name",
         "type_info": {
           "type": "VarString",
@@ -194,7 +214,7 @@
         }
       },
       {
-        "ordinal": 19,
+        "ordinal": 21,
         "name": "maybe_model_weight_creator_gravatar_hash",
         "type_info": {
           "type": "String",
@@ -204,7 +224,7 @@
         }
       },
       {
-        "ordinal": 20,
+        "ordinal": 22,
         "name": "public_bucket_directory_hash",
         "type_info": {
           "type": "VarString",
@@ -214,7 +234,7 @@
         }
       },
       {
-        "ordinal": 21,
+        "ordinal": 23,
         "name": "maybe_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
@@ -224,7 +244,7 @@
         }
       },
       {
-        "ordinal": 22,
+        "ordinal": 24,
         "name": "maybe_public_bucket_extension",
         "type_info": {
           "type": "VarString",
@@ -234,7 +254,7 @@
         }
       },
       {
-        "ordinal": 23,
+        "ordinal": 25,
         "name": "maybe_ratings_positive_count",
         "type_info": {
           "type": "Long",
@@ -244,7 +264,7 @@
         }
       },
       {
-        "ordinal": 24,
+        "ordinal": 26,
         "name": "maybe_ratings_negative_count",
         "type_info": {
           "type": "Long",
@@ -254,7 +274,7 @@
         }
       },
       {
-        "ordinal": 25,
+        "ordinal": 27,
         "name": "maybe_bookmark_count",
         "type_info": {
           "type": "Long",
@@ -264,7 +284,7 @@
         }
       },
       {
-        "ordinal": 26,
+        "ordinal": 28,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -274,7 +294,7 @@
         }
       },
       {
-        "ordinal": 27,
+        "ordinal": 29,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -296,6 +316,8 @@
       true,
       true,
       true,
+      true,
+      true,
       false,
       true,
       true,
@@ -318,5 +340,5 @@
       false
     ]
   },
-  "hash": "00a60f2949c7e639eb5cead57615c9806d815c64ffdbe38bf06f6646fae0e065"
+  "hash": "09a1a654d1493a700e89bf7d828d96864593642ef495335c135d8356dc9ac2c5"
 }

.sqlx/query-13ca06bcbb4a576f8a2229a8554b7488d379baa381d8d5cb60972750e81b2173.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_positive_prompt = ?,\n  maybe_negative_prompt = ?,\n  maybe_other_args = ?,\n\n  creator_ip_address = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "13ca06bcbb4a576f8a2229a8554b7488d379baa381d8d5cb60972750e81b2173"
+}

.sqlx/query-1c32bdb79ed2bc1b8988bbb6ea3f2a1db4ed4552d53cb4f31ff4b08de01691f7.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    users.token as user_token,\n    users.username,\n    users.display_name,\n\n    users.email_address,\n    users.email_confirmed,\n    users.email_gravatar_hash,\n\n    users.maybe_stripe_customer_id,\n    users.maybe_loyalty_program_key,\n\n    users.disable_gravatar,\n    users.auto_play_audio_preference,\n    users.auto_play_video_preference,\n    users.preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`,\n    users.preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`,\n\n    users.user_role_slug,\n    users.is_banned,\n\n    users.can_access_studio,\n\n    user_roles.can_use_tts,\n    user_roles.can_use_w2l,\n    user_roles.can_delete_own_tts_results,\n    user_roles.can_delete_own_w2l_results,\n    user_roles.can_delete_own_account,\n\n    user_roles.can_upload_tts_models,\n    user_roles.can_upload_w2l_templates,\n    user_roles.can_delete_own_tts_models,\n    user_roles.can_delete_own_w2l_templates,\n\n    user_roles.can_approve_w2l_templates,\n    user_roles.can_edit_other_users_profiles,\n    user_roles.can_edit_other_users_tts_models,\n    user_roles.can_edit_other_users_w2l_templates,\n    user_roles.can_delete_other_users_tts_models,\n    user_roles.can_delete_other_users_tts_results,\n    user_roles.can_delete_other_users_w2l_templates,\n    user_roles.can_delete_other_users_w2l_results,\n    user_roles.can_ban_users,\n    user_roles.can_delete_users\n\nFROM users\nLEFT OUTER JOIN user_sessions\n    ON users.token = user_sessions.user_token\nLEFT OUTER JOIN user_roles\n    ON users.user_role_slug = user_roles.slug\nWHERE user_sessions.token = ?\n    AND user_sessions.deleted_at IS NULL\n    AND users.user_deleted_at IS NULL\n    AND users.mod_deleted_at IS NULL\n        ",
+  "query": "\nSELECT\n    users.token as user_token,\n    users.username,\n    users.display_name,\n\n    users.email_address,\n    users.email_confirmed,\n    users.email_gravatar_hash,\n\n    users.maybe_stripe_customer_id,\n    users.maybe_loyalty_program_key,\n\n    users.disable_gravatar,\n    users.auto_play_audio_preference,\n    users.auto_play_video_preference,\n    users.preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`,\n    users.preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`,\n\n    users.user_role_slug,\n    users.is_banned,\n\n    users.can_access_studio,\n    users.maybe_feature_flags,\n\n    user_roles.can_use_tts,\n    user_roles.can_use_w2l,\n    user_roles.can_delete_own_tts_results,\n    user_roles.can_delete_own_w2l_results,\n    user_roles.can_delete_own_account,\n\n    user_roles.can_upload_tts_models,\n    user_roles.can_upload_w2l_templates,\n    user_roles.can_delete_own_tts_models,\n    user_roles.can_delete_own_w2l_templates,\n\n    user_roles.can_approve_w2l_templates,\n    user_roles.can_edit_other_users_profiles,\n    user_roles.can_edit_other_users_tts_models,\n    user_roles.can_edit_other_users_w2l_templates,\n    user_roles.can_delete_other_users_tts_models,\n    user_roles.can_delete_other_users_tts_results,\n    user_roles.can_delete_other_users_w2l_templates,\n    user_roles.can_delete_other_users_w2l_results,\n    user_roles.can_ban_users,\n    user_roles.can_delete_users\n\nFROM users\nLEFT OUTER JOIN user_sessions\n    ON users.token = user_sessions.user_token\nLEFT OUTER JOIN user_roles\n    ON users.user_role_slug = user_roles.slug\nWHERE user_sessions.token = ?\n    AND user_sessions.deleted_at IS NULL\n    AND users.user_deleted_at IS NULL\n    AND users.mod_deleted_at IS NULL\n        ",
   "describe": {
     "columns": [
       {
@@ -165,6 +165,16 @@
       },
       {
         "ordinal": 16,
+        "name": "maybe_feature_flags",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 17,
         "name": "can_use_tts",
         "type_info": {
           "type": "Tiny",
@@ -174,7 +184,7 @@
         }
       },
       {
-        "ordinal": 17,
+        "ordinal": 18,
         "name": "can_use_w2l",
         "type_info": {
           "type": "Tiny",
@@ -184,7 +194,7 @@
         }
       },
       {
-        "ordinal": 18,
+        "ordinal": 19,
         "name": "can_delete_own_tts_results",
         "type_info": {
           "type": "Tiny",
@@ -194,7 +204,7 @@
         }
       },
       {
-        "ordinal": 19,
+        "ordinal": 20,
         "name": "can_delete_own_w2l_results",
         "type_info": {
           "type": "Tiny",
@@ -204,7 +214,7 @@
         }
       },
       {
-        "ordinal": 20,
+        "ordinal": 21,
         "name": "can_delete_own_account",
         "type_info": {
           "type": "Tiny",
@@ -214,7 +224,7 @@
         }
       },
       {
-        "ordinal": 21,
+        "ordinal": 22,
         "name": "can_upload_tts_models",
         "type_info": {
           "type": "Tiny",
@@ -224,7 +234,7 @@
         }
       },
       {
-        "ordinal": 22,
+        "ordinal": 23,
         "name": "can_upload_w2l_templates",
         "type_info": {
           "type": "Tiny",
@@ -234,7 +244,7 @@
         }
       },
       {
-        "ordinal": 23,
+        "ordinal": 24,
         "name": "can_delete_own_tts_models",
         "type_info": {
           "type": "Tiny",
@@ -244,7 +254,7 @@
         }
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "can_delete_own_w2l_templates",
         "type_info": {
           "type": "Tiny",
@@ -254,7 +264,7 @@
         }
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "can_approve_w2l_templates",
         "type_info": {
           "type": "Tiny",
@@ -264,7 +274,7 @@
         }
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "can_edit_other_users_profiles",
         "type_info": {
           "type": "Tiny",
@@ -274,7 +284,7 @@
         }
       },
       {
-        "ordinal": 27,
+        "ordinal": 28,
         "name": "can_edit_other_users_tts_models",
         "type_info": {
           "type": "Tiny",
@@ -284,7 +294,7 @@
         }
       },
       {
-        "ordinal": 28,
+        "ordinal": 29,
         "name": "can_edit_other_users_w2l_templates",
         "type_info": {
           "type": "Tiny",
@@ -294,7 +304,7 @@
         }
       },
       {
-        "ordinal": 29,
+        "ordinal": 30,
         "name": "can_delete_other_users_tts_models",
         "type_info": {
           "type": "Tiny",
@@ -304,7 +314,7 @@
         }
       },
       {
-        "ordinal": 30,
+        "ordinal": 31,
         "name": "can_delete_other_users_tts_results",
         "type_info": {
           "type": "Tiny",
@@ -314,7 +324,7 @@
         }
       },
       {
-        "ordinal": 31,
+        "ordinal": 32,
         "name": "can_delete_other_users_w2l_templates",
         "type_info": {
           "type": "Tiny",
@@ -324,7 +334,7 @@
         }
       },
       {
-        "ordinal": 32,
+        "ordinal": 33,
         "name": "can_delete_other_users_w2l_results",
         "type_info": {
           "type": "Tiny",
@@ -334,7 +344,7 @@
         }
       },
       {
-        "ordinal": 33,
+        "ordinal": 34,
         "name": "can_ban_users",
         "type_info": {
           "type": "Tiny",
@@ -344,7 +354,7 @@
         }
       },
       {
-        "ordinal": 34,
+        "ordinal": 35,
         "name": "can_delete_users",
         "type_info": {
           "type": "Tiny",
@@ -392,8 +402,9 @@
       true,
       true,
       true,
+      true,
       true
     ]
   },
-  "hash": "423109f2dcee23a558c43ecaab0eb2836714d5316620daaa1127b447cad59212"
+  "hash": "1c32bdb79ed2bc1b8988bbb6ea3f2a1db4ed4552d53cb4f31ff4b08de01691f7"
 }

.sqlx/query-23061975280d3357a453705c90824001ff5023031a69425b8ec9b6ccff57aa8c.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO media_files\n        SET\n            token = ?,\n            media_type = ?,\n\n            origin_category = ?, \n            origin_product_category = ?, \n            maybe_origin_model_type = ?, \n            maybe_origin_model_token = ?, \n            maybe_origin_filename = ?,\n\n            is_batch_generated = ?,\n            maybe_batch_token = ?,\n\n            maybe_mime_type = ?,\n            file_size_bytes = ?,\n            maybe_duration_millis = ?,\n            maybe_audio_encoding = ?, \n            maybe_video_encoding = ?, \n            maybe_frame_width = ?, \n            maybe_frame_height = ?,\n            maybe_prompt_token = ?,\n            checksum_sha2 = ?,\n\n            public_bucket_directory_hash = ?, \n            maybe_public_bucket_prefix = ?, \n            maybe_public_bucket_extension = ?, \n            extra_file_modification_info = ?, \n\n            maybe_creator_user_token = ?, \n            maybe_creator_anonymous_visitor_token = ?, \n\n            creator_ip_address = ?, \n            creator_set_visibility = ?, \n\n            maybe_creator_file_synthetic_id = ?, \n            maybe_creator_category_synthetic_id = ?,\n\n            maybe_mod_user_token = ?, \n            is_generated_on_prem = ?, \n            generated_by_worker = ?, \n            generated_by_cluster = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 32
+    },
+    "nullable": []
+  },
+  "hash": "23061975280d3357a453705c90824001ff5023031a69425b8ec9b6ccff57aa8c"
+}

.sqlx/query-38b93187e20b51c7950bf9c5500890c15a00eec76a1bdf7501f349125ce7e4c4.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\n        INSERT INTO media_files\n        SET\n            token = ?,\n            media_type = ?,\n\n            origin_category = ?, \n            origin_product_category = ?, \n            maybe_origin_model_type = ?, \n            maybe_origin_model_token = ?, \n            maybe_origin_filename = ?,\n\n            is_batch_generated = ?,\n            maybe_batch_token = ?,\n\n            maybe_mime_type = ?,\n            file_size_bytes = ?,\n            maybe_duration_millis = ?,\n            maybe_audio_encoding = ?, \n            maybe_video_encoding = ?, \n            maybe_frame_width = ?, \n            maybe_frame_height = ?, \n            checksum_sha2 = ?,\n\n            public_bucket_directory_hash = ?, \n            maybe_public_bucket_prefix = ?, \n            maybe_public_bucket_extension = ?, \n            extra_file_modification_info = ?, \n\n            maybe_creator_user_token = ?, \n            maybe_creator_anonymous_visitor_token = ?, \n\n            creator_ip_address = ?, \n            creator_set_visibility = ?, \n\n            maybe_creator_file_synthetic_id = ?, \n            maybe_creator_category_synthetic_id = ?,\n\n            maybe_mod_user_token = ?, \n            is_generated_on_prem = ?, \n            generated_by_worker = ?, \n            generated_by_cluster = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 31
-    },
-    "nullable": []
-  },
-  "hash": "38b93187e20b51c7950bf9c5500890c15a00eec76a1bdf7501f349125ce7e4c4"
-}

.sqlx/query-61744bbf83f7cf00348bcc21e868d9c506fec46da4a33ac50d63c6d9e00c0cec.json

@@ -0,0 +1,102 @@
+{
+  "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_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": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::prompts::PromptToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "prompt_type: enums::by_table::prompts::prompt_type::PromptType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_positive_prompt",
+        "type_info": {
+          "type": "Blob",
+          "flags": "BLOB | BINARY",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_negative_prompt",
+        "type_info": {
+          "type": "Blob",
+          "flags": "BLOB | BINARY",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_other_args",
+        "type_info": {
+          "type": "Blob",
+          "flags": "BLOB | BINARY",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "creator_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "61744bbf83f7cf00348bcc21e868d9c506fec46da4a33ac50d63c6d9e00c0cec"
+}

.sqlx/query-b161ade93a0b6c8b7bd01ad627659903da1fa4ca6c0c9925b2a4e2bc791d4083.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n    m.maybe_text_transcript,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n    model_weights.title as maybe_model_weights_title,\n    model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n    model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n    model_weight_creator.username as maybe_model_weight_creator_username,\n    model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n    model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n    entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n    entity_stats.bookmark_count as maybe_bookmark_count,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n    ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n    ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n    ON entity_stats.entity_type = \"media_file\"\n    AND entity_stats.entity_token = m.token\nWHERE\n    m.token = ?\n    AND m.user_deleted_at IS NULL\n    AND m.mod_deleted_at IS NULL\n        ",
+  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n    m.maybe_media_subtype as `maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n    m.maybe_text_transcript,\n\n    m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n    model_weights.title as maybe_model_weights_title,\n    model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n    model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n    model_weight_creator.username as maybe_model_weight_creator_username,\n    model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n    model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n    entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n    entity_stats.bookmark_count as maybe_bookmark_count,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n    ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n    ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n    ON entity_stats.entity_type = \"media_file\"\n    AND entity_stats.entity_token = m.token\nWHERE\n    m.token = ?\n    AND m.user_deleted_at IS NULL\n    AND m.mod_deleted_at IS NULL\n        ",
   "describe": {
     "columns": [
       {
@@ -25,6 +25,16 @@
       },
       {
         "ordinal": 2,
+        "name": "maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
         "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
         "type_info": {
           "type": "VarString",
@@ -34,7 +44,7 @@
         }
       },
       {
-        "ordinal": 3,
+        "ordinal": 4,
         "name": "maybe_creator_username",
         "type_info": {
           "type": "VarString",
@@ -44,7 +54,7 @@
         }
       },
       {
-        "ordinal": 4,
+        "ordinal": 5,
         "name": "maybe_creator_display_name",
         "type_info": {
           "type": "VarString",
@@ -54,7 +64,7 @@
         }
       },
       {
-        "ordinal": 5,
+        "ordinal": 6,
         "name": "maybe_creator_gravatar_hash",
         "type_info": {
           "type": "String",
@@ -64,7 +74,7 @@
         }
       },
       {
-        "ordinal": 6,
+        "ordinal": 7,
         "name": "maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken",
         "type_info": {
           "type": "VarString",
@@ -74,7 +84,7 @@
         }
       },
       {
-        "ordinal": 7,
+        "ordinal": 8,
         "name": "maybe_text_transcript",
         "type_info": {
           "type": "Blob",
@@ -84,7 +94,17 @@
         }
       },
       {
-        "ordinal": 8,
+        "ordinal": 9,
+        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 10,
         "name": "creator_set_visibility: enums::common::visibility::Visibility",
         "type_info": {
           "type": "String",
@@ -94,7 +114,7 @@
         }
       },
       {
-        "ordinal": 9,
+        "ordinal": 11,
         "name": "maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken",
         "type_info": {
           "type": "VarString",
@@ -104,7 +124,7 @@
         }
       },
       {
-        "ordinal": 10,
+        "ordinal": 12,
         "name": "maybe_model_weights_title",
         "type_info": {
           "type": "VarString",
@@ -114,7 +134,7 @@
         }
       },
       {
-        "ordinal": 11,
+        "ordinal": 13,
         "name": "maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType",
         "type_info": {
           "type": "VarString",
@@ -124,7 +144,7 @@
         }
       },
       {
-        "ordinal": 12,
+        "ordinal": 14,
         "name": "maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
         "type_info": {
           "type": "VarString",
@@ -134,7 +154,7 @@
         }
       },
       {
-        "ordinal": 13,
+        "ordinal": 15,
         "name": "maybe_model_cover_image_public_bucket_hash",
         "type_info": {
           "type": "VarString",
@@ -144,7 +164,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 16,
         "name": "maybe_model_cover_image_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
@@ -154,7 +174,7 @@
         }
       },
       {
-        "ordinal": 15,
+        "ordinal": 17,
         "name": "maybe_model_cover_image_public_bucket_extension",
         "type_info": {
           "type": "VarString",
@@ -164,7 +184,7 @@
         }
       },
       {
-        "ordinal": 16,
+        "ordinal": 18,
         "name": "maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken",
         "type_info": {
           "type": "VarString",
@@ -174,7 +194,7 @@
         }
       },
       {
-        "ordinal": 17,
+        "ordinal": 19,
         "name": "maybe_model_weight_creator_username",
         "type_info": {
           "type": "VarString",
@@ -184,7 +204,7 @@
         }
       },
       {
-        "ordinal": 18,
+        "ordinal": 20,
         "name": "maybe_model_weight_creator_display_name",
         "type_info": {
           "type": "VarString",
@@ -194,7 +214,7 @@
         }
       },
       {
-        "ordinal": 19,
+        "ordinal": 21,
         "name": "maybe_model_weight_creator_gravatar_hash",
         "type_info": {
           "type": "String",
@@ -204,7 +224,7 @@
         }
       },
       {
-        "ordinal": 20,
+        "ordinal": 22,
         "name": "public_bucket_directory_hash",
         "type_info": {
           "type": "VarString",
@@ -214,7 +234,7 @@
         }
       },
       {
-        "ordinal": 21,
+        "ordinal": 23,
         "name": "maybe_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
@@ -224,7 +244,7 @@
         }
       },
       {
-        "ordinal": 22,
+        "ordinal": 24,
         "name": "maybe_public_bucket_extension",
         "type_info": {
           "type": "VarString",
@@ -234,7 +254,7 @@
         }
       },
       {
-        "ordinal": 23,
+        "ordinal": 25,
         "name": "maybe_ratings_positive_count",
         "type_info": {
           "type": "Long",
@@ -244,7 +264,7 @@
         }
       },
       {
-        "ordinal": 24,
+        "ordinal": 26,
         "name": "maybe_ratings_negative_count",
         "type_info": {
           "type": "Long",
@@ -254,7 +274,7 @@
         }
       },
       {
-        "ordinal": 25,
+        "ordinal": 27,
         "name": "maybe_bookmark_count",
         "type_info": {
           "type": "Long",
@@ -264,7 +284,7 @@
         }
       },
       {
-        "ordinal": 26,
+        "ordinal": 28,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -274,7 +294,7 @@
         }
       },
       {
-        "ordinal": 27,
+        "ordinal": 29,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -296,6 +316,8 @@
       true,
       true,
       true,
+      true,
+      true,
       false,
       true,
       true,
@@ -318,5 +340,5 @@
       false
     ]
   },
-  "hash": "f077f7692f4d79809534506dfde0dba28f4fdaa3d0b8cc2ebad2a594188429eb"
+  "hash": "b161ade93a0b6c8b7bd01ad627659903da1fa4ca6c0c9925b2a4e2bc791d4083"
 }

.sqlx/query-ca7db50451b04da0b5521ebc12416280d4fe6cbc1da47b7fa314d810b5f3a6fd.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO media_files\nSET\n  token = ?,\n\n  origin_category = ?,\n  origin_product_category = ?,\n  maybe_origin_model_type = ?,\n\n  media_type = ?,\n  maybe_mime_type = ?,\n  file_size_bytes = ?,\n\n  checksum_sha2 = ?,\n\n  maybe_prompt_token = ?,\n\n  public_bucket_directory_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n  extra_file_modification_info = ?,\n\n  maybe_creator_file_synthetic_id = ?,\n  maybe_creator_category_synthetic_id = ?,\n\n  is_generated_on_prem = ?,\n  generated_by_worker = ?,\n  generated_by_cluster = ?\n\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 22
+    },
+    "nullable": []
+  },
+  "hash": "ca7db50451b04da0b5521ebc12416280d4fe6cbc1da47b7fa314d810b5f3a6fd"
+}

Cargo.lock

@@ -1727,34 +1727,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
-[[package]]
-name = "database-backup"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "container_common",
- "dotenv",
- "easyenv",
- "log",
- "my-workspace-hack",
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "database-cleanup"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "container_common",
- "dotenv",
- "easyenv",
- "log",
- "my-workspace-hack",
- "serde",
- "serde_derive",
-]
-
 [[package]]
 name = "datetimes"
 version = "0.0.1"
@@ -1764,6 +1736,43 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "db-backup"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "container_common",
+ "dotenv",
+ "easyenv",
+ "log",
+ "my-workspace-hack",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "db-cleanup"
+version = "0.0.1"
+dependencies = [
+ "buckets",
+ "clap",
+ "container_common",
+ "dotenv",
+ "easyenv",
+ "enums",
+ "errors",
+ "log",
+ "my-workspace-hack",
+ "mysql_queries",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sqlx",
+ "storyteller_root",
+ "tokens",
+ "tokio",
+]
+
 [[package]]
 name = "debug-helper"
 version = "0.3.13"
@@ -3232,6 +3241,7 @@ dependencies = [
  "tokens",
  "tokio",
  "tts_common",
+ "videos",
  "walkdir",
 ]
 
@@ -3925,6 +3935,20 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "mp4"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9ef834d5ed55e494a2ae350220314dc4aacd1c43a9498b00e320e0ea352a5c3"
+dependencies = [
+ "byteorder",
+ "bytes 1.5.0",
+ "num-rational 0.4.1",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "my-workspace-hack"
 version = "0.1.0"
@@ -4251,6 +4275,7 @@ dependencies = [
  "num-bigint 0.4.4",
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -4792,6 +4817,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "prompt_engineering"
+version = "0.1.0"
+dependencies = [
+ "errors",
+ "my-workspace-hack",
+ "once_cell",
+ "regex",
+ "speculoos 0.11.0",
+]
+
 [[package]]
 name = "prost"
 version = "0.11.9"
@@ -5530,7 +5566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
-name = "scrape_test"
+name = "scrape-test"
 version = "0.0.1"
 dependencies = [
  "clap",
@@ -6387,6 +6423,7 @@ dependencies = [
  "native-tls",
  "once_cell",
  "pin-project-lite",
+ "prompt_engineering",
  "pulldown-cmark",
  "r2d2_redis",
  "rand 0.8.5",
@@ -6420,6 +6457,7 @@ dependencies = [
  "utoipa",
  "utoipa-swagger-ui",
  "uuid 0.8.2",
+ "videos",
 ]
 
 [[package]]
@@ -7750,6 +7788,17 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "videos"
+version = "0.0.1"
+dependencies = [
+ "errors",
+ "log",
+ "mp4",
+ "my-workspace-hack",
+ "testing",
+]
+
 [[package]]
 name = "void"
 version = "1.0.2"

Cargo.toml

@@ -11,22 +11,22 @@ members = [
   "crates/_types/tokens",
 
   # CLI tools for operations, etc.
-  "crates/cli/database-backup",
-  "crates/cli/database-cleanup",
-  "crates/cli/dev-database-seed",
-  "crates/cli/dev-upload-media-file",
-  "crates/cli/elasticsearch-cli",
-  "crates/cli/kubectl-pod-cleanup",
-  "crates/cli/lru-delete-models",
-  "crates/cli/migration-tool",
-  "crates/cli/scrape_test",
+  "crates/cli/devenv/dev-database-seed",
+  "crates/cli/devenv/dev-upload-media-file",
+  "crates/cli/devenv/scrape-test",
+  "crates/cli/production/db-backup",
+  "crates/cli/production/db-cleanup",
+  "crates/cli/production/elasticsearch-cli",
+  "crates/cli/production/kubectl-pod-cleanup",
+  "crates/cli/production/lru-delete-models",
+  "crates/cli/production/migration-tool",
 
   # Shared libraries
   "crates/lib/actix_helpers",
   "crates/lib/api_clients/cloud_storage",
   "crates/lib/api_clients/google_drive_common",
-  "crates/lib/api_clients/twitch_common",
   "crates/lib/api_clients/thumbnail_generator",
+  "crates/lib/api_clients/twitch_common",
   "crates/lib/bootstrap",
   "crates/lib/caching/memory_caching",
   "crates/lib/caching/redis_caching",
@@ -48,12 +48,14 @@ members = [
   "crates/lib/files/images",
   "crates/lib/files/media",
   "crates/lib/files/mimetypes",
+  "crates/lib/files/videos",
   "crates/lib/idempotency",
   "crates/lib/jobs_common",
   "crates/lib/logging",
   "crates/lib/migration",
   "crates/lib/mysql_queries",
   "crates/lib/password",
+  "crates/lib/prompt_engineering",
   "crates/lib/redis_common",
   "crates/lib/server_environment",
   "crates/lib/sqlx_mysql_helpers",

_sql/actions/studio/enroll_users_in_studio.sql

@@ -1,28 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
--- Staff
--- teddanson is victor's alt
--- SELECT token, username FROM users WHERE username IN (
-UPDATE users SET can_access_studio = true WHERE username IN (
-    'bflat',
-    'brandon',
-    'crossproduct',
-    'crossproduct1',
-    'echelon',
-    'fyscott',
-    'olivicmic',
-    'saltacc',
-    'teddanson',
-    'vegito1089',
-    'wilwong',
-    'yae_ph',
-    'zzz_last_item'
-);
-
-UPDATE users SET can_access_studio = true WHERE username IN (
-    'endtimes',
-    'tropicalfun',
-    'zzz_last_item'
-);

_sql/actions/user_access/enroll_users_as_admin.sql

@@ -0,0 +1,24 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Staff
+-- teddanson is victor's alt
+-- SELECT token, username FROM users WHERE username IN (
+UPDATE users SET user_role_slug = "admin" WHERE username IN (
+  'bflat',
+  'brandon',
+  'crossproduct',
+  'crossproduct1',
+  'echelon',
+  'fyscott',
+  'mrvintage',
+  'olivicmic',
+  'saltacc',
+  'teddanson',
+  'vegito1089',
+  'wilwong',
+  'yae_ph',
+  'zzz_last_item'
+);
+

_sql/actions/user_access/enroll_users_in_loyalty.sql

@@ -33,3 +33,35 @@ where token IN (
 );
 
 
+-- Staff
+-- teddanson is victor's alt
+-- endtimes is @sugarbro (testing)
+-- el_cid_93 is for testing
+-- NB: 'echelon' is absent
+-- SELECT token, username FROM users WHERE username IN (
+UPDATE users SET maybe_loyalty_program_key = 'fakeyou_contributor' WHERE username IN (
+  'bflat',
+  'brandon',
+  'crossproduct',
+  'crossproduct1',
+  'el_cid_93',
+  'endtimes',
+  'fyscott',
+  'gateway',
+  'jags111',
+  'mrvintage',
+  'olivicmic',
+  'rewin123',
+  'saltacc',
+  'teddanson',
+  'vegito1089',
+  'wilwong',
+  'yae_ph',
+  'zzz_last_item'
+);
+
+UPDATE users SET maybe_loyalty_program_key = 'fakeyou_contributor' WHERE username IN (
+  'endtimes',
+  'tropicalfun',
+  'zzz_last_item'
+);

_sql/actions/user_access/new_enroll.sql

@@ -0,0 +1,62 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Staff (1)
+--  * teddanson is victor's alt
+UPDATE users
+SET
+    can_access_studio = false,
+    maybe_feature_flags = 'explore_media,studio,video_style_transfer'
+WHERE username IN (
+    'bflat',
+    'brandon',
+    'crossproduct',
+    'crossproduct1',
+    'echelon',
+    'olivicmic',
+    'saltacc',
+    'teddanson',
+    'vegito1089',
+    'wilwong',
+    'zzz_last_item'
+);
+
+-- Staff (2)
+--  * el_cid_93 is for testing (who is this??)
+--  * endtimes is @sugarbro (testing)
+--  * tammieteller is Tammie (Pebblebed)
+UPDATE users
+SET
+    can_access_studio = false,
+    maybe_feature_flags = 'studio,video_style_transfer'
+WHERE username IN (
+    'el_cid_93',
+    'endtimes',
+    'fyscott',
+    'gateway',
+    'jags111',
+    'justinjohn0306',
+    'mrvintage',
+    'rewin123',
+    'tammieteller',
+    'tropicalfun',
+    'yae_ph',
+    'zzz_last_item'
+);
+
+-- Early access to VST only
+UPDATE users
+SET
+    can_access_studio = false,
+    maybe_feature_flags = 'video_style_transfer'
+WHERE username IN (
+    'kenjoplays',
+    'ofccccccc',
+    'sonicgt2',
+    'stewiegroffin',
+    'tanooki426',
+    'wawoul',
+    'zzz_last_item'
+);
+

_sql/analytics/generic_inference/top_users_image_generation.sql

@@ -0,0 +1,22 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- This finds the top users of image generation within a given time range.
+
+
+select
+    u.username,
+    u.email_address,
+    count(*) as use_count
+from users as u
+join
+(
+  select maybe_creator_user_token as user_token
+    from generic_inference_jobs
+    where job_type = 'stable_diffusion'
+      AND created_at > NOW() - INTERVAL 24 HOUR
+) as jobs
+ON jobs.user_token = u.token
+group by u.username, u.email_address
+order by use_count desc

_sql/migrations/2024-02-21-234807_prompts/down.sql

@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP TABLE prompts;

_sql/migrations/2024-02-21-234807_prompts/up.sql

@@ -0,0 +1,56 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Table to store prompts as a first class entity.
+-- Duplication of the same prompt is totally fine.
+CREATE TABLE prompts (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- ========== PRIMARY, FOREIGN KEYS, and POLYMORPHISM ==========
+
+  -- Effective "primary key" of the prompt
+  token VARCHAR(32) NOT NULL,
+
+  -- Original product to which the prompt applied.
+  -- Prompts may or may not be compatible across products.
+  -- Possible values:
+  --  * 'stable_diffusion'
+  --  * 'comfy_ui'
+  prompt_type VARCHAR(16) NOT NULL,
+
+  -- Whomever created the prompt
+  maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
+
+  -- ========== PROMPT DETAILS ==========
+
+  -- The positive prompt (optional)
+  -- TEXT = 65,535 bytes (64 KiB), ~= 4 bytes per UTF-8 character, ~ 16383 characters.
+  maybe_positive_prompt TEXT DEFAULT NULL,
+
+  -- The negative prompt (optional)
+  -- TEXT = 65,535 bytes (64 KiB), ~= 4 bytes per UTF-8 character, ~ 16383 characters.
+  maybe_negative_prompt TEXT DEFAULT NULL,
+
+  -- Polymorphic arguments payload that depends on the type of inference job.
+  -- TEXT = 65,535 bytes (64 KiB), ~= 4 bytes per UTF-8 character, ~ 16383 characters.
+  maybe_other_args TEXT DEFAULT NULL,
+
+  -- ========== ABUSE TRACKING ==========
+
+  -- For abuse tracking.
+  -- Wide enough for IPv4/6
+  creator_ip_address VARCHAR(40) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_maybe_creator_user_token (maybe_creator_user_token),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations/2024-02-21-234819_usages/down.sql

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

_sql/migrations/2024-02-21-234819_usages/up.sql

@@ -0,0 +1,46 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Usages of models and assets to create things
+-- This should work for inference as well as 3D object/scene creation,
+-- so the inputs can be models OR files.
+CREATE TABLE usages (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- ========== PRIMARY AND FOREIGN KEYS ==========
+
+  -- Type of the entity created
+  -- This only denotes which table to join against, not the type of the entity within the join table.
+  -- Possible values:
+  --  * 'model_weight'
+  --  * 'media_file'
+  --  * (maybe future types)
+  created_type VARCHAR(16) NOT NULL,
+
+  -- Token of the entity created
+  created_token VARCHAR(32) NOT NULL,
+
+  -- Type of the entity used
+  -- This only denotes which table to join against, not the type of the entity within the join table.
+  -- Possible values:
+  --  * 'model_weight'
+  --  * 'media_file'
+  --  * (maybe future types)
+  used_type VARCHAR(16) NOT NULL,
+
+  -- Token of the entity used
+  used_token VARCHAR(32) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (created_type, created_token, used_type, used_token),
+  KEY index_created_type_and_token (created_type, created_token),
+  KEY index_used_type_and_token (used_type, used_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations/2024-02-22-035926_alter_media_files_add_prompt_token/down.sql

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

_sql/migrations/2024-02-22-035926_alter_media_files_add_prompt_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files
+    ADD COLUMN maybe_prompt_token VARCHAR(32) DEFAULT NULL
+    AFTER maybe_text_transcript;
+
+ALTER TABLE media_files
+    ADD INDEX fk_maybe_prompt_token (maybe_prompt_token);

_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/down.sql

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

_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/up.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files
+    ADD COLUMN maybe_media_subtype VARCHAR(32) DEFAULT NULL
+    AFTER media_type;

_sql/migrations/2024-03-05-082026_alter_users_add_feature_flags/down.sql

@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE users DROP COLUMN maybe_feature_flags;

_sql/migrations/2024-03-05-082026_alter_users_add_feature_flags/up.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE users
+    ADD COLUMN maybe_feature_flags VARCHAR(255) DEFAULT NULL
+    AFTER user_role_slug;

_sql/migrations_squashed/media_files.sql

@@ -81,6 +81,12 @@ CREATE TABLE media_files (
   --   * 'video' for a variety of video types.
   media_type VARCHAR(16) NOT NULL,
 
+  -- A media file's possible subtype. Typically used for Storyteller Studio.
+  -- * 'mixamo' for mixamo animations (eg. for BVH, GLB, FBX, etc. files)
+  -- * 'mocap_net' for mocapnet animations (eg. for BVH files)
+  -- * 'scene' for generic scenes (eg. for BVH, GLB, FBX, etc. files)
+  maybe_media_subtype VARCHAR(32) DEFAULT NULL,
+
   -- The file's mime type.
   maybe_mime_type VARCHAR(32) DEFAULT NULL,
 
@@ -107,6 +113,9 @@ CREATE TABLE media_files (
   -- Optional text transcript for audio or video (especially TTS)
   maybe_text_transcript TEXT DEFAULT NULL,
 
+  -- Optional pointer to the prompt that generated this media file, if relevant.
+  maybe_prompt_token VARCHAR(32) DEFAULT NULL,
+
   -- Checksum of the original media
   -- SHA1 hash [SHA2 = CHAR(64), SHA1 = CHAR(40), MD5 = CHAR(32)]
   -- checksum_sha1 CHAR(40) NOT NULL,
@@ -221,6 +230,7 @@ CREATE TABLE media_files (
   KEY fk_maybe_origin_model_type_and_token (maybe_origin_model_type, maybe_origin_model_token),
   KEY index_maybe_batch_token (maybe_batch_token),
   KEY index_media_type (media_type),
+  KEY fk_maybe_prompt_token (maybe_prompt_token),
   KEY index_checksum_sha2 (checksum_sha2),
   KEY fk_maybe_creator_user_token (maybe_creator_user_token),
   KEY fk_maybe_mod_user_token (maybe_mod_user_token),

_sql/migrations_squashed/prompts.sql

@@ -0,0 +1,59 @@
+-- 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
+
+-- Table to store prompts as a first class entity.
+-- Duplication of the same prompt is totally fine.
+CREATE TABLE prompts (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- ========== PRIMARY, FOREIGN KEYS, and POLYMORPHISM ==========
+
+  -- Effective "primary key" of the prompt
+  token VARCHAR(32) NOT NULL,
+
+  -- Original product to which the prompt applied.
+  -- Prompts may or may not be compatible across products.
+  -- Possible values:
+  --  * 'stable_diffusion'
+  --  * 'comfy_ui'
+  prompt_type VARCHAR(16) NOT NULL,
+
+  -- Whomever created the prompt
+  maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
+
+  -- ========== PROMPT DETAILS ==========
+
+  -- The positive prompt (optional)
+  -- TEXT = 65,535 bytes (64 KiB), ~= 4 bytes per UTF-8 character, ~ 16383 characters.
+  maybe_positive_prompt TEXT DEFAULT NULL,
+
+  -- The negative prompt (optional)
+  -- TEXT = 65,535 bytes (64 KiB), ~= 4 bytes per UTF-8 character, ~ 16383 characters.
+  maybe_negative_prompt TEXT DEFAULT NULL,
+
+  -- Polymorphic arguments payload that depends on the type of inference job.
+  -- TEXT = 65,535 bytes (64 KiB), ~= 4 bytes per UTF-8 character, ~ 16383 characters.
+  maybe_other_args TEXT DEFAULT NULL,
+
+  -- ========== ABUSE TRACKING ==========
+
+  -- For abuse tracking.
+  -- Wide enough for IPv4/6
+  creator_ip_address VARCHAR(40) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+  KEY index_maybe_creator_user_token (maybe_creator_user_token),
+  KEY index_created_at (created_at)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/usages.sql

@@ -0,0 +1,49 @@
+-- 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
+
+-- Usages of models and assets to create things
+-- This should work for inference as well as 3D object/scene creation,
+-- so the inputs can be models OR files.
+CREATE TABLE usages (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- ========== PRIMARY AND FOREIGN KEYS ==========
+
+  -- Type of the entity created
+  -- This only denotes which table to join against, not the type of the entity within the join table.
+  -- Possible values:
+  --  * 'model_weight'
+  --  * 'media_file'
+  --  * (maybe future types)
+  created_type VARCHAR(16) NOT NULL,
+
+  -- Token of the entity created
+  created_token VARCHAR(32) NOT NULL,
+
+  -- Type of the entity used
+  -- This only denotes which table to join against, not the type of the entity within the join table.
+  -- Possible values:
+  --  * 'model_weight'
+  --  * 'media_file'
+  --  * (maybe future types)
+  used_type VARCHAR(16) NOT NULL,
+
+  -- Token of the entity used
+  used_token VARCHAR(32) NOT NULL,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (created_type, created_token, used_type, used_token),
+  KEY index_created_type_and_token (created_type, created_token),
+  KEY index_used_type_and_token (used_type, used_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/user_tables/users.sql

@@ -22,6 +22,19 @@ CREATE TABLE users (
   -- The role assigned to the user confers permissions.
   user_role_slug VARCHAR(16) NOT NULL,
 
+  -- An optional comma separated list of flags for user accounts
+  -- If a user has a flag, then they're enabled for that given feature.
+  -- There are better ways to do this, but this hack will do for now.
+  -- This should replace `can_access_studio`.
+  --
+  -- Possible flag values (multiple is okay) :
+  --   - "explore_media"
+  --   - "studio"
+  --   - "video_style_transfer"
+  maybe_feature_flags VARCHAR(255) DEFAULT NULL,
+
+  -- DEPRECATED
+  -- TODO(bt, 2024-03-05): Remove after new flags are in place.
   -- Rollout flag for Storyteller Studio
   -- Default to false until rollout is 100%, then remove the column.
   can_access_studio BOOLEAN NOT NULL DEFAULT false,

crates/_types/enums/src/by_table/media_files/media_file_origin_category.rs

@@ -26,6 +26,9 @@ pub enum MediaFileOriginCategory {
 
   /// User uploaded files recorded directly from their device (browser, mobile), typically using device APIs.
   DeviceApi,
+
+  /// From Storyteller Studio Engine
+  StoryEngine,
 }
 
 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -41,6 +44,7 @@ impl MediaFileOriginCategory {
       Self::Processed => "processed",
       Self::Upload => "upload",
       Self::DeviceApi => "device_api",
+      Self::StoryEngine => "story_engine",
     }
   }
 
@@ -50,6 +54,7 @@ impl MediaFileOriginCategory {
       "processed" => Ok(Self::Processed),
       "upload" => Ok(Self::Upload),
       "device_api" => Ok(Self::DeviceApi),
+      "story_engine" => Ok(Self::StoryEngine),
       _ => Err(format!("invalid value: {:?}", value)),
     }
   }
@@ -62,6 +67,7 @@ impl MediaFileOriginCategory {
       Self::Processed,
       Self::Upload,
       Self::DeviceApi,
+      Self::StoryEngine,
     ])
   }
 }
@@ -80,6 +86,7 @@ mod tests {
       assert_serialization(MediaFileOriginCategory::Processed, "processed");
       assert_serialization(MediaFileOriginCategory::Upload, "upload");
       assert_serialization(MediaFileOriginCategory::DeviceApi, "device_api");
+      assert_serialization(MediaFileOriginCategory::StoryEngine, "story_engine");
     }
 
     #[test]
@@ -88,6 +95,7 @@ mod tests {
       assert_eq!(MediaFileOriginCategory::Processed.to_str(), "processed");
       assert_eq!(MediaFileOriginCategory::Upload.to_str(), "upload");
       assert_eq!(MediaFileOriginCategory::DeviceApi.to_str(), "device_api");
+      assert_eq!(MediaFileOriginCategory::StoryEngine.to_str(), "story_engine");
     }
 
     #[test]
@@ -96,17 +104,19 @@ mod tests {
       assert_eq!(MediaFileOriginCategory::from_str("processed").unwrap(), MediaFileOriginCategory::Processed);
       assert_eq!(MediaFileOriginCategory::from_str("upload").unwrap(), MediaFileOriginCategory::Upload);
       assert_eq!(MediaFileOriginCategory::from_str("device_api").unwrap(), MediaFileOriginCategory::DeviceApi);
+      assert_eq!(MediaFileOriginCategory::from_str("story_engine").unwrap(), MediaFileOriginCategory::StoryEngine);
       assert!(MediaFileOriginCategory::from_str("foo").is_err());
     }
 
     #[test]
     fn all_variants() {
       let mut variants = MediaFileOriginCategory::all_variants();
-      assert_eq!(variants.len(), 4);
+      assert_eq!(variants.len(), 5);
       assert_eq!(variants.pop_first(), Some(MediaFileOriginCategory::Inference));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginCategory::Processed));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginCategory::Upload));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginCategory::DeviceApi));
+      assert_eq!(variants.pop_first(), Some(MediaFileOriginCategory::StoryEngine));
       assert_eq!(variants.pop_first(), None);
     }
   }
@@ -128,5 +138,15 @@ mod tests {
         assert_eq!(variant, MediaFileOriginCategory::from_str(&format!("{:?}", variant)).unwrap());
       }
     }
+
+    #[test]
+    fn serialized_length_ok_for_database() {
+      const MAX_LENGTH : usize = 16;
+      for variant in MediaFileOriginCategory::all_variants() {
+        let serialized = variant.to_str();
+        assert!(serialized.len() > 0, "variant {:?} is too short", variant);
+        assert!(serialized.len() <= MAX_LENGTH, "variant {:?} is too long", variant);
+      }
+    }
   }
 }

crates/_types/enums/src/by_table/media_files/media_file_subtype.rs

@@ -0,0 +1,135 @@
+use std::collections::BTreeSet;
+
+use serde::Deserialize;
+use serde::Serialize;
+#[cfg(test)]
+use strum::EnumCount;
+#[cfg(test)]
+use strum::EnumIter;
+use utoipa::ToSchema;
+
+/// Used in the `media_files` table in a `VARCHAR` field.
+///
+/// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
+#[cfg_attr(test, derive(EnumIter, EnumCount))]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum MediaFileSubtype {
+  /// Animation file from Mixamo
+  /// Primarily used for FBX and GLB.
+  Mixamo,
+
+  /// Animation file from MocapNet
+  /// Primarily used for BVH.
+  MocapNet,
+
+  /// Generic 3D scene file.
+  /// Can pertain to BVH, GLB, FBX, etc.
+  Scene,
+}
+
+// TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
+impl_enum_display_and_debug_using_to_str!(MediaFileSubtype);
+impl_mysql_enum_coders!(MediaFileSubtype);
+impl_mysql_from_row!(MediaFileSubtype);
+
+/// NB: Legacy API for older code.
+impl MediaFileSubtype {
+  pub fn to_str(&self) -> &'static str {
+    match self {
+      Self::Mixamo => "mixamo",
+      Self::Scene => "scene",
+      Self::MocapNet => "mocap_net",
+    }
+  }
+
+  pub fn from_str(value: &str) -> Result<Self, String> {
+    match value {
+      "mixamo" => Ok(Self::Mixamo),
+      "mocap_net" => Ok(Self::MocapNet),
+      "scene" => Ok(Self::Scene),
+      _ => Err(format!("invalid value: {:?}", value)),
+    }
+  }
+
+  pub fn all_variants() -> BTreeSet<Self> {
+    // NB: BTreeSet is sorted
+    // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
+    BTreeSet::from([
+      Self::Mixamo,
+      Self::MocapNet,
+      Self::Scene,
+    ])
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::by_table::media_files::media_file_subtype::MediaFileSubtype;
+  use crate::test_helpers::assert_serialization;
+
+  mod explicit_checks {
+    use super::*;
+
+    #[test]
+    fn test_serialization() {
+      assert_serialization(MediaFileSubtype::Mixamo, "mixamo");
+      assert_serialization(MediaFileSubtype::MocapNet, "mocap_net");
+      assert_serialization(MediaFileSubtype::Scene, "scene");
+    }
+
+    #[test]
+    fn test_to_str() {
+      assert_eq!(MediaFileSubtype::Mixamo.to_str(), "mixamo");
+      assert_eq!(MediaFileSubtype::MocapNet.to_str(), "mocap_net");
+      assert_eq!(MediaFileSubtype::Scene.to_str(), "scene");
+    }
+
+    #[test]
+    fn test_from_str() {
+      assert_eq!(MediaFileSubtype::from_str("mixamo").unwrap(), MediaFileSubtype::Mixamo);
+      assert_eq!(MediaFileSubtype::from_str("mocap_net").unwrap(), MediaFileSubtype::MocapNet);
+      assert_eq!(MediaFileSubtype::from_str("scene").unwrap(), MediaFileSubtype::Scene);
+      assert!(MediaFileSubtype::from_str("foo").is_err());
+    }
+
+    #[test]
+    fn all_variants() {
+      let mut variants = MediaFileSubtype::all_variants();
+      assert_eq!(variants.len(), 3);
+      assert_eq!(variants.pop_first(), Some(MediaFileSubtype::Mixamo));
+      assert_eq!(variants.pop_first(), Some(MediaFileSubtype::MocapNet));
+      assert_eq!(variants.pop_first(), Some(MediaFileSubtype::Scene));
+      assert_eq!(variants.pop_first(), None);
+    }
+  }
+
+  mod mechanical_checks {
+    use super::*;
+
+    #[test]
+    fn variant_length() {
+      use strum::IntoEnumIterator;
+      assert_eq!(MediaFileSubtype::all_variants().len(), MediaFileSubtype::iter().len());
+    }
+
+    #[test]
+    fn round_trip() {
+      for variant in MediaFileSubtype::all_variants() {
+        assert_eq!(variant, MediaFileSubtype::from_str(variant.to_str()).unwrap());
+        assert_eq!(variant, MediaFileSubtype::from_str(&format!("{}", variant)).unwrap());
+        assert_eq!(variant, MediaFileSubtype::from_str(&format!("{:?}", variant)).unwrap());
+      }
+    }
+
+    #[test]
+    fn serialized_length_ok_for_database() {
+      const MAX_LENGTH : usize = 32;
+      for variant in MediaFileSubtype::all_variants() {
+        let serialized = variant.to_str();
+        assert!(serialized.len() > 0, "variant {:?} is too short", variant);
+        assert!(serialized.len() <= MAX_LENGTH, "variant {:?} is too long", variant);
+      }
+    }
+  }
+}

crates/_types/enums/src/by_table/media_files/media_file_type.rs

@@ -10,8 +10,8 @@ use utoipa::ToSchema;
 ///
 /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
-#[serde(rename_all = "lowercase")]
+#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash, Deserialize, Serialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
 pub enum MediaFileType {
   /// Audio files: wav, mp3, etc.
   Audio,
@@ -39,6 +39,10 @@ pub enum MediaFileType {
 
   /// glTF files (for Bevy)
   Gltf,
+
+  /// Bevy's scene files (in RON; Rusty Object Notation)
+  /// This will be replaced with another format in future versions of Bevy
+  SceneRon,
 }
 
 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -58,6 +62,7 @@ impl MediaFileType {
       Self::Fbx => "fbx",
       Self::Glb => "glb",
       Self::Gltf => "gltf",
+      Self::SceneRon => "scene_ron",
     }
   }
 
@@ -71,6 +76,7 @@ impl MediaFileType {
       "fbx" => Ok(Self::Fbx),
       "glb" => Ok(Self::Glb),
       "gltf" => Ok(Self::Gltf),
+      "scene_ron" => Ok(Self::SceneRon),
       _ => Err(format!("invalid value: {:?}", value)),
     }
   }
@@ -87,6 +93,7 @@ impl MediaFileType {
       Self::Fbx,
       Self::Glb,
       Self::Gltf,
+      Self::SceneRon,
     ])
   }
 }
@@ -109,6 +116,7 @@ mod tests {
       assert_serialization(MediaFileType::Fbx, "fbx");
       assert_serialization(MediaFileType::Glb, "glb");
       assert_serialization(MediaFileType::Gltf, "gltf");
+      assert_serialization(MediaFileType::SceneRon, "scene_ron");
     }
   }
 
@@ -120,10 +128,12 @@ mod tests {
       assert_eq!(MediaFileType::Audio.to_str(), "audio");
       assert_eq!(MediaFileType::Image.to_str(), "image");
       assert_eq!(MediaFileType::Video.to_str(), "video");
+      assert_eq!(MediaFileType::Mocap.to_str(), "mocap");
       assert_eq!(MediaFileType::Bvh.to_str(), "bvh");
       assert_eq!(MediaFileType::Fbx.to_str(), "fbx");
       assert_eq!(MediaFileType::Glb.to_str(), "glb");
       assert_eq!(MediaFileType::Gltf.to_str(), "gltf");
+      assert_eq!(MediaFileType::SceneRon.to_str(), "scene_ron");
     }
 
     #[test]
@@ -136,6 +146,7 @@ mod tests {
       assert_eq!(MediaFileType::from_str("fbx").unwrap(), MediaFileType::Fbx);
       assert_eq!(MediaFileType::from_str("glb").unwrap(), MediaFileType::Glb);
       assert_eq!(MediaFileType::from_str("gltf").unwrap(), MediaFileType::Gltf);
+      assert_eq!(MediaFileType::from_str("scene_ron").unwrap(), MediaFileType::SceneRon);
       assert!(MediaFileType::from_str("foo").is_err());
     }
   }
@@ -146,7 +157,7 @@ mod tests {
     #[test]
     fn all_variants() {
       let mut variants = MediaFileType::all_variants();
-      assert_eq!(variants.len(), 8);
+      assert_eq!(variants.len(), 9);
       assert_eq!(variants.pop_first(), Some(MediaFileType::Audio));
       assert_eq!(variants.pop_first(), Some(MediaFileType::Image));
       assert_eq!(variants.pop_first(), Some(MediaFileType::Video));
@@ -155,6 +166,7 @@ mod tests {
       assert_eq!(variants.pop_first(), Some(MediaFileType::Fbx));
       assert_eq!(variants.pop_first(), Some(MediaFileType::Glb));
       assert_eq!(variants.pop_first(), Some(MediaFileType::Gltf));
+      assert_eq!(variants.pop_first(), Some(MediaFileType::SceneRon));
       assert_eq!(variants.pop_first(), None);
     }
   }

crates/_types/enums/src/by_table/media_files/mod.rs

@@ -1,4 +1,5 @@
 pub mod media_file_origin_category;
 pub mod media_file_origin_model_type;
 pub mod media_file_origin_product_category;
+pub mod media_file_subtype;
 pub mod media_file_type;

crates/_types/enums/src/by_table/mod.rs

@@ -11,10 +11,13 @@ pub mod media_files;
 pub mod media_uploads;
 pub mod model_categories;
 pub mod model_weights;
+pub mod prompts;
 pub mod trending_model_analytics;
 pub mod tts_models;
+pub mod usages;
 pub mod user_bookmarks;
 pub mod user_ratings;
+pub mod users;
 pub mod voice_conversion_models;
 pub mod voice_conversion_results;
 pub mod zs_voices;

crates/_types/enums/src/by_table/prompts/mod.rs

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

crates/_types/enums/src/by_table/prompts/prompt_type.rs

@@ -0,0 +1,128 @@
+use std::collections::BTreeSet;
+
+#[cfg(test)]
+use strum::EnumCount;
+#[cfg(test)]
+use strum::EnumIter;
+use utoipa::ToSchema;
+
+/// Used in the `prompts` table in a `VARCHAR(16)` field.
+///
+/// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
+#[cfg_attr(test, derive(EnumIter, EnumCount))]
+#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum PromptType {
+  /// Stable diffusion
+  StableDiffusion,
+
+  /// Comfy UI
+  ComfyUi,
+}
+
+// TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
+impl_enum_display_and_debug_using_to_str!(PromptType);
+impl_mysql_enum_coders!(PromptType);
+impl_mysql_from_row!(PromptType);
+
+/// NB: Legacy API for older code.
+impl PromptType {
+  pub fn to_str(&self) -> &'static str {
+    match self {
+      Self::StableDiffusion => "stable_diffusion",
+      Self::ComfyUi => "comfy_ui",
+    }
+  }
+
+  pub fn from_str(value: &str) -> Result<Self, String> {
+    match value {
+      "stable_diffusion" => Ok(Self::StableDiffusion),
+      "comfy_ui" => Ok(Self::ComfyUi),
+      _ => Err(format!("invalid value: {:?}", value)),
+    }
+  }
+
+  pub fn all_variants() -> BTreeSet<Self> {
+    // NB: BTreeSet is sorted
+    // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
+    BTreeSet::from([
+      Self::StableDiffusion,
+      Self::ComfyUi,
+    ])
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::by_table::prompts::prompt_type::PromptType;
+  use crate::test_helpers::assert_serialization;
+
+  mod serde {
+    use super::*;
+
+    #[test]
+    fn test_serialization() {
+      assert_serialization(PromptType::StableDiffusion, "stable_diffusion");
+      assert_serialization(PromptType::ComfyUi, "comfy_ui");
+    }
+  }
+
+  mod impl_methods {
+    use super::*;
+
+    #[test]
+    fn to_str() {
+      assert_eq!(PromptType::StableDiffusion.to_str(), "stable_diffusion");
+      assert_eq!(PromptType::ComfyUi.to_str(), "comfy_ui");
+    }
+
+    #[test]
+    fn from_str() {
+      assert_eq!(PromptType::from_str("stable_diffusion").unwrap(), PromptType::StableDiffusion);
+      assert_eq!(PromptType::from_str("comfy_ui").unwrap(), PromptType::ComfyUi);
+      assert!(PromptType::from_str("foo").is_err());
+    }
+  }
+
+  mod manual_variant_checks {
+    use super::*;
+
+    #[test]
+    fn all_variants() {
+      let mut variants = PromptType::all_variants();
+      assert_eq!(variants.len(), 2);
+      assert_eq!(variants.pop_first(), Some(PromptType::StableDiffusion));
+      assert_eq!(variants.pop_first(), Some(PromptType::ComfyUi));
+      assert_eq!(variants.pop_first(), None);
+    }
+  }
+
+  mod mechanical_checks {
+    use super::*;
+
+    #[test]
+    fn variant_length() {
+      use strum::IntoEnumIterator;
+      assert_eq!(PromptType::all_variants().len(), PromptType::iter().len());
+    }
+
+    #[test]
+    fn round_trip() {
+      for variant in PromptType::all_variants() {
+        assert_eq!(variant, PromptType::from_str(variant.to_str()).unwrap());
+        assert_eq!(variant, PromptType::from_str(&format!("{}", variant)).unwrap());
+        assert_eq!(variant, PromptType::from_str(&format!("{:?}", variant)).unwrap());
+      }
+    }
+
+    #[test]
+    fn serialized_length_ok_for_database() {
+      const MAX_LENGTH : usize = 16;
+      for variant in PromptType::all_variants() {
+        let serialized = variant.to_str();
+        assert!(serialized.len() > 0, "variant {:?} is too short", variant);
+        assert!(serialized.len() <= MAX_LENGTH, "variant {:?} is too long", variant);
+      }
+    }
+  }
+}

crates/_types/enums/src/by_table/usages/mod.rs

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

crates/_types/enums/src/by_table/usages/usages_type.rs

@@ -0,0 +1,128 @@
+use std::collections::BTreeSet;
+
+#[cfg(test)]
+use strum::EnumCount;
+#[cfg(test)]
+use strum::EnumIter;
+use utoipa::ToSchema;
+
+/// Used in the `usages` table in a `VARCHAR(16)` field. (Two fields!)
+///
+/// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
+#[cfg_attr(test, derive(EnumIter, EnumCount))]
+#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum UsagesType {
+  /// Represents a foreign key link against a model_weights record
+  ModelWeight,
+
+  /// Represents a foreign key link against a media_files record
+  MediaFile,
+}
+
+// TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
+impl_enum_display_and_debug_using_to_str!(UsagesType);
+impl_mysql_enum_coders!(UsagesType);
+impl_mysql_from_row!(UsagesType);
+
+/// NB: Legacy API for older code.
+impl UsagesType {
+  pub fn to_str(&self) -> &'static str {
+    match self {
+      Self::ModelWeight => "model_weight",
+      Self::MediaFile => "media_file",
+    }
+  }
+
+  pub fn from_str(value: &str) -> Result<Self, String> {
+    match value {
+      "model_weight" => Ok(Self::ModelWeight),
+      "media_file" => Ok(Self::MediaFile),
+      _ => Err(format!("invalid value: {:?}", value)),
+    }
+  }
+
+  pub fn all_variants() -> BTreeSet<Self> {
+    // NB: BTreeSet is sorted
+    // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
+    BTreeSet::from([
+      Self::ModelWeight,
+      Self::MediaFile,
+    ])
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::by_table::usages::usages_type::UsagesType;
+  use crate::test_helpers::assert_serialization;
+
+  mod serde {
+    use super::*;
+
+    #[test]
+    fn test_serialization() {
+      assert_serialization(UsagesType::ModelWeight, "model_weight");
+      assert_serialization(UsagesType::MediaFile, "media_file");
+    }
+  }
+
+  mod impl_methods {
+    use super::*;
+
+    #[test]
+    fn to_str() {
+      assert_eq!(UsagesType::ModelWeight.to_str(), "model_weight");
+      assert_eq!(UsagesType::MediaFile.to_str(), "media_file");
+    }
+
+    #[test]
+    fn from_str() {
+      assert_eq!(UsagesType::from_str("model_weight").unwrap(), UsagesType::ModelWeight);
+      assert_eq!(UsagesType::from_str("media_file").unwrap(), UsagesType::MediaFile);
+      assert!(UsagesType::from_str("foo").is_err());
+    }
+  }
+
+  mod manual_variant_checks {
+    use super::*;
+
+    #[test]
+    fn all_variants() {
+      let mut variants = UsagesType::all_variants();
+      assert_eq!(variants.len(), 2);
+      assert_eq!(variants.pop_first(), Some(UsagesType::ModelWeight));
+      assert_eq!(variants.pop_first(), Some(UsagesType::MediaFile));
+      assert_eq!(variants.pop_first(), None);
+    }
+  }
+
+  mod mechanical_checks {
+    use super::*;
+
+    #[test]
+    fn variant_length() {
+      use strum::IntoEnumIterator;
+      assert_eq!(UsagesType::all_variants().len(), UsagesType::iter().len());
+    }
+
+    #[test]
+    fn round_trip() {
+      for variant in UsagesType::all_variants() {
+        assert_eq!(variant, UsagesType::from_str(variant.to_str()).unwrap());
+        assert_eq!(variant, UsagesType::from_str(&format!("{}", variant)).unwrap());
+        assert_eq!(variant, UsagesType::from_str(&format!("{:?}", variant)).unwrap());
+      }
+    }
+
+    #[test]
+    fn serialized_length_ok_for_database() {
+      const MAX_LENGTH : usize = 16;
+      for variant in UsagesType::all_variants() {
+        let serialized = variant.to_str();
+        assert!(serialized.len() > 0, "variant {:?} is too short", variant);
+        assert!(serialized.len() <= MAX_LENGTH, "variant {:?} is too long", variant);
+      }
+    }
+  }
+}

crates/_types/enums/src/by_table/users/mod.rs

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

crates/_types/enums/src/by_table/users/user_feature_flag.rs

@@ -0,0 +1,133 @@
+use std::collections::BTreeSet;
+
+use serde::Deserialize;
+use serde::Serialize;
+#[cfg(test)]
+use strum::EnumCount;
+#[cfg(test)]
+use strum::EnumIter;
+use utoipa::ToSchema;
+
+/// Used in the `users` table in a `VARCHAR` field (stored as comma separated set).
+///
+/// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
+#[cfg_attr(test, derive(EnumIter, EnumCount))]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum UserFeatureFlag {
+  /// Grants a user the ability to list media
+  /// (For now, it's hidden until we get an NSFW filter.)
+  ExploreMedia,
+
+  /// Access to studio features
+  Studio,
+
+  /// Access to video style transfer
+  VideoStyleTransfer,
+}
+
+// TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
+impl_enum_display_and_debug_using_to_str!(UserFeatureFlag);
+impl_mysql_enum_coders!(UserFeatureFlag);
+impl_mysql_from_row!(UserFeatureFlag);
+
+/// NB: Legacy API for older code.
+impl UserFeatureFlag {
+  pub fn to_str(&self) -> &'static str {
+    match self {
+      Self::ExploreMedia => "explore_media",
+      Self::Studio => "studio",
+      Self::VideoStyleTransfer => "video_style_transfer",
+    }
+  }
+
+  pub fn from_str(value: &str) -> Result<Self, String> {
+    match value {
+      "explore_media" => Ok(Self::ExploreMedia),
+      "studio" => Ok(Self::Studio),
+      "video_style_transfer" => Ok(Self::VideoStyleTransfer),
+      _ => Err(format!("invalid value: {:?}", value)),
+    }
+  }
+
+  pub fn all_variants() -> BTreeSet<Self> {
+    // NB: BTreeSet is sorted
+    // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
+    BTreeSet::from([
+      Self::ExploreMedia,
+      Self::Studio,
+      Self::VideoStyleTransfer,
+    ])
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::test_helpers::assert_serialization;
+  use crate::by_table::users::user_feature_flag::UserFeatureFlag;
+
+  mod explicit_checks {
+    use super::*;
+
+    #[test]
+    fn test_serialization() {
+      assert_serialization(UserFeatureFlag::ExploreMedia, "explore_media");
+      assert_serialization(UserFeatureFlag::Studio, "studio");
+      assert_serialization(UserFeatureFlag::VideoStyleTransfer, "video_style_transfer");
+    }
+
+    #[test]
+    fn test_to_str() {
+      assert_eq!(UserFeatureFlag::ExploreMedia.to_str(), "explore_media");
+      assert_eq!(UserFeatureFlag::Studio.to_str(), "studio");
+      assert_eq!(UserFeatureFlag::VideoStyleTransfer.to_str(), "video_style_transfer");
+    }
+
+    #[test]
+    fn test_from_str() {
+      assert_eq!(UserFeatureFlag::from_str("explore_media").unwrap(), UserFeatureFlag::ExploreMedia);
+      assert_eq!(UserFeatureFlag::from_str("studio").unwrap(), UserFeatureFlag::Studio);
+      assert_eq!(UserFeatureFlag::from_str("video_style_transfer").unwrap(), UserFeatureFlag::VideoStyleTransfer);
+      assert!(UserFeatureFlag::from_str("foo").is_err());
+    }
+
+    #[test]
+    fn all_variants() {
+      let mut variants = UserFeatureFlag::all_variants();
+      assert_eq!(variants.len(), 3);
+      assert_eq!(variants.pop_first(), Some(UserFeatureFlag::ExploreMedia));
+      assert_eq!(variants.pop_first(), Some(UserFeatureFlag::Studio));
+      assert_eq!(variants.pop_first(), Some(UserFeatureFlag::VideoStyleTransfer));
+      assert_eq!(variants.pop_first(), None);
+    }
+  }
+
+  mod mechanical_checks {
+    use super::*;
+
+    #[test]
+    fn variant_length() {
+      use strum::IntoEnumIterator;
+      assert_eq!(UserFeatureFlag::all_variants().len(), UserFeatureFlag::iter().len());
+    }
+
+    #[test]
+    fn round_trip() {
+      for variant in UserFeatureFlag::all_variants() {
+        assert_eq!(variant, UserFeatureFlag::from_str(variant.to_str()).unwrap());
+        assert_eq!(variant, UserFeatureFlag::from_str(&format!("{}", variant)).unwrap());
+        assert_eq!(variant, UserFeatureFlag::from_str(&format!("{:?}", variant)).unwrap());
+      }
+    }
+
+    #[test]
+    fn serialized_length_ok_for_database() {
+      const MAX_LENGTH : usize = 32;
+      for variant in UserFeatureFlag::all_variants() {
+        let serialized = variant.to_str();
+        assert!(serialized.len() > 0, "variant {:?} is too short", variant);
+        assert!(serialized.len() <= MAX_LENGTH, "variant {:?} is too long", variant);
+      }
+    }
+  }
+}

crates/_types/tokens/src/prefixes.rs

@@ -34,6 +34,7 @@ pub(crate) enum TokenPrefix {
   ModelWeight,
   NewsStory, // NB: aichatbot / sqlite
   PasswordReset,
+  Prompt,
   TtsRenderTask, // NB: aichatbot / sqlite
   User,
   UserBookmark,
@@ -101,6 +102,7 @@ impl PrefixGenerator for TokenPrefix {
       Self::ModelWeight => "weight_",
       Self::NewsStory => "news_story_",
       Self::PasswordReset => "pw_reset_",
+      Self::Prompt => "prompt_",
       Self::TtsRenderTask => "tts_task_",
       Self::User => "user_", // NB: Previously "U:"
       Self::UserBookmark => "ub_",

crates/_types/tokens/src/tokens/media_files.rs

@@ -6,7 +6,7 @@ use utoipa::ToSchema;
 
 use crate::prefixes::TokenPrefix;
 
-/// The primary key for Audit Logs.
+/// The primary key for Media Files
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize, ToSchema)]
 #[sqlx(transparent)]
 pub struct MediaFileToken(pub String);

crates/_types/tokens/src/tokens/mod.rs

@@ -13,6 +13,7 @@ pub mod media_uploads;
 pub mod model_categories;
 pub mod model_weights;
 pub mod password_reset;
+pub mod prompts;
 pub mod sqlite;
 pub mod tts_inference_jobs;
 pub mod tts_model_upload_jobs;

crates/_types/tokens/src/tokens/prompts.rs

@@ -0,0 +1,15 @@
+use std::fmt::Debug;
+
+use serde::Deserialize;
+use serde::Serialize;
+use utoipa::ToSchema;
+
+use crate::prefixes::TokenPrefix;
+
+/// The primary key for Prompts
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize, ToSchema)]
+#[sqlx(transparent)]
+pub struct PromptToken(pub String);
+
+impl_string_token!(PromptToken);
+impl_crockford_generator!(PromptToken, 32usize, TokenPrefix::Prompt, CrockfordLower);

crates/cli/database-cleanup/Cargo.toml

@@ -1,33 +0,0 @@
-[package]
-name = "database-cleanup"
-publish = false
-edition = "2018"
-version = "0.0.1"
-authors = [
-    "Brandon Thomas <bt@brand.io>",
-    "Brandon Thomas <echelon@gmail.com>",
-]
-
-[[bin]]
-name = "database-cleanup"
-path = "src/main.rs"
-
-[dependencies]
-
-# Internal
-container_common = { path = "../../lib/deprecated/container_common" }
-easyenv = { path = "../../lib/easyenv" }
-
-# Workspace hack (faster compile times)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
-
-# External
-anyhow = "1.0.75"
-# TODO/NB: Commenting out clap4 as it prevents windows builds
-# clap4 = { package = "clap", version = "4.0" } # TODO/NB: We're using an older version of clap elsewhere, hence the naming.
-dotenv = "0.15.0"
-log = "0.4.14"
-
-# Serialization
-serde = "1.0.125"
-serde_derive = "1.0.125"

crates/cli/database-cleanup/src/main.rs

@@ -1,12 +0,0 @@
-use easyenv::init_all_with_default_logging;
-use log::info;
-
-use container_common::anyhow_result::AnyhowResult;
-
-fn main() -> AnyhowResult<()> {
-  init_all_with_default_logging(None);
-
-  info!("TODO...");
-
-  Ok(())
-}

crates/cli/dev-database-seed/Cargo.toml

@@ -1,47 +0,0 @@
-[package]
-name = "dev-database-seed"
-edition = "2018"
-version = "0.0.1"
-authors = [
-    "Brandon Thomas <bt@brand.io>",
-    "Brandon Thomas <echelon@gmail.com>",
-]
-publish = false
-
-[[bin]]
-name = "dev-database-seed"
-path = "src/main.rs"
-
-[dependencies]
-# Internal
-buckets = { path = "../../_types/buckets" }
-cloud_storage = { path = "../../lib/api_clients/cloud_storage" }
-config = { path = "../../lib/deprecated/config" }
-easyenv = { path = "../../lib/easyenv" }
-enums = { path = "../../_types/enums" }
-errors = { path = "../../lib/errors" }
-filesys = { path = "../../lib/files/filesys" }
-hashing = { path = "../../lib/files/hashing" }
-idempotency = { path = "../../lib/idempotency" }
-mimetypes = { path = "../../lib/files/mimetypes" }
-mysql_queries = { path = "../../lib/mysql_queries" }
-storyteller_root = { path = "../../lib/storyteller_root" }
-tokens = { path = "../../_types/tokens" }
-
-# Workspace hack (faster compile times)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
-
-# External
-log = "0.4.14"
-clap = "4.4.8"
-rand = "0.8.5" 
-# Runtime
-# NB: We switched to Tokio from `async-std` for broader ecosystem support.
-tokio = { version = "1.34.0", features = ["macros"] }
-
-sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
-
-elasticsearch = "8.5.0-alpha.1"
-
-[dev-dependencies]
-# None yet

crates/cli/devenv/dev-database-seed/Cargo.toml

@@ -0,0 +1,47 @@
+[package]
+name = "dev-database-seed"
+edition = "2018"
+version = "0.0.1"
+authors = [
+    "Brandon Thomas <bt@brand.io>",
+    "Brandon Thomas <echelon@gmail.com>",
+]
+publish = false
+
+[[bin]]
+name = "dev-database-seed"
+path = "src/main.rs"
+
+[dependencies]
+# Internal
+buckets = { path = "../../../_types/buckets" }
+cloud_storage = { path = "../../../lib/api_clients/cloud_storage" }
+config = { path = "../../../lib/deprecated/config" }
+easyenv = { path = "../../../lib/easyenv" }
+enums = { path = "../../../_types/enums" }
+errors = { path = "../../../lib/errors" }
+filesys = { path = "../../../lib/files/filesys" }
+hashing = { path = "../../../lib/files/hashing" }
+idempotency = { path = "../../../lib/idempotency" }
+mimetypes = { path = "../../../lib/files/mimetypes" }
+mysql_queries = { path = "../../../lib/mysql_queries" }
+storyteller_root = { path = "../../../lib/storyteller_root" }
+tokens = { path = "../../../_types/tokens" }
+
+# Workspace hack (faster compile times)
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+
+# External
+log = "0.4.14"
+clap = "4.4.8"
+rand = "0.8.5" 
+# Runtime
+# NB: We switched to Tokio from `async-std` for broader ecosystem support.
+tokio = { version = "1.34.0", features = ["macros"] }
+
+sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
+
+elasticsearch = "8.5.0-alpha.1"
+
+[dev-dependencies]
+# None yet

crates/cli/devenv/dev-upload-media-file/Cargo.toml

@@ -14,19 +14,19 @@ path = "src/main.rs"
 
 [dependencies]
 # Internal
-buckets = { path = "../../_types/buckets" }
-cloud_storage = { path = "../../lib/api_clients/cloud_storage" }
-config = { path = "../../lib/deprecated/config" }
-easyenv = { path = "../../lib/easyenv" }
-enums = { path = "../../_types/enums" }
-errors = { path = "../../lib/errors" }
-filesys = { path = "../../lib/files/filesys" }
-mimetypes = { path = "../../lib/files/mimetypes" }
-mysql_queries = { path = "../../lib/mysql_queries" }
-tokens = { path = "../../_types/tokens" }
+buckets = { path = "../../../_types/buckets" }
+cloud_storage = { path = "../../../lib/api_clients/cloud_storage" }
+config = { path = "../../../lib/deprecated/config" }
+easyenv = { path = "../../../lib/easyenv" }
+enums = { path = "../../../_types/enums" }
+errors = { path = "../../../lib/errors" }
+filesys = { path = "../../../lib/files/filesys" }
+mimetypes = { path = "../../../lib/files/mimetypes" }
+mysql_queries = { path = "../../../lib/mysql_queries" }
+tokens = { path = "../../../_types/tokens" }
 
 # Workspace hack (faster compile times)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 # External
 clap = "4.4.8"

crates/cli/devenv/scrape-test/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "scrape_test"
+name = "scrape-test"
 publish = false
 edition = "2021"
 version = "0.0.1"
@@ -9,17 +9,17 @@ authors = [
 ]
 
 [[bin]]
-name = "scrape_test"
+name = "scrape-test"
 path = "src/main.rs"
 
 [dependencies]
 
 # Internal
-errors = { path = "../../lib/errors" }
-web_scrapers = { path = "../../lib/web_scrapers" }
+errors = { path = "../../../lib/errors" }
+web_scrapers = { path = "../../../lib/web_scrapers" }
 
 # Workspace hack (faster compile times)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 # External
 clap = "4.4.8"

crates/cli/devenv/scrape-test/src/main.rs

@@ -4,7 +4,7 @@ use errors::AnyhowResult;
 use web_scrapers::scrape_supported_webpage::scrape_supported_webpage;
 
 #[derive(Parser, Debug)]
-#[command(name = "scrape_test")]
+#[command(name = "scrape-test")]
 pub struct Args {
   #[arg(name="url", short='u', long = "url", help = "URL of the page to scrape", required = true)]
   url: String,

crates/cli/production/db-backup/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "database-backup"
+name = "db-backup"
 publish = false
 edition = "2018"
 version = "0.0.1"
@@ -9,17 +9,17 @@ authors = [
 ]
 
 [[bin]]
-name = "database-backup"
+name = "db-backup"
 path = "src/main.rs"
 
 [dependencies]
 
 # Internal
-container_common = { path = "../../lib/deprecated/container_common" }
-easyenv = { path = "../../lib/easyenv" }
+container_common = { path = "../../../lib/deprecated/container_common" }
+easyenv = { path = "../../../lib/easyenv" }
 
 # Workspace hack (faster compile times)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 # External
 anyhow = "1.0.75"

crates/cli/production/db-cleanup/Cargo.toml

@@ -0,0 +1,44 @@
+[package]
+name = "db-cleanup"
+publish = false
+edition = "2018"
+version = "0.0.1"
+authors = [
+    "Brandon Thomas <bt@brand.io>",
+    "Brandon Thomas <echelon@gmail.com>",
+]
+
+[[bin]]
+name = "db-cleanup"
+path = "src/main.rs"
+
+[dependencies]
+# Internal
+buckets = { path = "../../../_types/buckets" }
+container_common = { path = "../../../lib/deprecated/container_common" }
+easyenv = { path = "../../../lib/easyenv" }
+enums = { path = "../../../_types/enums" }
+errors = { path = "../../../lib/errors" }
+mysql_queries = { path = "../../../lib/mysql_queries" }
+storyteller_root = { path = "../../../lib/storyteller_root" }
+tokens = { path = "../../../_types/tokens" }
+
+# Workspace hack (faster compile times)
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+
+# External
+clap = "4.4.8"
+dotenv = "0.15.0"
+log = "0.4.14"
+
+# Bigger pieces
+tokio = { version = "1.34.0", features = ["macros"] }
+sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
+
+# Serialization
+serde = "1.0.125"
+serde_derive = "1.0.125"
+serde_json = "1.0.108"
+
+[dev-dependencies]
+# None yet

crates/cli/production/db-cleanup/src/cli_args.rs

@@ -0,0 +1,37 @@
+use clap::{Parser, ValueEnum};
+use serde_derive::Deserialize;
+
+use errors::AnyhowResult;
+
+#[derive(Parser, Debug, Deserialize)]
+#[command(name="db-cleanup")]
+#[serde(rename_all = "snake_case")]
+pub struct Args {
+  // The primary action to take
+  #[arg(name="action", long="action", help="the primary action to take", required=true)]
+  pub action: Action,
+
+  // Optional username for some actions
+  #[arg(name="username", long="username", help="optional username", required=false)]
+  pub username: Option<String>,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, ValueEnum)]
+#[serde(rename_all = "snake_case")]
+pub enum Action {
+  /// Delete all anonymous user images.
+  DeleteAllAnonymousUserImages,
+
+  /// Delete files for a particular user.
+  DeleteUserFiles,
+}
+
+pub fn parse_cli_args() -> AnyhowResult<Args> {
+  let mut args = Args::parse();
+
+  if let Some(username) = args.username.as_deref() {
+    args.username = Some(username.trim().to_string());
+  }
+
+  Ok(args)
+}

crates/cli/production/db-cleanup/src/main.rs

@@ -0,0 +1,70 @@
+use log::info;
+use sqlx::{MySql, Pool};
+use sqlx::mysql::MySqlPoolOptions;
+
+use container_common::anyhow_result::AnyhowResult;
+use easyenv::init_all_with_default_logging;
+
+use crate::cli_args::Action;
+use crate::operations::delete_all_anonymous_user_images::delete_all_anonymous_user_images::delete_all_anonymous_user_images;
+use crate::operations::delete_user_files::delete_user_files::delete_user_files;
+
+mod cli_args;
+mod operations;
+mod util;
+
+/*
+
+Users that have had files deleted:
+- cheesetherat
+- endtimes
+- expandinggirl
+- markiwrench
+- regista2
+- regista77
+
+TODO:
+- juanfra3567
+- ceistin
+- elfabro17
+- sodoka
+- fluffernater
+
+*/
+
+#[tokio::main]
+async fn main() -> AnyhowResult<()> {
+  println!("db-cleanup: hard or soft delete database records");
+
+  init_all_with_default_logging(None);
+
+  // NB: This secrets file differs from the rest because we might want to delete from production.
+  // (Hopefully this isn't getting out of hand at this point.)
+  easyenv::from_filename(".env-db-cleanup-secrets")?;
+
+  let args = cli_args::parse_cli_args()?;
+
+  let mysql = get_mysql("MYSQL_PRODUCTION_URL").await?;
+
+  match args.action {
+    Action::DeleteAllAnonymousUserImages => {
+      delete_all_anonymous_user_images(&args, &mysql).await?;
+    }
+    Action::DeleteUserFiles => {
+      delete_user_files(&args, &mysql).await?;
+    }
+  }
+
+  Ok(())
+}
+
+async fn get_mysql(env_var_name: &str) -> errors::AnyhowResult<Pool<MySql>> {
+  info!("Connecting to MySQL {env_var_name}...");
+
+  let pool = MySqlPoolOptions::new()
+      .max_connections(easyenv::get_env_num("MYSQL_MAX_CONNECTIONS", 3)?)
+      .connect(&easyenv::get_env_string_required(env_var_name)?)
+      .await?;
+
+  Ok(pool)
+}

crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs

@@ -0,0 +1,66 @@
+use std::thread;
+use std::time::Duration;
+use log::info;
+use sqlx::{MySql, Pool};
+use enums::by_table::media_files::media_file_type::MediaFileType;
+use enums::common::view_as::ViewAs;
+
+use errors::{anyhow, AnyhowResult};
+use mysql_queries::queries::media_files::delete_media_file::delete_media_file_as_mod;
+use mysql_queries::queries::media_files::list::list_media_files::{list_media_files, ListMediaFilesArgs};
+use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs};
+use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username;
+
+use crate::cli_args::Args;
+use crate::util::constants::ECHELON_USER_TOKEN;
+
+pub async fn delete_all_anonymous_user_images(_args: &Args, mysql: &Pool<MySql>) -> AnyhowResult<()> {
+  info!("delete anonymous user images");
+
+  let mut page_index = 0;
+  let mut maybe_offset = None;
+
+  loop {
+    info!("Querying page {page_index} of files...");
+
+    let media_files = list_media_files(ListMediaFilesArgs {
+      limit: 100,
+      maybe_filter_media_type: Some(MediaFileType::Image),
+      maybe_offset,
+      cursor_is_reversed: false,
+      sort_ascending: false,
+      view_as: ViewAs::Moderator,
+      mysql_pool: &mysql,
+    }).await?;
+
+    if media_files.records.is_empty() {
+      break;
+    }
+
+    for file in media_files.records {
+      if file.maybe_creator_user_token.is_some() {
+        info!("Skipping file: {:?} , which has author: {:?}", &file.token, &file.maybe_creator_user_token);
+        continue;
+      }
+
+      match file.media_type {
+        MediaFileType::Image => {},
+        _ => {
+          info!("Skipping file: {:?} , which is not an image", &file.token);
+          continue;
+        }
+      }
+
+      info!("Deleting image file: {:?}", &file.token);
+      delete_media_file_as_mod(&file.token, ECHELON_USER_TOKEN, &mysql).await?;
+    }
+
+    page_index += 1;
+
+    maybe_offset = media_files.last_id.map(|id| id as usize);
+
+    thread::sleep(Duration::from_millis(1000));
+  }
+
+  Ok(())
+}

crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/mod.rs

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

crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs

@@ -0,0 +1,68 @@
+use std::thread;
+use std::time::Duration;
+use log::info;
+use sqlx::{MySql, Pool};
+use enums::common::view_as::ViewAs;
+
+use errors::{anyhow, AnyhowResult};
+use mysql_queries::queries::media_files::delete_media_file::delete_media_file_as_mod;
+use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs};
+use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username;
+
+use crate::cli_args::Args;
+use crate::util::constants::ECHELON_USER_TOKEN;
+
+pub async fn delete_user_files(args: &Args, mysql: &Pool<MySql>) -> AnyhowResult<()> {
+  info!("delete user files for username: {:?}", args.username);
+
+  let username = match args.username.as_deref() {
+    Some(username) => username,
+    None => return Err(anyhow!("username is required")),
+  };
+
+  let maybe_user_profile = get_user_profile_by_username(username, mysql).await?;
+
+  let user_profile = match maybe_user_profile {
+    Some(user_profile) => user_profile,
+    None => return Err(anyhow!("user not found")),
+  };
+
+  info!("user_profile: {:?}", &user_profile);
+
+  delete_all_files(username, mysql).await?;
+
+  Ok(())
+}
+
+pub async fn delete_all_files(username: &str, mysql: &Pool<MySql>) -> AnyhowResult<()> {
+  let mut page_index = 0;
+
+  loop {
+    info!("Querying page {page_index} of files...");
+
+    let media_files = list_media_files_for_user(ListMediaFileForUserArgs {
+      username,
+      maybe_filter_media_types: None,
+      page_size: 100,
+      page_index,
+      sort_ascending: false,
+      view_as: ViewAs::Moderator,
+      mysql_pool: &mysql,
+    }).await?;
+
+    if media_files.records.is_empty() {
+      break;
+    }
+
+    for file in media_files.records {
+      info!("Deleting file: {:?}", &file.token);
+      delete_media_file_as_mod(&file.token, ECHELON_USER_TOKEN, &mysql).await?;
+    }
+
+    page_index += 1;
+
+    thread::sleep(Duration::from_millis(1000));
+  }
+
+  Ok(())
+}

crates/cli/production/db-cleanup/src/operations/delete_user_files/mod.rs

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

crates/cli/production/db-cleanup/src/operations/mod.rs

@@ -0,0 +1,2 @@
+pub mod delete_all_anonymous_user_images;
+pub mod delete_user_files;

crates/cli/production/db-cleanup/src/util/constants.rs

@@ -0,0 +1,3 @@
+
+/// User token to use as the moderator field when deleting files.
+pub (crate) const ECHELON_USER_TOKEN : &str = "U:937C1VN0S5G8H";

crates/cli/production/db-cleanup/src/util/mod.rs

@@ -0,0 +1 @@
+pub (crate) mod constants;

crates/cli/production/elasticsearch-cli/Cargo.toml

@@ -14,30 +14,27 @@ path = "src/main.rs"
 
 [dependencies]
 # Internal
-buckets = { path = "../../_types/buckets" }
-config = { path = "../../lib/deprecated/config" }
-easyenv = { path = "../../lib/easyenv" }
-elasticsearch_schema = { path = "../../lib/elasticsearch_schema" }
-enums = { path = "../../_types/enums" }
-errors = { path = "../../lib/errors" }
-mysql_queries = { path = "../../lib/mysql_queries" }
-storyteller_root = { path = "../../lib/storyteller_root" }
-tokens = { path = "../../_types/tokens" }
+buckets = { path = "../../../_types/buckets" }
+config = { path = "../../../lib/deprecated/config" }
+easyenv = { path = "../../../lib/easyenv" }
+elasticsearch_schema = { path = "../../../lib/elasticsearch_schema" }
+enums = { path = "../../../_types/enums" }
+errors = { path = "../../../lib/errors" }
+mysql_queries = { path = "../../../lib/mysql_queries" }
+storyteller_root = { path = "../../../lib/storyteller_root" }
+tokens = { path = "../../../_types/tokens" }
 
 # Workspace hack (faster compile times)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 # External
-log = "0.4.14"
 clap = "4.4.8"
+log = "0.4.14"
 strum = { version = "0.25", features = ["derive"] }
 
-# Runtime
-# NB: We switched to Tokio from `async-std` for broader ecosystem support.
+# Bigger pieces
 tokio = { version = "1.34.0", features = ["macros"] }
-
 sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
-
 elasticsearch = "8.5.0-alpha.1"
 
 # Serialization

crates/cli/production/kubectl-pod-cleanup/Cargo.toml

@@ -14,12 +14,12 @@ path = "src/main.rs"
 
 [dependencies]
 # Internal
-config = { path = "../../lib/deprecated/config" }
-easyenv = { path = "../../lib/easyenv" }
-errors = { path = "../../lib/errors" }
+config = { path = "../../../lib/deprecated/config" }
+easyenv = { path = "../../../lib/easyenv" }
+errors = { path = "../../../lib/errors" }
 
 # Workspace hack (faster compile yytimes)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 # External
 log = "0.4.20"

crates/cli/production/lru-delete-models/Cargo.toml

@@ -14,11 +14,11 @@ path = "src/main.rs"
 
 [dependencies]
 # Internal
-errors = { path = "../../lib/errors" }
-logging = { path = "../../lib/logging" }
+errors = { path = "../../../lib/errors" }
+logging = { path = "../../../lib/logging" }
 
 # Workspace hack (faster compile times)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 # External
 clap = { version = "4.4.8", features = ["derive"] }

crates/cli/production/migration-tool/Cargo.toml

@@ -14,20 +14,20 @@ path = "src/main.rs"
 
 [dependencies]
 # Internal
-buckets = { path = "../../_types/buckets" }
-cloud_storage = { path = "../../lib/api_clients/cloud_storage" }
-config = { path = "../../lib/deprecated/config" }
-easyenv = { path = "../../lib/easyenv" }
-enums = { path = "../../_types/enums" }
-errors = { path = "../../lib/errors" }
-filesys = { path = "../../lib/files/filesys" }
-hashing = { path = "../../lib/files/hashing" }
-mysql_queries = { path = "../../lib/mysql_queries" }
-storyteller_root = { path = "../../lib/storyteller_root" }
-tokens = { path = "../../_types/tokens" }
+buckets = { path = "../../../_types/buckets" }
+cloud_storage = { path = "../../../lib/api_clients/cloud_storage" }
+config = { path = "../../../lib/deprecated/config" }
+easyenv = { path = "../../../lib/easyenv" }
+enums = { path = "../../../_types/enums" }
+errors = { path = "../../../lib/errors" }
+filesys = { path = "../../../lib/files/filesys" }
+hashing = { path = "../../../lib/files/hashing" }
+mysql_queries = { path = "../../../lib/mysql_queries" }
+storyteller_root = { path = "../../../lib/storyteller_root" }
+tokens = { path = "../../../_types/tokens" }
 
 # Workspace hack (faster compile times)
-my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 # External
 clap = "4.4.8"

crates/cli/production/migration-tool/src/main.rs

@@ -3,7 +3,6 @@
 //! Migrate database records.
 //!
 
-
 use std::time::Duration;
 
 use log::info;