insert batch generation records

refactor query modules
fix lint/test failures
2026-11-01 00:05:54 -04:00 · 2024-01-16 23:00:17 -05:00 · 2024-01-16 21:03:56 -05:00 · 2024-01-16 20:52:11 -05:00 · 2024-01-16 19:49:08 -05:00 · 2024-01-16 19:11:36 -05:00
259 changed files with 7814 additions and 534 deletions
@@ -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_description_markdown,\n        wt.maybe_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        cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n        cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n        cover_image.maybe_public_bucket_extension as maybe_cover_image_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 cover_image\n            ON cover_image.token = wt.maybe_cover_image_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        ",
+  "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_description_markdown,\n        wt.maybe_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        cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n        cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n        cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n        entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n        entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n        entity_stats.bookmark_count as maybe_bookmark_count,\n\n        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 cover_image\n            ON cover_image.token = wt.maybe_cover_image_media_file_token\n        LEFT OUTER JOIN entity_stats\n            ON entity_stats.entity_type = \"model_weight\"\n            AND entity_stats.entity_token = wt.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": [
      {
@@ -235,56 +235,36 @@
      },
      {
        "ordinal": 23,
-        "name": "cached_user_ratings_negative_count",
+        "name": "maybe_ratings_positive_count",
        "type_info": {
          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
+          "flags": "UNSIGNED",
          "char_set": 63,
          "max_size": 10
        }
      },
      {
        "ordinal": 24,
-        "name": "cached_user_ratings_positive_count",
+        "name": "maybe_ratings_negative_count",
        "type_info": {
          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
+          "flags": "UNSIGNED",
          "char_set": 63,
          "max_size": 10
        }
      },
      {
        "ordinal": 25,
-        "name": "cached_user_ratings_total_count",
+        "name": "maybe_bookmark_count",
        "type_info": {
          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
+          "flags": "UNSIGNED",
          "char_set": 63,
          "max_size": 10
        }
      },
      {
        "ordinal": 26,
-        "name": "maybe_cached_user_ratings_ratio",
-        "type_info": {
-          "type": "Float",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 12
-        }
-      },
-      {
-        "ordinal": 27,
-        "name": "cached_user_ratings_last_updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 28,
        "name": "version",
        "type_info": {
          "type": "Long",
@@ -294,7 +274,7 @@
        }
      },
      {
-        "ordinal": 29,
+        "ordinal": 27,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -304,7 +284,7 @@
        }
      },
      {
-        "ordinal": 30,
+        "ordinal": 28,
        "name": "updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -314,7 +294,7 @@
        }
      },
      {
-        "ordinal": 31,
+        "ordinal": 29,
        "name": "user_deleted_at",
        "type_info": {
          "type": "Timestamp",
@@ -324,7 +304,7 @@
        }
      },
      {
-        "ordinal": 32,
+        "ordinal": 30,
        "name": "mod_deleted_at",
        "type_info": {
          "type": "Timestamp",
@@ -361,11 +341,9 @@
      true,
      true,
      true,
-      false,
-      false,
-      false,
      true,
-      false,
+      true,
+      true,
      false,
      false,
      false,
@@ -373,5 +351,5 @@
      true
    ]
  },
-  "hash": "bb2c5a81ab6f38ecef7ee177a4ea36e75c5d2180a897094f940f097bbbd66060"
+  "hash": "0220f288c06686874df87ec163533be64cc000634920d58e7fa7a7d156cbfcae"
 }
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n    model_weights.title as maybe_model_weights_title,\n    model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n    model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n    model_weight_creator.username as maybe_model_weight_creator_username,\n    model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n    model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n    ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n    ON model_weight_creator.token = model_weights.creator_user_token\nWHERE\n    m.token = ?\n    AND m.user_deleted_at IS NULL\n    AND m.mod_deleted_at IS NULL\n        ",
+  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n    model_weights.title as maybe_model_weights_title,\n    model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n    model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n    model_weight_creator.username as maybe_model_weight_creator_username,\n    model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n    model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n    entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n    entity_stats.bookmark_count as maybe_bookmark_count,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n    ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n    ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n    ON entity_stats.entity_type = \"media_file\"\n    AND entity_stats.entity_token = m.token\nWHERE\n    m.token = ?\n    AND m.user_deleted_at IS NULL\n    AND m.mod_deleted_at IS NULL\n        ",
  "describe": {
    "columns": [
      {
@@ -215,6 +215,36 @@
      },
      {
        "ordinal": 21,
+        "name": "maybe_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "maybe_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_bookmark_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 24,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -224,7 +254,7 @@
        }
      },
      {
-        "ordinal": 22,
+        "ordinal": 25,
        "name": "updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -259,9 +289,12 @@
      false,
      true,
      true,
+      true,
+      true,
+      true,
      false,
      false
    ]
  },
