Fixed added weights type by request.

get weight endpoint to have updated_at (the list weight has but the single weight doesnt)
profile weight list endpoint weights_category is missing from the response, i need it for rendering the cards by what type of weight it is.

.env

@@ -75,4 +75,5 @@ TTS_HIFIGAN_SUPERRES_VOCODER_MODEL_FILENAME=hifigan_superres_twilight_33000.pt
 
 # Development key. Permissible to check in.
 NEWRELIC_API_KEY=c402be1c4c4216ec83d0cfc0851520cfFFFFNRAL
-STORYTELLER_ROOT="/home/tensor/code/storyteller/"
+
+#STORYTELLER_ROOT="/home/tensor/code/storyteller/" # Put this in .env-secrets so that not everyone gets this setting.

.gitignore

@@ -3,6 +3,7 @@
 .env
 .env-aichatbot-secrets
 .env-elasticsearch-secrets
+.env-migration-tool-secrets
 .env-secrets
 _develop/tools/.secrets
 _develop/tools/db_secrets.toml
@@ -17,6 +18,9 @@ secrets.toml
 secrets.yaml
 twitch_secrets.toml
 
+# Old env secrets
+.*-secrets
+
 # New env secrets (per-app)
 *-secrets.env
 

.sqlx/query-02136088e16742de2154cd9e84eeebbdb76045ad26aeb1c517a54c296bf31087.json

@@ -1,11 +1,11 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    f.token as `token: tokens::tokens::favorites::FavoriteToken`,\n\n    f.entity_type as `entity_type: enums::by_table::favorites::favorite_entity_type::FavoriteEntityType`,\n    f.entity_token,\n\n    f.user_token as `user_token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name as user_display_name,\n    u.email_gravatar_hash as user_gravatar_hash,\n\n    f.created_at,\n    f.updated_at,\n    f.deleted_at\n\nFROM\n    favorites AS f\nJOIN users AS u\n    ON f.user_token = u.token\nWHERE\n    f.token = ?\n        ",
+  "query": "\nSELECT\n    f.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n    f.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n    f.entity_token,\n\n    f.user_token as `user_token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name as user_display_name,\n    u.email_gravatar_hash as user_gravatar_hash,\n\n    f.created_at,\n    f.updated_at,\n    f.deleted_at\n\nFROM\n    user_bookmarks AS f\nJOIN users AS u\n    ON f.user_token = u.token\nWHERE\n    f.token = ?\n        ",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "token: tokens::tokens::favorites::FavoriteToken",
+        "name": "token: tokens::tokens::user_bookmarks::UserBookmarkToken",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
@@ -15,7 +15,7 @@
       },
       {
         "ordinal": 1,
-        "name": "entity_type: enums::by_table::favorites::favorite_entity_type::FavoriteEntityType",
+        "name": "entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
@@ -120,5 +120,5 @@
       true
     ]
   },
-  "hash": "f1ef63978793e7da5bd5e1a486254dd436db8021c8f049efa41f43cf7ce75f1d"
+  "hash": "02136088e16742de2154cd9e84eeebbdb76045ad26aeb1c517a54c296bf31087"
 }

.sqlx/query-030e26fa7977555cdd04864d9b95c07196ab520cd8c63d30689b6021fa4b4ec1.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO media_files\nSET\n  token = ?,\n\n  origin_category = ?,\n  origin_product_category = ?,\n\n  media_type = ?,\n  maybe_mime_type = ?,\n  file_size_bytes = ?,\n  checksum_sha2 = ?,\n\n  public_bucket_directory_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n\n  maybe_creator_user_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "030e26fa7977555cdd04864d9b95c07196ab520cd8c63d30689b6021fa4b4ec1"
-}

.sqlx/query-06734395f0a844e59d26c7d1cbc3e4b9a27f44c4bdacb8548d06a9e1dfb3db03.json

@@ -1,12 +1,12 @@
 {
   "db_name": "MySQL",
-  "query": "\nINSERT INTO voice_conversion_models\nSET\n  token = ?,\n  model_type = ?,\n  title = ?,\n  description_markdown = '',\n  description_rendered_html = '',\n  creator_user_token = ?,\n  ip_address_creation = ?,\n  ip_address_last_update = ?,\n  original_download_url = ?,\n  has_index_file = ?,\n  private_bucket_hash = ?,\n  private_bucket_object_name = ?,\n  file_size_bytes = ?\n        ",
+  "query": "\nINSERT INTO voice_conversion_models\nSET\n  token = ?,\n  model_type = ?,\n  title = ?,\n  description_markdown = '',\n  description_rendered_html = '',\n  creator_user_token = ?,\n  ip_address_creation = ?,\n  ip_address_last_update = ?,\n  original_download_url = ?,\n  has_index_file = ?,\n  private_bucket_hash = ?,\n  private_bucket_object_name = ?,\n  file_size_bytes = ?,\n  maybe_migration_new_model_weights_token = ?\n        ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 11
+      "Right": 12
     },
     "nullable": []
   },
-  "hash": "1e85e546684feffc151a26b0495b9ab8aa4ee5f1627464a9872e9c357ba1dc7a"
+  "hash": "06734395f0a844e59d26c7d1cbc3e4b9a27f44c4bdacb8548d06a9e1dfb3db03"
 }

.sqlx/query-1c1ef2195e81362d0eb023ede236c6fa65ede80d9efcaa4996694ce32c12cc0c.json

@@ -1,11 +1,11 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    f.token as `token: tokens::tokens::favorites::FavoriteToken`,\n    f.user_token as `user_token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name as user_display_name,\n    u.email_gravatar_hash as user_gravatar_hash,\n\n    f.created_at,\n    f.updated_at,\n    f.deleted_at\n\nFROM\n    favorites AS f\nJOIN users AS u\n    ON f.user_token = u.token\nWHERE\n    f.entity_type = ?\n    AND f.entity_token = ?\n    AND f.deleted_at IS NULL\nORDER BY f.id DESC\nLIMIT 50\n        ",
+  "query": "\nSELECT\n    f.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n    f.user_token as `user_token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name as user_display_name,\n    u.email_gravatar_hash as user_gravatar_hash,\n\n    f.created_at,\n    f.updated_at,\n    f.deleted_at\n\nFROM\n    user_bookmarks AS f\nJOIN users AS u\n    ON f.user_token = u.token\nWHERE\n    f.entity_type = ?\n    AND f.entity_token = ?\n    AND f.deleted_at IS NULL\nORDER BY f.id DESC\nLIMIT 50\n        ",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "token: tokens::tokens::favorites::FavoriteToken",
+        "name": "token: tokens::tokens::user_bookmarks::UserBookmarkToken",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
@@ -98,5 +98,5 @@
       true
     ]
   },
-  "hash": "99cff649bf75f5b05330e7db8536ecc832affbae7c9710e158099079609e5e16"
+  "hash": "1c1ef2195e81362d0eb023ede236c6fa65ede80d9efcaa4996694ce32c12cc0c"
 }

.sqlx/query-34aaedaebab0ea772714f31f42563b7e6b243c34a784e3f66f06aa102af3f1f9.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO model_weights_extension_voice_conversion_details\nSET\n  model_weights_token = ?,\n  has_index_file = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "34aaedaebab0ea772714f31f42563b7e6b243c34a784e3f66f06aa102af3f1f9"
+}

.sqlx/query-3a7ac7f979ac270dad1070031d0d663d0eb3d969365f6b2fd048ca41c5c455b2.json

@@ -1,11 +1,11 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    f.token as `token: tokens::tokens::favorites::FavoriteToken`,\n    f.entity_type as `entity_type: enums::by_table::favorites::favorite_entity_type::FavoriteEntityType`,\n    f.entity_token,\n    f.user_token as `user_token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name as user_display_name,\n    u.email_gravatar_hash as user_gravatar_hash,\n    f.created_at,\n    f.updated_at,\n    f.deleted_at,\n\n    media_files.media_type as `maybe_media_file_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n    media_files.origin_product_category as `maybe_media_file_origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`,\n\n    tts_models.title as maybe_descriptive_text_tts_model_title,\n    tts_results.raw_inference_text as maybe_descriptive_text_tts_result_inference_text,\n    users.display_name as maybe_descriptive_text_user_display_name,\n    voice_conversion_models.title as maybe_descriptive_text_voice_conversion_model_title,\n    zs_voices.title as maybe_descriptive_text_zs_voice_title\n\nFROM\n    favorites AS f\nJOIN users AS u\n    ON f.user_token = u.token\n\nLEFT OUTER JOIN media_files ON media_files.token = f.entity_token\nLEFT OUTER JOIN tts_models ON tts_models.token = f.entity_token\nLEFT OUTER JOIN tts_results ON tts_results.token = f.entity_token\nLEFT OUTER JOIN users ON users.token = f.entity_token\nLEFT OUTER JOIN voice_conversion_models ON voice_conversion_models.token = f.entity_token\nLEFT OUTER JOIN zs_voices ON zs_voices.token = f.entity_token\n\nWHERE\n    u.username = ?\n    AND f.entity_type = ?\n    AND f.deleted_at IS NULL\nORDER BY f.id DESC\nLIMIT 50\n        ",
+  "query": "\nSELECT\n    f.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n    f.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n    f.entity_token,\n    f.user_token as `user_token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name as user_display_name,\n    u.email_gravatar_hash as user_gravatar_hash,\n    f.created_at,\n    f.updated_at,\n    f.deleted_at,\n\n    media_files.media_type as `maybe_media_file_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n    media_files.origin_product_category as `maybe_media_file_origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`,\n\n    model_weights.title as maybe_descriptive_text_model_weight_title,\n    tts_models.title as maybe_descriptive_text_tts_model_title,\n    tts_results.raw_inference_text as maybe_descriptive_text_tts_result_inference_text,\n    users.display_name as maybe_descriptive_text_user_display_name,\n    voice_conversion_models.title as maybe_descriptive_text_voice_conversion_model_title,\n    zs_voices.title as maybe_descriptive_text_zs_voice_title\n\nFROM\n    user_bookmarks AS f\nJOIN users AS u\n    ON f.user_token = u.token\n\nLEFT OUTER JOIN model_weights ON model_weights.token = f.entity_token\nLEFT OUTER JOIN media_files ON media_files.token = f.entity_token\nLEFT OUTER JOIN tts_models ON tts_models.token = f.entity_token\nLEFT OUTER JOIN tts_results ON tts_results.token = f.entity_token\nLEFT OUTER JOIN users ON users.token = f.entity_token\nLEFT OUTER JOIN voice_conversion_models ON voice_conversion_models.token = f.entity_token\nLEFT OUTER JOIN zs_voices ON zs_voices.token = f.entity_token\n\nWHERE\n    u.username = ?\n    AND f.entity_type = ?\n    AND f.deleted_at IS NULL\nORDER BY f.id DESC\nLIMIT 50\n        ",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "token: tokens::tokens::favorites::FavoriteToken",
+        "name": "token: tokens::tokens::user_bookmarks::UserBookmarkToken",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
@@ -15,7 +15,7 @@
       },
       {
         "ordinal": 1,
-        "name": "entity_type: enums::by_table::favorites::favorite_entity_type::FavoriteEntityType",
+        "name": "entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
@@ -125,7 +125,7 @@
       },
       {
         "ordinal": 12,
-        "name": "maybe_descriptive_text_tts_model_title",
+        "name": "maybe_descriptive_text_model_weight_title",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY | NO_DEFAULT_VALUE",
@@ -135,6 +135,16 @@
       },
       {
         "ordinal": 13,
+        "name": "maybe_descriptive_text_tts_model_title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 14,
         "name": "maybe_descriptive_text_tts_result_inference_text",
         "type_info": {
           "type": "Blob",
@@ -144,7 +154,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 15,
         "name": "maybe_descriptive_text_user_display_name",
         "type_info": {
           "type": "VarString",
@@ -154,7 +164,7 @@
         }
       },
       {
-        "ordinal": 15,
+        "ordinal": 16,
         "name": "maybe_descriptive_text_voice_conversion_model_title",
         "type_info": {
           "type": "VarString",
@@ -164,7 +174,7 @@
         }
       },
       {
-        "ordinal": 16,
+        "ordinal": 17,
         "name": "maybe_descriptive_text_zs_voice_title",
         "type_info": {
           "type": "VarString",
@@ -194,8 +204,9 @@
       true,
       true,
       true,
+      true,
       true
     ]
   },
-  "hash": "4214d8e86b81eb0138a34702ce12960ee007ca602a7bd64b68924515f8fbb038"
+  "hash": "3a7ac7f979ac270dad1070031d0d663d0eb3d969365f6b2fd048ca41c5c455b2"
 }

.sqlx/query-4e30e34cdf7a5834a3981d5e634506966bac9f9c420e800d15ce313778272cee.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.private_bucket_hash,\n        wt.maybe_private_bucket_prefix,\n        wt.maybe_private_bucket_extension,\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        WHERE\n            wt.token = ?\n            AND wt.user_deleted_at IS NULL\n            AND wt.mod_deleted_at IS NULL\n        ",
+  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        users.username as creator_username,\n        users.display_name as creator_display_name,\n        users.email_gravatar_hash AS creator_gravatar_hash,\n\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.public_bucket_hash,\n        wt.maybe_public_bucket_prefix,\n        wt.maybe_public_bucket_extension,\n\n        avatar.public_bucket_directory_hash as maybe_avatar_public_bucket_hash,\n        avatar.maybe_public_bucket_prefix as maybe_avatar_public_bucket_prefix,\n        avatar.maybe_public_bucket_extension as maybe_avatar_public_bucket_extension,\n\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        JOIN users\n            ON users.token = wt.creator_user_token\n        LEFT OUTER JOIN media_files as avatar\n            ON avatar.token = wt.maybe_avatar_media_file_token\n        WHERE\n            wt.token = ?\n            ",
   "describe": {
     "columns": [
       {
@@ -28,7 +28,7 @@
         "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
@@ -38,7 +38,7 @@
         "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
@@ -78,13 +78,43 @@
         "name": "creator_user_token: tokens::tokens::users::UserToken",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
       },
       {
         "ordinal": 8,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "creator_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 11,
         "name": "creator_ip_address",
         "type_info": {
           "type": "VarString",
@@ -94,17 +124,17 @@
         }
       },
       {
-        "ordinal": 9,
+        "ordinal": 12,
         "name": "creator_set_visibility: enums::common::visibility::Visibility",
         "type_info": {
           "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
           "char_set": 224,
           "max_size": 28
         }
       },
       {
-        "ordinal": 10,
+        "ordinal": 13,
         "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
         "type_info": {
           "type": "VarString",
@@ -114,7 +144,7 @@
         }
       },
       {
-        "ordinal": 11,
+        "ordinal": 14,
         "name": "original_download_url",
         "type_info": {
           "type": "VarString",
@@ -124,7 +154,7 @@
         }
       },
       {
-        "ordinal": 12,
+        "ordinal": 15,
         "name": "original_filename",
         "type_info": {
           "type": "VarString",
@@ -134,7 +164,7 @@
         }
       },
       {
-        "ordinal": 13,
+        "ordinal": 16,
         "name": "file_size_bytes",
         "type_info": {
           "type": "Long",
@@ -144,7 +174,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 17,
         "name": "file_checksum_sha2",
         "type_info": {
           "type": "String",
@@ -154,8 +184,8 @@
         }
       },
       {
-        "ordinal": 15,
-        "name": "private_bucket_hash",
+        "ordinal": 18,
+        "name": "public_bucket_hash",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -164,8 +194,8 @@
         }
       },
       {
-        "ordinal": 16,
-        "name": "maybe_private_bucket_prefix",
+        "ordinal": 19,
+        "name": "maybe_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -174,8 +204,8 @@
         }
       },
       {
-        "ordinal": 17,
-        "name": "maybe_private_bucket_extension",
+        "ordinal": 20,
+        "name": "maybe_public_bucket_extension",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -184,7 +214,37 @@
         }
       },
       {
-        "ordinal": 18,
+        "ordinal": 21,
+        "name": "maybe_avatar_public_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "maybe_avatar_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_avatar_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 24,
         "name": "cached_user_ratings_negative_count",
         "type_info": {
           "type": "Long",
@@ -194,7 +254,7 @@
         }
       },
       {
-        "ordinal": 19,
+        "ordinal": 25,
         "name": "cached_user_ratings_positive_count",
         "type_info": {
           "type": "Long",
@@ -204,7 +264,7 @@
         }
       },
       {
-        "ordinal": 20,
+        "ordinal": 26,
         "name": "cached_user_ratings_total_count",
         "type_info": {
           "type": "Long",
@@ -214,7 +274,7 @@
         }
       },
       {
-        "ordinal": 21,
+        "ordinal": 27,
         "name": "maybe_cached_user_ratings_ratio",
         "type_info": {
           "type": "Float",
@@ -224,7 +284,7 @@
         }
       },
       {
-        "ordinal": 22,
+        "ordinal": 28,
         "name": "cached_user_ratings_last_updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -234,7 +294,7 @@
         }
       },
       {
-        "ordinal": 23,
+        "ordinal": 29,
         "name": "version",
         "type_info": {
           "type": "Long",
@@ -244,7 +304,7 @@
         }
       },
       {
-        "ordinal": 24,
+        "ordinal": 30,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -254,7 +314,7 @@
         }
       },
       {
-        "ordinal": 25,
+        "ordinal": 31,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -264,7 +324,7 @@
         }
       },
       {
-        "ordinal": 26,
+        "ordinal": 32,
         "name": "user_deleted_at",
         "type_info": {
           "type": "Timestamp",
@@ -274,7 +334,7 @@
         }
       },
       {
-        "ordinal": 27,
+        "ordinal": 33,
         "name": "mod_deleted_at",
         "type_info": {
           "type": "Timestamp",
@@ -298,6 +358,9 @@
       false,
       false,
       false,
+      false,
+      false,
+      false,
       true,
       true,
       true,
@@ -306,6 +369,9 @@
       false,
       true,
       true,
+      true,
+      true,
+      true,
       false,
       false,
       false,
@@ -318,5 +384,5 @@
       true
     ]
   },