-  "hash": "58648783cb376fc7ad093ff50a8a7bcb3c55fe57b2ad7d3ebbbdbc63573069ba"
+  "hash": "06e0c5e80803d072551bc4df40e7d273ba0772608d52b46b840249415c341945"
 }
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO model_weights\nSET\n  token = ?,\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n  maybe_cover_image_media_file_token = NULL,\n  maybe_description_markdown = ?,\n  maybe_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_cover_image_media_file_token = NULL,\n  maybe_description_markdown = ?,\n  maybe_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": "0a392b6adb884a4bb4c08fbc2123d40c27e9fbb5c2b688b182f849b0c1cc5735"
-}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO model_weights_extension_tts_details\nSET\n  model_weights_token = ?,\n  ietf_language_tag = ?,\n  ietf_primary_language_subtag = ?,\n  text_pipeline_type = ?,\n  use_default_mel_multiply_factor = ?,\n  maybe_custom_mel_multiply_factor = ?,\n  maybe_default_pretrained_vocoder = ?,\n  maybe_custom_vocoder_token = ?\nON DUPLICATE KEY UPDATE\n  ietf_language_tag = ?,\n  ietf_primary_language_subtag = ?,\n  text_pipeline_type = ?,\n  use_default_mel_multiply_factor = ?,\n  maybe_custom_mel_multiply_factor = ?,\n  maybe_default_pretrained_vocoder = ?,\n  maybe_custom_vocoder_token = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 15
+    },
+    "nullable": []
+  },
+  "hash": "1ce9219b8f05fe54adaa6841acb708e165e1c7855b441b9623a2151197578929"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO entity_stats SET\n          entity_type = ?,\n          entity_token = ?,\n          ratings_positive_count = 0,\n          ratings_negative_count = 1\n        ON DUPLICATE KEY UPDATE\n          ratings_positive_count = ABS(CAST(ratings_positive_count AS SIGNED) - 1),\n          ratings_negative_count = ratings_negative_count + 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "1d6c0e4b9c19d0726270e52cfd128f2a9068aa58465e86716c7476c8635f9762"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO entity_stats SET\n          entity_type = ?,\n          entity_token = ?,\n          bookmark_count = 1\n        ON DUPLICATE KEY UPDATE\n          bookmark_count = bookmark_count + 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "3cfd6ff9a99be15f4a90a710d147291e5f62487c88a5c5bbbbd1fb2c1780a4d5"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO entity_stats SET\n          entity_type = ?,\n          entity_token = ?,\n          ratings_negative_count = 1\n        ON DUPLICATE KEY UPDATE\n          ratings_negative_count = ratings_negative_count + 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "40cb263656c235549e5d69c2e66fa28b9feb966a8092583b8ffc26ae59cef1f6"
+}
@@ -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.title,\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_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_tts_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 (\"tt2\")\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": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 3,
+        "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": 4,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "creator_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "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": "4d45f5ce213627465e991eaec9b509100e22c614367b67ab026b5edd70927ea5"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO entity_stats SET\n          entity_type = ?,\n          entity_token = ?,\n          ratings_positive_count = 1,\n          ratings_negative_count = 0\n        ON DUPLICATE KEY UPDATE\n          ratings_positive_count = ratings_positive_count + 1,\n          ratings_negative_count = ABS(CAST(ratings_negative_count AS SIGNED) - 1)\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "5a7186c39fff3fee762918b33eb0081cec0a58f62b24f0b717bb9ff1f848d9b2"
+}
@@ -0,0 +1,289 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    w.id,\n    w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n\n    w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    w.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    w.title,\n\n    cover_image.token as `maybe_cover_image_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n    cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\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\n    entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n    entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n    entity_stats.bookmark_count as maybe_bookmark_count,\n\n    extension_tts.ietf_language_tag as maybe_tts_ietf_language_tag,\n    extension_tts.ietf_primary_language_subtag as maybe_tts_ietf_primary_language_subtag,\n\n    extension_vc.ietf_language_tag as maybe_vc_ietf_language_tag,\n    extension_vc.ietf_primary_language_subtag as maybe_vc_ietf_primary_language_subtag,\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\n\nJOIN users\n    ON users.token = w.creator_user_token\n\nLEFT OUTER JOIN model_weights_extension_tts_details as extension_tts\n    ON extension_tts.model_weights_token = w.token\nLEFT OUTER JOIN model_weights_extension_voice_conversion_details as extension_vc\n    ON extension_vc.model_weights_token = w.token\nLEFT OUTER JOIN entity_stats\n    ON entity_stats.entity_type = \"model_weights\"\n    AND entity_stats.entity_token = w.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = w.maybe_cover_image_media_file_token\n\nWHERE\n  w.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::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "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": 3,
+        "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": 4,
+        "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_cover_image_media_file_token: tokens::tokens::media_files::MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_cover_image_public_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_cover_image_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_cover_image_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 10,
+        "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": 11,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "creator_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "maybe_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "maybe_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "maybe_bookmark_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "maybe_tts_ietf_language_tag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "maybe_tts_ietf_primary_language_subtag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 48
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "maybe_vc_ietf_language_tag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "maybe_vc_ietf_primary_language_subtag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 48
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "6040227c139f6e2972734515b0a904d2a7b04bbf1a419677fc19287a0757ae21"
+}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nINSERT INTO model_weights\nSET\n  token = ?,\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n\n  maybe_cover_image_media_file_token = NULL,\n  maybe_description_markdown = NULL,\n  maybe_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        ",
+  "query": "\nINSERT INTO model_weights\nSET\n  token = ?,\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n\n  maybe_cover_image_media_file_token = NULL,\n  maybe_description_markdown = NULL,\n  maybe_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  maybe_migration_old_model_token = ?\n        ",
  "describe": {
    "columns": [],
    "parameters": {
@@ -8,5 +8,5 @@
    },
    "nullable": []
  },
-  "hash": "6512f05410514927b52b8cc42f4eda0ad7a256254fd7fcf3b8a1cc429b06ad38"
+  "hash": "632305ab500cf892b98971e5b23af854112a66897766c890631dd5d0105cb065"
 }
@@ -0,0 +1,102 @@
+{
+  "db_name": "MySQL",
+  "query": "\n  SELECT\n      b2.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n      b2.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n      b2.entity_token,\n\n      b2.user_token as `user_token: tokens::tokens::users::UserToken`,\n\n      es.bookmark_count as unused_bookmark_count,\n\n      b2.created_at,\n      b2.updated_at,\n      b2.deleted_at\n\n  FROM\n      user_bookmarks AS b1\n\n  JOIN user_bookmarks as b2\n      ON b1.entity_type = b2.entity_type\n      AND b1.entity_token = b2.entity_token\n\n  LEFT OUTER JOIN entity_stats AS es\n      ON b1.entity_type = es.entity_type\n      AND b1.entity_token = es.entity_token\n\n  WHERE\n      b1.token = ?\n\n  FOR UPDATE\n          ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::user_bookmarks::UserBookmarkToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "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",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "entity_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "unused_bookmark_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "706f0fd898ec367a7e2851e51c4d00dc63c89521238e55281737758ac87cfb01"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO entity_stats SET\n          entity_type = ?,\n          entity_token = ?,\n          ratings_positive_count = 1\n        ON DUPLICATE KEY UPDATE\n          ratings_positive_count = ratings_positive_count + 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "773047b78b08dd089d37a7f0d14cf5cce2ae580c4d6c673491f81144f9868ce3"
+}
@@ -0,0 +1,102 @@
+{
+  "db_name": "MySQL",
+  "query": "\n  SELECT\n      b.token as `token: tokens::tokens::user_bookmarks::UserBookmarkToken`,\n\n      b.entity_type as `entity_type: enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType`,\n      b.entity_token,\n\n      b.user_token as `user_token: tokens::tokens::users::UserToken`,\n\n      es.bookmark_count as unused_bookmark_count,\n\n      b.created_at,\n      b.updated_at,\n      b.deleted_at\n\n  FROM\n      user_bookmarks AS b\n\n  LEFT OUTER JOIN entity_stats AS es\n      ON b.entity_type = es.entity_type\n      AND b.entity_token = es.entity_token\n  WHERE\n      b.entity_type = ?\n      AND b.entity_token = ?\n  FOR UPDATE\n          ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::user_bookmarks::UserBookmarkToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "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",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "entity_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "unused_bookmark_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "799a88505077c6c286906087ee79141dd4aaa1d68df764c9a43b315e561d7291"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO entity_stats SET\n          entity_type = ?,\n          entity_token = ?,\n          ratings_positive_count = 0\n        ON DUPLICATE KEY UPDATE\n          ratings_positive_count = ABS(CAST(ratings_positive_count AS SIGNED) - 1)\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "9011676905b2a516fff4b43eb3692b973dede9b34a4876fda252510993720860"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE tts_models\nSET\n  maybe_migration_new_model_weights_token = ?\nWHERE token = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "aa7ec1c1e32f773212b264f34173f99db1e515e370c47065f932aaec56f89112"
+}
@@ -0,0 +1,25 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    COUNT(*) as total_count\nFROM\n    user_bookmarks\nWHERE\n    entity_type = ?\n    AND entity_token = ?\n    AND deleted_at IS NULL\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "total_count",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 21
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "abcda1fc0b5a28166f3e15f2b3df96c5b6556d0ea3009d3f2bc9995bae95147e"
+}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n    model_weights.title as maybe_model_weights_title,\n    model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n    model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n    model_weight_creator.username as maybe_model_weight_creator_username,\n    model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n    model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n    ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n    ON model_weight_creator.token = model_weights.creator_user_token\nWHERE\n    m.token = ?\n        ",
+  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n    model_weights.title as maybe_model_weights_title,\n    model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n    model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n    cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n    cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n    cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n    model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n    model_weight_creator.username as maybe_model_weight_creator_username,\n    model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n    model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n    entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n    entity_stats.bookmark_count as maybe_bookmark_count,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n    ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as cover_image\n    ON cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n    ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n    ON entity_stats.entity_type = \"media_file\"\n    AND entity_stats.entity_token = m.token\nWHERE\n    m.token = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -215,6 +215,36 @@
      },
      {
        "ordinal": 21,
+        "name": "maybe_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "maybe_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_bookmark_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 24,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -224,7 +254,7 @@
        }
      },
      {
-        "ordinal": 22,
+        "ordinal": 25,
        "name": "updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -259,9 +289,12 @@
      false,
      true,
      true,
+      true,
+      true,
+      true,
      false,
      false
    ]
  },
-  "hash": "5126434fe542604233d8c8a4f553998d8e71b4957989a9a856ebaf7fb52bab42"
+  "hash": "c2de3b6de37dbbb5b6afd91af08aae2739cda97ef8ebb8f9b4ee967969ce43be"
 }
@@ -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_cover_image_media_file_token = NULL,\n  maybe_description_markdown = ?,\n  maybe_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\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_cover_image_media_file_token = NULL,\n  maybe_description_markdown = ?,\n  maybe_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  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": "d8b255de4b16f95454c34e793c7a52726de90c2af490b17c415d7e92c00d9123"
+}
@@ -1,12 +1,12 @@
 {
  "db_name": "MySQL",
-  "query": "\n        INSERT INTO model_weights\n        SET\n          token = ?,\n          weights_type = ?,\n          weights_category = ?,\n          title = ?,\n          maybe_description_markdown = ?,\n          maybe_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        ",
+  "query": "\n        INSERT INTO model_weights\n        SET\n          token = ?,\n          weights_type = ?,\n          weights_category = ?,\n          title = ?,\n          maybe_description_markdown = ?,\n          maybe_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          version = ?\n        ",
  "describe": {
    "columns": [],
    "parameters": {
-      "Right": 22
+      "Right": 18
    },
    "nullable": []
  },
-  "hash": "a18c5b1418d71fa9aefd3ae5c440be2afc1f9467808aa66d3b850a4d54c81e4d"
+  "hash": "db59a239bac6f5ceaad4396dfe6c2c933a7189dbf8da5f555b94148db1b0667f"
 }
@@ -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_description_markdown,\n        wt.maybe_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\n        wt.public_bucket_hash,\n        wt.maybe_public_bucket_prefix,\n        wt.maybe_public_bucket_extension,\n\n        cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n        cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n        cover_image.maybe_public_bucket_extension as maybe_cover_image_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 cover_image\n            ON cover_image.token = wt.maybe_cover_image_media_file_token\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_description_markdown,\n        wt.maybe_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\n        wt.public_bucket_hash,\n        wt.maybe_public_bucket_prefix,\n        wt.maybe_public_bucket_extension,\n\n        cover_image.public_bucket_directory_hash as maybe_cover_image_public_bucket_hash,\n        cover_image.maybe_public_bucket_prefix as maybe_cover_image_public_bucket_prefix,\n        cover_image.maybe_public_bucket_extension as maybe_cover_image_public_bucket_extension,\n\n        entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n        entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n        entity_stats.bookmark_count as maybe_bookmark_count,\n\n        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 cover_image\n            ON cover_image.token = wt.maybe_cover_image_media_file_token\n        LEFT OUTER JOIN entity_stats\n            ON entity_stats.entity_type = \"model_weight\"\n            AND entity_stats.entity_token = wt.token\n        WHERE\n            wt.token = ?\n            ",
  "describe": {
    "columns": [
      {
@@ -235,56 +235,36 @@
      },
      {
        "ordinal": 23,
-        "name": "cached_user_ratings_negative_count",
+        "name": "maybe_ratings_positive_count",
        "type_info": {
          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
+          "flags": "UNSIGNED",
          "char_set": 63,
          "max_size": 10
        }
      },
      {
        "ordinal": 24,
-        "name": "cached_user_ratings_positive_count",
+        "name": "maybe_ratings_negative_count",
        "type_info": {
          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
+          "flags": "UNSIGNED",
          "char_set": 63,
          "max_size": 10
        }
      },
      {
        "ordinal": 25,
-        "name": "cached_user_ratings_total_count",
+        "name": "maybe_bookmark_count",
        "type_info": {
          "type": "Long",
-          "flags": "NOT_NULL | UNSIGNED",
+          "flags": "UNSIGNED",
          "char_set": 63,
          "max_size": 10
        }
      },
      {
        "ordinal": 26,
-        "name": "maybe_cached_user_ratings_ratio",
-        "type_info": {
-          "type": "Float",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 12
-        }
-      },
-      {
-        "ordinal": 27,
-        "name": "cached_user_ratings_last_updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 28,
        "name": "version",
        "type_info": {
          "type": "Long",
@@ -294,7 +274,7 @@
        }
      },
      {
-        "ordinal": 29,
+        "ordinal": 27,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -304,7 +284,7 @@
        }
      },
      {
-        "ordinal": 30,
+        "ordinal": 28,
        "name": "updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -314,7 +294,7 @@
        }
      },
      {
-        "ordinal": 31,
+        "ordinal": 29,
        "name": "user_deleted_at",
        "type_info": {
          "type": "Timestamp",
@@ -324,7 +304,7 @@
        }
      },
      {
-        "ordinal": 32,
+        "ordinal": 30,
        "name": "mod_deleted_at",
        "type_info": {
          "type": "Timestamp",
@@ -361,11 +341,9 @@
      true,
      true,
      true,
-      false,
-      false,
-      false,
      true,
-      false,
+      true,
+      true,
      false,
      false,
      false,
@@ -373,5 +351,5 @@
      true
    ]
  },
-  "hash": "7d3806f46b5cc96c0e3df22454190834c0294ad34db2d8271f2e2863a3cca3a1"
+  "hash": "e32645b06d20a0037c3ca3d514b56af2dba8396f11a4c2a93ee4fab9b4579fc3"
 }
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO entity_stats SET\n          entity_type = ?,\n          entity_token = ?,\n          bookmark_count = 0\n        ON DUPLICATE KEY UPDATE\n          bookmark_count = ABS(CAST(bookmark_count AS SIGNED) - 1)\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "e3bbd9cb8a0b8fdb74fcb809ea63709740a04ab936e47f5641af0eaf3e0fd339"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO entity_stats SET\n          entity_type = ?,\n          entity_token = ?,\n          ratings_negative_count = 0\n        ON DUPLICATE KEY UPDATE\n          ratings_negative_count = ABS(CAST(ratings_negative_count AS SIGNED) - 1)\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "e67894beb8e747e0f8c301e806d9fa62e685f23e2c581a07235568dd1a63f519"
+}
@@ -0,0 +1,25 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    COUNT(*) as positive_count\nFROM\n    user_ratings\nWHERE\n    entity_type = ?\n    AND entity_token = ?\n    AND rating_value = 'positive'\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "positive_count",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 63,
+          "max_size": 21
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "f9f52bf39daf43a8e6e9617282bf9bc83a62d53b69ab36a8429576c03d5c18d7"
+}
@@ -0,0 +1,58 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    r.rating_value as `rating_value: enums::by_table::user_ratings::rating_value::UserRatingValue`,\n    r.created_at,\n    r.updated_at,\n\n    es.ratings_positive_count as unused_ratings_positive_count\n\nFROM user_ratings AS r\n\nLEFT OUTER JOIN entity_stats AS es\n    ON r.entity_type = es.entity_type\n    AND r.entity_token = es.entity_token\n\nWHERE r.user_token = ?\n  AND r.entity_type = ?\n  AND r.entity_token = ?\n\nLIMIT 1\n\nFOR UPDATE\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "rating_value: enums::by_table::user_ratings::rating_value::UserRatingValue",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 32
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "unused_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "fa724ca3644d7cba26e503c1a2c900bea00e10250c703019363fe9cf855a5a69"
+}
@@ -1259,6 +1259,24 @@ dependencies = [
 "my-workspace-hack",
 ]

+[[package]]
+name = "composite_identifiers"
+version = "0.0.1"
+dependencies = [
+ "enums",
+ "my-workspace-hack",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sqlx",
+ "sqlx-core",
+ "sqlx-mysql",
+ "strum",
+ "tokens",
+ "toml 0.5.11",
+ "utoipa",
+]
+
 [[package]]
 name = "concurrency"
 version = "0.0.1"
@@ -3052,6 +3070,7 @@ dependencies = [
 "chrono",
 "cloud_storage",
 "collections",
+ "composite_identifiers",
 "concurrency",
 "config",
 "dotenv",
@@ -3857,6 +3876,7 @@ dependencies = [
 "anyhow",
 "buckets",
 "chrono",
+ "composite_identifiers",
 "config",
 "container_common",
 "dotenv",
@@ -6006,6 +6026,7 @@ dependencies = [
 "buckets",
 "chrono",
 "cloud_storage",
+ "composite_identifiers",
 "config",
 "container_common",
 "cookies",
@@ -5,6 +5,7 @@ members = [
  # Types: common strongly-typed tokens, ids, payloads, etc.
  # Also common cloud buckets and other "strongly typed" configs.
  "crates/_types/buckets",
+  "crates/_types/composite_identifiers",
  "crates/_types/enums",
  "crates/_types/reusable_types", # TODO(bt, 2022-12-21): Deprecate
  "crates/_types/tokens",
@@ -40,10 +40,12 @@ deny = [
  "clippy::redundant_static_lifetimes", # Lint: feels more modern to elide static lifetimes

  # Rust
-	"unused_parens", # Unused parens are ugly
  "unused_imports", # These are easy to automatically cull
+  "unused_parens", # Unused parens are ugly
  "unused_variables", # Don't leave cruft

+  #"unused_mut", # Be strict about mutability (TODO)
+
  # Possible:
  # "clippy::ptr_arg",
  # "clippy::too_many_lines" (note: this is configurable)
@@ -0,0 +1,40 @@
+{
+  "settings" : {
+    "index.number_of_shards" : 3,
+    "index.number_of_replicas" : 2
+  },
+  "mappings" : {
+    "properties" : {
+      "token" : { "type" : "keyword" },
+
+      "creator_set_visibility" : { "type" : "keyword" },
+
+      "weights_type" : { "type" : "keyword" },
+      "weights_category" : { "type" : "keyword" },
+
+      "title" : { "type" : "search_as_you_type" },
+
+      "maybe_cover_image_media_file_token" : { "type" : "keyword" },
+      "maybe_cover_image_public_bucket_hash" : { "type" : "keyword" },
+      "maybe_cover_image_public_bucket_prefix" : { "type" : "keyword" },
+      "maybe_cover_image_public_bucket_extension" : { "type" : "keyword" },
+
+      "creator_user_token" : { "type" : "keyword" },
+      "creator_username" : { "type" : "keyword" },
+      "creator_display_name" : { "type" : "text" },
+      "creator_gravatar_hash" : { "type" : "text" },
+
+      "ratings_positive_count" : { "type" : "unsigned_long" },
+      "ratings_negative_count" : { "type" : "unsigned_long" },
+      "bookmark_count" : { "type" : "unsigned_long" },
+
+      "maybe_ietf_language_tag" : { "type" : "keyword" },
+      "maybe_ietf_primary_language_subtag" : { "type" : "keyword" },
+
+      "created_at" : { "type" : "date" },
+      "updated_at" : { "type" : "date" },
+      "user_deleted_at" : { "type" : "date" },
+      "mod_deleted_at" : { "type" : "date" }
+    }
+  }
+}
@@ -32,7 +32,7 @@ where token IN (
        from generic_download_jobs
        where status IN ('started', 'attempt_failed', 'complete_failure', 'dead')
        and download_type NOT IN ('vits', 'hifigan')
-        and created_at > NOW() - INTERVAL 30 DAY
+        and created_at > NOW() - INTERVAL 120 DAY
    ) as x
 );

@@ -0,0 +1,24 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Summary stats on downloads
+select
+    distinct download_type,
+             count(*) as created
+from generic_download_jobs
+where created_at > (CURDATE() - INTERVAL 60 DAY)
+group by download_type;
+
+-- Find recent failed RVC downloads
+select
+    token,
+    title,
+    download_url,
+    status,
+    assigned_worker
+from generic_download_jobs
+where download_type = 'rvc_v2'
+and status IN ('started', 'attempt_failed', 'dead')
+and created_at > (CURDATE() - INTERVAL 12 HOUR)
+order by updated_at desc;
@@ -1,10 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-select
-    distinct download_type,
-             count(*) as created
-from generic_download_jobs
-where created_at > (CURDATE() - INTERVAL 60 DAY)
-group by download_type;
@@ -2,6 +2,20 @@
 -- noinspection SqlNoDataSourceInspectionForFile
 -- noinspection SqlResolveForFile

+
+-- Find jobs that are broken for a given user
+select id, last_assigned_worker, internal_debugging_failure_reason,created_at
+from tts_inference_jobs
+where maybe_creator_user_token IN (
+    select token
+    from users
+    where username IN ('knifecat ', 'rewritten_code', 'johnloberger')
+)
+  and attempt_count > 1
+  and status IN ('complete_failure', 'dead', 'attempt_failed')
+and created_at > ( CURDATE() - INTERVAL 5 DAY );
+
+
 -- Total pending jobs
 select count(*)
 from tts_inference_jobs
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP INDEX unique_index_user_type_token ON user_bookmarks;
@@ -0,0 +1,6 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+CREATE UNIQUE INDEX unique_index_user_type_token
+    ON user_bookmarks (user_token, entity_type, entity_token);
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights_extension_tts_details DROP COLUMN text_pipeline_type;
@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights_extension_tts_details
+    ADD COLUMN text_pipeline_type VARCHAR(64) DEFAULT NULL
+    AFTER ietf_primary_language_subtag;
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+drop table idempotency_tokens;
@@ -0,0 +1,19 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- A form of optimistic locking
+CREATE TABLE idempotency_tokens (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- This can be a UUID or any entropic value.
+  idempotency_value VARCHAR(36) NOT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (idempotency_value)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+drop table batch_generations;
@@ -0,0 +1,42 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Batch generations
+CREATE TABLE batch_generations (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- The batch token
+  -- This is **NOT** a unique token.
+  token VARCHAR(32) NOT NULL,
+
+  -- ========== ENTITY LINKAGE ==========
+
+  -- The type of record this is attached to
+  -- Currently supported values:
+  --   * 'model_weight'
+  --   * 'media_file'
+  --   * 'comment'
+  entity_type VARCHAR(32) NOT NULL,
+
+  -- The token for the record.
+  entity_token VARCHAR(32) NOT NULL,
+
+  -- ========== 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 (token, entity_type, entity_token),
+  KEY index_token (token),
+  KEY index_entity_token (entity_token)
+
+  -- NB: Realistically, we probably don't need this index until we have a lot of entity types, and the entity_token
+  -- entropy is probably sufficient enough as-is.
+  -- KEY index_entity_type_and_token (entity_type, entity_token),
+
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files DROP COLUMN is_batch_generated;
@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files
+    ADD COLUMN is_batch_generated BOOLEAN NOT NULL DEFAULT FALSE
+    AFTER maybe_origin_filename;
@@ -0,0 +1,42 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- Batch generations
+CREATE TABLE batch_generations (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- The batch token
+  -- This is **NOT** a unique token.
+  token VARCHAR(32) NOT NULL,
+
+  -- ========== ENTITY LINKAGE ==========
+
+  -- The type of record this is attached to
+  -- Currently supported values:
+  --   * 'model_weight'
+  --   * 'media_file'
+  --   * 'comment'
+  entity_type VARCHAR(32) NOT NULL,
+
+  -- The token for the record.
+  entity_token VARCHAR(32) NOT NULL,
+
+  -- ========== 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 (token, entity_type, entity_token),
+  KEY index_token (token),
+  KEY index_entity_token (entity_token)
+
+  -- NB: Realistically, we probably don't need this index until we have a lot of entity types, and the entity_token
+  -- entropy is probably sufficient enough as-is.
+  -- KEY index_entity_type_and_token (entity_type, entity_token),
+
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,19 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+-- A form of optimistic locking
+CREATE TABLE idempotency_tokens (
+  -- Not used for anything except replication.
+  id BIGINT(20) NOT NULL AUTO_INCREMENT,
+
+  -- This can be a UUID or any entropic value.
+  idempotency_value VARCHAR(36) NOT NULL,
+
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+  -- INDICES --
+  PRIMARY KEY (id),
+  UNIQUE KEY (idempotency_value)
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -26,7 +26,7 @@ CREATE TABLE media_files (
  --   * 'device_api' for direct user uploads recorded using Browser/Device APIs.
  origin_category VARCHAR(16) NOT NULL,

-  -- TODO: Remove default value once records backfilled and queries updated.
+  -- TODO(bt,2024-01-12): Rename to origin_product.
  -- Product area where the media file originated.
  -- This is not the *model* that created the thing, this is the *product*.
  -- (The underlying models can change over time.)
@@ -37,8 +37,13 @@ CREATE TABLE media_files (
  -- "Voice Designer" dataset samples in a video generation flow.)
  --
  -- Possible values:
+  --   * 'unknown' for legacy records without an associated product
  --   * 'face_animator' for uploads and outputs
-  --   * 'unknown' for legacy records without an associated product (TODO: This should be temporary)
+  --   * 'tts' for text to speech outputs
+  --   * 'voice_conversion' for uploads or outputs (RVC or SVC)
+  --   * 'zs_voice' for uploads or outputs for zero shot voice products
+  --   * 'video_filter' filters on videos
+  --   * 'mocap' for files uploaded or processed by motion capture
  origin_product_category VARCHAR(16) NOT NULL DEFAULT "unknown",

  -- For inference that can be tied back to a model, the type of model.
@@ -53,6 +58,11 @@ CREATE TABLE media_files (
  -- The original filename of the media (if uploaded by a user)
  maybe_origin_filename VARCHAR(255) DEFAULT NULL,

+  -- Whether this media file was generated as part of a batch
+  -- If so, we can look up the batch in a separate query/call to the `batch_generations` table.
+  -- We won't hold the batch token in this table since it'll be very sparsely populated.
+  is_batch_generated BOOLEAN NOT NULL DEFAULT FALSE,
+
  -- ========== METADATA ==========

  -- We can store text transcripts, etc. in other tables and refer back via foreign key.
@@ -28,7 +28,7 @@ CREATE TABLE model_weights_extension_tts_details (
  -- 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,
+  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,
@@ -0,0 +1,47 @@
+-- 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),
+    UNIQUE KEY (user_token, entity_type, entity_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;
@@ -5,7 +5,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -26,12 +26,14 @@ impl ModelCategory {
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum ModelType {
  VallEx,
+  StyleTTS2,
 }

 impl ModelType {
  pub fn to_str(&self) -> &'static str {
    match self {
      ModelType::VallEx => "vallex",
+      ModelType::StyleTTS2 => "styletts2",
    }
  }
 }
@@ -25,6 +25,11 @@ impl PublicPath for WeightFileBucketPath {}

 impl WeightFileBucketPath {

+  // TODO(bt,2024-01-14): This is temporary standardization. Clean this up.
+  pub fn generate_for_tt2_model() -> Self {
+    Self::generate_new(Some("tt2_"), Some(".pt"))
+  }
+
  // 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"))
@@ -35,6 +40,11 @@ impl WeightFileBucketPath {
    Self::generate_new(Some("rvc_"), Some(".pt"))
  }

+  // TODO(bt,2024-01-15): This is temporary standardization. Clean this up.
+  pub fn tt2_model_file_from_object_hash(hash: &str) -> Self {
+    Self::from_object_hash(hash, Some("tt2_"), 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"))
@@ -0,0 +1,40 @@
+[package]
+name = "composite_identifiers"
+edition = "2018"
+version = "0.0.1"
+authors = [
+    "Brandon Thomas <bt@brand.io>",
+    "Brandon Thomas <echelon@gmail.com>",
+]
+publish = false
+
+[lib]
+name = "composite_identifiers"
+path = "src/lib.rs"
+
+[dependencies]
+# Internal
+enums = { path = "../enums" }
+tokens = { path = "../tokens" }
+
+# Workspace hack (faster compile times)
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+
+# Serialization
+serde = "1.0.125"
+serde_derive = "1.0.125"
+
+sqlx = { version = "0.7.2", features = [ "mysql", "sqlite", "runtime-tokio-native-tls", "chrono" ] }
+sqlx-core = { version = "0.7.2" }
+sqlx-mysql= { version = "0.7.2" }
+
+utoipa = { version = "4", features = ["chrono","actix_extras"] }
+
+[dev-dependencies]
+
+# Enum utilities
+strum = { version = "0.25", features = ["derive"] }
+
+# Test serialization
+serde_json = "1.0.108"
+toml = "0.5.8"
@@ -0,0 +1,28 @@
+use enums::by_table::batch_generations::batch_generation_entity_type::BatchGenerationEntityType;
+use tokens::tokens::media_files::MediaFileToken;
+
+// TODO(bt, 2024-01-16): A ref type with <'a> lifetime of inner data instead of ownership?
+pub enum BatchGenerationEntity {
+  MediaFile(MediaFileToken),
+}
+
+// TODO(bt, 2024-01-16): Codegen? Make traits for these? Maybe overkill.
+impl BatchGenerationEntity {
+  pub fn get_entity_type(&self) -> BatchGenerationEntityType {
+    match self {
+      Self::MediaFile(_) => BatchGenerationEntityType::MediaFile,
+    }
+  }
+
+  pub fn get_entity_token_str(&self) -> &str {
+    match self {
+      Self::MediaFile(token) => token.as_str(),
+    }
+  }
+
+  pub fn get_composite_keys(&self) -> (BatchGenerationEntityType, &str) {
+    match self {
+      Self::MediaFile(token) => (BatchGenerationEntityType::MediaFile, token.as_str()),
+    }
+  }
+}
@@ -0,0 +1 @@
+pub mod batch_generation_entity;
@@ -0,0 +1 @@
+pub mod batch_generations;
@@ -0,0 +1,22 @@
+//! composite_identifiers
+//!
+//! The purpose of this library is to provide easy to construct, **typesafe**, composite identifiers.
+//! This is mostly a combination of `tokens` and `enums`.
+//!
+
+// Never allow these
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
+#![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things
+
+// Okay to toggle
+#![forbid(unreachable_patterns)]
+#![forbid(unused_imports)]
+#![forbid(unused_mut)]
+#![forbid(unused_variables)]
+
+// Always allow
+#![allow(dead_code)]
+#![allow(non_snake_case)]
+
+pub mod by_table;
@@ -0,0 +1,109 @@
+use std::collections::BTreeSet;
+
+use serde::Deserialize;
+use serde::Serialize;
+#[cfg(test)]
+use strum::EnumCount;
+#[cfg(test)]
+use strum::EnumIter;
+use utoipa::ToSchema;
+
+/// Used in the `batch_generations` table in a `VARCHAR(32)` field named `entity_type`.
+#[cfg_attr(test, derive(EnumIter, EnumCount))]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize, Ord, PartialOrd, ToSchema)]
+pub enum BatchGenerationEntityType {
+  /// Media files
+  /// This will probably be the only type supported, but we'll leave the possibility of future types.
+  #[serde(rename = "media_file")]
+  MediaFile,
+}
+
+// TODO(bt, 2023-01-17): This desperately needs MySQL integration tests!
+impl_enum_display_and_debug_using_to_str!(BatchGenerationEntityType);
+impl_mysql_enum_coders!(BatchGenerationEntityType);
+impl_mysql_from_row!(BatchGenerationEntityType);
+
+/// NB: Legacy API for older code.
+impl BatchGenerationEntityType {
+  pub fn to_str(&self) -> &'static str {
+    match self {
+      Self::MediaFile => "media_file",
+    }
+  }
+
+  pub fn from_str(value: &str) -> Result<Self, String> {
+    match value {
+      "media_file" => Ok(Self::MediaFile),
+      _ => Err(format!("invalid value: {:?}", value)),
+    }
+  }
+
+  pub fn all_variants() -> BTreeSet<Self> {
+    // NB: BTreeSet is sorted
+    // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
+    BTreeSet::from([
+      Self::MediaFile,
+    ])
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::by_table::batch_generations::batch_generation_entity_type::BatchGenerationEntityType;
+  use crate::test_helpers::assert_serialization;
+
+  mod serde {
+    use super::*;
+
+    #[test]
+    fn test_serialization() {
+      assert_serialization(BatchGenerationEntityType::MediaFile, "media_file");
+    }
+  }
+
+  mod impl_methods {
+    use super::*;
+
+    #[test]
+    fn to_str() {
+      assert_eq!(BatchGenerationEntityType::MediaFile.to_str(), "media_file");
+    }
+
+    #[test]
+    fn from_str() {
+      assert_eq!(BatchGenerationEntityType::from_str("media_file").unwrap(), BatchGenerationEntityType::MediaFile);
+      assert!(BatchGenerationEntityType::from_str("foo").is_err());
+    }
+  }
+
+  mod manual_variant_checks {
+    use super::*;
+
+    #[test]
+    fn all_variants() {
+      let mut variants = BatchGenerationEntityType::all_variants();
+      assert_eq!(variants.len(), 1);
+      assert_eq!(variants.pop_first(), Some(BatchGenerationEntityType::MediaFile));
+      assert_eq!(variants.pop_first(), None);
+    }
+  }
+
+  mod mechanical_checks {
+    use super::*;
+
+    #[test]
+    fn variant_length() {
+      use strum::IntoEnumIterator;
+      assert_eq!(BatchGenerationEntityType::all_variants().len(), BatchGenerationEntityType::iter().len());
+    }
+
+    #[test]
+    fn round_trip() {
+      for variant in BatchGenerationEntityType::all_variants() {
+        assert_eq!(variant, BatchGenerationEntityType::from_str(variant.to_str()).unwrap());
+        assert_eq!(variant, BatchGenerationEntityType::from_str(&format!("{}", variant)).unwrap());
+        assert_eq!(variant, BatchGenerationEntityType::from_str(&format!("{:?}", variant)).unwrap());
+      }
+    }
+  }
+}
@@ -0,0 +1 @@
+pub mod batch_generation_entity_type;
@@ -0,0 +1 @@
+pub mod stats_entity_type;
@@ -0,0 +1,121 @@
+use std::collections::BTreeSet;
+use serde::Deserialize;
+use serde::Serialize;
+#[cfg(test)]
+use strum::EnumCount;
+#[cfg(test)]
+use strum::EnumIter;
+use utoipa::ToSchema;
+
+/// Used in the `user_stats` table in a `VARCHAR(32)` field named `entity_type`.
+#[cfg_attr(test, derive(EnumIter, EnumCount))]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize, ToSchema, Ord, PartialOrd)]
+pub enum StatsEntityType {
+    /// Comment
+    #[serde(rename = "comment")]
+    Comment,
+    
+    /// MediaFile
+    #[serde(rename = "media_file")]
+    MediaFile,
+
+    /// ModelWeight (the new way to store models)
+    #[serde(rename = "model_weight")]
+    ModelWeight,
+}
+
+// TODO(bt, 2023-01-17): This desperately needs MySQL integration tests!
+impl_enum_display_and_debug_using_to_str!(StatsEntityType);
+impl_mysql_enum_coders!(StatsEntityType);
+impl_mysql_from_row!(StatsEntityType);
+
+/// NB: Legacy API for older code.
+impl StatsEntityType {
+    pub fn to_str(&self) -> &'static str {
+        match self {
+            Self::Comment => "comment",
+            Self::MediaFile => "media_file",
+            Self::ModelWeight => "model_weight",
+        }
+    }
+
+    pub fn from_str(value: &str) -> Result<Self, String> {
+        match value {
+            "comment" => Ok(Self::Comment),
+            "media_file" => Ok(Self::MediaFile),
+            "model_weight" => Ok(Self::ModelWeight),
+            _ => Err(format!("invalid value: {:?}", value)),
+        }
+    }
+
+    pub fn all_variants() -> BTreeSet<Self> {
+        // NB: BTreeSet is sorted
+        // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
+        BTreeSet::from([
+            Self::Comment,
+            Self::MediaFile,
+            Self::ModelWeight,
+        ])
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::by_table::entity_stats::stats_entity_type::StatsEntityType;
+    use crate::test_helpers::assert_serialization;
+
+    mod explicit_checks {
+        use super::*;
+
+        #[test]
+        fn test_serialization() {
+            assert_serialization(StatsEntityType::Comment, "comment");
+            assert_serialization(StatsEntityType::MediaFile, "media_file");
+            assert_serialization(StatsEntityType::ModelWeight, "model_weight");
+        }
+
+        #[test]
+        fn test_to_str() {
+            assert_eq!(StatsEntityType::Comment.to_str(), "comment");
+            assert_eq!(StatsEntityType::MediaFile.to_str(), "media_file");
+            assert_eq!(StatsEntityType::ModelWeight.to_str(), "model_weight");
+        }
+
+        #[test]
+        fn test_from_str() {
+            assert_eq!(StatsEntityType::from_str("comment").unwrap(), StatsEntityType::Comment);
+            assert_eq!(StatsEntityType::from_str("media_file").unwrap(), StatsEntityType::MediaFile);
+            assert_eq!(StatsEntityType::from_str("model_weight").unwrap(), StatsEntityType::ModelWeight);
+            assert!(StatsEntityType::from_str("foo").is_err());
+        }
+
+        #[test]
+        fn all_variants() {
+            let mut variants = StatsEntityType::all_variants();
+            assert_eq!(variants.len(), 3);
+            assert_eq!(variants.pop_first(), Some(StatsEntityType::Comment));
+            assert_eq!(variants.pop_first(), Some(StatsEntityType::MediaFile));
+            assert_eq!(variants.pop_first(), Some(StatsEntityType::ModelWeight));
+            assert_eq!(variants.pop_first(), None);
+        }
+    }
+
+    mod mechanical_checks {
+        use super::*;
+
+        #[test]
+        fn variant_length() {
+            use strum::IntoEnumIterator;
+            assert_eq!(StatsEntityType::all_variants().len(), StatsEntityType::iter().len());
+        }
+
+        #[test]
+        fn round_trip() {
+            for variant in StatsEntityType::all_variants() {
+                assert_eq!(variant, StatsEntityType::from_str(variant.to_str()).unwrap());
+                assert_eq!(variant, StatsEntityType::from_str(&format!("{}", variant)).unwrap());
+                assert_eq!(variant, StatsEntityType::from_str(&format!("{:?}", variant)).unwrap());
+            }
+        }
+    }
+}
@@ -28,6 +28,9 @@ pub enum InferenceCategory {

  #[serde(rename = "video_filter")]
  VideoFilter,
+
+  #[serde(rename = "mocap")]
+  Mocap,
 }

 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -42,6 +45,7 @@ impl InferenceCategory {
      Self::TextToSpeech => "text_to_speech",
      Self::VoiceConversion => "voice_conversion",
      Self::VideoFilter => "video_filter",
+      Self::Mocap => "mocap",
    }
  }

@@ -51,6 +55,7 @@ impl InferenceCategory {
      "text_to_speech" => Ok(Self::TextToSpeech),
      "voice_conversion" => Ok(Self::VoiceConversion),
      "video_filter" => Ok(Self::VideoFilter),
+      "mocap" => Ok(Self::Mocap),
      _ => Err(format!("invalid value: {:?}", value)),
    }
  }
@@ -63,6 +68,7 @@ impl InferenceCategory {
      Self::TextToSpeech,
      Self::VoiceConversion,
      Self::VideoFilter,
+      Self::Mocap,
    ])
  }
 }
@@ -78,6 +84,7 @@ mod tests {
    assert_serialization(InferenceCategory::TextToSpeech, "text_to_speech");
    assert_serialization(InferenceCategory::VoiceConversion, "voice_conversion");
    assert_serialization(InferenceCategory::VideoFilter, "video_filter");
+    assert_serialization(InferenceCategory::Mocap, "mocap")
  }

  #[test]
@@ -86,6 +93,7 @@ mod tests {
    assert_eq!(InferenceCategory::TextToSpeech.to_str(), "text_to_speech");
    assert_eq!(InferenceCategory::VoiceConversion.to_str(), "voice_conversion");
    assert_eq!(InferenceCategory::VideoFilter.to_str(), "video_filter");
+    assert_eq!(InferenceCategory::Mocap.to_str(), "mocap");
  }

  #[test]
@@ -94,17 +102,19 @@ mod tests {
    assert_eq!(InferenceCategory::from_str("text_to_speech").unwrap(), InferenceCategory::TextToSpeech);
    assert_eq!(InferenceCategory::from_str("voice_conversion").unwrap(), InferenceCategory::VoiceConversion);
    assert_eq!(InferenceCategory::from_str("video_filter").unwrap(), InferenceCategory::VideoFilter);
+    assert_eq!(InferenceCategory::from_str("mocap").unwrap(), InferenceCategory::Mocap);
  }

  #[test]
  fn all_variants() {
    // Static check
    let mut variants = InferenceCategory::all_variants();
-    assert_eq!(variants.len(), 4);
+    assert_eq!(variants.len(), 5);
    assert_eq!(variants.pop_first(), Some(InferenceCategory::LipsyncAnimation));
    assert_eq!(variants.pop_first(), Some(InferenceCategory::TextToSpeech));
    assert_eq!(variants.pop_first(), Some(InferenceCategory::VoiceConversion));
    assert_eq!(variants.pop_first(), Some(InferenceCategory::VideoFilter));
+    assert_eq!(variants.pop_first(), Some(InferenceCategory::Mocap));
    assert_eq!(variants.pop_first(), None);

    // Generated check
@@ -33,6 +33,10 @@ pub enum InferenceModelType {
  VallEX,
  #[serde(rename = "rerender_a_video")]
  RerenderAVideo,
+  #[serde(rename = "mocap_net")]
+  MocapNet,
+  #[serde(rename = "styletts2")]
+  StyleTTS2,
 }

 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -50,6 +54,8 @@ impl InferenceModelType {
      Self::Vits => "vits",
      Self::VallEX => "vall_e_x",
      Self::RerenderAVideo => "rerender_a_video",
+      Self::MocapNet => "mocap_net",
+      Self::StyleTTS2 => "styletts2",
    }
  }

@@ -62,6 +68,8 @@ impl InferenceModelType {
      "vits" => Ok(Self::Vits),
      "vall_e_x" => Ok(Self::VallEX),
      "rerender_a_video" => Ok(Self::RerenderAVideo),
+      "mocap_net" => Ok(Self::MocapNet),
+      "styletts2" => Ok(Self::StyleTTS2),
      _ => Err(format!("invalid value: {:?}", value)),
    }
  }
@@ -76,7 +84,9 @@ impl InferenceModelType {
      InferenceModelType::Tacotron2,
      InferenceModelType::Vits,
      InferenceModelType::VallEX,
-      InferenceModelType::RerenderAVideo
+      InferenceModelType::RerenderAVideo,
+      InferenceModelType::MocapNet,
+      InferenceModelType::StyleTTS2,
    ])
  }
 }
@@ -95,6 +105,8 @@ mod tests {
    assert_serialization(InferenceModelType::Vits, "vits");
    assert_serialization(InferenceModelType::VallEX, "vall_e_x");
    assert_serialization(InferenceModelType::RerenderAVideo, "rerender_a_video");
+    assert_serialization(InferenceModelType::MocapNet, "mocap_net");
+    assert_serialization(InferenceModelType::StyleTTS2, "styletts2");
  }

  #[test]
@@ -106,6 +118,8 @@ mod tests {
    assert_eq!(InferenceModelType::Vits.to_str(), "vits");
    assert_eq!(InferenceModelType::VallEX.to_str(), "vall_e_x");
    assert_eq!(InferenceModelType::RerenderAVideo.to_str(), "rerender_a_video");
+    assert_eq!(InferenceModelType::MocapNet.to_str(), "mocap_net");
+    assert_eq!(InferenceModelType::StyleTTS2.to_str(), "styletts2");
  }

  #[test]
@@ -117,13 +131,15 @@ mod tests {
    assert_eq!(InferenceModelType::from_str("vits").unwrap(), InferenceModelType::Vits);
    assert_eq!(InferenceModelType::from_str("vall_e_x").unwrap(), InferenceModelType::VallEX);
    assert_eq!(InferenceModelType::from_str("rerender_a_video").unwrap(), InferenceModelType::RerenderAVideo);
+    assert_eq!(InferenceModelType::from_str("mocap_net").unwrap(), InferenceModelType::MocapNet);
+    assert_eq!(InferenceModelType::from_str("styletts2").unwrap(), InferenceModelType::StyleTTS2);
  }

  #[test]
  fn all_variants() {
    // Static check
    let mut variants = InferenceModelType::all_variants();
-    assert_eq!(variants.len(), 7);
+    assert_eq!(variants.len(), 9);
    assert_eq!(variants.pop_first(), Some(InferenceModelType::RvcV2));
    assert_eq!(variants.pop_first(), Some(InferenceModelType::SadTalker));
    assert_eq!(variants.pop_first(), Some(InferenceModelType::SoVitsSvc));
@@ -131,6 +147,8 @@ mod tests {
    assert_eq!(variants.pop_first(), Some(InferenceModelType::Vits));
    assert_eq!(variants.pop_first(), Some(InferenceModelType::VallEX));
    assert_eq!(variants.pop_first(), Some(InferenceModelType::RerenderAVideo));
+    assert_eq!(variants.pop_first(), Some(InferenceModelType::MocapNet));
+    assert_eq!(variants.pop_first(), Some(InferenceModelType::StyleTTS2));
    assert_eq!(variants.pop_first(), None);

    // Generated check
@@ -25,6 +25,10 @@ pub enum IdCategory {
  #[serde(rename = "video_filter")]
  VideoFilterResult,

+  // Results from mocap
+  #[serde(rename = "mocap")]
+  MocapResult,
+
  /// Results from tacotron2
  /// Applies for RVC and SVC
  #[serde(rename = "tts_result")]
@@ -73,6 +77,7 @@ impl IdCategory {
      Self::VideoFilterResult => "video_filter",
      Self::ModelWeights => "model_weights",
      Self::FileUpload => "file_upload",
+      Self::MocapResult => "mocap",
    }
  }

@@ -88,6 +93,7 @@ impl IdCategory {
      "video_filter" => Ok(Self::VideoFilterResult),
      "model_weights" => Ok(Self::ModelWeights),
      "file_upload" => Ok(Self::FileUpload),
+      "mocap" => Ok(Self::MocapResult),
      _ => Err(format!("invalid value: {:?}", value)),
    }
  }
@@ -106,6 +112,7 @@ impl IdCategory {
      Self::ZeroShotVoiceEmbedding,
      Self::ModelWeights,
      Self::FileUpload,
+      Self::MocapResult,
    ])
  }
 }
@@ -130,6 +137,7 @@ mod tests {
    assert_serialization(IdCategory::ZeroShotTtsResult, "zs_tts_result");
    assert_serialization(IdCategory::ModelWeights, "model_weights");
    assert_serialization(IdCategory::FileUpload, "file_upload");
+    assert_serialization(IdCategory::MocapResult, "mocap");
  }

    #[test]
@@ -144,6 +152,7 @@ mod tests {
      assert_eq!(IdCategory::ZeroShotTtsResult.to_str(), "zs_tts_result");
      assert_eq!(IdCategory::ModelWeights.to_str(), "model_weights");
      assert_eq!(IdCategory::FileUpload.to_str(), "file_upload");
+      assert_eq!(IdCategory::MocapResult.to_str(), "mocap");
    }

    #[test]
@@ -158,16 +167,18 @@ mod tests {
      assert_eq!(IdCategory::from_str("zs_tts_result").unwrap(), IdCategory::ZeroShotTtsResult);
      assert_eq!(IdCategory::from_str("model_weights").unwrap(), IdCategory::ModelWeights);
      assert_eq!(IdCategory::from_str("file_upload").unwrap(), IdCategory::FileUpload);
+      assert_eq!(IdCategory::from_str("mocap").unwrap(), IdCategory::MocapResult);
    }

    #[test]
    fn all_variants() {
      // Static check
      let mut variants = IdCategory::all_variants();
-      assert_eq!(variants.len(), 10);
+      assert_eq!(variants.len(), 11);
      assert_eq!(variants.pop_first(), Some(IdCategory::MediaFile));
      assert_eq!(variants.pop_first(), Some(IdCategory::LipsyncAnimationResult));
      assert_eq!(variants.pop_first(), Some(IdCategory::VideoFilterResult));
+      assert_eq!(variants.pop_first(), Some(IdCategory::MocapResult));
      assert_eq!(variants.pop_first(), Some(IdCategory::TtsResult));
      assert_eq!(variants.pop_first(), Some(IdCategory::VoiceConversionResult));
      assert_eq!(variants.pop_first(), Some(IdCategory::ZeroShotTtsResult));
@@ -20,6 +20,7 @@ pub enum MediaFileOriginModelType {
  RvcV2,

  /// SadTalker -- v1, we may add another enum value for future versions
+  #[serde(rename = "sad_talker")]
  SadTalker,

  /// so-vits-svc voice conversion models
@@ -34,6 +35,12 @@ pub enum MediaFileOriginModelType {

  #[serde(rename = "rerender")]
  Rerender,
+
+  #[serde(rename = "mocap_net")]
+  MocapNet,
+
+  #[serde(rename = "styletts2")]
+  StyleTTS2,
 }

 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -51,6 +58,8 @@ impl MediaFileOriginModelType {
      Self::Tacotron2 => "tacotron2",
      Self::VallEX => "vall_e_x",
      Self::Rerender => "rerender",
+      Self::MocapNet => "mocap_net",
+      Self::StyleTTS2 => "styletts2",
    }
  }

@@ -62,6 +71,8 @@ impl MediaFileOriginModelType {
      "tacotron2" => Ok(Self::Tacotron2),
      "vall_e_x" => Ok(Self::VallEX),
      "rerender" => Ok(Self::Rerender),
+      "mocap_net" => Ok(Self::MocapNet),
+      "styletts2" => Ok(Self::StyleTTS2),
      _ => Err(format!("invalid value: {:?}", value)),
    }
  }
@@ -76,6 +87,8 @@ impl MediaFileOriginModelType {
      Self::Tacotron2,
      Self::VallEX,
      Self::Rerender,
+      Self::MocapNet,
+      Self::StyleTTS2,
    ])
  }
 }
@@ -101,6 +114,8 @@ mod tests {
      assert_eq!(MediaFileOriginModelType::Tacotron2.to_str(), "tacotron2");
      assert_eq!(MediaFileOriginModelType::VallEX.to_str(), "vall_e_x");
      assert_eq!(MediaFileOriginModelType::Rerender.to_str(), "rerender");
+      assert_eq!(MediaFileOriginModelType::MocapNet.to_str(), "mocap_net");
+      assert_eq!(MediaFileOriginModelType::StyleTTS2.to_str(), "styletts2");
  }

    #[test]
@@ -111,19 +126,23 @@ mod tests {
      assert_eq!(MediaFileOriginModelType::from_str("tacotron2").unwrap(), MediaFileOriginModelType::Tacotron2);
      assert_eq!(MediaFileOriginModelType::from_str("vall_e_x").unwrap(), MediaFileOriginModelType::VallEX);
      assert_eq!(MediaFileOriginModelType::from_str("rerender").unwrap(), MediaFileOriginModelType::Rerender);
+      assert_eq!(MediaFileOriginModelType::from_str("mocap_net").unwrap(), MediaFileOriginModelType::MocapNet);
+      assert_eq!(MediaFileOriginModelType::from_str("styletts2").unwrap(), MediaFileOriginModelType::StyleTTS2);
      assert!(MediaFileOriginModelType::from_str("foo").is_err());
    }

    #[test]
    fn all_variants() {
      let mut variants = MediaFileOriginModelType::all_variants();
-      assert_eq!(variants.len(), 6);
+      assert_eq!(variants.len(), 8);
      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::RvcV2));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::SadTalker));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::SoVitsSvc));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::Tacotron2));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::VallEX));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::Rerender));
+      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::MocapNet));
+      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::StyleTTS2));
      assert_eq!(variants.pop_first(), None);
    }
  }
@@ -17,6 +17,11 @@ use utoipa::ToSchema;
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
 #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
 pub enum MediaFileOriginProductCategory {
+  /// Unknown which product is attached to the file (generated the file, the file was
+  /// uploaded on behalf of, etc.)
+  #[serde(rename = "unknown")]
+  Unknown,
+
  /// Media files created by (or uploaded for) the Face Animator product.
  /// The underlying model could be SadTalker, Wav2Lip, or some future model
  #[serde(rename = "face_animator")]
@@ -26,12 +31,6 @@ pub enum MediaFileOriginProductCategory {
  #[serde(rename = "tts")]
  TextToSpeech,

-  // TODO: This should be a temporary category until we migrate the DB to remove this default value
-  /// Unknown which product is attached to the file (generated the file, the file was
-  /// uploaded on behalf of, etc.)
-  #[serde(rename = "unknown")]
-  Unknown,
-
  /// Voice conversion (either RVC or SVC)
  #[serde(rename = "voice_conversion")]
  VoiceConversion,
@@ -43,6 +42,10 @@ pub enum MediaFileOriginProductCategory {
  // Media files for video filters
  #[serde(rename = "video_filter")]
  VideoFilter,
+
+  // Mocap
+  #[serde(rename = "mocap")]
+  Mocap,
 }

 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -54,23 +57,25 @@ impl_mysql_from_row!(MediaFileOriginProductCategory);
 impl MediaFileOriginProductCategory {
  pub fn to_str(&self) -> &'static str {
    match self {
+      Self::Unknown => "unknown",
      Self::FaceAnimator => "face_animator",
      Self::TextToSpeech => "tts",
-      Self::Unknown => "unknown",
      Self::VoiceConversion => "voice_conversion",
      Self::ZeroShotVoice => "zs_voice",
      Self::VideoFilter => "video_filter",
+      Self::Mocap => "mocap",
    }
  }

  pub fn from_str(value: &str) -> Result<Self, String> {
    match value {
+      "unknown" => Ok(Self::Unknown),
      "face_animator" => Ok(Self::FaceAnimator),
      "tts" => Ok(Self::TextToSpeech),
-      "unknown" => Ok(Self::Unknown),
      "voice_conversion" => Ok(Self::VoiceConversion),
      "zs_voice" => Ok(Self::ZeroShotVoice),
      "video_filter" => Ok(Self::VideoFilter),
+      "mocap" => Ok(Self::Mocap),
      _ => Err(format!("invalid value: {:?}", value)),
    }
  }
@@ -79,12 +84,13 @@ impl MediaFileOriginProductCategory {
    // NB: BTreeSet is sorted
    // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
    BTreeSet::from([
+      Self::Unknown,
      Self::FaceAnimator,
      Self::TextToSpeech,
      Self::VideoFilter,
-      Self::Unknown,
      Self::VoiceConversion,
      Self::ZeroShotVoice,
+      Self::Mocap,
    ])
  }
 }
@@ -99,44 +105,48 @@ mod tests {

    #[test]
    fn test_serialization() {
+      assert_serialization(MediaFileOriginProductCategory::Unknown, "unknown");
      assert_serialization(MediaFileOriginProductCategory::FaceAnimator, "face_animator");
      assert_serialization(MediaFileOriginProductCategory::TextToSpeech, "tts");
-      assert_serialization(MediaFileOriginProductCategory::Unknown, "unknown");
      assert_serialization(MediaFileOriginProductCategory::VoiceConversion, "voice_conversion");
      assert_serialization(MediaFileOriginProductCategory::ZeroShotVoice, "zs_voice");
-      assert_serialization(MediaFileOriginProductCategory::VideoFilter, "video_filter")
+      assert_serialization(MediaFileOriginProductCategory::VideoFilter, "video_filter");
+      assert_serialization(MediaFileOriginProductCategory::Mocap, "mocap")
    }

    #[test]
    fn to_str() {
+      assert_eq!(MediaFileOriginProductCategory::Unknown.to_str(), "unknown");
      assert_eq!(MediaFileOriginProductCategory::FaceAnimator.to_str(), "face_animator");
      assert_eq!(MediaFileOriginProductCategory::TextToSpeech.to_str(), "tts");
-      assert_eq!(MediaFileOriginProductCategory::Unknown.to_str(), "unknown");
      assert_eq!(MediaFileOriginProductCategory::VoiceConversion.to_str(), "voice_conversion");
      assert_eq!(MediaFileOriginProductCategory::ZeroShotVoice.to_str(), "zs_voice");
      assert_eq!(MediaFileOriginProductCategory::VideoFilter.to_str(), "video_filter");
+      assert_eq!(MediaFileOriginProductCategory::Mocap.to_str(), "mocap");
    }

    #[test]
    fn from_str() {
+      assert_eq!(MediaFileOriginProductCategory::from_str("unknown").unwrap(), MediaFileOriginProductCategory::Unknown);
      assert_eq!(MediaFileOriginProductCategory::from_str("face_animator").unwrap(), MediaFileOriginProductCategory::FaceAnimator);
      assert_eq!(MediaFileOriginProductCategory::from_str("tts").unwrap(), MediaFileOriginProductCategory::TextToSpeech);
-      assert_eq!(MediaFileOriginProductCategory::from_str("unknown").unwrap(), MediaFileOriginProductCategory::Unknown);
      assert_eq!(MediaFileOriginProductCategory::from_str("voice_conversion").unwrap(), MediaFileOriginProductCategory::VoiceConversion);
      assert_eq!(MediaFileOriginProductCategory::from_str("zs_voice").unwrap(), MediaFileOriginProductCategory::ZeroShotVoice);
      assert_eq!(MediaFileOriginProductCategory::from_str("video_filter").unwrap(), MediaFileOriginProductCategory::VideoFilter);
+      assert_eq!(MediaFileOriginProductCategory::from_str("mocap").unwrap(), MediaFileOriginProductCategory::Mocap);
    }

    #[test]
    fn all_variants() {
      let mut variants = MediaFileOriginProductCategory::all_variants();
-      assert_eq!(variants.len(), 6);
+      assert_eq!(variants.len(), 7);
+      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::Unknown));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::FaceAnimator));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::TextToSpeech));
-      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::Unknown));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::VoiceConversion));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::ZeroShotVoice));
      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::VideoFilter));
+      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::Mocap));
      assert_eq!(variants.pop_first(), None);
    }
  }
@@ -21,6 +21,9 @@ pub enum MediaFileType {

  /// Video files: mp4, etc.
  Video,
+
+  /// Mocap files: BVH, etc.
+  Mocap,
 }

 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -35,6 +38,7 @@ impl MediaFileType {
      Self::Audio => "audio",
      Self::Image => "image",
      Self::Video => "video",
+      Self::Mocap => "mocap",
    }
  }

@@ -43,6 +47,7 @@ impl MediaFileType {
      "audio" => Ok(Self::Audio),
      "image" => Ok(Self::Image),
      "video" => Ok(Self::Video),
+      "mocap" => Ok(Self::Mocap),
      _ => Err(format!("invalid value: {:?}", value)),
    }
  }
@@ -54,6 +59,7 @@ impl MediaFileType {
      Self::Audio,
      Self::Image,
      Self::Video,
+      Self::Mocap,
    ])
  }
 }
@@ -71,6 +77,7 @@ mod tests {
      assert_serialization(MediaFileType::Audio, "audio");
      assert_serialization(MediaFileType::Image, "image");
      assert_serialization(MediaFileType::Video, "video");
+      assert_serialization(MediaFileType::Mocap, "mocap");
    }
  }

@@ -82,6 +89,7 @@ mod tests {
      assert_eq!(MediaFileType::Audio.to_str(), "audio");
      assert_eq!(MediaFileType::Image.to_str(), "image");
      assert_eq!(MediaFileType::Video.to_str(), "video");
+      assert_eq!(MediaFileType::Mocap.to_str(), "mocap");
    }

    #[test]
@@ -89,6 +97,7 @@ mod tests {
      assert_eq!(MediaFileType::from_str("audio").unwrap(), MediaFileType::Audio);
      assert_eq!(MediaFileType::from_str("image").unwrap(), MediaFileType::Image);
      assert_eq!(MediaFileType::from_str("video").unwrap(), MediaFileType::Video);
+      assert_eq!(MediaFileType::from_str("mocap").unwrap(), MediaFileType::Mocap);
      assert!(MediaFileType::from_str("foo").is_err());
    }
  }
@@ -99,10 +108,11 @@ mod tests {
    #[test]
    fn all_variants() {
      let mut variants = MediaFileType::all_variants();
-      assert_eq!(variants.len(), 3);
+      assert_eq!(variants.len(), 4);
      assert_eq!(variants.pop_first(), Some(MediaFileType::Audio));
      assert_eq!(variants.pop_first(), Some(MediaFileType::Image));
      assert_eq!(variants.pop_first(), Some(MediaFileType::Video));
+      assert_eq!(variants.pop_first(), Some(MediaFileType::Mocap));
      assert_eq!(variants.pop_first(), None);
    }
  }
@@ -1,13 +1,16 @@
 // ===== MySql =====
 pub mod audit_logs;
+pub mod batch_generations;
 pub mod comments;
 pub mod email_sender_jobs;
+pub mod entity_stats;
 pub mod generic_download_jobs;
 pub mod generic_inference_jobs;
 pub mod generic_synthetic_ids;
 pub mod media_files;
 pub mod media_uploads;
 pub mod model_categories;
+pub mod model_weights;
 pub mod trending_model_analytics;
 pub mod tts_models;
 pub mod user_bookmarks;
@@ -15,7 +18,7 @@ pub mod user_ratings;
 pub mod voice_conversion_models;
 pub mod voice_conversion_results;
 pub mod zs_voices;
-pub mod model_weights;
+
 // ===== Sqlite =====
 pub mod tts_render_tasks;
 pub mod web_rendition_targets;
@@ -16,6 +16,8 @@ pub enum ZsVoiceModelType {
  /// TTS-type zero shot models
  #[serde(rename = "vall-e-x")]
  VallEX,
+  #[serde(rename = "styletts2")]
+  StyleTTS2,
 }

 // TODO(bt, 2023-01-17): This desperately needs MySQL integration tests!
@@ -27,12 +29,14 @@ impl ZsVoiceModelType {
  pub fn to_str(&self) -> &'static str {
    match self {
      Self::VallEX=> "vall-e-x",
+      Self::StyleTTS2 => "styletts2",
    }
  }

  pub fn from_str(value: &str) -> Result<Self, String> {
    match value {
      "vall-e-x" => Ok(Self::VallEX),
+      "styletts2" => Ok(Self::StyleTTS2),
      _ => Err(format!("invalid value: {:?}", value)),
    }
  }
@@ -42,6 +46,7 @@ impl ZsVoiceModelType {
    // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
    BTreeSet::from([
      Self::VallEX,
+      Self::StyleTTS2,
    ])
  }
 }
@@ -66,11 +71,13 @@ mod tests {
    #[test]
    fn to_str() {
      assert_eq!(ZsVoiceModelType::VallEX.to_str(), "vall-e-x");
+      assert_eq!(ZsVoiceModelType::StyleTTS2.to_str(), "styletts2");
    }

    #[test]
    fn from_str() {
      assert_eq!(ZsVoiceModelType::from_str("vall-e-x").unwrap(), ZsVoiceModelType::VallEX);
+      assert_eq!(ZsVoiceModelType::from_str("styletts2").unwrap(), ZsVoiceModelType::StyleTTS2);
      assert!(ZsVoiceModelType::from_str("foo").is_err());
    }
  }
@@ -81,8 +88,9 @@ mod tests {
    #[test]
    fn all_variants() {
      let mut variants = ZsVoiceModelType::all_variants();
-      assert_eq!(variants.len(), 1);
+      assert_eq!(variants.len(), 2);
      assert_eq!(variants.pop_first(), Some(ZsVoiceModelType::VallEX));
+      assert_eq!(variants.pop_first(), Some(ZsVoiceModelType::StyleTTS2));
      assert_eq!(variants.pop_first(), None);
    }
  }
@@ -10,7 +10,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -1,5 +1,6 @@
 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -18,7 +18,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -24,6 +24,7 @@ use strum::EnumIter;
 pub(crate) enum TokenPrefix {
  AnonymousVisitorTracking, // AVTs are not stored as primary keys in any table, but an index in many tables.
  AuditLog,
+  BatchGeneration,
  Comment,
  DownloadJob,
  EmailSenderJob,
@@ -90,6 +91,7 @@ impl PrefixGenerator for TokenPrefix {
    match self {
      Self::AnonymousVisitorTracking => "avt_",
      Self::AuditLog => "audit_",
+      Self::BatchGeneration => "batch_g_",
      Self::Comment => "comment_",
      Self::DownloadJob => "jdown_", // NB: Previously "JGUP:"
      Self::EmailSenderJob => "email_job_",
@@ -297,7 +299,13 @@ mod tests {
    #[test]
    fn test_all_prefixes_end_with_separator_length_one() {
      for prefix in get_all_prefixes().iter().map(|s| *s) {
-        if prefix == "news_story_" || prefix == "tts_task_" || prefix == "INT_API:" || prefix == "pw_reset_" || prefix == "email_job_" {
+        if prefix == "news_story_"
+            || prefix == "tts_task_"
+            || prefix == "INT_API:"
+            || prefix == "pw_reset_"
+            || prefix == "email_job_"
+            || prefix == "batch_g_"
+        {
          // TODO/FIXME: I'm too tired at 5AM to replacen from the left. Make this test valid.
          //  These tokens are from the AIChatBot sidecar, so asserting their validity is less important.
          continue;
@@ -0,0 +1,15 @@
+use std::fmt::Debug;
+
+use serde::Deserialize;
+use serde::Serialize;
+use utoipa::ToSchema;
+
+use crate::prefixes::TokenPrefix;
+
+/// The primary key for Audit Logs.
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize, ToSchema)]
+#[sqlx(transparent)]
+pub struct BatchGenerationToken(pub String);
+
+impl_string_token!(BatchGenerationToken);
+impl_crockford_generator!(BatchGenerationToken, 32usize, TokenPrefix::BatchGeneration, CrockfordLower);
@@ -2,6 +2,7 @@ pub mod anonymous_visitor_tracking;
 pub mod api_tokens_external;
 pub mod api_tokens_internal;
 pub mod audit_logs;
+pub mod batch_generations;
 pub mod comments;
 pub mod email_sender_job_token;
 pub mod firehose_entries;
@@ -20,6 +21,7 @@ pub mod tts_results;
 pub mod twitch_event_rule;
 pub mod twitch_oauth_tokens_grouping;
 pub mod twitch_oauth_tokens_internal;
+pub mod user_bookmarks;
 pub mod user_sessions;
 pub mod user_subscriptions;
 pub mod users;
@@ -34,4 +36,3 @@ pub mod w2l_templates;
 pub mod zs_voice_dataset_samples;
 pub mod zs_voice_datasets;
 pub mod zs_voices;
-pub mod user_bookmarks;
@@ -8,12 +8,11 @@ use errors::AnyhowResult;
 use crate::bucket_clients::get_bucket_clients;
 use crate::cli_args::parse_cli_args;
 use crate::seeding::model_weights::seed_weights; // V1
-use crate::seeding::seed_model_weights::seed_weights_files; // V2 v3 will come later on when everything is more conslidated and clear.
 use crate::seeding::seed_media_files::seed_media_files;
+use crate::seeding::seed_model_weights::seed_weights_files; // V2 v3 will come later on when everything is more conslidated and clear.
 use crate::seeding::tts_tacotron2::seed_tts_tacotron2;
 use crate::seeding::users::seed_user_accounts;
 use crate::seeding::voice_conversion::seed_voice_conversion;
-use crate::seeding::zero_shot_tts::seed_zero_shot_tts;

 pub mod bucket_clients;

@@ -55,11 +54,9 @@ pub async fn main() -> AnyhowResult<()> {

  seed_user_accounts(&pool).await?;
  seed_media_files(&pool, maybe_bucket_clients.as_ref()).await?;
-  seed_zero_shot_tts(&pool, maybe_bucket_clients.as_ref()).await?;
+  //seed_zero_shot_tts(&pool, maybe_bucket_clients.as_ref()).await?;
  seed_voice_conversion(&pool).await?;
-
  seed_weights(&pool).await?;
-
  seed_tts_tacotron2(&pool, maybe_bucket_clients.as_ref()).await?;
  
  // should seed the weights with a few files for hanashi
@@ -83,7 +83,7 @@ pub async fn seed_weights_files(
        let user_token = UserToken::new_from_str(user_token);
        // prepare the inputs for a model
        let mut rng = rand::thread_rng();
-        let n: u32 = rng.gen();
+        let _n: u32 = rng.gen();

        let model_weight_token = ModelWeightToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously();

@@ -23,6 +23,10 @@ pub enum Environment {
 pub enum Action {
  ReindexTts,
  SearchTts,
+  /// Reindex model_weights into ElasticSearch
+  ReindexModelWeights,
+  /// Search the model weights
+  SearchModelWeights,
 }

 #[derive(Parser, Debug)]
@@ -12,10 +12,12 @@ use sqlx::{MySql, Pool};
 use sqlx::mysql::MySqlPoolOptions;

 use config::shared_constants::DEFAULT_RUST_LOG;
+use elasticsearch_schema::searches::search_model_weights::search_model_weights;
 use elasticsearch_schema::searches::search_tts_models::search_tts_models;
 use errors::AnyhowResult;

 use crate::cli_args::{Action, Environment, parse_cli_args};
+use crate::plans::create_all_model_weight_documents::create_all_model_weight_documents;
 use crate::plans::create_all_tts_documents::create_all_tts_documents;

 pub mod cli_args;
@@ -45,7 +47,18 @@ pub async fn main() -> AnyhowResult<()> {
    }
    Action::SearchTts => {
      info!("Searching TTS...");
-      search_tts_models(&elasticsearch, "zel", Some("en")).await;
+      let _results = search_tts_models(&elasticsearch, "zel", Some("en")).await?;
+    }
+    Action::ReindexModelWeights => {
+      info!("Reindexing model weights...");
+      create_all_model_weight_documents(&mysql, &elasticsearch).await?;
+    }
+    Action::SearchModelWeights => {
+      info!("Searching model weights...");
+      let results = search_model_weights(&elasticsearch, "zel", Some("en")).await?;
+      for result in results {
+        println!("Result: {:?}", result);
+      }
    }
  }

@@ -0,0 +1,146 @@
+use std::fs::read_to_string;
+
+use elasticsearch::{BulkOperation, BulkParts, Elasticsearch};
+use log::{error, info, warn};
+use serde_json::Value;
+use sqlx::{MySql, Pool};
+
+use elasticsearch_schema::documents::model_weight_document::{MODEL_WEIGHT_INDEX, ModelWeightDocument};
+use elasticsearch_schema::traits::document::Document;
+use elasticsearch_schema::utils::create_index_if_not_exists::{create_index_if_not_exists, CreateIndexArgs};
+use enums::by_table::model_weights::weights_category::WeightsCategory;
+use errors::AnyhowResult;
+use mysql_queries::queries::model_weights::list::list_model_weights_for_elastic_search_backfill_using_cursor::{list_model_weights_for_elastic_search_backfill_using_cursor, ModelWeightForElasticsearchRecord};
+use storyteller_root::get_storyteller_rust_root;
+
+pub async fn create_all_model_weight_documents(mysql: &Pool<MySql>, elasticsearch: &Elasticsearch) -> AnyhowResult<()> {
+  info!("Create all model weight documents.");
+
+  // TODO(bt, 2024-01-10): expose this as a CLI flag
+  const DELETE_EXISTING_INDEX : bool = true;
+  const PAGE_SIZE : u64 = 1000;
+
+  create_model_weight_model_index(&elasticsearch, DELETE_EXISTING_INDEX).await?;
+
+  let mut cursor = 0;
+
+  loop {
+    let results = list_model_weights_for_elastic_search_backfill_using_cursor(mysql, PAGE_SIZE, cursor).await?;
+
+    if results.is_empty() {
+      info!("No more results at cursor {cursor}");
+      break;
+    }
+
+    let maybe_last_id = results.last().map(|result| result.id);
+
+    match maybe_last_id {
+      Some(last_id) => cursor = last_id as u64,
+      None => {
+        warn!("No final ID at cursor {cursor}");
+        break;
+      }
+    }
+
+    for result in results {
+      create_document_from_record(elasticsearch, result).await?;
+    }
+  }
+
+  Ok(())
+}
+
+async fn create_document_from_record(elasticsearch: &Elasticsearch, record: ModelWeightForElasticsearchRecord) -> AnyhowResult<()> {
+  info!("Create record for {:?} - {:?}", record.token, record.title);
+
+  let document = ModelWeightDocument {
+    token: record.token,
+
+    creator_set_visibility: record.creator_set_visibility,
+
+    weights_type: record.weights_type,
+    weights_category: record.weights_category,
+
+    title: record.title,
+
+    maybe_cover_image_media_file_token: record.maybe_cover_image_media_file_token,
+    maybe_cover_image_public_bucket_hash: record.maybe_cover_image_public_bucket_hash,
+    maybe_cover_image_public_bucket_prefix: record.maybe_cover_image_public_bucket_prefix,
+    maybe_cover_image_public_bucket_extension: record.maybe_cover_image_public_bucket_extension,
+
+    creator_user_token: record.creator_user_token,
+    creator_username: record.creator_username,
+    creator_display_name: record.creator_display_name,
+    creator_gravatar_hash: record.creator_gravatar_hash,
+
+    ratings_positive_count: record.maybe_ratings_positive_count.unwrap_or(0),
+    ratings_negative_count: record.maybe_ratings_negative_count.unwrap_or(0),
+    bookmark_count: record.maybe_bookmark_count.unwrap_or(0),
+
+    maybe_ietf_language_tag: match record.weights_category {
+      WeightsCategory::TextToSpeech => record.maybe_tts_ietf_language_tag,
+      WeightsCategory::VoiceConversion => record.maybe_voice_conversion_ietf_language_tag,
+      _ => None,
+    },
+
+    maybe_ietf_primary_language_subtag: match record.weights_category {
+      WeightsCategory::TextToSpeech => record.maybe_tts_ietf_primary_language_subtag,
+      WeightsCategory::VoiceConversion => record.maybe_voice_conversion_ietf_primary_language_subtag,
+      _ => None,
+    },
+
+    created_at: record.created_at,
+    updated_at: record.updated_at,
+    user_deleted_at: record.user_deleted_at,
+    mod_deleted_at: record.mod_deleted_at,
+  };
+
+  let op : BulkOperation<_> = BulkOperation::index(&document)
+      .id(document.get_document_id())
+      .into();
+
+  let response = elasticsearch
+      .bulk(BulkParts::Index(MODEL_WEIGHT_INDEX))
+      .body(vec![op])
+      .send()
+      .await?;
+
+  let json: Value = response.json().await?;
+
+  let had_errors = json["errors"].as_bool().unwrap_or(false);
+  if had_errors {
+    let failed: Vec<&Value> = json["items"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .filter(|v| !v["error"].is_null())
+        .collect();
+
+    // TODO: retry failures
+    error!("Errors during indexing. Failures: {}", failed.len());
+  }
+
+  Ok(())
+}
+
+// NB: Adapted from elasticsearch crate examples source
+async fn create_model_weight_model_index(client: &Elasticsearch, delete_existing: bool) -> AnyhowResult<()> {
+
+  info!("Creating model weight model index...");
+
+  let index_path = get_storyteller_rust_root()
+      .join("_elasticsearch/index_definitions/model_weights_v1.json");
+
+  info!("Reading index file: {:?}", index_path);
+
+  let index_definition = read_to_string(index_path)?;
+
+  create_index_if_not_exists(CreateIndexArgs {
+    client,
+    index_name: MODEL_WEIGHT_INDEX,
+    index_definition: &index_definition,
+    delete_existing,
+  }).await?;
+
+  Ok(())
+}
@@ -1 +1,2 @@
+pub mod create_all_model_weight_documents;
 pub mod create_all_tts_documents;
@@ -0,0 +1,47 @@
+use std::str::FromStr;
+
+use clap::Parser;
+use strum::{EnumCount, EnumString, IntoEnumIterator};
+use strum::EnumIter;
+
+use errors::{anyhow, AnyhowResult};
+
+pub struct ParsedArgs {
+  pub action: Action,
+}
+
+#[derive(Clone, Copy, Debug, EnumIter, EnumCount, EnumString, strum::Display)]
+#[strum(serialize_all = "snake_case")]
+pub enum Action {
+  /// Migrate VC
+  MigrateVoiceConversion,
+  /// Migrate TTS
+  MigrateTts,
+}
+
+#[derive(Parser, Debug)]
+#[command(name="migration-tool")]
+pub struct Args {
+  #[arg(name="action", long="action", help="action to take", required=true)]
+  action: String,
+}
+
+pub fn parse_cli_args() -> AnyhowResult<ParsedArgs> {
+  let args = Args::parse();
+
+  Ok(ParsedArgs {
+    action: action_from_str(&args.action)?,
+  })
+}
+
+
+fn action_from_str(value: &str) -> AnyhowResult<Action> {
+  let action = Action::from_str(value)
+      .map_err(|err| {
+        let choices = Action::iter()
+            .map(|e| e.to_string())
+            .collect::<Vec<_>>();
+        anyhow!("parse error: {:?}, provided: \"{}\" choices: {:?}", err, value, choices)
+      })?;
+  Ok(action)
+}
@@ -5,17 +5,21 @@


 use std::time::Duration;
+
 use log::info;
 use sqlx::{MySql, Pool};
 use sqlx::mysql::MySqlPoolOptions;
-use cloud_storage::bucket_client::BucketClient;

+use cloud_storage::bucket_client::BucketClient;
 use config::shared_constants::DEFAULT_RUST_LOG;
 use errors::AnyhowResult;

+use crate::cli_args::{Action, parse_cli_args};
 use crate::deps::Deps;
+use crate::migrations::tts_models_to_weights::migrate::migrate_tts_to_weights;
 use crate::migrations::voice_conversion_to_weights::migrate::migrate_voice_conversion_to_weights;

+pub mod cli_args;
 pub mod deps;
 pub mod migrations;

@@ -40,10 +44,20 @@ pub async fn main() -> AnyhowResult<()> {
    bucket_production_private: get_bucket_client("PRODUCTION_PRIVATE")?,
  };

-  migrate_voice_conversion_to_weights(&deps).await?;
+  let args = parse_cli_args()?;
+
+  match args.action {
+    Action::MigrateVoiceConversion => {
+      migrate_voice_conversion_to_weights(&deps).await?;
+    }
+    Action::MigrateTts => {
+      migrate_tts_to_weights(&deps).await?;
+    }
+  }

  Ok(())
 }
+
 async fn get_mysql(env_var_name: &str) -> AnyhowResult<Pool<MySql>> {
  info!("Connecting to MySQL {env_var_name}...");

@@ -1 +1,2 @@
+pub mod tts_models_to_weights;
 pub mod voice_conversion_to_weights;
@@ -0,0 +1,47 @@
+use tempdir::TempDir;
+
+use buckets::public::weight_files::bucket_file_path::WeightFileBucketPath;
+use cloud_storage::bucket_path_unifier::BucketPathUnifier;
+use errors::AnyhowResult;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
+use hashing::sha256::sha256_hash_file::sha256_hash_file;
+use mysql_queries::queries::model_weights::migration::upsert_model_weight_from_tts_model::CopiedTtsFileData;
+use mysql_queries::queries::tts::tts_models::migration::list_whole_tts_models_using_cursor::WholeTtsModelRecord;
+
+use crate::deps::Deps;
+
+pub async fn copy_cloud_files(model: &WholeTtsModelRecord, deps: &Deps) -> AnyhowResult<CopiedTtsFileData> {
+  let copied_file_data = copy_model(model, deps).await?;
+  Ok(copied_file_data)
+}
+
+async fn copy_model(model: &WholeTtsModelRecord, deps: &Deps) -> AnyhowResult<CopiedTtsFileData> {
+  let bucket_path_unifier = BucketPathUnifier::default_paths();
+
+  let old_model_bucket_path = bucket_path_unifier.tts_synthesizer_path(&model.private_bucket_hash);
+
+  // TODO(bt,2023-12-19): Probably faster to stream between buckets, but whatever.
+  let temp_dir = TempDir::new("model_transfer")?;
+  let model_temp_fs_path = temp_dir.path().join("model.bin");
+
+  deps.bucket_production_private.download_file_to_disk(&old_model_bucket_path, &model_temp_fs_path).await?;
+
+  let file_checksum = sha256_hash_file(&model_temp_fs_path)?;
+
+  let new_model_bucket_path = WeightFileBucketPath::generate_for_tt2_model();
+
+  deps.bucket_production_public.upload_filename_with_content_type(
+    &new_model_bucket_path.get_full_object_path_str(),
+    &model_temp_fs_path,
+    "application/octet-stream").await?;
+
+  safe_delete_temp_file(&model_temp_fs_path);
+  safe_delete_temp_directory(&temp_dir);
+
+  Ok(CopiedTtsFileData {
+    bucket_path: new_model_bucket_path,
+    file_sha_hash: file_checksum,
+  })
+}
+
@@ -0,0 +1,93 @@
+use std::thread;
+use std::time::Duration;
+
+use log::{info, warn};
+
+use buckets::public::weight_files::bucket_file_path::WeightFileBucketPath;
+use enums::by_table::model_weights::weights_types::WeightsType;
+use errors::AnyhowResult;
+use mysql_queries::queries::model_weights::get_weight::get_weight_by_token;
+use mysql_queries::queries::model_weights::migration::upsert_model_weight_from_tts_model::{CopiedTtsFileData, upsert_model_weight_from_tts_model};
+use mysql_queries::queries::tts::tts_models::migration::list_whole_tts_models_using_cursor::{list_whole_tts_models_using_cursor, WholeTtsModelRecord};
+use tokens::tokens::model_weights::ModelWeightToken;
+
+use crate::deps::Deps;
+use crate::migrations::tts_models_to_weights::copy_cloud_files::copy_cloud_files;
+
+const PAGE_SIZE: u64 = 10;
+
+// TODO(bt,2024-01-15): This hasn't been fully vetted / tested. Do not run until it's combed over.
+
+pub async fn migrate_tts_to_weights(deps: &Deps) -> AnyhowResult<()> {
+
+  let mut cursor = 0;
+
+  loop {
+    info!("Querying {PAGE_SIZE} models at cursor = {cursor}");
+
+    let results
+        = list_whole_tts_models_using_cursor(&deps.mysql_production, PAGE_SIZE, cursor).await?;
+
+    if results.is_empty() {
+      warn!("No more results found; exiting.");
+      break;
+    }
+
+    for result in results.iter() {
+      println!("\n\nmigrating over result {:?} : {:?} ...", result.token, result);
+      copy_model_record_and_bucket_files(result, &deps).await?;
+    }
+
+    if let Some(last_id) = results.last().map(|result| result.id) {
+      cursor = last_id as u64;
+    }
+
+    thread::sleep(Duration::from_secs(2));
+  }
+
+  Ok(())
+}
+
+async fn copy_model_record_and_bucket_files(record: &WholeTtsModelRecord, deps: &Deps) -> AnyhowResult<()> {
+  let mut maybe_copied_data = None;
+
+  match &record.maybe_migration_new_model_weights_token {
+    None => {
+      info!("Copying bucket files for record {:?} ...", record.token);
+      let result = copy_cloud_files(record, &deps).await?;
+      maybe_copied_data = Some(result);
+    }
+    Some(token) => {
+      info!("Existing migrated record; skipping cloud bucket copy...");
+      maybe_copied_data = lookup_bucket_details_from_record(token, &deps).await?;
+    }
+  }
+
+  if let Some(copied_data) = &maybe_copied_data {
+    info!("Upserting records...");
+    upsert_model_weight_from_tts_model(record, &deps.mysql_production, copied_data).await?;
+  }
+
+  Ok(())
+}
+
+/// Look up the bucket storage details from a previously-migrated record
+async fn lookup_bucket_details_from_record(model_weight_token: &ModelWeightToken, deps: &Deps) -> AnyhowResult<Option<CopiedTtsFileData>> {
+  let maybe_model_weight_record =
+      get_weight_by_token(model_weight_token, true, &deps.mysql_production).await?;
+
+  let model_weight_record = match maybe_model_weight_record {
+    None => return Ok(None),
+    Some(record) => record,
+  };
+
+  let bucket_path = match model_weight_record.weights_type {
+    WeightsType::Tacotron2 => WeightFileBucketPath::tt2_model_file_from_object_hash(&model_weight_record.public_bucket_hash),
+    _ => return Ok(None), // NB: SVC, RVC, Stable Diffusion, etc. aren't valid for TTS migration
+  };
+
+  Ok(Some(CopiedTtsFileData {
+    bucket_path,
+    file_sha_hash: model_weight_record.file_checksum_sha2,
+  }))
+}
@@ -0,0 +1,2 @@
+pub mod copy_cloud_files;
+pub mod migrate;
@@ -5,7 +5,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -1,17 +1,18 @@
+use anyhow::anyhow;
 use errors::AnyhowResult;
 use filesys::file_read_bytes::file_read_bytes;
 use filesys::file_size::file_size;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes;

-use crate::remote_file_manager::bucket_orchestration::BucketOrchestrationCore;
+use crate::remote_file_manager::bucket_orchestration::{BucketOrchestration, BucketOrchestrationCore};
 use crate::remote_file_manager::file_directory::FileBucketDirectory;
 use crate::remote_file_manager::remote_cloud_bucket_details::RemoteCloudBucketDetails;

 use super::file_descriptor::FileDescriptor;
 use super::file_meta_data::FileMetaData;

-struct RemoteCloudFileClient {
+pub struct RemoteCloudFileClient {
    bucket_orchestration_client: Box<dyn BucketOrchestrationCore>
 }

@@ -22,6 +23,19 @@ impl RemoteCloudFileClient {
        }
    }

+    pub async fn get_remote_cloud_file_client() -> AnyhowResult<Self> {
+        let bucket_orchestration = match BucketOrchestration::new_bucket_client_from_existing_env() {
+            Ok(client) => client,
+            Err(e) => {
+                return Err(anyhow!("Error creating bucket orchestration client: {:?}", e));
+            }
+        };
+
+        Ok(Self {
+            bucket_orchestration_client: Box::new(bucket_orchestration)
+        })
+    }
+
    pub async fn download_file(&self, remote_cloud_bucket_details:RemoteCloudBucketDetails, to_system_file_path:String) -> AnyhowResult<()> {
        let file_descriptor = remote_cloud_bucket_details.file_descriptor_from_bucket_details();
        let file_bucket_directory = FileBucketDirectory::from_existing_bucket_details(remote_cloud_bucket_details);
@@ -4,7 +4,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 //// Okay to toggle
@@ -4,7 +4,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -1,5 +1,6 @@
 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -4,7 +4,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -5,7 +5,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -8,7 +8,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 //// Okay to toggle
@@ -4,7 +4,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -4,7 +4,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -7,7 +7,8 @@
 //!

 // Never allow these
-#![forbid(private_in_public)]
+#![forbid(private_bounds)]
+#![forbid(private_interfaces)]
 #![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things

 // Okay to toggle
@@ -59,6 +59,8 @@ pub fn add_fakeyou(cors: Cors, is_production: bool) -> Cors {
        // FakeYou (Staging)
        .allowed_origin("http://staging.fakeyou.com")
        .allowed_origin("https://staging.fakeyou.com")
+        // FakeYou (Netlify Staging / Production)
+        .allowed_origin("https://feature-mvp--fakeyou.netlify.app")
  } else {
    cors
        // FakeYou (Development)
@@ -1,2 +1,2 @@
-pub mod tts_model_document;
-mod model_weight_document;
+pub mod model_weight_document;
+pub mod tts_model_document;
@@ -2,9 +2,9 @@ use std::path::PathBuf;

 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
+
 use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::by_table::model_weights::weights_types::WeightsType;
-
 use enums::common::visibility::Visibility;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::model_weights::ModelWeightToken;
@@ -18,6 +18,9 @@ pub const MODEL_WEIGHT_INDEX: &str = "model_weights_v1";

 #[derive(Serialize, Deserialize, Debug)]
 pub struct ModelWeightDocument {
+
+  // *** NB: Never put the bucket path to the model in Elasticsearch ! ***
+
  pub token: ModelWeightToken,

  pub creator_set_visibility: Visibility,
@@ -27,30 +30,34 @@ pub struct ModelWeightDocument {

  pub title: String,

+  // *** NB: Never put the bucket path to the model in Elasticsearch ! ***
+
  pub maybe_cover_image_media_file_token: Option<MediaFileToken>,
-  pub maybe_cover_image_media_bucket_path: Option<String>,
+  pub maybe_cover_image_public_bucket_hash: Option<String>,
+  pub maybe_cover_image_public_bucket_prefix: Option<String>,
+  pub maybe_cover_image_public_bucket_extension: Option<String>,

  //pub description_markdown: String,
  //pub description_markdown_html: String,

-  // TODO(bt,2023-12-22): Populate these fields
-  //pub cached_user_ratings_total_count: u32,
-  //pub cached_user_ratings_positive_count: u32,
-  //pub cached_user_ratings_negative_count: u32,
-  //pub cached_user_ratings_ratio: f32,
-  //pub cached_user_ratings_last_updated_at: DateTime<Utc>,
-
  pub creator_user_token: UserToken,
  pub creator_username: String,
  pub creator_display_name: String,
  pub creator_gravatar_hash: String,

+  // Statistics
+  pub ratings_positive_count: u32,
+  pub ratings_negative_count: u32,
+  pub bookmark_count: u32,
+
  // Fields only used for TTS models and voice conversion models.
  pub maybe_ietf_language_tag: Option<String>,
  pub maybe_ietf_primary_language_subtag: Option<String>,

  pub created_at: DateTime<Utc>,
  pub updated_at: DateTime<Utc>,
+  pub user_deleted_at: Option<DateTime<Utc>>,
+  pub mod_deleted_at: Option<DateTime<Utc>>,
 }

 impl Document for ModelWeightDocument {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brandon Thomas	33613cb5d8	insert batch generation records	2024-01-16 23:00:17 -05:00
Brandon Thomas	2487a8d646	refactor query modules	2024-01-16 21:03:56 -05:00
Brandon Thomas	1771e1dffe	fix lint/test failures	2024-01-16 20:52:11 -05:00
Brandon Thomas	2d4d2c667f	reference schemas	2024-01-16 19:49:08 -05:00
Brandon Thomas	0c99852dfd	Merge pull request #278 from storytold/brandon-new-tables new tables: idempotency_tokens, batch_generations; new column	2024-01-16 19:11:36 -05:00
Brandon Thomas	7cc310764e	new tables: idempotency_tokens, batch_generations; new column	2024-01-16 19:10:23 -05:00
Kasisnu	b66b04d86c	Merge pull request #277 from storytold/jan-16-mithoo bugfix: ignore more than one samples for zs	2024-01-16 13:06:48 +05:30
Kasisnu	18d46a0f57	bugfix: ignore more than one samples for zs	2024-01-16 13:06:29 +05:30
Kasisnu	97795fac22	Merge pull request #276 from storytold/jan-16-mithoo codegen & styletts2 downloader cleanup	2024-01-16 11:40:30 +05:30
Kasisnu	cec0cfc907	remove misleading downloaders from styletts2	2024-01-16 11:39:46 +05:30
Kasisnu	d516058802	codegen	2024-01-16 11:36:28 +05:30
Kasisnu	b77810cd29	Merge pull request #268 from storytold/jan-04-mithoo adds styletts2 as voice designer model	2024-01-16 10:52:06 +05:30
Brandon Thomas	2507cf0332	analysis of AI streamer bug reports	2024-01-15 21:48:45 -05:00
Brandon Thomas	cf4c335d41	migration tool for tts models	2024-01-15 21:27:44 -05:00
Kasisnu	5e98049c50	switch from vallex -> styletts2 for zero shot	2024-01-15 17:44:29 +05:30
Brandon Thomas	89cd104551	codegen	2024-01-13 22:58:39 -05:00
Brandon Thomas	5933387f5c	tts_models migration: weights db column, list tts models	2024-01-13 22:49:14 -05:00
Brandon Thomas	b5009d5985	bvh extension	2024-01-13 03:42:06 -05:00
Brandon Thomas	de4548795c	handle BVH file uploads	2024-01-13 03:38:17 -05:00
Brandon Thomas	6122f11cf3	Add MediaFileOriginDetails to list media files for user	2024-01-13 01:40:34 -05:00
Brandon Thomas	929105bb85	add color index to cover images	2024-01-13 01:22:31 -05:00
Brandon Thomas	a76272aeb3	doc	2024-01-13 01:13:21 -05:00
Brandon Thomas	4c9cb5d986	add MediaFileOriginDetails to list featured media files	2024-01-13 01:12:04 -05:00
Brandon Thomas	108806cb52	list media files - MediaFileOriginDetails + title	2024-01-13 01:00:55 -05:00
Brandon Thomas	ce852eda8a	netlify feature branch cors	2024-01-12 15:51:50 -05:00
Kasisnu	ea3a6d3c0b	pass appropriate arguments to styletts inference command	2024-01-12 17:58:12 +05:30
Kasisnu	c6a6676f08	adds styletts2 as voice designer model	2024-01-12 14:53:55 +05:30
Brandon Thomas	5949d1d4e7	fix names of search fields	2024-01-12 00:18:44 -05:00
Brandon Thomas	c01ffe33a5	cover image details on all informational weight endpoints	2024-01-11 23:32:52 -05:00
Brandon Thomas	f251e8b88a	document types	2024-01-11 21:39:29 -05:00
Brandon Thomas	65ea06767a	cover image details on list weights	2024-01-11 21:28:32 -05:00
Brandon Thomas	5643ecae89	CoverImageDetails	2024-01-11 21:16:10 -05:00
Brandon Thomas	c1b152cc35	default cover images (part 1)	2024-01-11 20:56:37 -05:00
Brandon Thomas	65bdea264d	move mod `user_avatars`	2024-01-11 20:34:13 -05:00
Brandon Thomas	0bca56a9db	query bug - referenced old columns	2024-01-11 20:19:34 -05:00
Brandon Thomas	990f51bef0	fix failing tests and lints	2024-01-11 19:38:27 -05:00
Brandon Thomas	c8be79c1dc	change enum serialization	2024-01-11 19:15:55 -05:00
Brandon Thomas	dca8ff7014	deprecated lint; clarify serde casing	2024-01-11 19:09:38 -05:00
Brandon Thomas	d11c236257	analyze download jobs	2024-01-11 16:25:38 -05:00
Brandon Thomas	3a0246822f	change token name for frontend	2024-01-11 15:57:17 -05:00
Brandon Thomas	690afa66d7	ugh, it was feature flagged	2024-01-11 05:48:03 -05:00
Brandon Thomas	0657880a9b	this was 404ing, not sure why (too tired)	2024-01-11 05:21:16 -05:00
Brandon Thomas	792c109bb6	query exact indices in elasticsearch	2024-01-11 04:57:08 -05:00
Brandon Thomas	95987860f4	codegen	2024-01-11 02:30:17 -05:00
Brandon Thomas	6104782041	api docs for elasticsearch	2024-01-11 02:29:40 -05:00
Brandon Thomas	b75dea434f	model_weights elasticsearch endpoint	2024-01-11 02:23:42 -05:00
Brandon Thomas	3372447a0b	cli elasticsearch search	2024-01-11 02:03:57 -05:00
Brandon Thomas	33323baf22	elasticsearch schema	2024-01-10 23:33:10 -05:00
Brandon Thomas	6e681b0ff6	Merge pull request #275 from storytold/brandon-es-wip elasticsearch wip	2024-01-10 22:54:19 -05:00
Brandon Thomas	aa1a007c5e	elasticsearch wip	2024-01-10 22:53:36 -05:00
Brandon Thomas	590ef4701e	codegen	2024-01-10 04:24:06 -05:00
Brandon Thomas	38d14ad361	stats on list weights (explore)	2024-01-10 04:22:33 -05:00
Brandon Thomas	8b63c7e5bc	stats for get weight handler	2024-01-10 04:04:17 -05:00
Brandon Thomas	ae80d5c02d	clear out bookmark token if soft deleted (recommended by victor)	2024-01-10 03:38:47 -05:00
Brandon Thomas	d3de1c9a4b	add stats to list weights by user (remove old fields)	2024-01-10 03:32:56 -05:00
Brandon Thomas	70691437f3	add stats to featured weights handler	2024-01-10 03:05:22 -05:00
Brandon Thomas	e63f4e08bf	stats on list media for user handler	2024-01-10 02:39:52 -05:00
Brandon Thomas	0fae1229b6	stats on get media file endpoint	2024-01-10 02:34:43 -05:00
Brandon Thomas	aae75c4050	fix batch bookmark bug	2024-01-10 02:21:37 -05:00
ArEnSc	19670459e8	Merge pull request #273 from storytold/feature/mocap-net Add mocapnet	2024-01-10 00:34:18 -05:00
saltacc	240bf5f488	size arg & todo comment	2024-01-09 21:11:14 -08:00
Brandon Thomas	b8c26fa9ce	remove fields	2024-01-09 23:18:37 -05:00
Brandon Thomas	52d7e0585e	Merge pull request #274 from storytold/brandon-more-stats-2 add stats on all endpoints	2024-01-09 23:12:22 -05:00
Brandon Thomas	9f54bfe0ab	add stats on all endpoints	2024-01-09 23:11:24 -05:00
saltacc	7714f0c056	add command line arguments	2024-01-09 19:26:46 -08:00
saltacc	dbdc5b3c9d	fix directories, mime, and inference categories	2024-01-09 18:58:01 -08:00
saltacc	c25cc3b126	add mocapnet	2024-01-09 16:21:32 -08:00
Brandon Thomas	c07e71b8c3	add bookmark tokwn to batch get bookmarks	2024-01-09 00:35:29 -05:00
Brandon Thomas	0aaacdddaa	reusable type	2024-01-08 23:30:16 -05:00
Brandon Thomas	52af33a94d	stats on list bookmarks for user endpoint	2024-01-08 23:25:49 -05:00
Brandon Thomas	7900d732c7	codegen queries	2024-01-08 00:31:34 -05:00
Brandon Thomas	af24c8d469	Merge pull request #270 from storytold/brandon-ratings-counts collect rating stats	2024-01-08 00:30:41 -05:00
Brandon Thomas	de768158ab	collect rating stats	2024-01-08 00:29:52 -05:00
Brandon Thomas	1237aa8a10	rename create -> upsert	2024-01-07 23:14:47 -05:00
Brandon Thomas	f601c4a385	codegen DB, comment	2024-01-06 09:57:30 -05:00
Brandon Thomas	d03c53ed2e	fix logic on delete, too	2024-01-05 23:59:06 -05:00
Brandon Thomas	cd0c35de4a	fix increment logic	2024-01-05 23:54:13 -05:00
Brandon Thomas	39a5440b81	Merge pull request #269 from storytold/brandon-record-stats record stats	2024-01-05 23:37:16 -05:00
Brandon Thomas	12f59916b6	record stats	2024-01-05 23:34:12 -05:00
Brandon Thomas	4489ffb95e	Merge pull request #267 from storytold/brandon-stats-table remove stats from model_weights, add a stats side table	2024-01-04 01:59:35 -05:00