-  "hash": "f0b5767d52c389660d1859e628c746f6f33a9e1c25f21f66aeeb0784df768c8e"
+  "hash": "4e30e34cdf7a5834a3981d5e634506966bac9f9c420e800d15ce313778272cee"
 }

.sqlx/query-4ed42766cc0ca2234b7bc1837d645d05198d483564b39a2a8b8034df25e287a4.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\n        UPDATE model_weights\n        SET\n            title = ?,\n            description_markdown = ?,\n            maybe_thumbnail_token = ?,\n            description_rendered_html = ?,\n            creator_set_visibility = ?,\n            version = version + 1\n        WHERE token = ?\n        LIMIT 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 6
-    },
-    "nullable": []
-  },
-  "hash": "4ed42766cc0ca2234b7bc1837d645d05198d483564b39a2a8b8034df25e287a4"
-}

.sqlx/query-576e5a72e385d44a1e53dc473dd0b5a04e33d7c6b9c38bef96f275b064a12386.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE user_bookmarks\nSET\ndeleted_at = CURRENT_TIMESTAMP,\nversion = version + 1\nWHERE\ntoken = ?\nAND user_token = ?\nLIMIT 1\n      ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "576e5a72e385d44a1e53dc473dd0b5a04e33d7c6b9c38bef96f275b064a12386"
+}

.sqlx/query-57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908.json

@@ -0,0 +1,146 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n    w.weights_type as `weight_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as creator_username,\n    users.display_name as creator_display_name,\n    users.email_gravatar_hash as creator_gravatar_hash,\n    w.title,\n    w_extension.ietf_language_tag,\n    w_extension.ietf_primary_language_subtag,\n    w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    w.created_at,\n    w.updated_at\nFROM model_weights as w\nLEFT OUTER JOIN model_weights_extension_voice_conversion_details as w_extension\n    ON w_extension.model_weights_token = w.token\nJOIN users\n    ON users.token = w.creator_user_token\nWHERE\n    w.weights_type IN (\"rvc_v2\", \"so_vits_svc\")\n    AND w.user_deleted_at IS NULL\n    AND w.mod_deleted_at IS NULL\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "weight_type: enums::by_table::model_weights::weights_types::WeightsType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "creator_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "ietf_language_tag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "ietf_primary_language_subtag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 48
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908"
+}

.sqlx/query-6a9fc0a3d983eb1d2bdf7d4c80904d73b9f4a649098fc0ba78cbc20cfde12437.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE favorites\nSET\ndeleted_at = CURRENT_TIMESTAMP,\nversion = version + 1\nWHERE\ntoken = ?\nAND user_token = ?\nLIMIT 1\n      ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "6a9fc0a3d983eb1d2bdf7d4c80904d73b9f4a649098fc0ba78cbc20cfde12437"
-}

.sqlx/query-707af35ee4ab4519f28e6d69982944666e6c7c0f24b5da79dde828ffdb2c8302.json

@@ -1,11 +1,11 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    f.token as `token: tokens::tokens::favorites::FavoriteToken`,\n    f.entity_type as `entity_type: enums::by_table::favorites::favorite_entity_type::FavoriteEntityType`,\n    f.entity_token,\n    f.user_token as `user_token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name as user_display_name,\n    u.email_gravatar_hash as user_gravatar_hash,\n    f.created_at,\n    f.updated_at,\n    f.deleted_at,\n\n    media_files.media_type as `maybe_media_file_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n    media_files.origin_product_category as `maybe_media_file_origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`,\n\n    tts_models.title as maybe_descriptive_text_tts_model_title,\n    tts_results.raw_inference_text as maybe_descriptive_text_tts_result_inference_text,\n    users.display_name as maybe_descriptive_text_user_display_name,\n    voice_conversion_models.title as maybe_descriptive_text_voice_conversion_model_title,\n    zs_voices.title as maybe_descriptive_text_zs_voice_title\n\nFROM\n    favorites AS f\nJOIN users AS u\n    ON f.user_token = u.token\n\nLEFT OUTER JOIN media_files ON media_files.token = f.entity_token\nLEFT OUTER JOIN tts_models ON tts_models.token = f.entity_token\nLEFT OUTER JOIN tts_results ON tts_results.token = f.entity_token\nLEFT OUTER JOIN users ON users.token = f.entity_token\nLEFT OUTER JOIN voice_conversion_models ON voice_conversion_models.token = f.entity_token\nLEFT OUTER JOIN zs_voices ON zs_voices.token = f.entity_token\n\nWHERE\n    u.username = ?\n    AND f.deleted_at IS NULL\nORDER BY f.id DESC\nLIMIT 50\n        ",
+  "query": "\nSELECT\n    f.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n    f.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n    f.entity_token,\n    f.user_token as `user_token: tokens::tokens::users::UserToken`,\n    u.username,\n    u.display_name as user_display_name,\n    u.email_gravatar_hash as user_gravatar_hash,\n    f.created_at,\n    f.updated_at,\n    f.deleted_at,\n\n    media_files.media_type as `maybe_media_file_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n    media_files.origin_product_category as `maybe_media_file_origin_category: enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory`,\n\n    model_weights.title as maybe_descriptive_text_model_weight_title,\n    tts_models.title as maybe_descriptive_text_tts_model_title,\n    tts_results.raw_inference_text as maybe_descriptive_text_tts_result_inference_text,\n    users.display_name as maybe_descriptive_text_user_display_name,\n    voice_conversion_models.title as maybe_descriptive_text_voice_conversion_model_title,\n    zs_voices.title as maybe_descriptive_text_zs_voice_title\n\nFROM\n    user_bookmarks AS f\nJOIN users AS u\n    ON f.user_token = u.token\n\nLEFT OUTER JOIN model_weights ON model_weights.token = f.entity_token\nLEFT OUTER JOIN media_files ON media_files.token = f.entity_token\nLEFT OUTER JOIN tts_models ON tts_models.token = f.entity_token\nLEFT OUTER JOIN tts_results ON tts_results.token = f.entity_token\nLEFT OUTER JOIN users ON users.token = f.entity_token\nLEFT OUTER JOIN voice_conversion_models ON voice_conversion_models.token = f.entity_token\nLEFT OUTER JOIN zs_voices ON zs_voices.token = f.entity_token\n\nWHERE\n    u.username = ?\n    AND f.deleted_at IS NULL\nORDER BY f.id DESC\nLIMIT 50\n        ",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "token: tokens::tokens::favorites::FavoriteToken",
+        "name": "token: tokens::tokens::user_bookmarks::UserBookmarkToken",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
@@ -15,7 +15,7 @@
       },
       {
         "ordinal": 1,
-        "name": "entity_type: enums::by_table::favorites::favorite_entity_type::FavoriteEntityType",
+        "name": "entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
@@ -125,7 +125,7 @@
       },
       {
         "ordinal": 12,
-        "name": "maybe_descriptive_text_tts_model_title",
+        "name": "maybe_descriptive_text_model_weight_title",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY | NO_DEFAULT_VALUE",
@@ -135,6 +135,16 @@
       },
       {
         "ordinal": 13,
+        "name": "maybe_descriptive_text_tts_model_title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 14,
         "name": "maybe_descriptive_text_tts_result_inference_text",
         "type_info": {
           "type": "Blob",
@@ -144,7 +154,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 15,
         "name": "maybe_descriptive_text_user_display_name",
         "type_info": {
           "type": "VarString",
@@ -154,7 +164,7 @@
         }
       },
       {
-        "ordinal": 15,
+        "ordinal": 16,
         "name": "maybe_descriptive_text_voice_conversion_model_title",
         "type_info": {
           "type": "VarString",
@@ -164,7 +174,7 @@
         }
       },
       {
-        "ordinal": 16,
+        "ordinal": 17,
         "name": "maybe_descriptive_text_zs_voice_title",
         "type_info": {
           "type": "VarString",
@@ -194,8 +204,9 @@
       true,
       true,
       true,
+      true,
       true
     ]
   },
-  "hash": "c33f8df5a9ed1991366d6078460d9e936a5470d1794ea319d6cf19b0f5338fd4"
+  "hash": "707af35ee4ab4519f28e6d69982944666e6c7c0f24b5da79dde828ffdb2c8302"
 }

.sqlx/query-72eaa9124662acf0ed354b868fcdfe33c94b61046c30940f55cdc73789f94041.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO favorites\nSET\n  token = ?,\n  user_token = ?,\n  entity_type = ?,\n  entity_token = ?\n\nON DUPLICATE KEY UPDATE\n  deleted_at = NULL,\n  version = version + 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "72eaa9124662acf0ed354b868fcdfe33c94b61046c30940f55cdc73789f94041"
-}

.sqlx/query-760f4250fe5fb700c95ba0296b6b06ed89c2399fd1cb03dbae36d6c35143aa30.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO model_weights_extension_voice_conversion_details\nSET\n  model_weights_token = ?,\n  has_index_file = ?\nON DUPLICATE KEY UPDATE\n  has_index_file = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "760f4250fe5fb700c95ba0296b6b06ed89c2399fd1cb03dbae36d6c35143aa30"
+}

.sqlx/query-81df77a84fee48398e8a07e053b0393a0e341caf652c18c7160dd0a59247a19a.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n    UPDATE model_weights\n    SET\n        title = COALESCE(?, title),\n        description_markdown = COALESCE(?, description_markdown),\n        maybe_thumbnail_token = COALESCE(?, maybe_thumbnail_token),\n        description_rendered_html = COALESCE(?, description_rendered_html),\n        creator_set_visibility = COALESCE(?, creator_set_visibility),\n        version = version + 1\n    WHERE token = ?\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": []
+  },
+  "hash": "81df77a84fee48398e8a07e053b0393a0e341caf652c18c7160dd0a59247a19a"
+}

.sqlx/query-854da1bad28fbcf5a8f82c26c52c25a7727957b52b727831ce62518b3c5fc9bd.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\n            SELECT\n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.private_bucket_hash,\n                mw.maybe_private_bucket_prefix,\n                mw.maybe_private_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n                AND mw.user_deleted_at IS NULL\n                AND mw.mod_deleted_at IS NULL\n            ",
+  "query": "\n            SELECT\n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.public_bucket_hash,\n                mw.maybe_public_bucket_prefix,\n                mw.maybe_public_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n                AND mw.user_deleted_at IS NULL\n                AND mw.mod_deleted_at IS NULL\n            ",
   "describe": {
     "columns": [
       {
@@ -28,7 +28,7 @@
         "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
@@ -38,7 +38,7 @@
         "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
@@ -128,7 +128,7 @@
         "name": "creator_set_visibility: enums::common::visibility::Visibility",
         "type_info": {
           "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
           "char_set": 224,
           "max_size": 28
         }
@@ -185,7 +185,7 @@
       },
       {
         "ordinal": 18,
-        "name": "private_bucket_hash",
+        "name": "public_bucket_hash",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -195,7 +195,7 @@
       },
       {
         "ordinal": 19,
-        "name": "maybe_private_bucket_prefix",
+        "name": "maybe_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -205,7 +205,7 @@
       },
       {
         "ordinal": 20,
-        "name": "maybe_private_bucket_extension",
+        "name": "maybe_public_bucket_extension",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -351,5 +351,5 @@
       true
     ]
   },
-  "hash": "a6ed8524fb5339fed17bec6611f8f56b6bdee35bac63c9eacbe21eb032a6a831"
+  "hash": "854da1bad28fbcf5a8f82c26c52c25a7727957b52b727831ce62518b3c5fc9bd"
 }

.sqlx/query-898a2f89d1f3efcb87adaef432cc73117057e44766c330caff6ce2c9d48518fd.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE voice_conversion_models\nSET\n  maybe_migration_new_model_weights_token = ?\nWHERE token = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "898a2f89d1f3efcb87adaef432cc73117057e44766c330caff6ce2c9d48518fd"
+}

.sqlx/query-8cb3ba5acb8dbef84408370810c98d4b99223761d4547ce7c8a9438ba92e8523.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO model_weights\nSET\n  token = ?,\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n\n  maybe_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = NULL,\n  description_rendered_html = NULL,\n\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = ?,\n\n  creator_user_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  public_bucket_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n\n  cached_user_ratings_total_count = 0,\n  cached_user_ratings_positive_count = 0,\n  cached_user_ratings_negative_count = 0,\n  maybe_cached_user_ratings_ratio = 0.0,\n  cached_user_ratings_last_updated_at = NOW(),\n\n  maybe_migration_old_model_token = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 15
+    },
+    "nullable": []
+  },
+  "hash": "8cb3ba5acb8dbef84408370810c98d4b99223761d4547ce7c8a9438ba92e8523"
+}

.sqlx/query-8f8b81d54aeabb31a200de98ba3106ac6bea906979c89355f805abb9650a7588.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\n  media_type = ?,\n  maybe_mime_type = ?,\n  file_size_bytes = ?,\n  checksum_sha2 = ?,\n\n  maybe_origin_filename = ?,\n\n  public_bucket_directory_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n\n  maybe_creator_user_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 14
+    },
+    "nullable": []
+  },
+  "hash": "8f8b81d54aeabb31a200de98ba3106ac6bea906979c89355f805abb9650a7588"
+}

.sqlx/query-93084dc42ae4ada186dc90bdd470122342586f4f19a3ac961286c1c54a5c32b2.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.private_bucket_hash,\n        wt.maybe_private_bucket_prefix,\n        wt.maybe_private_bucket_extension,\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        WHERE\n            wt.token = ?\n            ",
+  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        users.username as creator_username,\n        users.display_name as creator_display_name,\n        users.email_gravatar_hash AS creator_gravatar_hash,\n\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.public_bucket_hash,\n        wt.maybe_public_bucket_prefix,\n        wt.maybe_public_bucket_extension,\n\n        avatar.public_bucket_directory_hash as maybe_avatar_public_bucket_hash,\n        avatar.maybe_public_bucket_prefix as maybe_avatar_public_bucket_prefix,\n        avatar.maybe_public_bucket_extension as maybe_avatar_public_bucket_extension,\n\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        JOIN users\n            ON users.token = wt.creator_user_token\n        LEFT OUTER JOIN media_files as avatar\n            ON avatar.token = wt.maybe_avatar_media_file_token\n        WHERE\n            wt.token = ?\n            AND wt.user_deleted_at IS NULL\n            AND wt.mod_deleted_at IS NULL\n        ",
   "describe": {
     "columns": [
       {
@@ -28,7 +28,7 @@
         "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
@@ -38,7 +38,7 @@
         "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
@@ -75,16 +75,6 @@
       },
       {
         "ordinal": 7,
-        "name": "creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
         "name": "creator_ip_address",
         "type_info": {
           "type": "VarString",
@@ -94,17 +84,57 @@
         }
       },
       {
-        "ordinal": 9,
+        "ordinal": 8,
         "name": "creator_set_visibility: enums::common::visibility::Visibility",
         "type_info": {
           "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
           "char_set": 224,
           "max_size": 28
         }
       },
+      {
+        "ordinal": 9,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
       {
         "ordinal": 10,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "creator_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 13,
         "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
         "type_info": {
           "type": "VarString",
@@ -114,7 +144,7 @@
         }
       },
       {
-        "ordinal": 11,
+        "ordinal": 14,
         "name": "original_download_url",
         "type_info": {
           "type": "VarString",
@@ -124,7 +154,7 @@
         }
       },
       {
-        "ordinal": 12,
+        "ordinal": 15,
         "name": "original_filename",
         "type_info": {
           "type": "VarString",
@@ -134,7 +164,7 @@
         }
       },
       {
-        "ordinal": 13,
+        "ordinal": 16,
         "name": "file_size_bytes",
         "type_info": {
           "type": "Long",
@@ -144,7 +174,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 17,
         "name": "file_checksum_sha2",
         "type_info": {
           "type": "String",
@@ -154,8 +184,8 @@
         }
       },
       {
-        "ordinal": 15,
-        "name": "private_bucket_hash",
+        "ordinal": 18,
+        "name": "public_bucket_hash",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -164,8 +194,8 @@
         }
       },
       {
-        "ordinal": 16,
-        "name": "maybe_private_bucket_prefix",
+        "ordinal": 19,
+        "name": "maybe_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -174,8 +204,8 @@
         }
       },
       {
-        "ordinal": 17,
-        "name": "maybe_private_bucket_extension",
+        "ordinal": 20,
+        "name": "maybe_public_bucket_extension",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -184,7 +214,37 @@
         }
       },
       {
-        "ordinal": 18,
+        "ordinal": 21,
+        "name": "maybe_avatar_public_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "maybe_avatar_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_avatar_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 24,
         "name": "cached_user_ratings_negative_count",
         "type_info": {
           "type": "Long",
@@ -194,7 +254,7 @@
         }
       },
       {
-        "ordinal": 19,
+        "ordinal": 25,
         "name": "cached_user_ratings_positive_count",
         "type_info": {
           "type": "Long",
@@ -204,7 +264,7 @@
         }
       },
       {
-        "ordinal": 20,
+        "ordinal": 26,
         "name": "cached_user_ratings_total_count",
         "type_info": {
           "type": "Long",
@@ -214,7 +274,7 @@
         }
       },
       {
-        "ordinal": 21,
+        "ordinal": 27,
         "name": "maybe_cached_user_ratings_ratio",
         "type_info": {
           "type": "Float",
@@ -224,7 +284,7 @@
         }
       },
       {
-        "ordinal": 22,
+        "ordinal": 28,
         "name": "cached_user_ratings_last_updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -234,7 +294,7 @@
         }
       },
       {
-        "ordinal": 23,
+        "ordinal": 29,
         "name": "version",
         "type_info": {
           "type": "Long",
@@ -244,7 +304,7 @@
         }
       },
       {
-        "ordinal": 24,
+        "ordinal": 30,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -254,7 +314,7 @@
         }
       },
       {
-        "ordinal": 25,
+        "ordinal": 31,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -264,7 +324,7 @@
         }
       },
       {
-        "ordinal": 26,
+        "ordinal": 32,
         "name": "user_deleted_at",
         "type_info": {
           "type": "Timestamp",
@@ -274,7 +334,7 @@
         }
       },
       {
-        "ordinal": 27,
+        "ordinal": 33,
         "name": "mod_deleted_at",
         "type_info": {
           "type": "Timestamp",
@@ -298,6 +358,9 @@
       false,
       false,
       false,
+      false,
+      false,
+      false,
       true,
       true,
       true,
@@ -306,6 +369,9 @@
       false,
       true,
       true,
+      true,
+      true,
+      true,
       false,
       false,
       false,
@@ -318,5 +384,5 @@
       true
     ]
   },
-  "hash": "6a94791c8a8f66ee54bb367a4e8c71106bbcbbb205f54c14e3657279e83dabb6"
+  "hash": "93084dc42ae4ada186dc90bdd470122342586f4f19a3ac961286c1c54a5c32b2"
 }

.sqlx/query-98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb.json

@@ -0,0 +1,36 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n    w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`\nFROM model_weights as w\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb"
+}

.sqlx/query-a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44.json

@@ -0,0 +1,542 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    id,\n    token as `token: tokens::tokens::tts_models::TtsModelToken`,\n\n    tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n\n    text_pipeline_type,\n    has_self_contained_vocoder,\n    has_self_contained_duration_model,\n    has_self_contained_pitch_model,\n    text_preprocessing_algorithm,\n\n    use_default_mel_multiply_factor,\n    maybe_custom_mel_multiply_factor,\n    maybe_default_pretrained_vocoder,\n    maybe_custom_vocoder_token as `maybe_custom_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,\n\n    ietf_language_tag,\n    ietf_primary_language_subtag,\n\n    title,\n    description_markdown,\n    description_rendered_html,\n\n    voice_name,\n    actor_name,\n    characteristic,\n    version_string,\n\n    is_front_page_featured,\n    is_twitch_featured,\n\n    maybe_suggested_unique_bot_command,\n\n    original_download_url,\n    original_filename,\n    file_size_bytes,\n\n    creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n\n    creator_ip_address_creation,\n    creator_ip_address_last_update,\n\n    creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    private_bucket_hash,\n    private_bucket_object_name,\n\n    private_bucket_object_is_archive,\n\n    user_ratings_total_count,\n    user_ratings_positive_count,\n    user_ratings_negative_count,\n\n    is_public_listing_approved,\n    is_locked_from_user_modification,\n    is_locked_from_use,\n\n    maybe_mod_comments,\n    maybe_mod_user_token as `maybe_mod_user_token: tokens::tokens::users::UserToken`,\n\n    maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n\n    version,\n\n    created_at,\n    updated_at,\n\n    user_deleted_at,\n    mod_deleted_at\n\nFROM tts_models\nWHERE\n  id > ?\nORDER BY id ASC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: tokens::tokens::tts_models::TtsModelToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 60
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "text_pipeline_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "has_self_contained_vocoder",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "has_self_contained_duration_model",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "has_self_contained_pitch_model",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "text_preprocessing_algorithm",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "use_default_mel_multiply_factor",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_custom_mel_multiply_factor",
+        "type_info": {
+          "type": "Double",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 22
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_default_pretrained_vocoder",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "maybe_custom_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "ietf_language_tag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "ietf_primary_language_subtag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 224,
+          "max_size": 48
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "description_markdown",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "description_rendered_html",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "voice_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "actor_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "characteristic",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "version_string",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "is_front_page_featured",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "is_twitch_featured",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_suggested_unique_bot_command",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "original_download_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 2048
+        }
+      },
+      {
+        "ordinal": 25,
+        "name": "original_filename",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 26,
+        "name": "file_size_bytes",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 27,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 28,
+        "name": "creator_ip_address_creation",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 29,
+        "name": "creator_ip_address_last_update",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 30,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 31,
+        "name": "private_bucket_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 32,
+        "name": "private_bucket_object_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 33,
+        "name": "private_bucket_object_is_archive",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 34,
+        "name": "user_ratings_total_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 35,
+        "name": "user_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 36,
+        "name": "user_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 37,
+        "name": "is_public_listing_approved",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "MULTIPLE_KEY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 38,
+        "name": "is_locked_from_user_modification",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL | MULTIPLE_KEY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 39,
+        "name": "is_locked_from_use",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL | MULTIPLE_KEY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 40,
+        "name": "maybe_mod_comments",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 41,
+        "name": "maybe_mod_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 42,
+        "name": "maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 43,
+        "name": "version",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 11
+        }
+      },
+      {
+        "ordinal": 44,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 45,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 46,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 47,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44"
+}

.sqlx/query-aae28dc5fbeff858e4c9dd8b079752ce7892d76b56d2eff95db39c6b6d9f7f11.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO model_weights\nSET\n  token = ?,\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n  maybe_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = ?,\n  description_rendered_html = ?,\n  creator_user_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = ?,\n\n  public_bucket_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n  cached_user_ratings_total_count = 0,\n  cached_user_ratings_positive_count = 0,\n  cached_user_ratings_negative_count = 0,\n  maybe_cached_user_ratings_ratio = 0.0,\n  cached_user_ratings_last_updated_at = NOW(),\n\n  maybe_migration_old_model_token = ?,\n  version = ?,\n  created_at = ?,\n  updated_at = ?,\n  user_deleted_at = ?,\n  mod_deleted_at = ?\n\nON DUPLICATE KEY UPDATE\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n  maybe_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = ?,\n  description_rendered_html = ?,\n  creator_user_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = ?,\n  public_bucket_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n  cached_user_ratings_total_count = 0,\n  cached_user_ratings_positive_count = 0,\n  cached_user_ratings_negative_count = 0,\n  maybe_cached_user_ratings_ratio = 0.0,\n  cached_user_ratings_last_updated_at = NOW(),\n  maybe_migration_old_model_token = ?,\n  version = ?,\n  created_at = ?,\n  updated_at = ?,\n  user_deleted_at = ?,\n  mod_deleted_at = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 43
+    },
+    "nullable": []
+  },
+  "hash": "aae28dc5fbeff858e4c9dd8b079752ce7892d76b56d2eff95db39c6b6d9f7f11"
+}

.sqlx/query-ae34c2ce11250786962be50f167f15f6d2d023afe2bb31994d21a1007d81e0a0.json

@@ -0,0 +1,135 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n    w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n\n    w.title,\n    vc.has_index_file,\n\n    w.public_bucket_hash,\n    w.maybe_public_bucket_prefix,\n    w.maybe_public_bucket_extension,\n\n    w.created_at,\n    w.updated_at,\n    w.user_deleted_at,\n    w.mod_deleted_at\n\nFROM model_weights as w\nJOIN model_weights_extension_voice_conversion_details as vc\nON vc.model_weights_token = w.token\n\nWHERE w.token = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "has_index_file",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "public_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "ae34c2ce11250786962be50f167f15f6d2d023afe2bb31994d21a1007d81e0a0"
+}

.sqlx/query-bda002b24b98328f0fb0440cfc82a47faf01e5d16d1030e15a7e2da161dd0d80.json

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

.sqlx/query-cb07f1522d0d619e2f364af78250080c99e7930ec095c5600abb80a9d8c5154d.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\n        INSERT INTO model_weights\n        SET\n          token = ?,\n          weights_type = ?,\n          weights_category = ?,\n          title = ?,\n          maybe_thumbnail_token = ?,\n          description_markdown = ?,\n          description_rendered_html = ?,\n          creator_user_token = ?,\n          creator_ip_address = ?,\n          creator_set_visibility = ?,\n          maybe_last_update_user_token = ?,\n          original_download_url = ?,\n          original_filename = ?,\n          file_size_bytes = ?,\n          file_checksum_sha2 = ?,\n          private_bucket_hash = ?,\n          maybe_private_bucket_prefix = ?,\n          maybe_private_bucket_extension = ?,\n          cached_user_ratings_total_count = ?,\n          cached_user_ratings_positive_count = ?,\n          cached_user_ratings_negative_count = ?,\n          maybe_cached_user_ratings_ratio = ?,\n          version = ?\n        ",
+  "query": "\n        INSERT INTO model_weights\n        SET\n          token = ?,\n          weights_type = ?,\n          weights_category = ?,\n          title = ?,\n          maybe_thumbnail_token = ?,\n          description_markdown = ?,\n          description_rendered_html = ?,\n          creator_user_token = ?,\n          creator_ip_address = ?,\n          creator_set_visibility = ?,\n          maybe_last_update_user_token = ?,\n          original_download_url = ?,\n          original_filename = ?,\n          file_size_bytes = ?,\n          file_checksum_sha2 = ?,\n          public_bucket_hash = ?,\n          maybe_public_bucket_prefix = ?,\n          maybe_public_bucket_extension = ?,\n          cached_user_ratings_total_count = ?,\n          cached_user_ratings_positive_count = ?,\n          cached_user_ratings_negative_count = ?,\n          maybe_cached_user_ratings_ratio = ?,\n          version = ?\n        ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -8,5 +8,5 @@
     },
     "nullable": []
   },
-  "hash": "274cfb1e3caca706e3dbc3d95064e0f4b354c936f8de948070854920f265cc41"
+  "hash": "cb07f1522d0d619e2f364af78250080c99e7930ec095c5600abb80a9d8c5154d"
 }

.sqlx/query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json

@@ -0,0 +1,344 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    id,\n    token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n\n    model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n    maybe_vocoder_token as `maybe_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,\n\n    title,\n    description_markdown,\n    description_rendered_html,\n\n    ietf_language_tag,\n    ietf_primary_language_subtag,\n\n    has_index_file,\n\n    is_front_page_featured,\n\n    original_download_url,\n    original_filename,\n    file_size_bytes,\n\n    creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n\n    ip_address_creation,\n    ip_address_last_update,\n\n    maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n\n    creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    private_bucket_hash,\n    private_bucket_object_name,\n\n    is_public_listing_approved,\n    is_locked_from_user_modification,\n    maybe_mod_comments,\n\n    maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n\n    version,\n\n    created_at,\n    updated_at,\n\n    user_deleted_at,\n    mod_deleted_at\n\nFROM voice_conversion_models\nWHERE\n  id > ?\nORDER BY id ASC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "description_markdown",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "description_rendered_html",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "ietf_language_tag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "ietf_primary_language_subtag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 224,
+          "max_size": 48
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "has_index_file",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "is_front_page_featured",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "original_download_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 2048
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "original_filename",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "file_size_bytes",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "ip_address_creation",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "ip_address_last_update",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "private_bucket_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "private_bucket_object_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "is_public_listing_approved",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "MULTIPLE_KEY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "is_locked_from_user_modification",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL | MULTIPLE_KEY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_mod_comments",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 25,
+        "name": "version",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 11
+        }
+      },
+      {
+        "ordinal": 26,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 27,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 28,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 29,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c"
+}

.sqlx/query-e8f3bb68896d316498b52fdaaf4c352624b79bd4e097f57db5ad59f53fd66995.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO user_bookmarks\nSET\n  token = ?,\n  user_token = ?,\n  entity_type = ?,\n  entity_token = ?\n\nON DUPLICATE KEY UPDATE\n  deleted_at = NULL,\n  version = version + 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "e8f3bb68896d316498b52fdaaf4c352624b79bd4e097f57db5ad59f53fd66995"
+}

.sqlx/query-ec733ae6705dc03fb785e2299c35fcfef23422142735319c8cd091ca8179f97d.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\n            SELECT              \n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.private_bucket_hash,\n                mw.maybe_private_bucket_prefix,\n                mw.maybe_private_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n            ",
+  "query": "\n            SELECT              \n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.public_bucket_hash,\n                mw.maybe_public_bucket_prefix,\n                mw.maybe_public_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n            ",
   "describe": {
     "columns": [
       {
@@ -28,7 +28,7 @@
         "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
@@ -38,7 +38,7 @@
         "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
         "type_info": {
           "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
           "max_size": 128
         }
@@ -128,7 +128,7 @@
         "name": "creator_set_visibility: enums::common::visibility::Visibility",
         "type_info": {
           "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
           "char_set": 224,
           "max_size": 28
         }
@@ -185,7 +185,7 @@
       },
       {
         "ordinal": 18,
-        "name": "private_bucket_hash",
+        "name": "public_bucket_hash",
         "type_info": {
           "type": "VarString",
           "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -195,7 +195,7 @@
       },
       {
         "ordinal": 19,
-        "name": "maybe_private_bucket_prefix",
+        "name": "maybe_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -205,7 +205,7 @@
       },
       {
         "ordinal": 20,
-        "name": "maybe_private_bucket_extension",
+        "name": "maybe_public_bucket_extension",
         "type_info": {
           "type": "VarString",
           "flags": "BINARY",
@@ -351,5 +351,5 @@
       true
     ]
   },
-  "hash": "3d586592422727dcc928574966bdf5081ac69fdbb856fffcbd68187fd99c4642"
+  "hash": "ec733ae6705dc03fb785e2299c35fcfef23422142735319c8cd091ca8179f97d"
 }

.sqlx/query-f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2.json

@@ -0,0 +1,36 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    m.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n    m.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`\nFROM model_weights as m\nWHERE m.token = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2"
+}

.sqlx/query-fed337e365f0bd36cfa543e0ce9d4076cc0bd7809b6c2cb5740151d6583a6d11.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\n  maybe_origin_model_type = NULL,\n  maybe_origin_model_token = NULL,\n\n  media_type = ?,\n  maybe_mime_type = ?,\n  file_size_bytes = ?,\n\n  checksum_sha2 = ?,\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\n  maybe_creator_file_synthetic_id = ?,\n  maybe_creator_category_synthetic_id = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 16
+    },
+    "nullable": []
+  },
+  "hash": "fed337e365f0bd36cfa543e0ce9d4076cc0bd7809b6c2cb5740151d6583a6d11"
+}

Cargo.lock

@@ -468,6 +468,12 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -477,15 +483,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "anstream"
 version = "0.6.4"
@@ -521,7 +518,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -531,7 +528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -599,9 +596,9 @@ dependencies = [
 
 [[package]]
 name = "async-stripe"
-version = "0.25.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b39347f478f57a40cbaf82cbaebb4a350acc757cda30fc7ff88707a11d1d81"
+checksum = "19a0b12cb3b2df9abfaa381632e4d55b2aede9063034daaa0d0145413719a7e1"
 dependencies = [
  "chrono",
  "futures-util",
@@ -623,9 +620,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -678,17 +675,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -805,8 +791,9 @@ dependencies = [
  "serde_json",
  "sqlx",
  "tokio",
- "toml",
+ "toml 0.5.11",
  "url_config",
+ "user_traits_component",
 ]
 
 [[package]]
@@ -1037,18 +1024,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "serde",
- "time 0.1.45",
  "wasm-bindgen",
- "winapi 0.3.9",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -1093,21 +1079,6 @@ dependencies = [
  "inout",
 ]
 
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
 [[package]]
 name = "clap"
 version = "4.4.8"
@@ -1127,7 +1098,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.10.0",
+ "strsim",
 ]
 
 [[package]]
@@ -1153,10 +1124,19 @@ name = "cloud_storage"
 version = "0.0.1"
 dependencies = [
  "anyhow",
+ "async-trait",
  "buckets",
+ "crockford",
+ "easyenv",
+ "env_logger",
+ "errors",
+ "filesys",
+ "hashing",
  "log",
+ "mimetypes",
  "my-workspace-hack",
  "rust-s3",
+ "storyteller_root",
  "tokio",
 ]
 
@@ -1273,7 +1253,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "tempfile",
- "toml",
+ "toml 0.5.11",
  "uuid 0.8.2",
 ]
 
@@ -1524,7 +1504,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim",
  "syn 1.0.109",
 ]
 
@@ -1538,7 +1518,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim",
  "syn 1.0.109",
 ]
 
@@ -1552,7 +1532,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim",
  "syn 2.0.39",
 ]
 
@@ -1732,7 +1712,7 @@ name = "dev-database-seed"
 version = "0.0.1"
 dependencies = [
  "buckets",
- "clap 2.34.0",
+ "clap",
  "cloud_storage",
  "config",
  "easyenv",
@@ -1746,6 +1726,7 @@ dependencies = [
  "mimetypes",
  "my-workspace-hack",
  "mysql_queries",
+ "rand 0.8.5",
  "sqlx",
  "storyteller_root",
  "tokens",
@@ -1757,7 +1738,7 @@ name = "dev-upload-media-file"
 version = "0.0.1"
 dependencies = [
  "buckets",
- "clap 2.34.0",
+ "clap",
  "cloud_storage",
  "config",
  "easyenv",
@@ -1905,6 +1886,7 @@ version = "0.0.1"
 dependencies = [
  "anyhow",
  "bootstrap",
+ "buckets",
  "chrono",
  "cloud_storage",
  "concurrency",
@@ -1922,6 +1904,7 @@ dependencies = [
  "hyper",
  "jobs_common",
  "log",
+ "migration",
  "mimetypes",
  "my-workspace-hack",
  "mysql_queries",
@@ -1934,6 +1917,7 @@ dependencies = [
  "subprocess",
  "subprocess_common",
  "tempdir",
+ "tokens",
  "tokio",
  "zip",
 ]
@@ -2040,7 +2024,7 @@ name = "elasticsearch-cli"
 version = "0.0.1"
 dependencies = [
  "buckets",
- "clap 2.34.0",
+ "clap",
  "config",
  "easyenv",
  "elasticsearch",
@@ -2096,7 +2080,6 @@ dependencies = [
  "bootstrap",
  "buckets",
  "chrono",
- "clap 2.34.0",
  "cloud_storage",
  "concurrency",
  "config",
@@ -2172,7 +2155,8 @@ dependencies = [
  "sqlx-core",
  "sqlx-mysql",
  "strum",
- "toml",
+ "toml 0.5.11",
+ "utoipa",
 ]
 
 [[package]]
@@ -2196,12 +2180,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2220,7 +2204,7 @@ checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
 dependencies = [
  "cfg-if 1.0.0",
  "home",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2659,15 +2643,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.3"
@@ -2714,7 +2689,7 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2907,16 +2882,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -3020,12 +2985,14 @@ dependencies = [
  "log",
  "media",
  "memory_caching",
+ "migration",
+ "mime",
  "mimetypes",
  "my-workspace-hack",
  "mysql_queries",
- "newrelic-telemetry",
  "once_cell",
  "r2d2_redis",
+ "rand 0.8.5",
  "redis_common",
  "serde",
  "serde_derive",
@@ -3034,6 +3001,7 @@ dependencies = [
  "subprocess",
  "subprocess_common",
  "tempdir",
+ "time 0.3.30",
  "tokens",
  "tokio",
  "tts_common",
@@ -3078,9 +3046,9 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi",
  "rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3216,9 +3184,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "lettre"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a466bc111374ccf4d90877dba636924a2185e67e5be4b35d32043199365097b2"
+checksum = "a48c2e9831b370bc2d7233c2620298c45f3a158ed6b4b8d7416b2ada5a268fd8"
 dependencies = [
  "base64 0.21.5",
  "chumsky",
@@ -3228,7 +3196,7 @@ dependencies = [
  "futures-util",
  "hostname",
  "httpdate",
- "idna 0.4.0",
+ "idna",
  "mime",
  "native-tls",
  "nom",
@@ -3294,13 +3262,14 @@ dependencies = [
 [[package]]
 name = "limitation"
 version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e415413963930f7050f21994bfd336dc75ef8b5b3b142e99c55b72b61f726d5"
 dependencies = [
  "chrono",
  "futures 0.1.31",
+ "my-workspace-hack",
  "redis 0.13.0",
  "time 0.1.45",
+ "tokio",
+ "version-sync",
 ]
 
 [[package]]
@@ -3380,7 +3349,7 @@ dependencies = [
 name = "lru-delete-models"
 version = "0.0.1"
 dependencies = [
- "clap 4.4.8",
+ "clap",
  "errors",
  "logging",
  "my-workspace-hack",
@@ -3524,6 +3493,57 @@ dependencies = [
  "my-workspace-hack",
 ]
 
+[[package]]
+name = "migration"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "buckets",
+ "chrono",
+ "cloud_storage",
+ "enums",
+ "errors",
+ "jobs_common",
+ "my-workspace-hack",
+ "mysql_queries",
+ "once_cell",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serial_test",
+ "sqlx",
+ "tokens",
+ "tokio",
+ "toml 0.5.11",
+]
+
+[[package]]
+name = "migration-tool"
+version = "0.0.1"
+dependencies = [
+ "buckets",
+ "clap",
+ "cloud_storage",
+ "config",
+ "easyenv",
+ "enums",
+ "errors",
+ "filesys",
+ "hashing",
+ "log",
+ "my-workspace-hack",
+ "mysql_queries",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sqlx",
+ "storyteller_root",
+ "strum",
+ "tempdir",
+ "tokens",
+ "tokio",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -3601,7 +3621,7 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3686,11 +3706,11 @@ dependencies = [
  "generic-array",
  "getrandom 0.1.16",
  "getrandom 0.2.11",
- "hashbrown 0.12.3",
  "hashbrown 0.14.2",
  "heck",
  "hmac 0.12.1",
  "hyper",
+ "indexmap",
  "lazy_static",
  "libc",
  "log",
@@ -3737,7 +3757,8 @@ dependencies = [
  "url",
  "void",
  "winapi 0.3.9",
- "windows-sys",
+ "windows-sys 0.48.0",
+ "zip",
 ]
 
 [[package]]
@@ -3765,7 +3786,7 @@ dependencies = [
  "sqlx",
  "tokens",
  "tokio",
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -3819,25 +3840,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
-[[package]]
-name = "newrelic-telemetry"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "env_logger",
- "flate2",
- "futures 0.3.29",
- "hyper",
- "hyper-tls",
- "log",
- "my-workspace-hack",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "tokio",
- "uuid 0.8.2",
-]
-
 [[package]]
 name = "nix"
 version = "0.26.4"
@@ -3991,7 +3993,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi",
  "libc",
 ]
 
@@ -4132,7 +4134,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.4.1",
  "smallvec 1.11.2",
- "windows-targets",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -4837,7 +4839,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "sqlx",
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -4866,7 +4868,7 @@ dependencies = [
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5011,15 +5013,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.25"
+version = "0.38.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
+checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5121,7 +5123,7 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5143,7 +5145,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 name = "scrape_test"
 version = "0.0.1"
 dependencies = [
- "clap 2.34.0",
+ "clap",
  "errors",
  "my-workspace-hack",
  "tokio",
@@ -5333,6 +5335,15 @@ dependencies = [
  "syn 2.0.39",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -5583,7 +5594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5915,6 +5926,7 @@ dependencies = [
  "hex",
  "hmac 0.10.1",
  "hostname",
+ "http",
  "http_server_common",
  "hyper",
  "infer 0.5.0",
@@ -5929,6 +5941,7 @@ dependencies = [
  "md-5 0.9.1",
  "media",
  "memory_caching",
+ "migration",
  "mimetypes",
  "my-workspace-hack",
  "mysql_queries",
@@ -5956,12 +5969,13 @@ dependencies = [
  "time 0.3.30",
  "tokens",
  "tokio",
- "toml",
+ "toml 0.5.11",
  "tts_common",
  "twitch_common",
  "twitch_oauth2",
  "url_config",
  "user_input_common",
+ "user_traits_component",
  "users_component",
  "utoipa",
  "utoipa-swagger-ui",
@@ -6014,12 +6028,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -6302,7 +6310,7 @@ dependencies = [
  "fastrand 2.0.1",
  "redox_syscall 0.4.1",
  "rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6339,15 +6347,6 @@ dependencies = [
  "my-workspace-hack",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.50"
@@ -6450,6 +6449,7 @@ name = "tokens"
 version = "0.0.1"
 dependencies = [
  "my-workspace-hack",
+ "once_cell",
  "rand 0.8.5",
  "serde",
  "serde_derive",
@@ -6457,7 +6457,7 @@ dependencies = [
  "sqlx",
  "sqlx-core",
  "strum",
- "toml",
+ "toml 0.5.11",
  "utoipa",
 ]
 
@@ -6477,7 +6477,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2 0.5.5",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6656,6 +6656,40 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -6737,7 +6771,6 @@ version = "0.0.1"
 dependencies = [
  "anyhow",
  "chrono",
- "clap 2.34.0",
  "cloud_storage",
  "collections",
  "config",
@@ -6754,7 +6787,6 @@ dependencies = [
  "memory_caching",
  "my-workspace-hack",
  "mysql_queries",
- "newrelic-telemetry",
  "r2d2_redis",
  "serde",
  "serde_derive",
@@ -6845,7 +6877,7 @@ dependencies = [
  "tokens",
  "tokio",
  "tokio-tungstenite",
- "toml",
+ "toml 0.5.11",
  "tts_common",
  "twitch_api2",
  "twitch_common",
@@ -7007,7 +7039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna",
  "percent-encoding",
  "serde",
 ]
@@ -7040,6 +7072,16 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "user_traits_component"
+version = "0.0.1"
+dependencies = [
+ "actix-web",
+ "errors",
+ "mockall",
+ "my-workspace-hack",
+]
+
 [[package]]
 name = "users_component"
 version = "0.0.1"
@@ -7081,8 +7123,9 @@ dependencies = [
  "strum_macros",
  "time 0.3.30",
  "tokens",
- "toml",
+ "toml 0.5.11",
  "user_input_common",
+ "user_traits_component",
 ]
 
 [[package]]
@@ -7160,10 +7203,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
-name = "vec_map"
-version = "0.8.2"
+name = "version-sync"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+checksum = "835169da0173ea373ddf5987632aac1f918967fbbe58195e304342282efa6089"
+dependencies = [
+ "proc-macro2",
+ "pulldown-cmark",
+ "regex",
+ "semver 1.0.20",
+ "syn 2.0.39",
+ "toml 0.7.8",
+ "url",
+]
 
 [[package]]
 name = "version_check"
@@ -7464,7 +7516,7 @@ dependencies = [
  "sqlx",
  "time 0.3.30",
  "tokio",
- "toml",
+ "toml 0.5.11",
  "twitch_api2",
  "twitch_common",
  "twitch_oauth2",
@@ -7532,7 +7584,7 @@ version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -7541,7 +7593,16 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -7550,13 +7611,28 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
@@ -7565,42 +7641,93 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "winnow"
+version = "0.5.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -7608,7 +7735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
  "cfg-if 1.0.0",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]

Cargo.toml

@@ -10,13 +10,14 @@ 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/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",
 
   # Shared libraries
@@ -48,6 +49,7 @@ members = [
   "crates/lib/idempotency",
   "crates/lib/jobs_common",
   "crates/lib/logging",
+  "crates/lib/migration",
   "crates/lib/mysql_queries",
   "crates/lib/password",
   "crates/lib/redis_common",
@@ -83,11 +85,14 @@ members = [
   # Service Plugins: complete subsystems that can be plugged into services (users, billing, etc.)
   "crates/service/plugins/billing",
   "crates/service/plugins/inference_workloads",
+  "crates/service/plugins/user_traits_component",
   "crates/service/plugins/users",
 
   # Vendored code
-  "crates/vendor/newrelic-telemetry-sdk-rust",
+  "crates/vendor/limitation",
+  # NB(bt,2023-12-12): Newrelic keeps breaking with upgrades. Kill for now.
+  #"crates/vendor/newrelic-telemetry-sdk-rust", 
 
-  # Vendored code
-  "my-workspace-hack",
+  # cargo-hakari workspace hack (compilation speedup hack)
+  "crates/my-workspace-hack",
 ]

_develop/docs/local_development/general_setup.md

@@ -310,7 +310,7 @@ Secrets:
   - Put `.env-secrets` in the root `storyteller-rust` directory.
   
 - Per app secrets (ask Brandon for these):
-  - Put `storteller-web.development-secrets.env` in `crates/service/web/storyteller-web/config`
+  - Put `storteller-web.development-secrets.env` in `crates/service/web/storyteller_web/config`
   - Put `inference-job.development-secrets.env` in `crates/service/job/inference_job/config`
   - Put `donwload-job.development-secrets.env` in `crates/service/job/download_job/config`
 
@@ -392,4 +392,4 @@ We use this: `https://github.com/juhaku/utoipa`
 The documentation example is in: 
 `crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs`
 Write into the api doc to: 
-`crates/service/web/storyteller_web/src/api_doc.rs`
+`crates/service/web/storyteller_web/src/api_doc.rs`

_sql/actions/tts_models.sql

@@ -0,0 +1,6 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Re-home Nessu's models
+update tts_models set creator_user_token = "user_7z1h6sykg4r62" where creator_user_token = "U:C00NRSW1AE8T4" limit 5;

_sql/actions/voice_conversion_models.sql

@@ -13,6 +13,9 @@ where token IN (
     'vcm_502wkt2pca3y'
 );
 
+-- Re-home Nessu's models
+update voice_conversion_models set creator_user_token = "user_7z1h6sykg4r62" where creator_user_token = "U:C00NRSW1AE8T4" limit 5;
+
 -- Remove broken models
 update voice_conversion_models
 set
@@ -344,6 +347,46 @@ where token IN (
     'vcm_zmxv2k1q9jd8'
 );
 
+update voice_conversion_models
+set
+    mod_deleted_at = NOW(),
+    maybe_mod_comments = 'takedown request'
+where token IN (
+    'vcm_3mzcjkf78x7m',
+    'vcm_7k2t1wnyqxsc',
+    'vcm_w2edpe6q2nya',
+    'vcm_vz9cg294xa29',
+    'vcm_0z1ys58589k7',
+    'vcm_4x8a30h1r26z',
+    'vcm_0vf9prxsww60',
+    'vcm_yxbadkvqhg16',
+    'vcm_p0ezrc6wvzak',
+    'vcm_6r5pbtexyvtp',
+    'vcm_pb0ewrf7ych5',
+    'vcm_7frb2xk0cxk3',
+    'vcm_x129c9s2af06',
+    'vcm_e0snndfd59b6',
+    'vcm_nb8zb0djqwqw',
+    'vcm_2erz5hbh8tpf',
+    'vcm_e9wn2ccqe3bk',
+    'vcm_f8jbxdbjgcjb',
+    'vcm_x02h7z3jqxb0',
+    'vcm_xy97xcgnk9y6',
+    'vcm_a47wtfbsjrfc',
+    'vcm_kygenhbg5mgj',
+    'vcm_s8gndv19yt7p',
+    'vcm_ny9pj57w5eyh'
+);
+
+
+update voice_conversion_models
+set
+  mod_deleted_at = NOW(),
+  maybe_mod_comments = 'abuse'
+where token IN (
+  'vcm_qajyd528p8kw',
+  'vcm_f5pcdecmzcc5'
+);
 
 
 

_sql/analytics/generic_inference/generic_inference_jobs.sql

@@ -23,6 +23,27 @@ and success_execution_millis IS NOT NULL
 order by id desc
 limit 50;
 
+-- See how many are using a deleted model
+select
+    creator_ip_address,
+    count(*)
+from generic_inference_jobs
+where maybe_model_token = 'vcm_4x8a30h1r26z'
+and created_at >  NOW() - INTERVAL 24 HOUR
+group by  creator_ip_address
+
+-- See which deleted models are in use
+select
+    vm.token,
+    vm.title,
+    count(*)
+from generic_inference_jobs as j
+join voice_conversion_models as vm
+on j.maybe_model_token = vm.token
+where vm.mod_deleted_at IS NOT NULL
+  and j.created_at >  NOW() - INTERVAL 24 HOUR
+group by vm.token, vm.title
+
 -- See who is uploading SadTalker jobs
 select
     maybe_creator_user_token,

_sql/migrations/2023-12-11-115710_add_user_bookmarks/down.sql

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

_sql/migrations/2023-12-11-115710_add_user_bookmarks/up.sql

@@ -0,0 +1,46 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Favorites that can be attached to just about anything.
+-- This is a polymorphic table and can apply to a wide variety of entities.
+CREATE TABLE user_bookmarks
+(
+    -- Not used for anything except replication.
+    id                      BIGINT(20)  NOT NULL AUTO_INCREMENT,
+
+    -- Effective "primary key" (PUBLIC)
+    token                   VARCHAR(32) NOT NULL,
+
+    -- User making the favorite
+    user_token              VARCHAR(32) NOT NULL,
+
+    -- The type of entity the favorite applies to
+    entity_type             VARCHAR(32) NOT NULL,
+
+    -- The token of the entity the favorite applies to
+    entity_token            VARCHAR(32) NOT NULL,
+
+    -- ========== VECTOR CLOCK ==========
+
+    -- Incremented with every update.
+    version                 INT  NOT NULL DEFAULT 0,
+
+    -- ========== TIMESTAMPS ==========
+
+    created_at         TIMESTAMP   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at         TIMESTAMP   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    deleted_at         TIMESTAMP   NULL,
+
+    -- INDICES --
+    PRIMARY KEY (id),
+    UNIQUE KEY (token),
+    KEY index_entity_type_entity_token (entity_type, entity_token),
+    KEY index_user_token_entity_token (user_token, entity_type),
+    KEY index_user_token (user_token),
+    KEY index_created_at (created_at),
+    KEY index_user_deleted_at (deleted_at)
+
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_bin;

_sql/migrations/2023-12-15-015254_alter_model_weights_add_old_token/down.sql

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

_sql/migrations/2023-12-15-015254_alter_model_weights_add_old_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights
+    ADD COLUMN maybe_migration_old_model_token VARCHAR(32) DEFAULT NULL
+    AFTER cached_user_ratings_last_updated_at;
+
+ALTER TABLE model_weights
+    ADD UNIQUE INDEX unique_index_maybe_migration_old_model_token (maybe_migration_old_model_token);

_sql/migrations/2023-12-15-015311_alter_voice_conversion_models_add_new_token/down.sql

@@ -0,0 +1,6 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE voice_conversion_models
+    DROP COLUMN maybe_migration_new_model_weights_token;

_sql/migrations/2023-12-15-015311_alter_voice_conversion_models_add_new_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE voice_conversion_models
+    ADD COLUMN maybe_migration_new_model_weights_token VARCHAR(32) DEFAULT NULL
+    AFTER maybe_mod_comments;
+
+ALTER TABLE voice_conversion_models
+    ADD UNIQUE INDEX unique_index_maybe_migration_new_model_weights_token (maybe_migration_new_model_weights_token);

_sql/migrations/2023-12-15-015319_alter_tts_models_add_new_token/down.sql

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

_sql/migrations/2023-12-15-015319_alter_tts_models_add_new_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE tts_models
+    ADD COLUMN maybe_migration_new_model_weights_token VARCHAR(32) DEFAULT NULL
+    AFTER maybe_mod_user_token;
+
+ALTER TABLE tts_models
+    ADD UNIQUE INDEX unique_index_maybe_migration_new_model_weights_token (maybe_migration_new_model_weights_token);

_sql/migrations/2023-12-15-015329_alter_vocoder_models_add_new_token/down.sql

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

_sql/migrations/2023-12-15-015329_alter_vocoder_models_add_new_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE vocoder_models
+    ADD COLUMN maybe_migration_new_model_weights_token VARCHAR(32) DEFAULT NULL
+    AFTER maybe_mod_user_token;
+
+ALTER TABLE vocoder_models
+    ADD UNIQUE INDEX unique_index_maybe_migration_new_model_weights_token (maybe_migration_new_model_weights_token);

_sql/migrations/2023-12-15-024344_alter_model_weights_add_avatar_media_file_token/down.sql

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

_sql/migrations/2023-12-15-024344_alter_model_weights_add_avatar_media_file_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights
+    ADD COLUMN maybe_avatar_media_file_token VARCHAR(32) DEFAULT NULL
+    AFTER maybe_thumbnail_token;
+
+ALTER TABLE model_weights
+    ADD INDEX index_maybe_avatar_media_file_token (maybe_avatar_media_file_token);

_sql/migrations/2023-12-15-024350_alter_model_weights_add_cover_media_file_token/down.sql

@@ -0,0 +1,6 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights DROP COLUMN maybe_cover_media_file_token;
+

_sql/migrations/2023-12-15-024350_alter_model_weights_add_cover_media_file_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights
+    ADD COLUMN maybe_cover_media_file_token VARCHAR(32) DEFAULT NULL
+    AFTER maybe_avatar_media_file_token;
+
+ALTER TABLE model_weights
+    ADD INDEX index_maybe_cover_media_file_token (maybe_cover_media_file_token);

_sql/migrations/2023-12-15-034614_alter_users_add_avatar_media_file_token/down.sql

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

_sql/migrations/2023-12-15-034614_alter_users_add_avatar_media_file_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE users
+    ADD COLUMN maybe_avatar_media_file_token VARCHAR(32) DEFAULT NULL
+    AFTER ip_address_last_update;
+
+ALTER TABLE users
+    ADD INDEX index_maybe_avatar_media_file_token (maybe_avatar_media_file_token);

_sql/migrations/2023-12-15-034644_alter_users_add_cover_media_file_token/down.sql

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

_sql/migrations/2023-12-15-034644_alter_users_add_cover_media_file_token/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE users
+    ADD COLUMN maybe_cover_media_file_token VARCHAR(32) DEFAULT NULL
+    AFTER maybe_avatar_media_file_token;
+
+ALTER TABLE users
+    ADD INDEX index_maybe_cover_media_file_token (maybe_cover_media_file_token);

_sql/migrations/2023-12-15-044416_model_weights_preview_samples/down.sql

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

_sql/migrations/2023-12-15-044416_model_weights_preview_samples/up.sql

@@ -0,0 +1,47 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE model_weights_preview_samples (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- ========== WEIGHTS CLASSIFICATION ==========
+
+  -- Foreign key to model weights.
+  -- This is in a composite index with media_file_token to make sure a media file only applies
+  -- to a given model once.
+  model_weight_token VARCHAR(32) NOT NULL,
+
+  -- Foreign key to media files
+  -- This is in a composite index with model_weight_token to make sure a media file only applies
+  -- to a given model once.
+  media_file_token VARCHAR(32) NOT NULL,
+
+  -- Information about who set the sample
+  --  * automation
+  --  * author
+  --  * community
+  set_by VARCHAR(16) NOT NULL,
+
+  -- Incremented with every update.
+  version INT NOT NULL DEFAULT 0,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- If this is removed by a mod.
+  -- It completely disappears from the system.
+  user_deleted_at TIMESTAMP NULL,
+  mod_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (model_weight_token, media_file_token),
+
+  KEY index_model_weight_token (model_weight_token),
+  KEY index_media_file_token (media_file_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations/2023-12-15-182157_rename_model_weights_extension_tables/down.sql

@@ -0,0 +1,9 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- I'm doing this to visually align these tables and sort them together, because there will likely be other model_weights_* tables.
+RENAME TABLE model_weights_extension_image_generation_details TO model_weights_image_generation_details;
+RENAME TABLE model_weights_extension_tts_details TO model_weights_tts_details;
+RENAME TABLE model_weights_extension_vocoder_details TO model_weights_vocoder_details;
+RENAME TABLE model_weights_extension_voice_conversion_details TO model_weights_voice_conversion_details;

_sql/migrations/2023-12-15-182157_rename_model_weights_extension_tables/up.sql

@@ -0,0 +1,9 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- I'm doing this to visually align these tables and sort them together, because there will likely be other model_weights_* tables.
+RENAME TABLE model_weights_image_generation_details TO model_weights_extension_image_generation_details;
+RENAME TABLE model_weights_tts_details TO model_weights_extension_tts_details;
+RENAME TABLE model_weights_vocoder_details TO model_weights_extension_vocoder_details;
+RENAME TABLE model_weights_voice_conversion_details TO model_weights_extension_voice_conversion_details;

_sql/migrations/2023-12-15-184731_alter_model_weights_add_indices/down.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP INDEX index_weights_type ON model_weights;
+DROP INDEX index_weights_category ON model_weights;
+DROP INDEX fk_creator_user_token ON model_weights;
+DROP INDEX index_creator_set_visibility ON model_weights;
+DROP INDEX fk_maybe_avatar_media_file_token ON model_weights;
+DROP INDEX fk_maybe_cover_media_file_token ON model_weights;

_sql/migrations/2023-12-15-184731_alter_model_weights_add_indices/up.sql

@@ -0,0 +1,10 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE INDEX index_weights_type ON model_weights (weights_type);
+CREATE INDEX index_weights_category ON model_weights (weights_category);
+CREATE INDEX fk_creator_user_token ON model_weights (creator_user_token);
+CREATE INDEX index_creator_set_visibility ON model_weights (creator_set_visibility);
+CREATE INDEX fk_maybe_avatar_media_file_token ON model_weights (maybe_avatar_media_file_token);
+CREATE INDEX fk_maybe_cover_media_file_token ON model_weights (maybe_cover_media_file_token);

_sql/migrations/2023-12-15-185147_alter_users_add_indices/down.sql

@@ -0,0 +1,6 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP INDEX fk_maybe_avatar_media_file_token ON users;
+DROP INDEX fk_maybe_cover_media_file_token ON users;

_sql/migrations/2023-12-15-185147_alter_users_add_indices/up.sql

@@ -0,0 +1,6 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE INDEX fk_maybe_avatar_media_file_token ON users (maybe_avatar_media_file_token);
+CREATE INDEX fk_maybe_cover_media_file_token ON users (maybe_cover_media_file_token);

_sql/migrations/2023-12-21-060916_alter_model_weights_rename_bucket_hash/down.sql

@@ -0,0 +1,12 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights
+    RENAME COLUMN public_bucket_hash TO private_bucket_hash;
+
+ALTER TABLE model_weights
+    RENAME COLUMN maybe_public_bucket_prefix TO maybe_private_bucket_prefix;
+
+ALTER TABLE model_weights
+    RENAME COLUMN maybe_public_bucket_extension TO maybe_private_bucket_extension;

_sql/migrations/2023-12-21-060916_alter_model_weights_rename_bucket_hash/up.sql

@@ -0,0 +1,12 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights
+    RENAME COLUMN private_bucket_hash TO public_bucket_hash;
+
+ALTER TABLE model_weights
+    RENAME COLUMN maybe_private_bucket_prefix TO maybe_public_bucket_prefix;
+
+ALTER TABLE model_weights
+    RENAME COLUMN maybe_private_bucket_extension TO maybe_public_bucket_extension;

_sql/migrations_squashed/model_weights/model_weights.sql

@@ -0,0 +1,200 @@
+-- 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
+
+-- Every type of fine tuned model that users can upload.
+CREATE TABLE model_weights (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Effective "primary key" (PUBLIC)
+  token VARCHAR(32) NOT NULL,
+
+  -- ========== WEIGHTS CLASSIFICATION ==========
+
+  -- The exact type of weights
+  -- Currently supported values:
+  --   * 'hifigan_tt2' - hifigan for Tacotron2; TTS vocoder
+  --   * 'rvc_v2' - RVC (v2); voice conversion
+  --   * 'sd_1.5' - Stable Diffusion 1.5; image generation
+  --   * 'sdxl' - Stable Diffusion XL; image generation
+  --   * 'so_vits_svc' - SVC; voice conversion
+  --   * 'tt2' - Tacotron2; TTS
+  weights_type VARCHAR(32) NOT NULL,
+
+  -- The broader category of the weights
+  -- Currently supported values:
+  --   * 'image_generation' (SD1.5, SDXL)
+  --   * 'text_to_speech' (TT2)
+  --   * 'vocoder' (Hifigan)
+  --   * 'voice_conversion' (RVCv2, SVC)
+  weights_category VARCHAR(32) NOT NULL,
+
+
+  -- ========== MODEL DESCRIPTION ==========
+
+  -- The "name" of the model, which might be complicated.
+  title VARCHAR(255) NOT NULL,
+
+  -- TODO(bt, 2023-12-14): Delete the `maybe_thumbnail_token` column later.
+  --   We're using other columns instead.
+  maybe_thumbnail_token VARCHAR(32) DEFAULT NULL,
+
+  -- The "avatar" image is a media file of type image that serves as a
+  -- small avatar or profile picture icon.
+  maybe_avatar_media_file_token VARCHAR(32) DEFAULT NULL,
+
+  -- The "cover" image is a media file of type image that covers the
+  -- top of the page.
+  maybe_cover_media_file_token VARCHAR(32) DEFAULT NULL,
+
+  -- The description of the model in markdown.
+  description_markdown TEXT NOT NULL,
+
+  -- Generated HTML (not user-editable).
+  description_rendered_html TEXT NOT NULL,
+
+
+  -- ========== CREATOR DETAILS ==========
+
+  -- The person that created the model.
+  creator_user_token VARCHAR(32) NOT NULL,
+
+  -- For abuse tracking.
+  -- Wide enough for IPv4/6.
+  -- IP address of creator at time of creation.
+  creator_ip_address VARCHAR(40) NOT NULL,
+
+  -- (THIS MIGHT NOT BE USED)
+  -- NB: DO NOT SORT!
+  -- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
+  creator_set_visibility ENUM(
+    'public',
+    'hidden',
+    'private'
+  ) NOT NULL DEFAULT 'public',
+
+  -- The synthetic id associated with this model.
+  -- These ids are incremented on a per-user basis to help users
+  -- sequence their own work. They serve no other purpose.
+  -- "weights" synthetic ids are incremented over all media files
+  -- creator_weights_synthetic_id BIGINT(20) DEFAULT NULL,
+
+  -- "weights_type" synthetic ids are incremented over a given weight type
+  -- creator_weights_type_synthetic_id BIGINT(20) DEFAULT NULL,
+
+  -- The last user to edit the model. This could be the creator or a moderator.
+  -- Check the future audit logs table for more info.
+  maybe_last_update_user_token VARCHAR(32) DEFAULT NULL,
+
+
+  -- ========== IMMUTABLE PROVENANCE AND METADATA ==========
+
+  -- Where the file was originally downloaded (if it was downloaded)
+  original_download_url VARCHAR(512) DEFAULT NULL,
+
+  -- The filename that was used at upload time (if available)
+  original_filename VARCHAR(255) DEFAULT NULL,
+
+  -- File characteristics
+  file_size_bytes INT(10) NOT NULL DEFAULT 0,
+
+  -- Checksum of the original weights file
+  -- SHA2 hash [SHA2 = CHAR(64), SHA1 = CHAR(40), MD5 = CHAR(32)]
+  -- Note that SHA2 is a hash family (SHA-228, SHA-256, SHA-384, SHA-512, SHA-512/224, SHA-512/256, ...)
+  -- and produces different lengths output depending on the choice of algorithm.
+  file_checksum_sha2 CHAR(64) NOT NULL,
+
+  -- ========== BUCKET STORAGE ==========
+
+  -- The hash for the bucket directory that contains the original upload
+  -- as well as any associated other files.
+  -- The bucket filename for the primary file (not including the directory path) is given by:
+  -- `[{maybe_public_bucket_prefix}]{public_bucket_hash}[{maybe_public_bucket_extension}]`
+  public_bucket_hash  VARCHAR(32) NOT NULL,
+
+  -- An optional prefix on the bucket filename.
+  -- If present, this will be prepended to the beginning of the bucket filename to access the file.
+  -- The bucket filename for the primary file (not including the directory path) is given by:
+  -- `[{maybe_public_bucket_prefix}]{public_bucket_hash}[{maybe_public_bucket_extension}]`
+  maybe_public_bucket_prefix VARCHAR(16) DEFAULT NULL,
+
+  -- An optional appended extension on the bucket filename.
+  -- If present, this will be appended to the end of the bucket filename to access the file.
+  -- To allow for flexibility, this extension typically will contain a leading period if
+  -- the file needs it (eg ".mp4" rather than "mp4")!
+  -- The bucket filename for the primary file (not including the directory path) is given by:
+  -- `[{maybe_public_bucket_prefix}]{public_bucket_hash}[{maybe_public_bucket_extension}]`
+  maybe_public_bucket_extension VARCHAR(16) DEFAULT NULL,
+
+
+  -- ========== MODERATION DETAILS ==========
+
+  -- Mods may have to approve of vc models for them to show up in a public index.
+  -- Models can be used by the author (or other parties that know the URL) before
+  -- they're approved, but unapproved models won't show up in public indices.
+  -- This is independent of other visibility controls (is_mod_disabled, deleted_at,
+  -- and creator_set_visibility)
+  -- is_public_listing_approved BOOLEAN DEFAULT NULL,
+
+  -- Extremely popular models may be locked from deletion or modification by users.
+  -- is_locked_from_user_modification BOOLEAN NOT NULL DEFAULT FALSE,
+
+
+  -- ========== RATING AND RANKING ==========
+
+  -- User ratings are cached on the model, but are *not* a source of truth.
+  -- Total count only includes "positive" and "negative" votes, not neutral ones.
+  cached_user_ratings_total_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
+
+  -- Total positive
+  cached_user_ratings_positive_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
+
+  -- Total negative
+  cached_user_ratings_negative_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
+
+  -- User ratings are cached on the model, but are *not* a source of truth.
+  -- Total count only includes "positive" and "negative" votes, not neutral ones.
+  maybe_cached_user_ratings_ratio FLOAT,
+
+  -- When the cached ratings were last calculated and updated.
+  cached_user_ratings_last_updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+
+  -- ========== MIGRATION DETAILS ==========
+
+  -- If migrated from another table, this is the token of the original model.
+  maybe_migration_old_model_token VARCHAR(32) DEFAULT NULL,
+
+
+  -- ========== VECTOR CLOCK ==========
+
+  -- Incremented with every update.
+  version INT NOT NULL DEFAULT 0,
+
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- If this is removed by a mod.
+  -- It completely disappears from the system.
+  user_deleted_at TIMESTAMP NULL,
+  mod_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (token),
+
+  KEY index_weights_type (weights_type),
+  KEY index_weights_category (weights_category),
+  KEY fk_creator_user_token (creator_user_token),
+  KEY index_creator_set_visibility (creator_set_visibility),
+  KEY fk_maybe_avatar_media_file_token (maybe_avatar_media_file_token),
+  KEY fk_maybe_cover_media_file_token (maybe_cover_media_file_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/model_weights/model_weights_extension_image_generation_details.sql

@@ -0,0 +1,50 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Every type of fine tuned model that users can upload.
+CREATE TABLE model_weights_extension_image_generation_details (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Simultaneous primary and foreign key.
+  -- This should match a single record in the `model_weights` table.
+  -- This turns this table into a polymorphic extension table.
+  model_weights_token VARCHAR(32) NOT NULL,
+
+
+  -- ========== IMAGE GENERATION MODEL METADATA ==========
+
+  -- RVC (v2) specific - whether the model has an index file associated with it
+  -- These files improve the quality of the results.
+  vc_has_index_file BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- ========== VECTOR CLOCK ==========
+
+  -- Incremented with every update.
+  version INT NOT NULL DEFAULT 0,
+
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- If this is removed by a mod.
+  -- It completely disappears from the system.
+  user_deleted_at TIMESTAMP NULL,
+  mod_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (model_weights_token)
+  -- TODO:
+  -- KEY index_model_type (model_type),
+  -- KEY fk_maybe_vocoder_token (maybe_vocoder_token),
+  -- KEY fk_creator_user_token (creator_user_token),
+  -- KEY index_creator_set_visibility (creator_set_visibility),
+  -- KEY index_private_bucket_hash (private_bucket_hash),
+  -- KEY index_is_public_listing_approved (is_public_listing_approved),
+  -- KEY index_is_locked_from_user_modification (is_locked_from_user_modification)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/model_weights/model_weights_extension_tts_details.sql

@@ -0,0 +1,73 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Extra metadata on tts models
+CREATE TABLE model_weights_extension_tts_details (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Simultaneous primary and foreign key.
+  -- This should match a single record in the `model_weights` table.
+  -- This turns this table into a polymorphic extension table.
+  model_weights_token VARCHAR(32) NOT NULL,
+
+  -- ========== TTS MODEL METADATA ==========
+
+  -- The full IETF BCP47 language tag (eg. en, en-US, es-419, ja-JP, pt, etc.)
+  -- (Not that it matters apart from categorization, since voice conversion is universal.)
+  ietf_language_tag VARCHAR(64) NOT NULL DEFAULT 'en',
+
+  -- The IETF BCP47 language tag's primary language subtag (eg. "es-419" becomes "es")
+  -- (Not that it matters apart from categorization, since voice conversion is universal.)
+  ietf_primary_language_subtag VARCHAR(12) NOT NULL DEFAULT 'en',
+
+  -- This is for Tacotron2, specifically.
+  -- The name of the type of pipeline to use, eg "legacy_fakeyou", "legacy_vocodes", "english_v1", etc.
+  -- New pipelines may be added at any point in the future and the source of truth for them will mostly
+  -- live in the `storyteller-ml` repository.
+  -- Older models and brand new models will have this field set to null, and we'll infer which value to
+  -- lazily backfill based on the creation date and language setting.
+  -- tts_text_pipeline_type VARCHAR(64) DEFAULT NULL,
+
+  -- If true, multiply the mel outputs before being vocoded by a globally default constant.
+  use_default_mel_multiply_factor BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- If not null, multiply the mel outputs before being vocoded by this value.
+  -- This is used instead of the default if `tts_use_default_mel_multiply_factor` is
+  -- set (ie. `tts_use_default_mel_multiply_factor` is ignored and this custom value is used instead)
+  maybe_custom_mel_multiply_factor DOUBLE DEFAULT NULL,
+
+  -- If set, use a different pretrained vocoder.
+  -- If not set, use the website default. (Currently HifiGan-SS)
+  maybe_default_pretrained_vocoder VARCHAR(64) DEFAULT NULL,
+
+  -- If set, we'll use a custom vocoder (from table vocoder_models) instead of a default vocoder.
+  -- If not set, we'll use `maybe_default_pretrained_vocoder` (or the website default).
+  maybe_custom_vocoder_token VARCHAR(32) DEFAULT NULL,
+
+
+  -- ========== VECTOR CLOCK ==========
+
+  -- Incremented with every update.
+  version INT NOT NULL DEFAULT 0,
+
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (model_weights_token)
+  -- TODO:
+  -- KEY index_model_type (model_type),
+  -- KEY fk_maybe_vocoder_token (maybe_vocoder_token),
+  -- KEY fk_creator_user_token (creator_user_token),
+  -- KEY index_creator_set_visibility (creator_set_visibility),
+  -- KEY index_private_bucket_hash (private_bucket_hash),
+  -- KEY index_is_public_listing_approved (is_public_listing_approved),
+  -- KEY index_is_locked_from_user_modification (is_locked_from_user_modification)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/model_weights/model_weights_extension_vocoder_details.sql

@@ -0,0 +1,50 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Every type of fine tuned model that users can upload.
+CREATE TABLE model_weights_extension_vocoder_details (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Simultaneous primary and foreign key.
+  -- This should match a single record in the `model_weights` table.
+  -- This turns this table into a polymorphic extension table.
+  model_weights_token VARCHAR(32) NOT NULL,
+
+
+  -- ========== VOCODER MODEL METADATA ==========
+
+  -- Whether the vocoder is recommended for use
+  -- vocoder_is_staff_recommended BOOLEAN NOT NULL DEFAULT FALSE,
+
+
+  -- ========== VECTOR CLOCK ==========
+
+  -- Incremented with every update.
+  version INT NOT NULL DEFAULT 0,
+
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- If this is removed by a mod.
+  -- It completely disappears from the system.
+  user_deleted_at TIMESTAMP NULL,
+  mod_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (model_weights_token)
+  -- TODO:
+  -- KEY index_model_type (model_type),
+  -- KEY fk_maybe_vocoder_token (maybe_vocoder_token),
+  -- KEY fk_creator_user_token (creator_user_token),
+  -- KEY index_creator_set_visibility (creator_set_visibility),
+  -- KEY index_private_bucket_hash (private_bucket_hash),
+  -- KEY index_is_public_listing_approved (is_public_listing_approved),
+  -- KEY index_is_locked_from_user_modification (is_locked_from_user_modification)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/model_weights/model_weights_extension_voice_conversion_details.sql

@@ -0,0 +1,62 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Every type of fine tuned model that users can upload.
+CREATE TABLE model_weights_extension_voice_conversion_details (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- Simultaneous primary and foreign key.
+  -- This should match a single record in the `model_weights` table.
+  -- This turns this table into a polymorphic extension table.
+  model_weights_token VARCHAR(32) NOT NULL,
+
+
+  -- ========== VOICE CONVERSION MODEL METADATA ==========
+
+  -- The full IETF BCP47 language tag (eg. en, en-US, es-419, ja-JP, pt, etc.)
+  -- (Not that it matters apart from categorization, since voice conversion is universal.)
+  ietf_language_tag VARCHAR(64) NOT NULL DEFAULT 'en',
+
+  -- The IETF BCP47 language tag's primary language subtag (eg. "es-419" becomes "es")
+  -- (Not that it matters apart from categorization, since voice conversion is universal.)
+  ietf_primary_language_subtag VARCHAR(12) NOT NULL DEFAULT 'en',
+
+  -- RVC (v2) specific - whether the model has an index file associated with it
+  -- These files improve the quality of the results.
+  has_index_file BOOLEAN NOT NULL DEFAULT FALSE,
+
+  -- Pitch algorithm to use by default
+  default_pitch_algorithm VARCHAR(64) DEFAULT NULL,
+
+
+  -- ========== VECTOR CLOCK ==========
+
+  -- Incremented with every update.
+  version INT NOT NULL DEFAULT 0,
+
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- If this is removed by a mod.
+  -- It completely disappears from the system.
+  user_deleted_at TIMESTAMP NULL,
+  mod_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (model_weights_token)
+  -- TODO:
+  -- KEY index_model_type (model_type),
+  -- KEY fk_maybe_vocoder_token (maybe_vocoder_token),
+  -- KEY fk_creator_user_token (creator_user_token),
+  -- KEY index_creator_set_visibility (creator_set_visibility),
+  -- KEY index_private_bucket_hash (private_bucket_hash),
+  -- KEY index_is_public_listing_approved (is_public_listing_approved),
+  -- KEY index_is_locked_from_user_modification (is_locked_from_user_modification)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/model_weights/model_weights_preview_samples.sql

@@ -0,0 +1,47 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE TABLE model_weights_preview_samples (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- ========== WEIGHTS CLASSIFICATION ==========
+
+  -- Foreign key to model weights.
+  -- This is in a composite index with media_file_token to make sure a media file only applies
+  -- to a given model once.
+  model_weight_token VARCHAR(32) NOT NULL,
+
+  -- Foreign key to media files
+  -- This is in a composite index with model_weight_token to make sure a media file only applies
+  -- to a given model once.
+  media_file_token VARCHAR(32) NOT NULL,
+
+  -- Information about who set the sample
+  --  * automation
+  --  * author
+  --  * community
+  set_by VARCHAR(16) NOT NULL,
+
+  -- Incremented with every update.
+  version INT NOT NULL DEFAULT 0,
+
+  -- ========== TIMESTAMPS ==========
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+
+  -- If this is removed by a mod.
+  -- It completely disappears from the system.
+  user_deleted_at TIMESTAMP NULL,
+  mod_deleted_at TIMESTAMP NULL,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (model_weight_token, media_file_token),
+
+  KEY index_model_weight_token (model_weight_token),
+  KEY index_media_file_token (media_file_token)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_sql/migrations_squashed/tts_tables/tts_models.sql

@@ -200,6 +200,11 @@ CREATE TABLE tts_models (
   -- The last moderator that made changes.
   maybe_mod_user_token VARCHAR(32) DEFAULT NULL,
 
+  -- ========== MIGRATION DETAILS ==========
+
+  -- If migrated to model_weights, this is the new token
+  maybe_migration_new_model_weights_token VARCHAR(32) DEFAULT NULL,
+
   -- ========== VECTOR CLOCK ==========
 
   -- Incremented with every update.

_sql/migrations_squashed/tts_tables/vocoder_models.sql

@@ -99,6 +99,11 @@ CREATE TABLE vocoder_models (
   -- The last moderator that made changes.
   maybe_mod_user_token VARCHAR(32) DEFAULT NULL,
 
+  -- ========== MIGRATION DETAILS ==========
+
+  -- If migrated to model_weights, this is the new token
+  maybe_migration_new_model_weights_token VARCHAR(32) DEFAULT NULL,
+
   -- ========== VECTOR CLOCK ==========
 
   -- Incremented with every update.

_sql/migrations_squashed/user_tables/users.sql

@@ -53,6 +53,14 @@ CREATE TABLE users (
 
   -- ========== DISPLAY / PROFILE ==========
 
+  -- The "avatar" image is a media file of type image that serves as a
+  -- small avatar or profile picture icon.
+  maybe_avatar_media_file_token VARCHAR(32) DEFAULT NULL,
+
+  -- The "cover" image is a media file of type image that covers the
+  -- top of the page.
+  maybe_cover_media_file_token VARCHAR(32) DEFAULT NULL,
+
   -- Gravatar image hashes are precomputed.
   email_gravatar_hash CHAR(32) NOT NULL,
 
@@ -162,7 +170,9 @@ CREATE TABLE users (
   UNIQUE KEY (token),
   UNIQUE KEY (username),
   UNIQUE KEY (email_address),
-  KEY fk_user_role_slug (user_role_slug)
+  KEY fk_user_role_slug (user_role_slug),
+  KEY fk_maybe_avatar_media_file_token (maybe_avatar_media_file_token),
+  KEY fk_maybe_cover_media_file_token (maybe_cover_media_file_token)
 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 

_sql/migrations_squashed/voice_conversion_models.sql

@@ -121,6 +121,11 @@ CREATE TABLE voice_conversion_models (
   -- If a moderator has comments.
   maybe_mod_comments VARCHAR(255) DEFAULT NULL,
 
+  -- ========== MIGRATION DETAILS ==========
+
+  -- If migrated to model_weights, this is the new token
+  maybe_migration_new_model_weights_token VARCHAR(32) DEFAULT NULL,
+
   -- ========== VECTOR CLOCK ==========
 
   -- Incremented with every update.

crates/_types/buckets/Cargo.toml

@@ -17,7 +17,10 @@ path = "src/lib.rs"
 # Internal
 crockford = { path = "../../lib/crockford" }
 errors = { path = "../../lib/errors" }
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+
+
+# Workspace hack (faster compile times)
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 # External
 # (none yet)

crates/_types/buckets/src/lib.rs

@@ -10,7 +10,7 @@
 
 // Okay to toggle
 #![forbid(unreachable_patterns)]
-#![forbid(unused_imports)]
+// #![forbid(unused_imports)]
 #![forbid(unused_mut)]
 #![forbid(unused_variables)]
 

crates/_types/buckets/src/private/mod.rs

@@ -1 +1,2 @@
-pub mod private_path;
+pub mod private_path;
+pub mod zs_voices;

crates/_types/buckets/src/private/zs_voices/bucket_directory.rs

@@ -1,6 +1,6 @@
 use crockford::crockford_entropy_lower;
-use crate::private::private_path::PrivatePath;
 
+use crate::private::private_path::PrivatePath;
 use crate::util::hashed_directory_path_long_string::hashed_directory_path_long_string;
 
 // TODO: Generate these from a macro.
@@ -79,7 +79,7 @@ impl ZeroShotVoiceEmbeddingBucketDirectory {
 
 #[cfg(test)]
 mod tests {
-  use crate::public::zs_voices::directory::{ModelCategory, ModelType, ZeroShotVoiceEmbeddingBucketDirectory};
+  use crate::private::zs_voices::bucket_directory::{ModelCategory, ModelType, ZeroShotVoiceEmbeddingBucketDirectory};
 
   #[test]
   pub fn generate_new_entropy() {

crates/_types/buckets/src/private/zs_voices/bucket_file_path.rs

@@ -3,11 +3,10 @@ use std::path::PathBuf;
 use crockford::crockford_entropy_lower;
 
 use crate::private::private_path::PrivatePath;
-use crate::public::zs_voices::directory::{ModelCategory, ModelType, ZeroShotVoiceEmbeddingBucketDirectory};
+use crate::private::zs_voices::bucket_directory::{ModelCategory, ModelType, ZeroShotVoiceEmbeddingBucketDirectory};
 
 // TODO: Generate these from a macro.
 
-
 /// The original user upload file.
 /// It may have derivative files (down samples, crops, etc.) that live alongside it.
 #[derive(Clone)]
@@ -74,11 +73,9 @@ impl ZeroShotVoiceEmbeddingBucketPath {
 mod tests {
   use std::path::PathBuf;
 
-  use crate::public::media_files::original_file::MediaFileBucketPath;
-
   mod with_prefix_and_extension {
-    use crate::public::zs_voices::directory::ModelCategory;
-    use crate::public::zs_voices::file::{ModelType, ZeroShotVoiceEmbeddingBucketPath};
+    use crate::private::zs_voices::bucket_directory::ModelCategory;
+    use crate::private::zs_voices::bucket_file_path::{ModelType, ZeroShotVoiceEmbeddingBucketPath};
 
     #[test]
     pub fn generate_new_entropy() {
@@ -97,8 +94,8 @@ mod tests {
   }
 
   mod without_prefix_and_extension {
-    use crate::public::zs_voices::directory::ModelCategory;
-    use crate::public::zs_voices::file::{ModelType, ZeroShotVoiceEmbeddingBucketPath};
+    use crate::private::zs_voices::bucket_directory::ModelCategory;
+    use crate::private::zs_voices::bucket_file_path::{ModelType, ZeroShotVoiceEmbeddingBucketPath};
 
     use super::*;
 
@@ -135,7 +132,7 @@ mod tests {
     #[test]
     pub fn get_object_hash() {
       let hash = "abcdefghijk";
-      let file = MediaFileBucketPath::from_object_hash(hash, None, None);
+      let file = ZeroShotVoiceEmbeddingBucketPath::from_object_hash(hash, ModelCategory::Tts, ModelType::VallEx, 1);
       assert_eq!(file.get_object_hash(), hash);
     }
   }

crates/_types/buckets/src/private/zs_voices/mod.rs

@@ -0,0 +1,2 @@
+pub mod bucket_directory;
+pub mod bucket_file_path;

crates/_types/buckets/src/public/media_files/bucket_directory.rs

@@ -4,7 +4,6 @@ use crate::public::public_path::PublicPath;
 use crate::util::hashed_directory_path_long_string::hashed_directory_path_long_string;
 
 // TODO: Generate these from a macro.
-
 // TODO: Use a central path registry for quick reference
 const MEDIA_FILE_DIRECTORY: &str = "/media";
 
@@ -47,7 +46,7 @@ impl MediaFileBucketDirectory {
 
 #[cfg(test)]
 mod tests {
-  use crate::public::media_files::directory::MediaFileBucketDirectory;
+  use crate::public::media_files::bucket_directory::MediaFileBucketDirectory;
 
   #[test]
   pub fn generate_new_entropy() {

crates/_types/buckets/src/public/media_files/bucket_file_path.rs

@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use crockford::crockford_entropy_lower;
 
-use crate::public::media_files::directory::MediaFileBucketDirectory;
+use crate::public::media_files::bucket_directory::MediaFileBucketDirectory;
 use crate::public::public_path::PublicPath;
 
 const ORIGINAL_FILE_BASENAME : &str = "file.bin";
@@ -79,7 +79,7 @@ impl MediaFileBucketPath {
 mod tests {
   use std::path::PathBuf;
 
-  use crate::public::media_files::original_file::MediaFileBucketPath;
+  use crate::public::media_files::bucket_file_path::MediaFileBucketPath;
 
   mod with_prefix_and_extension {
     use super::*;

crates/_types/buckets/src/public/media_files/mod.rs

@@ -1,2 +1,2 @@
-pub mod directory;
-pub mod original_file;
+pub mod bucket_directory;
+pub mod bucket_file_path;

crates/_types/buckets/src/public/media_uploads/bucket_directory.rs

@@ -47,7 +47,7 @@ impl MediaUploadDirectory {
 
 #[cfg(test)]
 mod tests {
-  use crate::public::media_uploads::directory::MediaUploadDirectory;
+  use crate::public::media_uploads::bucket_directory::MediaUploadDirectory;
 
   #[test]
   pub fn generate_new_entropy() {

crates/_types/buckets/src/public/media_uploads/bucket_file_path.rs

@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use crockford::crockford_entropy_lower;
 
-use crate::public::media_uploads::directory::MediaUploadDirectory;
+use crate::public::media_uploads::bucket_directory::MediaUploadDirectory;
 use crate::public::public_path::PublicPath;
 
 const ORIGINAL_FILE_BASENAME : &str = "original_upload.bin";
@@ -61,7 +61,7 @@ impl MediaUploadOriginalFilePath {
 mod tests {
   use std::path::PathBuf;
 
-  use crate::public::media_uploads::original_file::MediaUploadOriginalFilePath;
+  use crate::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath;
 
   #[test]
   pub fn generate_new_entropy() {

crates/_types/buckets/src/public/media_uploads/mod.rs

@@ -1,2 +1,2 @@
-pub mod directory;
-pub mod original_file;
+pub mod bucket_directory;
+pub mod bucket_file_path;

crates/_types/buckets/src/public/mod.rs

@@ -2,4 +2,5 @@ pub mod media_files;
 pub mod media_uploads;
 pub mod public_path;
 pub mod voice_conversion_results;
-pub mod zs_voices;
+pub mod weight_uploads;
+pub mod weight_files;

crates/_types/buckets/src/public/voice_conversion_results/bucket_directory.rs

@@ -40,7 +40,7 @@ impl VoiceConversionResultDirectory {
 
 #[cfg(test)]
 mod tests {
-  use crate::public::voice_conversion_results::directory::VoiceConversionResultDirectory;
+  use crate::public::voice_conversion_results::bucket_directory::VoiceConversionResultDirectory;
 
   #[test]
   pub fn get_directory_path_str() {

crates/_types/buckets/src/public/voice_conversion_results/bucket_file_path.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use crockford::crockford_entropy_lower;
 
 use crate::public::public_path::PublicPath;
-use crate::public::voice_conversion_results::directory::VoiceConversionResultDirectory;
+use crate::public::voice_conversion_results::bucket_directory::VoiceConversionResultDirectory;
 
 const ORIGINAL_FILE_PREFIX : &str = "fakeyou_";
 const ORIGINAL_FILE_SUFFIX : &str = ".wav";
@@ -65,7 +65,7 @@ impl VoiceConversionResultOriginalFilePath {
 mod tests {
   use std::path::PathBuf;
 
-  use crate::public::voice_conversion_results::original_file::VoiceConversionResultOriginalFilePath;
+  use crate::public::voice_conversion_results::bucket_file_path::VoiceConversionResultOriginalFilePath;
 
   #[test]
   pub fn generate_new_entropy() {

crates/_types/buckets/src/public/voice_conversion_results/mod.rs

@@ -1,2 +1,2 @@
-pub mod directory;
-pub mod original_file;
+pub mod bucket_directory;
+pub mod bucket_file_path;

crates/_types/buckets/src/public/weight_files/bucket_directory.rs

@@ -0,0 +1,75 @@
+use crockford::crockford_entropy_lower;
+
+use crate::public::public_path::PublicPath;
+use crate::util::hashed_directory_path_long_string::hashed_directory_path_long_string;
+
+// TODO: Generate these from a macro.
+// TODO: Use a central path registry for quick reference
+const WEIGHT_FILE_DIRECTORY: &str = "/weights";
+
+/// Directory for user weight uploads.
+/// Each uploaded file gets its own directory so that we can store the original
+/// file alongside re-processed derivatives.
+#[derive(Clone)]
+pub struct WeightFileBucketDirectory {
+  object_hash: String,
+  directory: String,
+}
+
+impl PublicPath for WeightFileBucketDirectory {}
+
+impl WeightFileBucketDirectory {
+
+  pub fn generate_new() -> Self {
+    let entropy = crockford_entropy_lower(32);
+    Self::from_object_hash(&entropy)
+  }
+
+  pub fn from_object_hash(object_hash: &str) -> Self {
+    // TODO: Path construction could be cleaner.
+    let middle = hashed_directory_path_long_string(object_hash);
+    let directory = format!("{}/{}{}", WEIGHT_FILE_DIRECTORY, middle, object_hash);
+    Self {
+      object_hash: object_hash.to_string(),
+      directory,
+    }
+  }
+
+  pub fn get_directory_path_str(&self) -> &str {
+    &self.directory
+  }
+
+  pub fn get_object_hash(&self) -> &str {
+    &self.object_hash
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::public::weight_files::bucket_directory::WeightFileBucketDirectory;
+
+  #[test]
+  pub fn generate_new_entropy() {
+    let directory = WeightFileBucketDirectory::generate_new();
+    assert_eq!(directory.get_object_hash().len(), 32);
+  }
+
+  #[test]
+  pub fn get_directory_path_str() {
+    let directory = WeightFileBucketDirectory::from_object_hash("abcdefghijk");
+    assert_eq!(directory.get_directory_path_str(), "/weights/a/b/c/d/e/abcdefghijk");
+  }
+
+  #[test]
+  pub fn get_directory_path_str_short_name() {
+    let directory = WeightFileBucketDirectory::from_object_hash("foo");
+    assert_eq!(directory.get_directory_path_str(), "/weights/f/o/foo");
+  }
+
+  #[test]
+  pub fn get_object_hash() {
+    let hash = "abcdefghijk";
+    let directory = WeightFileBucketDirectory::from_object_hash(hash);
+    assert_eq!(directory.get_object_hash(), hash);
+  }
+}

crates/_types/buckets/src/public/weight_files/bucket_file_path.rs

@@ -0,0 +1,218 @@
+use std::path::PathBuf;
+
+use crockford::crockford_entropy_lower;
+use crate::public::public_path::PublicPath;
+
+const ORIGINAL_FILE_BASENAME : &str = "file.bin";
+
+// TODO: Generate these from a macro.
+use crate::public::weight_files::bucket_directory::WeightFileBucketDirectory;
+/// The original user upload file.
+/// It may have derivative files (down samples, crops, etc.) that live alongside it.
+#[derive(Clone)]
+pub struct WeightFileBucketPath {
+  directory: WeightFileBucketDirectory,
+
+  filename: String,
+  full_object_path: String,
+
+  optional_prefix: Option<String>,
+  /// NB: Extension contains the leading period, eg. ".mp4"
+  optional_extension: Option<String>,
+}
+
+impl PublicPath for WeightFileBucketPath {}
+
+impl WeightFileBucketPath {
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn generate_for_svc_model() -> Self {
+    Self::generate_new(Some("svc_"), Some(".pt"))
+  }
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn generate_for_rvc_model() -> Self {
+    Self::generate_new(Some("rvc_"), Some(".pt"))
+  }
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn svc_model_file_from_object_hash(hash: &str) -> Self {
+    Self::from_object_hash(hash, Some("svc_"), Some(".pt"))
+  }
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn rvc_model_file_from_object_hash(hash: &str) -> Self {
+    Self::from_object_hash(hash, Some("rvc_"), Some(".pt"))
+  }
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn rvc_index_file_from_object_hash(hash: &str) -> Self {
+    Self::from_object_hash(hash, Some("rvc_"), Some(".index"))
+  }
+
+  pub fn generate_new(optional_prefix: Option<&str>, optional_extension: Option<&str>) -> Self {
+    let entropy = crockford_entropy_lower(32);
+    Self::from_object_hash(&entropy, optional_prefix, optional_extension)
+  }
+
+  pub fn from_object_hash(hash: &str, optional_prefix: Option<&str>, optional_extension: Option<&str>) -> Self {
+    // TODO: Path construction could be cleaner.
+    let directory = WeightFileBucketDirectory::from_object_hash(hash);
+
+    let filename = match (optional_prefix, optional_extension) {
+      (None, None) => ORIGINAL_FILE_BASENAME.to_string(),
+      (None, Some(ext)) => format!("{}{}", hash, ext),
+      (Some(pre), None) => format!("{}{}", pre, hash),
+      (Some(pre), Some(ext)) => format!("{}{}{}", pre, hash, ext),
+    };
+
+    let full_object_path = format!("{}/{}", directory.get_directory_path_str(), filename);
+
+    Self {
+      directory,
+      filename,
+      full_object_path,
+      optional_prefix: optional_prefix.map(|p| p.to_string()),
+      optional_extension: optional_extension.map(|e| e.to_string()),
+    }
+  }
+
+  pub fn get_full_object_path_str(&self) -> &str {
+    &self.full_object_path
+  }
+
+  pub fn to_full_object_pathbuf(&self) -> PathBuf {
+    PathBuf::from(&self.full_object_path)
+  }
+
+  pub fn get_directory(&self) -> &WeightFileBucketDirectory {
+    &self.directory
+  }
+
+  pub fn get_object_hash(&self) -> &str {
+    &self.directory.get_object_hash()
+  }
+
+  pub fn get_basename(&self) -> &str {
+    &self.filename
+  }
+
+  pub fn get_optional_prefix(&self) -> Option<&str> {
+    self.optional_prefix.as_deref()
+  }
+
+  pub fn get_optional_extension(&self) -> Option<&str> {
+    self.optional_extension.as_deref()
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use std::path::PathBuf;
+
+  use crate::public::weight_files::bucket_file_path::WeightFileBucketPath;
+  mod with_prefix_and_extension {
+    use super::*;
+
+    #[test]
+    pub fn generate_new_entropy() {
+      let file = WeightFileBucketPath::generate_new(Some("pre_"), Some(".mp4"));
+      assert_eq!(file.get_object_hash().len(), 32);
+      assert_eq!(file.get_object_hash().len(), 32);
+      assert_eq!(file.get_directory().get_object_hash().len(), 32);
+    }
+
+    #[test]
+    pub fn get_full_object_path_str() {
+      let file = WeightFileBucketPath::from_object_hash("abcdefghijk", Some("pre_"), Some(".mp4"));
+      assert_eq!(file.get_full_object_path_str(), "/weights/a/b/c/d/e/abcdefghijk/pre_abcdefghijk.mp4");
+      assert_eq!(file.get_basename(), "pre_abcdefghijk.mp4");
+    }
+
+    #[test]
+    pub fn generate_for_rvc_model() {
+      let file = WeightFileBucketPath::generate_for_rvc_model();
+      assert_eq!(file.get_object_hash().len(), 32);
+      assert_eq!(file.get_directory().get_object_hash().len(), 32);
+      assert_eq!(file.get_optional_prefix(), Some("rvc_"));
+      assert_eq!(file.get_optional_extension(), Some(".pt"));
+      assert!(file.get_basename().starts_with("rvc_"));
+      assert!(file.get_basename().ends_with(".pt"));
+    }
+
+    #[test]
+    pub fn generate_for_svc_model() {
+      let file = WeightFileBucketPath::generate_for_svc_model();
+      assert_eq!(file.get_object_hash().len(), 32);
+      assert_eq!(file.get_directory().get_object_hash().len(), 32);
+      assert_eq!(file.get_optional_prefix(), Some("svc_"));
+      assert_eq!(file.get_optional_extension(), Some(".pt"));
+      assert!(file.get_basename().starts_with("svc_"));
+      assert!(file.get_basename().ends_with(".pt"));
+    }
+
+    #[test]
+    pub fn svc_model_file_from_object_hash() {
+      let file = WeightFileBucketPath::svc_model_file_from_object_hash("hashed");
+      assert_eq!(file.get_full_object_path_str(), "/weights/h/a/s/h/e/hashed/svc_hashed.pt");
+      assert_eq!(file.get_basename(), "svc_hashed.pt");
+    }
+
+    #[test]
+    pub fn rvc_model_file_from_object_hash() {
+      let file = WeightFileBucketPath::rvc_model_file_from_object_hash("hashed");
+      assert_eq!(file.get_full_object_path_str(), "/weights/h/a/s/h/e/hashed/rvc_hashed.pt");
+      assert_eq!(file.get_basename(), "rvc_hashed.pt");
+    }
+
+    #[test]
+    pub fn rvc_index_file_from_object_hash() {
+      let file = WeightFileBucketPath::rvc_index_file_from_object_hash("hashed");
+      assert_eq!(file.get_full_object_path_str(), "/weights/h/a/s/h/e/hashed/rvc_hashed.index");
+      assert_eq!(file.get_basename(), "rvc_hashed.index");
+    }
+  }
+
+  mod without_prefix_and_extension {
+    use super::*;
+
+    #[test]
+    pub fn generate_new_entropy() {
+      let file = WeightFileBucketPath::generate_new(None, None);
+      assert_eq!(file.get_object_hash().len(), 32);
+      assert_eq!(file.get_directory().get_object_hash().len(), 32);
+    }
+
+    #[test]
+    pub fn get_full_object_path_str() {
+      let file = WeightFileBucketPath::from_object_hash("abcdefghijk", None, None);
+      assert_eq!(file.get_full_object_path_str(), "/weights/a/b/c/d/e/abcdefghijk/file.bin");
+    }
+
+    #[test]
+    pub fn to_full_object_pathbuf() {
+      let file = WeightFileBucketPath::from_object_hash("abcdefghijk", None, None);
+      assert_eq!(file.to_full_object_pathbuf(), PathBuf::from("/weights/a/b/c/d/e/abcdefghijk/file.bin"));
+    }
+
+    #[test]
+    pub fn get_full_object_path_str_short_name() {
+      let file = WeightFileBucketPath::from_object_hash("foo", None, None);
+      assert_eq!(file.get_full_object_path_str(), "/weights/f/o/foo/file.bin");
+    }
+
+    #[test]
+    pub fn get_full_object_path_str_starts_with_directory() {
+      let file = WeightFileBucketPath::from_object_hash("abcdefghijk", None, None);
+      let full_path = file.get_full_object_path_str();
+      assert!(full_path.starts_with(file.get_directory().get_directory_path_str()))
+    }
+
+    #[test]
+    pub fn get_object_hash() {
+      let hash = "abcdefghijk";
+      let file = WeightFileBucketPath::from_object_hash(hash, None, None);
+      assert_eq!(file.get_object_hash(), hash);
+    }
+  }
+}

crates/_types/buckets/src/public/weight_files/mod.rs

@@ -0,0 +1,2 @@
+pub mod bucket_directory;
+pub mod bucket_file_path;

crates/_types/buckets/src/public/weight_uploads/bucket_directory.rs

@@ -0,0 +1,77 @@
+use crockford::crockford_entropy_lower;
+// TODO Thoughts NOTE:
+// I am wondering if it be easier if we just had a single struct and impl to handle downloads from public and private buckets.
+// essentially, the only difference is the prefix and file postfix and the path of where the file goes and the path will be constructed from there.
+// then you can tie in the downloader as a single object that can be used for both public and private buckets.
+
+use crate::public::public_path::PublicPath;
+use crate::util::hashed_directory_path_long_string::hashed_directory_path_long_string;
+
+const WEIGHT_UPLOAD_DIRECTORY : &str = "/weight_upload";
+
+/// Directory for user media uploads.
+/// Each uploaded file gets its own directory so that we can store the original
+/// file alongside re-processed derivatives.
+#[derive(Clone)]
+pub struct WeightUploadDirectory {
+  object_hash: String,
+  directory: String,
+}
+
+impl PublicPath for WeightUploadDirectory {}
+
+impl WeightUploadDirectory {
+
+  pub fn generate_new() -> Self {
+    let entropy = crockford_entropy_lower(32);
+    Self::from_object_hash(&entropy)
+  }
+
+  pub fn from_object_hash(object_hash: &str) -> Self {
+    // TODO: Path construction could be cleaner.
+    let middle = hashed_directory_path_long_string(object_hash);
+    let directory = format!("{}/{}{}", WEIGHT_UPLOAD_DIRECTORY, middle, object_hash);
+    Self {
+      object_hash: object_hash.to_string(),
+      directory,
+    }
+  }
+
+  pub fn get_directory_path_str(&self) -> &str {
+    &self.directory
+  }
+
+  pub fn get_object_hash(&self) -> &str {
+    &self.object_hash
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::public::weight_uploads::bucket_directory::WeightUploadDirectory;
+
+  #[test]
+  pub fn generate_new_entropy() {
+    let directory = WeightUploadDirectory::generate_new();
+    assert_eq!(directory.get_object_hash().len(), 32);
+  }
+
+  #[test]
+  pub fn get_directory_path_str() {
+    let directory = WeightUploadDirectory::from_object_hash("abcdefghijk");
+    assert_eq!(directory.get_directory_path_str(), "/weight_upload/a/b/c/d/e/abcdefghijk");
+  }
+
+  #[test]
+  pub fn get_directory_path_str_short_name() {
+    let directory = WeightUploadDirectory::from_object_hash("foo");
+    assert_eq!(directory.get_directory_path_str(), "/weight_upload/f/o/foo");
+  }
+
+  #[test]
+  pub fn get_object_hash() {
+    let hash = "abcdefghijk";
+    let directory = WeightUploadDirectory::from_object_hash(hash);
+    assert_eq!(directory.get_object_hash(), hash);
+  }
+}

crates/_types/buckets/src/public/weight_uploads/bucket_file_path.rs

@@ -0,0 +1,100 @@
+use std::path::PathBuf;
+
+use crockford::crockford_entropy_lower;
+
+use crate::public::public_path::PublicPath;
+use crate::public::weight_uploads::bucket_directory::WeightUploadDirectory;
+
+const ORIGINAL_FILE_BASENAME : &str = "original_upload.bin";
+
+#[derive(Clone)]
+pub struct WeightUploadOriginalFilePath {
+  directory: WeightUploadDirectory,
+  full_object_path: String,
+}
+
+impl PublicPath for WeightUploadOriginalFilePath {}
+
+impl WeightUploadOriginalFilePath {
+
+  pub fn generate_new() -> Self {
+    let entropy = crockford_entropy_lower(32);
+    Self::from_object_hash(&entropy)
+  }
+
+  pub fn from_object_hash(hash: &str) -> Self {
+    // TODO: Path construction could be cleaner.
+    let directory = WeightUploadDirectory::from_object_hash(hash);
+    let full_object_path = format!("{}/{}", directory.get_directory_path_str(), ORIGINAL_FILE_BASENAME);
+    Self {
+      directory,
+      full_object_path,
+    }
+  }
+
+  pub fn get_full_object_path_str(&self) -> &str {
+    &self.full_object_path
+  }
+
+  pub fn to_full_object_pathbuf(&self) -> PathBuf {
+    PathBuf::from(&self.full_object_path)
+  }
+
+  pub fn get_directory(&self) -> &WeightUploadDirectory {
+    &self.directory
+  }
+
+  pub fn get_object_hash(&self) -> &str {
+    &self.directory.get_object_hash()
+  }
+
+  pub fn get_basename() -> &'static str {
+    ORIGINAL_FILE_BASENAME
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use std::path::PathBuf;
+
+  use crate::public::weight_uploads::bucket_file_path::WeightUploadOriginalFilePath;
+
+  #[test]
+  pub fn generate_new_entropy() {
+    let file = WeightUploadOriginalFilePath::generate_new();
+    assert_eq!(file.get_object_hash().len(), 32);
+    assert_eq!(file.get_directory().get_object_hash().len(), 32);
+  }
+
+  #[test]
+  pub fn get_full_object_path_str() {
+    let file = WeightUploadOriginalFilePath::from_object_hash("abcdefghijk");
+    assert_eq!(file.get_full_object_path_str(), "/weight_upload/a/b/c/d/e/abcdefghijk/original_upload.bin");
+  }
+
+  #[test]
+  pub fn to_full_object_pathbuf() {
+    let file = WeightUploadOriginalFilePath::from_object_hash("abcdefghijk");
+    assert_eq!(file.to_full_object_pathbuf(), PathBuf::from("/weight_upload/a/b/c/d/e/abcdefghijk/original_upload.bin"));
+  }
+
+  #[test]
+  pub fn get_full_object_path_str_short_name() {
+    let file = WeightUploadOriginalFilePath::from_object_hash("foo");
+    assert_eq!(file.get_full_object_path_str(), "/weight_upload/f/o/foo/original_upload.bin");
+  }
+
+  #[test]
+  pub fn get_full_object_path_str_starts_with_directory() {
+    let file = WeightUploadOriginalFilePath::from_object_hash("abcdefghijk");
+    let full_path = file.get_full_object_path_str();
+    assert!(full_path.starts_with(file.get_directory().get_directory_path_str()))
+  }
+
+  #[test]
+  pub fn get_object_hash() {
+    let hash = "abcdefghijk";
+    let file = WeightUploadOriginalFilePath::from_object_hash(hash);
+    assert_eq!(file.get_object_hash(), hash);
+  }
+}

crates/_types/buckets/src/public/weight_uploads/mod.rs

@@ -0,0 +1,2 @@
+pub mod bucket_directory;
+pub mod bucket_file_path;

crates/_types/buckets/src/public/zs_voices/mod.rs

@@ -1,2 +0,0 @@
-pub mod directory;
-pub mod file;