Fixed added weights type by request.

Add missing data in response
get weight endpoint to have updated_at (the list weight has but the single weight doesnt) profile weight list endpoint weights_category is missing from the response, i need it for rendering the cards by what type of weight it is.
2026-10-31 15:55:54 -04:00 · 2023-12-23 23:25:43 -05:00 · 2023-12-23 14:46:45 -05:00 · 2023-12-21 20:51:39 -05:00 · 2023-12-21 19:53:07 -05:00 · 2023-12-21 19:51:32 -05:00
144 changed files with 4362 additions and 1021 deletions
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO model_weights\nSET\n  token = ?,\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n\n  maybe_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = NULL,\n  description_rendered_html = NULL,\n\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = \"TODO\",\n\n  creator_user_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  private_bucket_hash = ?,\n  maybe_private_bucket_prefix = ?,\n  maybe_private_bucket_extension = ?,\n\n  cached_user_ratings_total_count = 0,\n  cached_user_ratings_positive_count = 0,\n  cached_user_ratings_negative_count = 0,\n  maybe_cached_user_ratings_ratio = 0.0,\n  cached_user_ratings_last_updated_at = NOW(),\n\n  maybe_migration_old_model_token = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 14
-    },
-    "nullable": []
-  },
-  "hash": "2a8ac5f5cf9d955f154ef9369eff4aff39656262147e97f3e8d8eb59497fcbd5"
-}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.private_bucket_hash,\n        wt.maybe_private_bucket_prefix,\n        wt.maybe_private_bucket_extension,\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        WHERE\n            wt.token = ?\n            ",
+  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        users.username as creator_username,\n        users.display_name as creator_display_name,\n        users.email_gravatar_hash AS creator_gravatar_hash,\n\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.public_bucket_hash,\n        wt.maybe_public_bucket_prefix,\n        wt.maybe_public_bucket_extension,\n\n        avatar.public_bucket_directory_hash as maybe_avatar_public_bucket_hash,\n        avatar.maybe_public_bucket_prefix as maybe_avatar_public_bucket_prefix,\n        avatar.maybe_public_bucket_extension as maybe_avatar_public_bucket_extension,\n\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        JOIN users\n            ON users.token = wt.creator_user_token\n        LEFT OUTER JOIN media_files as avatar\n            ON avatar.token = wt.maybe_avatar_media_file_token\n        WHERE\n            wt.token = ?\n            ",
  "describe": {
    "columns": [
      {
@@ -85,6 +85,36 @@
      },
      {
        "ordinal": 8,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "creator_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 11,
        "name": "creator_ip_address",
        "type_info": {
          "type": "VarString",
@@ -94,7 +124,7 @@
        }
      },
      {
-        "ordinal": 9,
+        "ordinal": 12,
        "name": "creator_set_visibility: enums::common::visibility::Visibility",
        "type_info": {
          "type": "String",
@@ -104,7 +134,7 @@
        }
      },
      {
-        "ordinal": 10,
+        "ordinal": 13,
        "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
        "type_info": {
          "type": "VarString",
@@ -114,7 +144,7 @@
        }
      },
      {
-        "ordinal": 11,
+        "ordinal": 14,
        "name": "original_download_url",
        "type_info": {
          "type": "VarString",
@@ -124,7 +154,7 @@
        }
      },
      {
-        "ordinal": 12,
+        "ordinal": 15,
        "name": "original_filename",
        "type_info": {
          "type": "VarString",
@@ -134,7 +164,7 @@
        }
      },
      {
-        "ordinal": 13,
+        "ordinal": 16,
        "name": "file_size_bytes",
        "type_info": {
          "type": "Long",
@@ -144,7 +174,7 @@
        }
      },
      {
-        "ordinal": 14,
+        "ordinal": 17,
        "name": "file_checksum_sha2",
        "type_info": {
          "type": "String",
@@ -154,8 +184,8 @@
        }
      },
      {
-        "ordinal": 15,
-        "name": "private_bucket_hash",
+        "ordinal": 18,
+        "name": "public_bucket_hash",
        "type_info": {
          "type": "VarString",
          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -164,8 +194,8 @@
        }
      },
      {
-        "ordinal": 16,
-        "name": "maybe_private_bucket_prefix",
+        "ordinal": 19,
+        "name": "maybe_public_bucket_prefix",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -174,8 +204,8 @@
        }
      },
      {
-        "ordinal": 17,
-        "name": "maybe_private_bucket_extension",
+        "ordinal": 20,
+        "name": "maybe_public_bucket_extension",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -184,7 +214,37 @@
        }
      },
      {
-        "ordinal": 18,
+        "ordinal": 21,
+        "name": "maybe_avatar_public_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "maybe_avatar_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_avatar_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 24,
        "name": "cached_user_ratings_negative_count",
        "type_info": {
          "type": "Long",
@@ -194,7 +254,7 @@
        }
      },
      {
-        "ordinal": 19,
+        "ordinal": 25,
        "name": "cached_user_ratings_positive_count",
        "type_info": {
          "type": "Long",
@@ -204,7 +264,7 @@
        }
      },
      {
-        "ordinal": 20,
+        "ordinal": 26,
        "name": "cached_user_ratings_total_count",
        "type_info": {
          "type": "Long",
@@ -214,7 +274,7 @@
        }
      },
      {
-        "ordinal": 21,
+        "ordinal": 27,
        "name": "maybe_cached_user_ratings_ratio",
        "type_info": {
          "type": "Float",
@@ -224,7 +284,7 @@
        }
      },
      {
-        "ordinal": 22,
+        "ordinal": 28,
        "name": "cached_user_ratings_last_updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -234,7 +294,7 @@
        }
      },
      {
-        "ordinal": 23,
+        "ordinal": 29,
        "name": "version",
        "type_info": {
          "type": "Long",
@@ -244,7 +304,7 @@
        }
      },
      {
-        "ordinal": 24,
+        "ordinal": 30,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -254,7 +314,7 @@
        }
      },
      {
-        "ordinal": 25,
+        "ordinal": 31,
        "name": "updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -264,7 +324,7 @@
        }
      },
      {
-        "ordinal": 26,
+        "ordinal": 32,
        "name": "user_deleted_at",
        "type_info": {
          "type": "Timestamp",
@@ -274,7 +334,7 @@
        }
      },
      {
-        "ordinal": 27,
+        "ordinal": 33,
        "name": "mod_deleted_at",
        "type_info": {
          "type": "Timestamp",
@@ -298,6 +358,9 @@
      false,
      false,
      false,
+      false,
+      false,
+      false,
      true,
      true,
      true,
@@ -306,6 +369,9 @@
      false,
      true,
      true,
+      true,
+      true,
+      true,
      false,
      false,
      false,
@@ -318,5 +384,5 @@
      true
    ]
  },
-  "hash": "6a94791c8a8f66ee54bb367a4e8c71106bbcbbb205f54c14e3657279e83dabb6"
+  "hash": "4e30e34cdf7a5834a3981d5e634506966bac9f9c420e800d15ce313778272cee"
 }
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\n            SELECT\n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.private_bucket_hash,\n                mw.maybe_private_bucket_prefix,\n                mw.maybe_private_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n                AND mw.user_deleted_at IS NULL\n                AND mw.mod_deleted_at IS NULL\n            ",
+  "query": "\n            SELECT\n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.public_bucket_hash,\n                mw.maybe_public_bucket_prefix,\n                mw.maybe_public_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n                AND mw.user_deleted_at IS NULL\n                AND mw.mod_deleted_at IS NULL\n            ",
  "describe": {
    "columns": [
      {
@@ -185,7 +185,7 @@
      },
      {
        "ordinal": 18,
-        "name": "private_bucket_hash",
+        "name": "public_bucket_hash",
        "type_info": {
          "type": "VarString",
          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -195,7 +195,7 @@
      },
      {
        "ordinal": 19,
-        "name": "maybe_private_bucket_prefix",
+        "name": "maybe_public_bucket_prefix",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -205,7 +205,7 @@
      },
      {
        "ordinal": 20,
-        "name": "maybe_private_bucket_extension",
+        "name": "maybe_public_bucket_extension",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -351,5 +351,5 @@
      true
    ]
  },
-  "hash": "a6ed8524fb5339fed17bec6611f8f56b6bdee35bac63c9eacbe21eb032a6a831"
+  "hash": "854da1bad28fbcf5a8f82c26c52c25a7727957b52b727831ce62518b3c5fc9bd"
 }
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE voice_conversion_models\nSET\n  maybe_migration_new_model_weights_token = ?\nWHERE token = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "898a2f89d1f3efcb87adaef432cc73117057e44766c330caff6ce2c9d48518fd"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO model_weights\nSET\n  token = ?,\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n\n  maybe_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = NULL,\n  description_rendered_html = NULL,\n\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = ?,\n\n  creator_user_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  public_bucket_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n\n  cached_user_ratings_total_count = 0,\n  cached_user_ratings_positive_count = 0,\n  cached_user_ratings_negative_count = 0,\n  maybe_cached_user_ratings_ratio = 0.0,\n  cached_user_ratings_last_updated_at = NOW(),\n\n  maybe_migration_old_model_token = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 15
+    },
+    "nullable": []
+  },
+  "hash": "8cb3ba5acb8dbef84408370810c98d4b99223761d4547ce7c8a9438ba92e8523"
+}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.private_bucket_hash,\n        wt.maybe_private_bucket_prefix,\n        wt.maybe_private_bucket_extension,\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        WHERE\n            wt.token = ?\n            AND wt.user_deleted_at IS NULL\n            AND wt.mod_deleted_at IS NULL\n        ",
+  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        users.username as creator_username,\n        users.display_name as creator_display_name,\n        users.email_gravatar_hash AS creator_gravatar_hash,\n\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.public_bucket_hash,\n        wt.maybe_public_bucket_prefix,\n        wt.maybe_public_bucket_extension,\n\n        avatar.public_bucket_directory_hash as maybe_avatar_public_bucket_hash,\n        avatar.maybe_public_bucket_prefix as maybe_avatar_public_bucket_prefix,\n        avatar.maybe_public_bucket_extension as maybe_avatar_public_bucket_extension,\n\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        JOIN users\n            ON users.token = wt.creator_user_token\n        LEFT OUTER JOIN media_files as avatar\n            ON avatar.token = wt.maybe_avatar_media_file_token\n        WHERE\n            wt.token = ?\n            AND wt.user_deleted_at IS NULL\n            AND wt.mod_deleted_at IS NULL\n        ",
  "describe": {
    "columns": [
      {
@@ -75,16 +75,6 @@
      },
      {
        "ordinal": 7,
-        "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": 8,
        "name": "creator_ip_address",
        "type_info": {
          "type": "VarString",
@@ -94,7 +84,7 @@
        }
      },
      {
-        "ordinal": 9,
+        "ordinal": 8,
        "name": "creator_set_visibility: enums::common::visibility::Visibility",
        "type_info": {
          "type": "String",
@@ -103,8 +93,48 @@
          "max_size": 28
        }
      },
+      {
+        "ordinal": 9,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
      {
        "ordinal": 10,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "creator_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 13,
        "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
        "type_info": {
          "type": "VarString",
@@ -114,7 +144,7 @@
        }
      },
      {
-        "ordinal": 11,
+        "ordinal": 14,
        "name": "original_download_url",
        "type_info": {
          "type": "VarString",
@@ -124,7 +154,7 @@
        }
      },
      {
-        "ordinal": 12,
+        "ordinal": 15,
        "name": "original_filename",
        "type_info": {
          "type": "VarString",
@@ -134,7 +164,7 @@
        }
      },
      {
-        "ordinal": 13,
+        "ordinal": 16,
        "name": "file_size_bytes",
        "type_info": {
          "type": "Long",
@@ -144,7 +174,7 @@
        }
      },
      {
-        "ordinal": 14,
+        "ordinal": 17,
        "name": "file_checksum_sha2",
        "type_info": {
          "type": "String",
@@ -154,8 +184,8 @@
        }
      },
      {
-        "ordinal": 15,
-        "name": "private_bucket_hash",
+        "ordinal": 18,
+        "name": "public_bucket_hash",
        "type_info": {
          "type": "VarString",
          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -164,8 +194,8 @@
        }
      },
      {
-        "ordinal": 16,
-        "name": "maybe_private_bucket_prefix",
+        "ordinal": 19,
+        "name": "maybe_public_bucket_prefix",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -174,8 +204,8 @@
        }
      },
      {
-        "ordinal": 17,
-        "name": "maybe_private_bucket_extension",
+        "ordinal": 20,
+        "name": "maybe_public_bucket_extension",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -184,7 +214,37 @@
        }
      },
      {
-        "ordinal": 18,
+        "ordinal": 21,
+        "name": "maybe_avatar_public_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "maybe_avatar_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_avatar_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 24,
        "name": "cached_user_ratings_negative_count",
        "type_info": {
          "type": "Long",
@@ -194,7 +254,7 @@
        }
      },
      {
-        "ordinal": 19,
+        "ordinal": 25,
        "name": "cached_user_ratings_positive_count",
        "type_info": {
          "type": "Long",
@@ -204,7 +264,7 @@
        }
      },
      {
-        "ordinal": 20,
+        "ordinal": 26,
        "name": "cached_user_ratings_total_count",
        "type_info": {
          "type": "Long",
@@ -214,7 +274,7 @@
        }
      },
      {
-        "ordinal": 21,
+        "ordinal": 27,
        "name": "maybe_cached_user_ratings_ratio",
        "type_info": {
          "type": "Float",
@@ -224,7 +284,7 @@
        }
      },
      {
-        "ordinal": 22,
+        "ordinal": 28,
        "name": "cached_user_ratings_last_updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -234,7 +294,7 @@
        }
      },
      {
-        "ordinal": 23,
+        "ordinal": 29,
        "name": "version",
        "type_info": {
          "type": "Long",
@@ -244,7 +304,7 @@
        }
      },
      {
-        "ordinal": 24,
+        "ordinal": 30,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -254,7 +314,7 @@
        }
      },
      {
-        "ordinal": 25,
+        "ordinal": 31,
        "name": "updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -264,7 +324,7 @@
        }
      },
      {
-        "ordinal": 26,
+        "ordinal": 32,
        "name": "user_deleted_at",
        "type_info": {
          "type": "Timestamp",
@@ -274,7 +334,7 @@
        }
      },
      {
-        "ordinal": 27,
+        "ordinal": 33,
        "name": "mod_deleted_at",
        "type_info": {
          "type": "Timestamp",
@@ -298,6 +358,9 @@
      false,
      false,
      false,
+      false,
+      false,
+      false,
      true,
      true,
      true,
@@ -306,6 +369,9 @@
      false,
      true,
      true,
+      true,
+      true,
+      true,
      false,
      false,
      false,
@@ -318,5 +384,5 @@
      true
    ]
  },
-  "hash": "f0b5767d52c389660d1859e628c746f6f33a9e1c25f21f66aeeb0784df768c8e"
+  "hash": "93084dc42ae4ada186dc90bdd470122342586f4f19a3ac961286c1c54a5c32b2"
 }
@@ -0,0 +1,542 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    id,\n    token as `token: tokens::tokens::tts_models::TtsModelToken`,\n\n    tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n\n    text_pipeline_type,\n    has_self_contained_vocoder,\n    has_self_contained_duration_model,\n    has_self_contained_pitch_model,\n    text_preprocessing_algorithm,\n\n    use_default_mel_multiply_factor,\n    maybe_custom_mel_multiply_factor,\n    maybe_default_pretrained_vocoder,\n    maybe_custom_vocoder_token as `maybe_custom_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,\n\n    ietf_language_tag,\n    ietf_primary_language_subtag,\n\n    title,\n    description_markdown,\n    description_rendered_html,\n\n    voice_name,\n    actor_name,\n    characteristic,\n    version_string,\n\n    is_front_page_featured,\n    is_twitch_featured,\n\n    maybe_suggested_unique_bot_command,\n\n    original_download_url,\n    original_filename,\n    file_size_bytes,\n\n    creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n\n    creator_ip_address_creation,\n    creator_ip_address_last_update,\n\n    creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    private_bucket_hash,\n    private_bucket_object_name,\n\n    private_bucket_object_is_archive,\n\n    user_ratings_total_count,\n    user_ratings_positive_count,\n    user_ratings_negative_count,\n\n    is_public_listing_approved,\n    is_locked_from_user_modification,\n    is_locked_from_use,\n\n    maybe_mod_comments,\n    maybe_mod_user_token as `maybe_mod_user_token: tokens::tokens::users::UserToken`,\n\n    maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n\n    version,\n\n    created_at,\n    updated_at,\n\n    user_deleted_at,\n    mod_deleted_at\n\nFROM tts_models\nWHERE\n  id > ?\nORDER BY id ASC\nLIMIT ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: tokens::tokens::tts_models::TtsModelToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 60
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "text_pipeline_type",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "has_self_contained_vocoder",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "has_self_contained_duration_model",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "has_self_contained_pitch_model",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "text_preprocessing_algorithm",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "use_default_mel_multiply_factor",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_custom_mel_multiply_factor",
+        "type_info": {
+          "type": "Double",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 22
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_default_pretrained_vocoder",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "maybe_custom_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "ietf_language_tag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "ietf_primary_language_subtag",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY",
+          "char_set": 224,
+          "max_size": 48
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "description_markdown",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "description_rendered_html",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "voice_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "actor_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "characteristic",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "version_string",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "is_front_page_featured",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "is_twitch_featured",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "maybe_suggested_unique_bot_command",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "original_download_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 2048
+        }
+      },
+      {
+        "ordinal": 25,
+        "name": "original_filename",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 26,
+        "name": "file_size_bytes",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 27,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 28,
+        "name": "creator_ip_address_creation",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 29,
+        "name": "creator_ip_address_last_update",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 30,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 31,
+        "name": "private_bucket_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 32,
+        "name": "private_bucket_object_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 33,
+        "name": "private_bucket_object_is_archive",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 34,
+        "name": "user_ratings_total_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 35,
+        "name": "user_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 36,
+        "name": "user_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 37,
+        "name": "is_public_listing_approved",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "MULTIPLE_KEY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 38,
+        "name": "is_locked_from_user_modification",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL | MULTIPLE_KEY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 39,
+        "name": "is_locked_from_use",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL | MULTIPLE_KEY",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 40,
+        "name": "maybe_mod_comments",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 41,
+        "name": "maybe_mod_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 42,
+        "name": "maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "UNIQUE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 43,
+        "name": "version",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 11
+        }
+      },
+      {
+        "ordinal": 44,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 45,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 46,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 47,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "a44c637e84152864a00f0ba58838c2f3888e3061fc8b44291541840fdb706e44"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO model_weights\nSET\n  token = ?,\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n  maybe_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = ?,\n  description_rendered_html = ?,\n  creator_user_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = ?,\n\n  public_bucket_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n  cached_user_ratings_total_count = 0,\n  cached_user_ratings_positive_count = 0,\n  cached_user_ratings_negative_count = 0,\n  maybe_cached_user_ratings_ratio = 0.0,\n  cached_user_ratings_last_updated_at = NOW(),\n\n  maybe_migration_old_model_token = ?,\n  version = ?,\n  created_at = ?,\n  updated_at = ?,\n  user_deleted_at = ?,\n  mod_deleted_at = ?\n\nON DUPLICATE KEY UPDATE\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n  maybe_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = ?,\n  description_rendered_html = ?,\n  creator_user_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = ?,\n  public_bucket_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n  cached_user_ratings_total_count = 0,\n  cached_user_ratings_positive_count = 0,\n  cached_user_ratings_negative_count = 0,\n  maybe_cached_user_ratings_ratio = 0.0,\n  cached_user_ratings_last_updated_at = NOW(),\n  maybe_migration_old_model_token = ?,\n  version = ?,\n  created_at = ?,\n  updated_at = ?,\n  user_deleted_at = ?,\n  mod_deleted_at = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 43
+    },
+    "nullable": []
+  },
+  "hash": "aae28dc5fbeff858e4c9dd8b079752ce7892d76b56d2eff95db39c6b6d9f7f11"
+}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nSELECT\n    w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n    w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n\n    w.title,\n    vc.has_index_file,\n\n    w.private_bucket_hash,\n    w.maybe_private_bucket_prefix,\n    w.maybe_private_bucket_extension,\n\n    w.created_at,\n    w.updated_at,\n    w.user_deleted_at,\n    w.mod_deleted_at\n\nFROM model_weights as w\nJOIN model_weights_extension_voice_conversion_details as vc\nON vc.model_weights_token = w.token\n\nWHERE w.token = ?\n        ",
+  "query": "\nSELECT\n    w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n    w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n\n    w.title,\n    vc.has_index_file,\n\n    w.public_bucket_hash,\n    w.maybe_public_bucket_prefix,\n    w.maybe_public_bucket_extension,\n\n    w.created_at,\n    w.updated_at,\n    w.user_deleted_at,\n    w.mod_deleted_at\n\nFROM model_weights as w\nJOIN model_weights_extension_voice_conversion_details as vc\nON vc.model_weights_token = w.token\n\nWHERE w.token = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -45,7 +45,7 @@
      },
      {
        "ordinal": 4,
-        "name": "private_bucket_hash",
+        "name": "public_bucket_hash",
        "type_info": {
          "type": "VarString",
          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -55,7 +55,7 @@
      },
      {
        "ordinal": 5,
-        "name": "maybe_private_bucket_prefix",
+        "name": "maybe_public_bucket_prefix",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -65,7 +65,7 @@
      },
      {
        "ordinal": 6,
-        "name": "maybe_private_bucket_extension",
+        "name": "maybe_public_bucket_extension",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -131,5 +131,5 @@
      true
    ]
  },
-  "hash": "0d4c43d9055cea3ce35c71ab8ef27058075414496dc5858d57a9f06d7c076bab"
+  "hash": "ae34c2ce11250786962be50f167f15f6d2d023afe2bb31994d21a1007d81e0a0"
 }
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        UPDATE model_weights\n        SET\n            maybe_avatar_media_file_token = ?\n        WHERE token = ?\n        LIMIT 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "bda002b24b98328f0fb0440cfc82a47faf01e5d16d1030e15a7e2da161dd0d80"
+}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\n        INSERT INTO model_weights\n        SET\n          token = ?,\n          weights_type = ?,\n          weights_category = ?,\n          title = ?,\n          maybe_thumbnail_token = ?,\n          description_markdown = ?,\n          description_rendered_html = ?,\n          creator_user_token = ?,\n          creator_ip_address = ?,\n          creator_set_visibility = ?,\n          maybe_last_update_user_token = ?,\n          original_download_url = ?,\n          original_filename = ?,\n          file_size_bytes = ?,\n          file_checksum_sha2 = ?,\n          private_bucket_hash = ?,\n          maybe_private_bucket_prefix = ?,\n          maybe_private_bucket_extension = ?,\n          cached_user_ratings_total_count = ?,\n          cached_user_ratings_positive_count = ?,\n          cached_user_ratings_negative_count = ?,\n          maybe_cached_user_ratings_ratio = ?,\n          version = ?\n        ",
+  "query": "\n        INSERT INTO model_weights\n        SET\n          token = ?,\n          weights_type = ?,\n          weights_category = ?,\n          title = ?,\n          maybe_thumbnail_token = ?,\n          description_markdown = ?,\n          description_rendered_html = ?,\n          creator_user_token = ?,\n          creator_ip_address = ?,\n          creator_set_visibility = ?,\n          maybe_last_update_user_token = ?,\n          original_download_url = ?,\n          original_filename = ?,\n          file_size_bytes = ?,\n          file_checksum_sha2 = ?,\n          public_bucket_hash = ?,\n          maybe_public_bucket_prefix = ?,\n          maybe_public_bucket_extension = ?,\n          cached_user_ratings_total_count = ?,\n          cached_user_ratings_positive_count = ?,\n          cached_user_ratings_negative_count = ?,\n          maybe_cached_user_ratings_ratio = ?,\n          version = ?\n        ",
  "describe": {
    "columns": [],
    "parameters": {
@@ -8,5 +8,5 @@
    },
    "nullable": []
  },
-  "hash": "274cfb1e3caca706e3dbc3d95064e0f4b354c936f8de948070854920f265cc41"
+  "hash": "cb07f1522d0d619e2f364af78250080c99e7930ec095c5600abb80a9d8c5154d"
 }
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\n            SELECT              \n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.private_bucket_hash,\n                mw.maybe_private_bucket_prefix,\n                mw.maybe_private_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n            ",
+  "query": "\n            SELECT              \n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.public_bucket_hash,\n                mw.maybe_public_bucket_prefix,\n                mw.maybe_public_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n            ",
  "describe": {
    "columns": [
      {
@@ -185,7 +185,7 @@
      },
      {
        "ordinal": 18,
-        "name": "private_bucket_hash",
+        "name": "public_bucket_hash",
        "type_info": {
          "type": "VarString",
          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
@@ -195,7 +195,7 @@
      },
      {
        "ordinal": 19,
-        "name": "maybe_private_bucket_prefix",
+        "name": "maybe_public_bucket_prefix",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -205,7 +205,7 @@
      },
      {
        "ordinal": 20,
-        "name": "maybe_private_bucket_extension",
+        "name": "maybe_public_bucket_extension",
        "type_info": {
          "type": "VarString",
          "flags": "BINARY",
@@ -351,5 +351,5 @@
      true
    ]
  },
-  "hash": "3d586592422727dcc928574966bdf5081ac69fdbb856fffcbd68187fd99c4642"
+  "hash": "ec733ae6705dc03fb785e2299c35fcfef23422142735319c8cd091ca8179f97d"
 }
@@ -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_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = ?,\n  description_rendered_html = ?,\n  creator_user_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = \"TODO\",\n\n  private_bucket_hash = \"TODO\",\n  maybe_private_bucket_prefix = \"TODO\",\n  maybe_private_bucket_extension = \"TODO\",\n  cached_user_ratings_total_count = 0,\n  cached_user_ratings_positive_count = 0,\n  cached_user_ratings_negative_count = 0,\n  maybe_cached_user_ratings_ratio = 0.0,\n  cached_user_ratings_last_updated_at = NOW(),\n\n  maybe_migration_old_model_token = ?,\n  version = ?,\n  created_at = ?,\n  updated_at = ?,\n  user_deleted_at = ?,\n  mod_deleted_at = ?\n\nON DUPLICATE KEY UPDATE\n  weights_type = ?,\n  weights_category = ?,\n  title = ?,\n  maybe_thumbnail_token = NULL,\n  maybe_avatar_media_file_token = NULL,\n  maybe_cover_media_file_token = NULL,\n  description_markdown = ?,\n  description_rendered_html = ?,\n  creator_user_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n  maybe_last_update_user_token = NULL,\n  original_download_url = ?,\n  original_filename = ?,\n  file_size_bytes = ?,\n  file_checksum_sha2 = \"TODO\",\n  private_bucket_hash = \"TODO\",\n  maybe_private_bucket_prefix = \"TODO\",\n  maybe_private_bucket_extension = \"TODO\",\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": 35
-    },
-    "nullable": []
-  },
-  "hash": "fbcaa705fac9d2262a8b3ac337e30d899c8704a55999866d4cd2bce561a40065"
-}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO media_files\nSET\n  token = ?,\n\n  origin_category = ?,\n  origin_product_category = ?,\n\n  maybe_origin_model_type = NULL,\n  maybe_origin_model_token = NULL,\n\n  media_type = ?,\n  maybe_mime_type = ?,\n  file_size_bytes = ?,\n\n  checksum_sha2 = ?,\n\n  public_bucket_directory_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n\n  maybe_creator_file_synthetic_id = ?,\n  maybe_creator_category_synthetic_id = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 16
+    },
+    "nullable": []
+  },
+  "hash": "fed337e365f0bd36cfa543e0ce9d4076cc0bd7809b6c2cb5740151d6583a6d11"
+}
@@ -620,9 +620,9 @@ dependencies = [

 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1124,10 +1124,19 @@ name = "cloud_storage"
 version = "0.0.1"
 dependencies = [
 "anyhow",
+ "async-trait",
 "buckets",
+ "crockford",
+ "easyenv",
+ "env_logger",
+ "errors",
+ "filesys",
+ "hashing",
 "log",
+ "mimetypes",
 "my-workspace-hack",
 "rust-s3",
+ "storyteller_root",
 "tokio",
 ]

@@ -1877,6 +1886,7 @@ version = "0.0.1"
 dependencies = [
 "anyhow",
 "bootstrap",
+ "buckets",
 "chrono",
 "cloud_storage",
 "concurrency",
@@ -3513,10 +3523,13 @@ version = "0.0.1"
 dependencies = [
 "buckets",
 "clap",
+ "cloud_storage",
 "config",
 "easyenv",
 "enums",
 "errors",
+ "filesys",
+ "hashing",
 "log",
 "my-workspace-hack",
 "mysql_queries",
@@ -3526,6 +3539,7 @@ dependencies = [
 "sqlx",
 "storyteller_root",
 "strum",
+ "tempdir",
 "tokens",
 "tokio",
 ]
@@ -310,7 +310,7 @@ Secrets:
  - Put `.env-secrets` in the root `storyteller-rust` directory.
  
 - Per app secrets (ask Brandon for these):
-  - Put `storteller-web.development-secrets.env` in `crates/service/web/storyteller-web/config`
+  - Put `storteller-web.development-secrets.env` in `crates/service/web/storyteller_web/config`
  - Put `inference-job.development-secrets.env` in `crates/service/job/inference_job/config`
  - Put `donwload-job.development-secrets.env` in `crates/service/job/download_job/config`

@@ -392,4 +392,4 @@ We use this: `https://github.com/juhaku/utoipa`
 The documentation example is in: 
 `crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs`
 Write into the api doc to: 
-`crates/service/web/storyteller_web/src/api_doc.rs`
+`crates/service/web/storyteller_web/src/api_doc.rs`
@@ -0,0 +1,12 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights
+    RENAME COLUMN public_bucket_hash TO private_bucket_hash;
+
+ALTER TABLE model_weights
+    RENAME COLUMN maybe_public_bucket_prefix TO maybe_private_bucket_prefix;
+
+ALTER TABLE model_weights
+    RENAME COLUMN maybe_public_bucket_extension TO maybe_private_bucket_extension;
@@ -0,0 +1,12 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE model_weights
+    RENAME COLUMN private_bucket_hash TO public_bucket_hash;
+
+ALTER TABLE model_weights
+    RENAME COLUMN maybe_private_bucket_prefix TO maybe_public_bucket_prefix;
+
+ALTER TABLE model_weights
+    RENAME COLUMN maybe_private_bucket_extension TO maybe_public_bucket_extension;
@@ -113,22 +113,22 @@ CREATE TABLE model_weights (
  -- The hash for the bucket directory that contains the original upload
  -- as well as any associated other files.
  -- The bucket filename for the primary file (not including the directory path) is given by:
-  -- `[{maybe_private_bucket_prefix}]{private_bucket_hash}[{maybe_private_bucket_extension}]`
-  private_bucket_hash  VARCHAR(32) NOT NULL,
+  -- `[{maybe_public_bucket_prefix}]{public_bucket_hash}[{maybe_public_bucket_extension}]`
+  public_bucket_hash  VARCHAR(32) NOT NULL,

  -- An optional prefix on the bucket filename.
  -- If present, this will be prepended to the beginning of the bucket filename to access the file.
  -- The bucket filename for the primary file (not including the directory path) is given by:
-  -- `[{maybe_private_bucket_prefix}]{private_directory_hash}[{maybe_private_bucket_extension}]`
-  maybe_private_bucket_prefix VARCHAR(16) DEFAULT NULL,
+  -- `[{maybe_public_bucket_prefix}]{public_bucket_hash}[{maybe_public_bucket_extension}]`
+  maybe_public_bucket_prefix VARCHAR(16) DEFAULT NULL,

  -- An optional appended extension on the bucket filename.
  -- If present, this will be appended to the end of the bucket filename to access the file.
  -- To allow for flexibility, this extension typically will contain a leading period if
  -- the file needs it (eg ".mp4" rather than "mp4")!
  -- The bucket filename for the primary file (not including the directory path) is given by:
-  -- `[{maybe_private_bucket_prefix}]{private_directory_hash}[{maybe_private_bucket_extension}]`
-  maybe_private_bucket_extension VARCHAR(16) DEFAULT NULL,
+  -- `[{maybe_public_bucket_prefix}]{public_bucket_hash}[{maybe_public_bucket_extension}]`
+  maybe_public_bucket_extension VARCHAR(16) DEFAULT NULL,


  -- ========== MODERATION DETAILS ==========
@@ -18,6 +18,7 @@ path = "src/lib.rs"
 crockford = { path = "../../lib/crockford" }
 errors = { path = "../../lib/errors" }

+
 # Workspace hack (faster compile times)
 my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

@@ -10,7 +10,7 @@

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

@@ -1,3 +0,0 @@
-pub trait descriptor {
-    fn my_method(&self);
-}
@@ -1,4 +0,0 @@
-pub mod bucket_directory;
-pub mod bucket_file_path;
-pub mod web_file_manager;
-
@@ -1,32 +0,0 @@
-
-pub struct FileBucketPath {
-    pub bucket_clients: BucketClients
-}
-
-impl web_file_manager {
-    pub fn new(my_field: i32) -> Self {
-        web_file_manager { my_field }
-    }
-
-    pub fn increment(&mut self) {
-        self.my_field += 1;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_new() {
-        let my_class = web_file_manager::new(10);
-        assert_eq!(my_class.my_field, 10);
-    }
-
-    #[test]
-    fn test_increment() {
-        let mut my_class = web_file_manager::new(10);
-        my_class.increment();
-        assert_eq!(my_class.my_field, 11);
-    }
-}
@@ -3,4 +3,4 @@ pub mod media_uploads;
 pub mod public_path;
 pub mod voice_conversion_results;
 pub mod weight_uploads;
-pub mod weight_files;
+pub mod weight_files;
@@ -25,6 +25,31 @@ impl PublicPath for WeightFileBucketPath {}

 impl WeightFileBucketPath {

+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn generate_for_svc_model() -> Self {
+    Self::generate_new(Some("svc_"), Some(".pt"))
+  }
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn generate_for_rvc_model() -> Self {
+    Self::generate_new(Some("rvc_"), Some(".pt"))
+  }
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn svc_model_file_from_object_hash(hash: &str) -> Self {
+    Self::from_object_hash(hash, Some("svc_"), Some(".pt"))
+  }
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn rvc_model_file_from_object_hash(hash: &str) -> Self {
+    Self::from_object_hash(hash, Some("rvc_"), Some(".pt"))
+  }
+
+  // TODO(bt,2023-12-19): This is temporary standardization. Clean this up.
+  pub fn rvc_index_file_from_object_hash(hash: &str) -> Self {
+    Self::from_object_hash(hash, Some("rvc_"), Some(".index"))
+  }
+
  pub fn generate_new(optional_prefix: Option<&str>, optional_extension: Option<&str>) -> Self {
    let entropy = crockford_entropy_lower(32);
    Self::from_object_hash(&entropy, optional_prefix, optional_extension)
@@ -71,6 +96,14 @@ impl WeightFileBucketPath {
  pub fn get_basename(&self) -> &str {
    &self.filename
  }
+
+  pub fn get_optional_prefix(&self) -> Option<&str> {
+    self.optional_prefix.as_deref()
+  }
+
+  pub fn get_optional_extension(&self) -> Option<&str> {
+    self.optional_extension.as_deref()
+  }
 }

 #[cfg(test)]
@@ -95,6 +128,49 @@ mod tests {
      assert_eq!(file.get_full_object_path_str(), "/weights/a/b/c/d/e/abcdefghijk/pre_abcdefghijk.mp4");
      assert_eq!(file.get_basename(), "pre_abcdefghijk.mp4");
    }
+
+    #[test]
+    pub fn generate_for_rvc_model() {
+      let file = WeightFileBucketPath::generate_for_rvc_model();
+      assert_eq!(file.get_object_hash().len(), 32);
+      assert_eq!(file.get_directory().get_object_hash().len(), 32);
+      assert_eq!(file.get_optional_prefix(), Some("rvc_"));
+      assert_eq!(file.get_optional_extension(), Some(".pt"));
+      assert!(file.get_basename().starts_with("rvc_"));
+      assert!(file.get_basename().ends_with(".pt"));
+    }
+
+    #[test]
+    pub fn generate_for_svc_model() {
+      let file = WeightFileBucketPath::generate_for_svc_model();
+      assert_eq!(file.get_object_hash().len(), 32);
+      assert_eq!(file.get_directory().get_object_hash().len(), 32);
+      assert_eq!(file.get_optional_prefix(), Some("svc_"));
+      assert_eq!(file.get_optional_extension(), Some(".pt"));
+      assert!(file.get_basename().starts_with("svc_"));
+      assert!(file.get_basename().ends_with(".pt"));
+    }
+
+    #[test]
+    pub fn svc_model_file_from_object_hash() {
+      let file = WeightFileBucketPath::svc_model_file_from_object_hash("hashed");
+      assert_eq!(file.get_full_object_path_str(), "/weights/h/a/s/h/e/hashed/svc_hashed.pt");
+      assert_eq!(file.get_basename(), "svc_hashed.pt");
+    }
+
+    #[test]
+    pub fn rvc_model_file_from_object_hash() {
+      let file = WeightFileBucketPath::rvc_model_file_from_object_hash("hashed");
+      assert_eq!(file.get_full_object_path_str(), "/weights/h/a/s/h/e/hashed/rvc_hashed.pt");
+      assert_eq!(file.get_basename(), "rvc_hashed.pt");
+    }
+
+    #[test]
+    pub fn rvc_index_file_from_object_hash() {
+      let file = WeightFileBucketPath::rvc_index_file_from_object_hash("hashed");
+      assert_eq!(file.get_full_object_path_str(), "/weights/h/a/s/h/e/hashed/rvc_hashed.index");
+      assert_eq!(file.get_basename(), "rvc_hashed.index");
+    }
  }

  mod without_prefix_and_extension {
@@ -1,49 +0,0 @@
-use std::path::PathBuf;
-
-use errors::AnyhowResult;
-use errors::bail;
-
-#[deprecated(note = "this is a messy function and should be avoided")]
-pub (crate) fn hash_to_bucket_path(file_hash: &str,
-                           optional_root_directory: Option<&str>)
-  -> AnyhowResult<PathBuf>
-{
-  if file_hash.len() < 4 {
-    bail!("File length is too short");
-  }
-
-  let root_directory = optional_root_directory
-    .map(|root| PathBuf::from(root.to_string()))
-    .unwrap_or(PathBuf::from("/"));
-
-  let file_path = format!(
-    "{}/{}/{}/{}",
-    &file_hash[0..1],
-    &file_hash[1..2],
-    &file_hash[2..3],
-    &file_hash,
-  );
-
-  Ok(root_directory.join(file_path))
-}
-
-#[cfg(test)]
-mod tests {
-  use std::path::PathBuf;
-
-  use crate::util::hash_to_bucket_path::hash_to_bucket_path;
-
-  #[test]
-  fn test_bucket_without_root() {
-    assert_eq!(
-      hash_to_bucket_path("abcdefg", None).unwrap(),
-      PathBuf::from("/a/b/c/abcdefg"));
-  }
-
-  #[test]
-  fn test_bucket_with_root() {
-    assert_eq!(
-      hash_to_bucket_path("abcdefg", Some("/root")).unwrap(),
-      PathBuf::from("/root/a/b/c/abcdefg"));
-  }
-}
@@ -1,35 +0,0 @@
-use errors::anyhow;
-use errors::AnyhowResult;
-
-use crate::util::hash_to_bucket_path::hash_to_bucket_path;
-
-#[deprecated(note = "this is a messy function and should be avoided")]
-pub fn hash_to_bucket_path_string(file_hash: &str,
-                           optional_root_directory: Option<&str>)
-  -> AnyhowResult<String>
-{
-  let path = hash_to_bucket_path(file_hash, optional_root_directory)?;
-
-  let maybe_path = path.to_str().map(|s| s.to_string());
-
-  maybe_path.ok_or(anyhow!("Path could not be converted"))
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::util::hash_to_bucket_path_string::hash_to_bucket_path_string;
-
-  #[test]
-  fn test_bucket_without_root() {
-    assert_eq!(
-      hash_to_bucket_path_string("abcdefg", None).unwrap(),
-      "/a/b/c/abcdefg".to_string());
-  }
-
-  #[test]
-  fn test_bucket_with_root() {
-    assert_eq!(
-      hash_to_bucket_path_string("abcdefg", Some("/root")).unwrap(),
-      "/root/a/b/c/abcdefg".to_string());
-  }
-}
@@ -5,6 +5,7 @@
 /// With a million items, each directory will have ~244 items.
 /// With a billion items, each directory will have ~244,140 items (impractical at this scale).
 ///
+#[deprecated(note = "Use hashed_directory_path_long_string instead! (This function is only used by BucketPathUnifier, which should also die)")]
 pub fn hashed_directory_path_short_string(file_hash: &str) -> String {
  match file_hash.len() {
    0 | 1 => "".to_string(),
@@ -1,4 +1,2 @@
-pub (crate) mod hash_to_bucket_path;
-pub mod hash_to_bucket_path_string;
 pub mod hashed_directory_path_long_string;
 pub mod hashed_directory_path_short_string;
@@ -49,6 +49,10 @@ pub enum IdCategory {

  #[serde(rename = "model_weights")]
  ModelWeights,
+
+  /// Files that are uploaded with no general product area they belong to. (Eg. local dev testing)
+  #[serde(rename = "file_upload")]
+  FileUpload,
 }

 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -68,6 +72,7 @@ impl IdCategory {
      Self::ZeroShotTtsResult => "zs_tts_result",
      Self::VideoFilterResult => "video_filter",
      Self::ModelWeights => "model_weights",
+      Self::FileUpload => "file_upload",
    }
  }

@@ -82,6 +87,7 @@ impl IdCategory {
      "zs_tts_result" => Ok(Self::ZeroShotTtsResult),
      "video_filter" => Ok(Self::VideoFilterResult),
      "model_weights" => Ok(Self::ModelWeights),
+      "file_upload" => Ok(Self::FileUpload),
      _ => Err(format!("invalid value: {:?}", value)),
    }
  }
@@ -99,6 +105,7 @@ impl IdCategory {
      Self::ZeroShotVoiceDataset,
      Self::ZeroShotVoiceEmbedding,
      Self::ModelWeights,
+      Self::FileUpload,
    ])
  }
 }
@@ -121,7 +128,8 @@ mod tests {
    assert_serialization(IdCategory::ZeroShotVoiceDataset, "zs_dataset");
    assert_serialization(IdCategory::ZeroShotVoiceEmbedding, "zs_voice");
    assert_serialization(IdCategory::ZeroShotTtsResult, "zs_tts_result");
-    assert_serialization(IdCategory::ModelWeights, "model_weights")
+    assert_serialization(IdCategory::ModelWeights, "model_weights");
+    assert_serialization(IdCategory::FileUpload, "file_upload");
  }

    #[test]
@@ -135,6 +143,7 @@ mod tests {
      assert_eq!(IdCategory::ZeroShotVoiceEmbedding.to_str(), "zs_voice");
      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");
    }

    #[test]
@@ -148,13 +157,14 @@ mod tests {
      assert_eq!(IdCategory::from_str("zs_voice").unwrap(), IdCategory::ZeroShotVoiceEmbedding);
      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);
    }

    #[test]
    fn all_variants() {
      // Static check
      let mut variants = IdCategory::all_variants();
-      assert_eq!(variants.len(), 9);
+      assert_eq!(variants.len(), 10);
      assert_eq!(variants.pop_first(), Some(IdCategory::MediaFile));
      assert_eq!(variants.pop_first(), Some(IdCategory::LipsyncAnimationResult));
      assert_eq!(variants.pop_first(), Some(IdCategory::VideoFilterResult));
@@ -164,6 +174,7 @@ mod tests {
      assert_eq!(variants.pop_first(), Some(IdCategory::ZeroShotVoiceDataset));
      assert_eq!(variants.pop_first(), Some(IdCategory::ZeroShotVoiceEmbedding));
      assert_eq!(variants.pop_first(), Some(IdCategory::ModelWeights));
+      assert_eq!(variants.pop_first(), Some(IdCategory::FileUpload));
      assert_eq!(variants.pop_first(), None);

      // Generated check
@@ -6,12 +6,13 @@ use serde::Serialize;
 use strum::EnumCount;
 #[cfg(test)]
 use strum::EnumIter;
+use utoipa::ToSchema;

 /// Used in the `media_files` table in a `VARCHAR` field.
 ///
 /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum MediaFileOriginCategory {
  /// ML model inference output - uploaded models or zero shot.
@@ -6,12 +6,13 @@ use serde::Serialize;
 use strum::EnumCount;
 #[cfg(test)]
 use strum::EnumIter;
+use utoipa::ToSchema;

 /// Used in the `media_files` table in a `VARCHAR` field.
 ///
 /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum MediaFileOriginModelType {
  /// RVC (v2) voice conversion models
@@ -4,6 +4,7 @@ use std::collections::BTreeSet;
 use strum::EnumCount;
 #[cfg(test)]
 use strum::EnumIter;
+use utoipa::ToSchema;

 /// Used in the `media_files` table in `VARCHAR(16)` field `origin_product_category`.
 ///
@@ -14,7 +15,7 @@ use strum::EnumIter;
 ///
 /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
 pub enum MediaFileOriginProductCategory {
  /// Media files created by (or uploaded for) the Face Animator product.
  /// The underlying model could be SadTalker, Wav2Lip, or some future model
@@ -4,12 +4,13 @@ use std::collections::BTreeSet;
 use strum::EnumCount;
 #[cfg(test)]
 use strum::EnumIter;
+use utoipa::ToSchema;

 /// Used in the `media_files` table in a `VARCHAR` field.
 ///
 /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize)]
+#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
 #[serde(rename_all = "lowercase")]
 pub enum MediaFileType {
  /// Audio files: wav, mp3, etc.
@@ -4,10 +4,11 @@ use serde::Serialize;
 use strum::EnumCount;
 #[cfg(test)]
 use strum::EnumIter;
+use utoipa::ToSchema;

 /// Used in the `user_bookmarks` table in a `VARCHAR(32)` field named `entity_type`.
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Deserialize, Serialize, ToSchema)]
 pub enum UserBookmarkEntityType {
    /// User
    #[serde(rename = "user")]
@@ -2,11 +2,12 @@ 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)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize, ToSchema)]
 #[sqlx(transparent)]
 pub struct MediaFileToken(pub String);

@@ -2,11 +2,12 @@ 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)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize, ToSchema)]
 #[sqlx(transparent)]
 pub struct UserBookmarkToken(pub String);

@@ -9,7 +9,7 @@ use enums::by_table::model_weights::{
 };
 use enums::common::visibility::Visibility;
 use errors::{anyhow, AnyhowResult};
-use mysql_queries::queries::model_weights::create_weight::{create_weight, CreateModelWeightsArgs};
+use mysql_queries::queries::model_weights::create::create_weight::{create_weight, CreateModelWeightsArgs};
 use mysql_queries::queries::users::user::get_user_token_by_username::get_user_token_by_username;
 use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::users::UserToken;
@@ -335,9 +335,9 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool<MySql>, user_token: UserT
                original_filename: Some(original_filename),
                file_size_bytes: 1024,
                file_checksum_sha2: "checksum1".to_string(),
-                private_bucket_hash: "bucket_hash1".to_string(),
-                maybe_private_bucket_prefix: Some(private_bucket_prefix),
-                maybe_private_bucket_extension: Some(private_bucket_extension),
+                public_bucket_hash: "bucket_hash1".to_string(),
+                maybe_public_bucket_prefix: Some(private_bucket_prefix),
+                maybe_public_bucket_extension: Some(private_bucket_extension),
                cached_user_ratings_total_count,
                cached_user_ratings_positive_count,
                cached_user_ratings_negative_count,
@@ -381,9 +381,9 @@ pub async fn seed_weights_for_user_token(
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1024,
            file_checksum_sha2: "checksum1".to_string(),
-            private_bucket_hash: "bucket_hash1".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("rvc".to_string()),
+            public_bucket_hash: "bucket_hash1".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("rvc".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -407,9 +407,9 @@ pub async fn seed_weights_for_user_token(
            original_filename: Some("filename2.txt".to_string()),
            file_size_bytes: 2024,
            file_checksum_sha2: "checksum2".to_string(),
-            private_bucket_hash: "bucket_hash2".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("tt2".to_string()),
+            public_bucket_hash: "bucket_hash2".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("tt2".to_string()),
            cached_user_ratings_total_count: 20,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 2,
@@ -433,9 +433,9 @@ pub async fn seed_weights_for_user_token(
            original_filename: Some("filename3.txt".to_string()),
            file_size_bytes: 3024,
            file_checksum_sha2: "checksum3".to_string(),
-            private_bucket_hash: "bucket_hash3".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("safetensors".to_string()),
+            public_bucket_hash: "bucket_hash3".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("safetensors".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -459,9 +459,9 @@ pub async fn seed_weights_for_user_token(
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1024,
            file_checksum_sha2: "checksum4".to_string(),
-            private_bucket_hash: "bucket_hash4".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("LoRA".to_string()),
+            public_bucket_hash: "bucket_hash4".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("LoRA".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -485,9 +485,9 @@ pub async fn seed_weights_for_user_token(
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1024,
            file_checksum_sha2: "checksum4".to_string(),
-            private_bucket_hash: "bucket_hash4".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("LoRA".to_string()),
+            public_bucket_hash: "bucket_hash4".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("LoRA".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -537,9 +537,9 @@ pub async fn original_seed_weights(mysql_pool: &Pool<MySql>,user_token: UserToke
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1024,
            file_checksum_sha2: "checksum1".to_string(),
-            private_bucket_hash: "bucket_hash1".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("rvc".to_string()),
+            public_bucket_hash: "bucket_hash1".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("rvc".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -563,9 +563,9 @@ pub async fn original_seed_weights(mysql_pool: &Pool<MySql>,user_token: UserToke
            original_filename: Some("filename2.txt".to_string()),
            file_size_bytes: 2024,
            file_checksum_sha2: "checksum2".to_string(),
-            private_bucket_hash: "bucket_hash2".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("tt2".to_string()),
+            public_bucket_hash: "bucket_hash2".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("tt2".to_string()),
            cached_user_ratings_total_count: 20,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 2,
@@ -589,9 +589,9 @@ pub async fn original_seed_weights(mysql_pool: &Pool<MySql>,user_token: UserToke
            original_filename: Some("filename3.txt".to_string()),
            file_size_bytes: 3024,
            file_checksum_sha2: "checksum3".to_string(),
-            private_bucket_hash: "bucket_hash3".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("safetensors".to_string()),
+            public_bucket_hash: "bucket_hash3".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("safetensors".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -615,9 +615,9 @@ pub async fn original_seed_weights(mysql_pool: &Pool<MySql>,user_token: UserToke
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1024,
            file_checksum_sha2: "checksum4".to_string(),
-            private_bucket_hash: "bucket_hash4".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("LoRA".to_string()),
+            public_bucket_hash: "bucket_hash4".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("LoRA".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -641,9 +641,9 @@ pub async fn original_seed_weights(mysql_pool: &Pool<MySql>,user_token: UserToke
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1025,
            file_checksum_sha2: "checksum5".to_string(),
-            private_bucket_hash: "bucket_hash5".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("LoRA".to_string()),
+            public_bucket_hash: "bucket_hash5".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("LoRA".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -5,16 +5,18 @@ use sqlx::{MySql, Pool};

 use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use enums::by_table::media_files::media_file_type::MediaFileType;
+
 use enums::common::visibility::Visibility;
 use errors::AnyhowResult;
+
 use filesys::file_read_bytes::file_read_bytes;
 use filesys::file_size::file_size;
 use filesys::path_to_string::path_to_string;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes;
 use mimetypes::mimetype_for_file::get_mimetype_for_file;
+use mysql_queries::queries::media_files::create::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs};
 use mysql_queries::queries::media_files::get_media_file::get_media_file;
-use mysql_queries::queries::media_files::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs};
 use storyteller_root::get_seed_tool_data_root;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::users::UserToken;
@@ -106,7 +108,7 @@ async fn seed_model(
  let mut bucket_hash = "NOT_UPLOADED_BY_SEED_TOOL".to_string();
  let mut maybe_bucket_prefix = None;
  let mut maybe_bucket_extension = None;
-
+  
  if media_file_exists(mysql_pool, media_file_token).await? {
    info!("Media file already seeded: {:?}", media_file_token);
    return Ok(())
@@ -181,16 +183,16 @@ async fn seed_file_to_bucket(
      .extension()
      .map(|extension| extension.to_str())
      .flatten();
-
+  // get the new bucket path ...
  let bucket_location = MediaFileBucketPath::generate_new(maybe_bucket_prefix, maybe_bucket_extension);
-
+  
  let bucket_path = path_to_string(bucket_location.to_full_object_pathbuf());

  info!("Reading media file: {:?}", media_file_path);
-
+  // get meta data 
  let bytes = file_read_bytes(media_file_path)?;
  let mimetype = get_mimetype_for_bytes(&bytes).unwrap_or("application/octet-stream");
-
+  
  info!("Uploading media file to bucket path: {:?}", bucket_path);

  let _r = bucket_clients.public.upload_file_with_content_type(
@@ -15,7 +15,7 @@ use filesys::file_size::file_size;
 use filesys::path_to_string::path_to_string;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes;
-use mysql_queries::queries::model_weights::create_weight::{
+use mysql_queries::queries::model_weights::create::create_weight::{
    create_weight,
    CreateModelWeightsArgs,
 };
@@ -25,7 +25,7 @@ use tokens::tokens::users::UserToken;

 use crate::bucket_clients::BucketClients;
 use crate::seeding::users::HANASHI_USER_TOKEN;
-
+use std::result::Result::Ok;
 pub async fn seed_weights_files(
    mysql_pool: &Pool<MySql>,
    maybe_bucket_clients: Option<&BucketClients>
@@ -141,9 +141,9 @@ pub async fn seed_weights_files(
            original_filename: Some(original_filename.to_string()),
            file_size_bytes: file_size_bytes as i32, // Assuming the file size is 0
            file_checksum_sha2: sha256_checksum.to_string(), // Assuming the file checksum is an empty string
-            private_bucket_hash: bucket_hash,
-            maybe_private_bucket_prefix: Some(maybe_bucket_prefix.to_string()),
-            maybe_private_bucket_extension: Some(maybe_bucket_extension.to_string()),
+            public_bucket_hash: bucket_hash,
+            maybe_public_bucket_prefix: Some(maybe_bucket_prefix.to_string()),
+            maybe_public_bucket_extension: Some(maybe_bucket_extension.to_string()),
            cached_user_ratings_total_count,
            cached_user_ratings_positive_count,
            cached_user_ratings_negative_count,
@@ -202,7 +202,7 @@ async fn seed_file_to_bucket(
        .map(|extension| extension.to_str())
        .flatten();
    // we should just have this be file bucket path and then we can use a file descriptor to turn it into a specific type of path
-    let bucket_location = WeightFileBucketPath::generate_new(
+    let bucket_location: WeightFileBucketPath = WeightFileBucketPath::generate_new(
        maybe_bucket_prefix,
        maybe_bucket_extension
    );
@@ -11,7 +11,7 @@ use enums::common::visibility::Visibility;
 use errors::{AnyhowResult, bail};
 use filesys::file_read_bytes::file_read_bytes;
 use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes;
-use mysql_queries::queries::media_files::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs};
+use mysql_queries::queries::media_files::create::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs};

 use crate::cli_args::parse_cli_args;

@@ -15,10 +15,13 @@ path = "src/main.rs"
 [dependencies]
 # Internal
 buckets = { path = "../../_types/buckets" }
+cloud_storage = { path = "../../lib/api_clients/cloud_storage" }
 config = { path = "../../lib/deprecated/config" }
 easyenv = { path = "../../lib/easyenv" }
 enums = { path = "../../_types/enums" }
 errors = { path = "../../lib/errors" }
+filesys = { path = "../../lib/files/filesys" }
+hashing = { path = "../../lib/files/hashing" }
 mysql_queries = { path = "../../lib/mysql_queries" }
 storyteller_root = { path = "../../lib/storyteller_root" }
 tokens = { path = "../../_types/tokens" }
@@ -30,6 +33,7 @@ my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 clap = "4.4.8"
 log = "0.4.14"
 strum = { version = "0.25", features = ["derive"] }
+tempdir = "0.3.7"

 # Async + clients
 tokio = { version = "1.34.0", features = ["macros"] }
@@ -1,6 +1,13 @@
 use sqlx::{MySql, Pool};
+use cloud_storage::bucket_client::BucketClient;

 pub struct Deps {
  pub mysql_development : Pool<MySql>,
  pub mysql_production : Pool<MySql>,
+
+  pub bucket_development_public: BucketClient,
+  pub bucket_development_private: BucketClient,
+
+  pub bucket_production_public: BucketClient,
+  pub bucket_production_private: BucketClient,
 }
@@ -4,9 +4,11 @@
 //!


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

 use config::shared_constants::DEFAULT_RUST_LOG;
 use errors::AnyhowResult;
@@ -31,6 +33,11 @@ pub async fn main() -> AnyhowResult<()> {
  let deps = Deps {
    mysql_development: get_mysql("MYSQL_DEVELOPMENT_URL").await?,
    mysql_production: get_mysql("MYSQL_PRODUCTION_URL").await?,
+
+    bucket_development_public: get_bucket_client("DEVELOPMENT_PUBLIC")?,
+    bucket_development_private: get_bucket_client("DEVELOPMENT_PRIVATE")?,
+    bucket_production_public: get_bucket_client("PRODUCTION_PUBLIC")?,
+    bucket_production_private: get_bucket_client("PRODUCTION_PRIVATE")?,
  };

  migrate_voice_conversion_to_weights(&deps).await?;
@@ -47,3 +54,27 @@ async fn get_mysql(env_var_name: &str) -> AnyhowResult<Pool<MySql>> {

  Ok(pool)
 }
+
+pub fn get_bucket_client(env_var_suffix: &str) -> AnyhowResult<BucketClient> {
+  let env_var_suffix = env_var_suffix.to_uppercase();
+  let access_key = easyenv::get_env_string_required(&format!("ACCESS_KEY_{env_var_suffix}"))?;
+  let secret_key = easyenv::get_env_string_required(&format!("SECRET_KEY_{env_var_suffix}"))?;
+  let region_name = easyenv::get_env_string_required(&format!("REGION_NAME_{env_var_suffix}"))?;
+  let bucket_name = easyenv::get_env_string_required(&format!("BUCKET_NAME_{env_var_suffix}"))?;
+
+  // NB: Long timeout for dev rust builds to upload to cloud buckets.
+  // Unoptimized binaries sometimes take a lot of time to upload, presumably due to unoptimized code.
+  let bucket_timeout = easyenv::get_env_duration_seconds_or_default(
+    "BUCKET_TIMEOUT_SECONDS", Duration::from_secs(60 * 10));
+
+  info!("Configuring GCS bucket {env_var_suffix} ...");
+
+  Ok(BucketClient::create(
+    &access_key,
+    &secret_key,
+    &region_name,
+    &bucket_name,
+    None,
+    Some(bucket_timeout),
+  )?)
+}
@@ -0,0 +1,85 @@
+use tempdir::TempDir;
+
+use buckets::public::weight_files::bucket_file_path::WeightFileBucketPath;
+use cloud_storage::bucket_path_unifier::BucketPathUnifier;
+use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
+use errors::{anyhow, 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_voice_conversion_model::CopiedFileData;
+use mysql_queries::queries::voice_conversion::migration::list_whole_voice_conversion_models_using_cursor::WholeVoiceConversionModelRecord;
+
+use crate::deps::Deps;
+
+pub async fn copy_cloud_files(model: &WholeVoiceConversionModelRecord, deps: &Deps) -> AnyhowResult<CopiedFileData> {
+  let copied_file_data = copy_model(model, deps).await?;
+
+  if model.has_index_file {
+    copy_index_file(model, deps, &copied_file_data.bucket_path).await?;
+  }
+
+  Ok(copied_file_data)
+}
+
+async fn copy_model(model: &WholeVoiceConversionModelRecord, deps: &Deps) -> AnyhowResult<CopiedFileData> {
+  let bucket_path_unifier = BucketPathUnifier::default_paths();
+
+  let old_model_bucket_path = match model.model_type {
+    VoiceConversionModelType::RvcV2 => bucket_path_unifier.rvc_v2_model_path(&model.private_bucket_hash),
+    VoiceConversionModelType::SoVitsSvc => bucket_path_unifier.so_vits_svc_model_path(&model.private_bucket_hash),
+    VoiceConversionModelType::SoftVc => return Err(anyhow!("we never built softvc models")),
+  };
+
+  // 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 = match model.model_type {
+    VoiceConversionModelType::RvcV2 => WeightFileBucketPath::generate_for_rvc_model(),
+    VoiceConversionModelType::SoVitsSvc => WeightFileBucketPath::generate_for_svc_model(),
+    VoiceConversionModelType::SoftVc => return Err(anyhow!("we never built softvc models")),
+  };
+
+  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(CopiedFileData {
+    bucket_path: new_model_bucket_path,
+    file_sha_hash: file_checksum,
+  })
+}
+
+async fn copy_index_file(model: &WholeVoiceConversionModelRecord, deps: &Deps, bucket_path: &WeightFileBucketPath) -> AnyhowResult<()> {
+  let bucket_path_unifier = BucketPathUnifier::default_paths();
+
+  let old_model_index_bucket_path = bucket_path_unifier.rvc_v2_model_index_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_index_bucket_path, &model_temp_fs_path).await?;
+
+  let new_model_bucket_path =
+      WeightFileBucketPath::rvc_index_file_from_object_hash(bucket_path.get_object_hash());
+
+  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(()) // NB: We don't care about the path of the index file.
+}
@@ -1,11 +1,18 @@
 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::migration::upsert_model_weight_from_voice_conversion_model::upsert_model_weight_from_voice_conversion_model;
-use mysql_queries::queries::voice_conversion::migration::list_whole_voice_conversion_models_using_cursor::list_whole_voice_conversion_models_using_cursor;
+use mysql_queries::queries::model_weights::get_weight::get_weight_by_token;
+use mysql_queries::queries::model_weights::migration::upsert_model_weight_from_voice_conversion_model::{CopiedFileData, upsert_model_weight_from_voice_conversion_model};
+use mysql_queries::queries::voice_conversion::migration::list_whole_voice_conversion_models_using_cursor::{list_whole_voice_conversion_models_using_cursor, WholeVoiceConversionModelRecord};
+use tokens::tokens::model_weights::ModelWeightToken;

 use crate::deps::Deps;
+use crate::migrations::voice_conversion_to_weights::copy_cloud_files::copy_cloud_files;

 const PAGE_SIZE: u64 = 10;

@@ -14,17 +21,19 @@ pub async fn migrate_voice_conversion_to_weights(deps: &Deps) -> AnyhowResult<()
  let mut cursor = 0;

  loop {
+    info!("Querying {PAGE_SIZE} models at cursor = {cursor}");

    let results
        = list_whole_voice_conversion_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!("result: {:?}\n\n", result);
-      upsert_model_weight_from_voice_conversion_model(result, &deps.mysql_development).await?;
+      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) {
@@ -36,3 +45,48 @@ pub async fn migrate_voice_conversion_to_weights(deps: &Deps) -> AnyhowResult<()

  Ok(())
 }
+
+async fn copy_model_record_and_bucket_files(record: &WholeVoiceConversionModelRecord, 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_voice_conversion_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<CopiedFileData>> {
+  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::RvcV2 => WeightFileBucketPath::rvc_model_file_from_object_hash(&model_weight_record.public_bucket_hash),
+    WeightsType::SoVitsSvc => WeightFileBucketPath::svc_model_file_from_object_hash(&model_weight_record.public_bucket_hash),
+    _ => return Ok(None), // NB: Stable Diffusion, etc. aren't valid for migration
+  };
+
+  Ok(Some(CopiedFileData {
+    bucket_path,
+    file_sha_hash: model_weight_record.file_checksum_sha2,
+  }))
+}
@@ -1 +1,2 @@
+pub mod copy_cloud_files;
 pub mod migrate;
@@ -16,14 +16,21 @@ path = "src/lib.rs"

 # Internal
 buckets = { path = "../../../_types/buckets" }
-
+crockford = { path = "../../../lib/crockford" }
+errors = { path = "../../../lib/errors" }
+easyenv = { path = "../../../lib/easyenv" }
+filesys = { path = "../../../lib/files/filesys" }
+hashing = { path = "../../../lib/files/hashing" }
+mimetypes = { path = "../../../lib/files/mimetypes" }
+storyteller_root = { path = "../../../lib/storyteller_root" }
 # Workspace hack (faster compile times)
 my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 anyhow = "1.0.75"
 log = "0.4.14"
-
+env_logger = "0.10.1"
+async-trait = "0.1.75"
 # The "never-encode-slash" feature seems to have been removed:
 # https://github.com/durch/rust-s3/pull/254
 rust-s3 = { version = "0.33.0" }
@@ -31,3 +38,4 @@ rust-s3 = { version = "0.33.0" }
 # Runtime
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
 tokio = { version = "1.34.0", features = ["macros"] }
+
@@ -1,6 +1,6 @@
 use std::path::Path;
 use std::time::Duration;
-
+use errors::AnyhowResult;
 use anyhow::anyhow;
 use anyhow::bail;
 use log::info;
@@ -10,15 +10,31 @@ use s3::creds::Credentials;
 use s3::region::Region;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
-
+ use std::error::Error;
+ 
 #[derive(Clone)]
 pub struct BucketClient {
  bucket: Bucket,
-
  /// If set, put all files under this root path.
  optional_bucket_root: Option<String>,
 }

+
+#[derive(Debug)]
+pub enum BucketClientError {
+    ErrorWithCodeAndMessage { code: u16, message: String },
+}
+
+impl std::fmt::Display for BucketClientError {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self {
+            BucketClientError::ErrorWithCodeAndMessage { code, message } => write!(f, "Error {}: {}", code, message),
+        }
+    }
+}
+impl Error for BucketClientError {}
+
+
 impl BucketClient {

  pub fn create(
@@ -87,6 +103,25 @@ impl BucketClient {
    Ok(())
  }

+  pub async fn upload_file_with_content_type_process(&self, object_name: &str, bytes: &[u8], content_type: &str) -> AnyhowResult<()> {
+    info!("Filename for bucket: {}", object_name);
+    let object_name = self.get_rooted_object_name(object_name);
+    info!("Rooted filename for bucket: {}", object_name);
+    let response = self.bucket.put_object_with_content_type(&object_name, bytes, content_type).await?;
+    let body_bytes = response.bytes();
+    let code = response.status_code();
+    info!("upload code: {}", code);
+    if code != 200 {
+      let body = String::from_utf8_lossy(body_bytes);
+      warn!("upload body: {}", body);
+      return Err(anyhow!("upload failed: {}", code));
+    } else {
+      info!("upload success: {}", code);
+      Ok(())
+    }
+  }
+
+  #[deprecated = "Use upload_file instead above it returns an error we can surface and act on. upload_file_with_content_type_process"]
  pub async fn upload_file_with_content_type(&self, object_name: &str, bytes: &[u8], content_type: &str) -> anyhow::Result<()> {
    info!("Filename for bucket: {}", object_name);

@@ -191,8 +226,7 @@ impl BucketClient {
    &self,
    object_path: P,
    filesystem_path: Q,
-  ) -> anyhow::Result<()> {
-    // TODO I think we might want to return an error here? but there has to a reason why we are just returning ok?
+  ) -> AnyhowResult<()> {
    let object_path_str = object_path.as_ref()
      .to_str()
      .map(|s| s.to_string())
@@ -208,9 +242,7 @@ impl BucketClient {
      404 => bail!("File not found in bucket: {}", &object_path_str),
      _ => {},
    }
-
    info!("download code: {}", status_code);
-
    Ok(())
  }

@@ -1,2 +1,4 @@
 pub mod bucket_client;
 pub mod bucket_path_unifier;
+pub mod remote_file_manager;
+pub mod remote_file_manager_mock;
@@ -0,0 +1,131 @@
+use log::info;
+use tokio::time::Duration;
+
+use async_trait::async_trait;
+use errors::AnyhowResult;
+
+use crate::bucket_client::BucketClient;
+use crate::remote_file_manager::file_meta_data::FileMetaData;
+
+#[async_trait]
+pub trait BucketOrchestrationCore {
+    async fn download_file_to_disk(
+        &self,
+        object_path: String,
+        filesystem_path: String,
+        is_public: bool,
+    ) -> AnyhowResult<()>;
+
+    async fn upload_file_with_content_type_process(&self, object_name: &str,
+                                                   bytes: &[u8],
+                                                   content_type: &str,
+                                                   is_public: bool) -> AnyhowResult<()>;
+
+}
+
+
+pub struct BucketOrchestration {
+    access_key: String,
+    secret_key: String,
+    region_name: String,
+    public_bucket_name: String,
+    private_bucket_name: String,
+}
+
+#[async_trait]
+impl BucketOrchestrationCore for BucketOrchestration {
+    async fn download_file_to_disk(
+        &self,
+        object_path: String,
+        filesystem_path: String,
+        is_public: bool,
+    ) -> AnyhowResult<()> {
+        let bucket_client = self.get_bucket_with_visbility(is_public).await?;
+        bucket_client.download_file_to_disk(object_path, filesystem_path).await
+    }
+
+    async fn upload_file_with_content_type_process(&self, object_name: &str,
+                                                   bytes: &[u8],
+                                                   content_type: &str,
+                                                   is_public: bool) -> AnyhowResult<()> {
+        let bucket_client = self.get_bucket_with_visbility(is_public).await?;
+        bucket_client.upload_file_with_content_type_process(
+            object_name,
+            bytes,
+            content_type,
+        ).await
+    }
+}
+
+impl BucketOrchestration {
+    pub fn new_bucket_client_from_existing_env() -> AnyhowResult<Self> {
+        let access_key = easyenv::get_env_string_required("ACCESS_KEY")?;
+        let secret_key = easyenv::get_env_string_required("SECRET_KEY")?;
+
+        let region_name = easyenv::get_env_string_required("REGION_NAME")?;
+        let public_bucket_name = easyenv::get_env_string_required("PUBLIC_BUCKET_NAME")?;
+        let private_bucket_name = easyenv::get_env_string_required("PRIVATE_BUCKET_NAME")?;
+
+
+        let bucket_orchestration = BucketOrchestration::new(
+            access_key,
+            secret_key,
+            region_name,
+            public_bucket_name,
+            private_bucket_name,
+        );
+
+        Ok(bucket_orchestration)
+    }
+
+    pub fn new(
+        access_key: String,
+        secret_key: String,
+        region_name: String,
+        public_bucket_name: String,
+        private_bucket_name: String) -> Self {
+        Self {
+            access_key: access_key,
+            secret_key: secret_key,
+            region_name: region_name,
+            public_bucket_name: public_bucket_name,
+            private_bucket_name: private_bucket_name,
+        }
+    }
+
+
+    async fn get_bucket_with_visbility(&self, public: bool) -> AnyhowResult<BucketClient> {
+        let bucket_timeout = easyenv::get_env_duration_seconds_or_default(
+            "BUCKET_TIMEOUT_SECONDS", Duration::from_secs(60 * 10));
+        let bucket_client: BucketClient;
+        if public {
+            // use public bucket client
+            info!("Configuring public GCS bucket...");
+            bucket_client = BucketClient::create(
+                &self.access_key,
+                &self.secret_key,
+                &self.region_name,
+                &self.public_bucket_name,
+                None,
+                Some(bucket_timeout),
+            )?;
+        } else {
+            info!("Configuring private GCS bucket...");
+            bucket_client = BucketClient::create(
+                &self.access_key,
+                &self.secret_key,
+                &self.region_name,
+                &self.private_bucket_name,
+                None,
+                Some(bucket_timeout),
+            )?;
+        }
+        Ok(bucket_client)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    pub fn test() {}
+}
@@ -0,0 +1,35 @@
+// Describes the file and how it will be saved to GCBucket
+// where the file should be stored based off the descriptor 
+
+// DEFAULT IMPLEMENTATION
+const REMOTE_FILE_DIRECTORY: &str = "/implement_google_cloud_storage_bucket_name";
+// File Descriptor Steers the Bucket Directory
+pub trait FileDescriptor {
+    // By default a file belongs in the public bucket will help us figureout which bucket to use.
+    fn remote_directory_path(&self) -> &str {
+        return REMOTE_FILE_DIRECTORY;
+    }
+    // this will be the type of file
+    // e.g requires! a period .safetensors .bin .jpg
+    fn get_suffix(&self)->String {
+       return "implement".to_string();
+    }
+    // This will be the prefix of the media type or the weights type.
+    // name of the weights or the name of the media type
+    // vall-e_prompt, loRA, sd15, sdxl when implmenting add to the end 
+    fn get_prefix(&self)->String {
+        return "implement".to_string();
+    }
+
+    // This will be ensure that the right bucket is picked
+    fn is_public(&self) -> bool {
+      true
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+  #[test]
+  pub fn test() {}
+}
@@ -0,0 +1,83 @@
+
+use std::path::PathBuf;
+use crockford::crockford_entropy_lower;
+use buckets::util::hashed_directory_path_long_string;
+use crate::remote_file_manager::file_descriptor::FileDescriptor;
+use crate::remote_file_manager::remote_cloud_bucket_details::RemoteCloudBucketDetails;
+
+pub struct FileBucketDirectory {
+    file_object_hash: String, 
+    remote_cloud_base_directory: String,
+    full_remote_cloud_file_path: String,
+    file_name: String,
+    file_descriptor: Box<dyn FileDescriptor>
+  }
+  
+  impl FileBucketDirectory {
+    pub fn generate_new(file_descriptor: Box<dyn FileDescriptor>) -> Self {
+      Self::new_from_file_descriptor(file_descriptor)
+    }
+
+    // TODO refactor this out of here
+    pub fn from_existing_bucket_details(bucket_details:RemoteCloudBucketDetails) -> Self {
+      let file_descriptor = bucket_details.file_descriptor_from_bucket_details();
+      let entropy = bucket_details.get_object_hash();
+      let middle = hashed_directory_path_long_string::hashed_directory_path_long_string(entropy.as_ref());
+      // gets you cloud bucket path e.g weights/a/b/c/d/clould_path_entropy
+      let remote_cloud_base_directory = format!("{}/{}{}", file_descriptor.remote_directory_path(), middle, entropy);
+      // gets you name of the file with suffix and prefix and entropy in the centre
+      let file_name = format!("{}_{}.{}", bucket_details.get_prefix(), entropy, bucket_details.get_suffix());
+      // note: no longer optional because it's easy to know what it would be in the db explicit is better than implcit.
+      // This is the full path you download from
+      let full_remote_cloud_file_path = format!("{}/{}", remote_cloud_base_directory , file_name);
+      Self {
+        file_object_hash: entropy.to_string(),
+        remote_cloud_base_directory: remote_cloud_base_directory,
+        full_remote_cloud_file_path: full_remote_cloud_file_path,
+        file_name:file_name,
+        file_descriptor:file_descriptor
+      }
+    }
+    
+    pub fn new_from_file_descriptor(file_descriptor: Box<dyn FileDescriptor>) -> Self {
+      let entropy = crockford_entropy_lower(32);
+      // gets you wiki /a/b/c/d folder structure
+      let middle = hashed_directory_path_long_string::hashed_directory_path_long_string(entropy.as_ref());
+      // gets you cloud bucket path e.g weights/a/b/c/d/clould_path_entropy
+      let remote_cloud_base_directory = format!("{}/{}{}", file_descriptor.remote_directory_path(), middle, entropy);
+      // gets you name of the file with suffix and prefix and entropy in the centre
+      let file_name = format!("{}_{}.{}", file_descriptor.get_prefix(), entropy, file_descriptor.get_suffix());
+      // note: no longer optional because it's easy to know what it would be in the db explicit is better than implcit.
+
+      // This is the full path you upload to.
+      let full_remote_cloud_file_path = format!("{}/{}", remote_cloud_base_directory , file_name);
+      Self {
+        file_object_hash: entropy,
+        remote_cloud_base_directory: remote_cloud_base_directory,
+        full_remote_cloud_file_path: full_remote_cloud_file_path,
+        file_name:file_name,
+        file_descriptor:file_descriptor
+      }
+    }
+    
+    pub fn get_file_object_hash(&self) -> &str {
+        &self.file_object_hash
+    }
+
+    pub fn get_remote_cloud_base_directory(&self) -> &str {
+        &self.remote_cloud_base_directory
+    }
+  
+    pub fn get_full_remote_cloud_file_path(&self) -> &str {
+        &self.full_remote_cloud_file_path
+    }
+  
+    pub fn to_full_remote_cloud_file_path_pathbuf(&self) -> PathBuf {
+      PathBuf::from(&self.full_remote_cloud_file_path)
+    }
+    pub fn get_file_name(&self) -> &str {
+        &self.file_name
+    }
+
+  }
+  
@@ -0,0 +1,6 @@
+#[derive(Debug, Clone)]
+pub struct FileMetaData {
+    pub file_size_bytes: u64,
+    pub sha256_checksum: String,
+    pub mimetype: String
+}
@@ -0,0 +1,12 @@
+pub mod remote_cloud_file_manager;
+pub mod remote_cloud_bucket_details;
+
+pub mod bucket_orchestration;
+        
+
+pub mod file_directory;
+pub mod file_meta_data;
+pub mod file_descriptor;
+
+pub mod media_descriptor;
+pub mod weights_descriptor;
@@ -0,0 +1,58 @@
+
+
+use super::file_descriptor::FileDescriptor;
+use crate::remote_file_manager::weights_descriptor::{WeightsLoRADescriptor, WeightsSD15Descriptor, WeightsSDXLDescriptor, self};
+
+pub struct RemoteCloudBucketDetails {
+    pub object_hash: String,
+    pub prefix: String,
+    pub suffix: String,
+}
+
+impl RemoteCloudBucketDetails {
+    pub fn new(object_hash: String, prefix: String, suffix: String) -> Self {
+        Self {
+            object_hash: object_hash,
+            prefix: prefix,
+            suffix: suffix
+        }
+    }
+    pub fn get_object_hash(&self) -> &str {
+        &self.object_hash
+    }
+    pub fn get_prefix(&self) -> &str {
+        &self.prefix
+    }
+    pub fn get_suffix(&self) -> &str {
+        &self.suffix
+    }
+
+    pub fn file_descriptor_from_bucket_details(&self) -> Box<dyn FileDescriptor> {
+        match self.prefix.as_str() {
+            "loRA" => Box::new(weights_descriptor::WeightsLoRADescriptor {}),
+            "sd15" => Box::new(weights_descriptor::WeightsSD15Descriptor {}),
+            "sdxl" => Box::new(weights_descriptor::WeightsSDXLDescriptor {}),
+            "valle_prompt" => Box::new(weights_descriptor::WeightsVallePromptDescriptor {}),
+            "rvc" => {
+                match self.suffix.as_str() {
+                    "safetensors" => Box::new(weights_descriptor::WeightsRVCDescriptor {}),
+                    "index" => Box::new(weights_descriptor::WeightsRVCIndexDescriptor {}),
+                    _ => panic!("Unknown suffix: {}",self.suffix)
+                }
+            },
+            "svc" => Box::new(weights_descriptor::WeightsSVCDescriptor {}),
+            _ => panic!("Unknown prefix: {}", self.prefix)
+        }
+    }
+}
+
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    pub fn test() {
+
+    }
+ 
+}
@@ -0,0 +1,196 @@
+
+
+use crate::remote_file_manager::file_directory::FileBucketDirectory;
+use crate::remote_file_manager::remote_cloud_bucket_details::RemoteCloudBucketDetails;
+
+use super::bucket_orchestration;
+use super::file_descriptor::{FileDescriptor};
+use super::file_meta_data::FileMetaData;
+
+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};
+
+struct RemoteCloudFileClient {
+    bucket_orchestration_client: Box<dyn BucketOrchestrationCore>
+}
+
+impl RemoteCloudFileClient {
+    pub fn new(bucket_orchestration_client: Box<dyn BucketOrchestrationCore>) -> Self {
+        Self {
+            bucket_orchestration_client: bucket_orchestration_client
+        }
+    }
+
+    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);
+        let full_remote_cloud_file_path = file_bucket_directory.get_full_remote_cloud_file_path().to_string();
+        let is_public = file_descriptor.is_public().clone();
+
+        self.bucket_orchestration_client.download_file_to_disk(full_remote_cloud_file_path, to_system_file_path, is_public).await?;
+        Ok(())
+    }
+
+    // return error or success with meta data.
+    pub async fn upload_file(&self, file_descriptor:Box<dyn FileDescriptor>, from_system_file_path:&str) -> AnyhowResult<FileMetaData> {
+     
+        // get file meta data
+        println!("Reading media file: {:?}", from_system_file_path);
+        // get meta data 
+        let bytes = file_read_bytes(from_system_file_path)?;
+        let result = Self::get_file_meta_data(from_system_file_path)?;
+        let is_public = file_descriptor.is_public();
+
+        let directory = FileBucketDirectory::generate_new(
+            file_descriptor
+        );
+
+        println!("Uploading media file to bucket path: {:?}",directory.get_full_remote_cloud_file_path());
+
+        self.bucket_orchestration_client.upload_file_with_content_type_process(
+            &directory.get_remote_cloud_base_directory(),
+            bytes.as_ref(),
+            result.mimetype.as_ref(),
+            is_public
+        ).await?;
+
+        Ok(result)
+    }
+
+    // Retrieve the metadata from the file
+    fn get_file_meta_data(system_file_path:&str) -> AnyhowResult<FileMetaData> {
+        let file_size_bytes = file_size(system_file_path.clone())?;
+        let sha256_checksum = sha256_hash_file(system_file_path.clone())?;
+
+        let bytes = file_read_bytes(system_file_path)?;
+        let mimetype: &str = get_mimetype_for_bytes(&bytes).unwrap_or("application/octet-stream");
+
+        Ok(FileMetaData {
+            file_size_bytes: file_size_bytes,
+            sha256_checksum: sha256_checksum,
+            mimetype: mimetype.to_string()
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use async_trait::async_trait;
+    use env_logger;
+    use errors::AnyhowResult;
+    use crate::remote_file_manager::bucket_orchestration::BucketOrchestrationCore;
+    use crate::remote_file_manager::weights_descriptor::{WeightsLoRADescriptor, WeightsSD15Descriptor, WeightsSDXLDescriptor};
+
+    struct BucketOrchestrationMock {}
+
+    #[async_trait]
+    impl BucketOrchestrationCore for BucketOrchestrationMock {
+        async fn download_file_to_disk(
+            &self,
+            object_path: String,
+            filesystem_path: String,
+            is_public: bool,
+        ) -> AnyhowResult<()>{
+            println!("Download File to Disk");
+            println!("{}",object_path);
+            println!("{}",filesystem_path);
+            println!("{}",is_public);
+            println!("Download Done Downloading");
+
+            assert_eq!(String::from("/weights/1/2/123/loRA_123.safetensors"),object_path);
+            assert_eq!(String::from("./file_path_here"),filesystem_path);
+            assert_eq!(is_public,true);
+            Ok(())
+        }
+
+        async fn upload_file_with_content_type_process(&self, object_name: &str,
+                                                       bytes: &[u8],
+                                                       content_type: &str,
+                                                       is_public: bool) -> AnyhowResult<()> {
+            println!("Upload File to Disk");
+            println!("{}",object_name);
+            assert_eq!(object_name,String::from("/weights/2/y/q/m/2/2yqm2f1bamh88seyd690h9v24apgezhr/loRA_2yqm2f1bamh88seyd690h9v24apgezhr.safetensors"));
+            println!("ContentType:{}",content_type);
+            println!("{}",is_public);
+            assert_eq!(is_public,true);
+
+            println!("Is Done Uploading");
+            Ok(())
+        }
+    }
+
+    #[tokio::test]
+
+    async fn remote_file_manager_descriptor_test() {
+        use super::*;
+        let remote_cloud_bucket_details = RemoteCloudBucketDetails::new("object_hash".to_string(), "loRA".to_string(), "safetensors".to_string());
+        let file_descriptor = remote_cloud_bucket_details.file_descriptor_from_bucket_details();
+        
+        assert_eq!(file_descriptor.get_prefix(), "loRA");
+        assert_eq!(file_descriptor.get_suffix(), "safetensors");
+        assert_eq!(file_descriptor.is_public(), true);
+
+    }
+    #[tokio::test]
+    async fn remote_file_manager_download_existing_file() {
+        use super::*;
+
+        env_logger::init();
+
+        let file_path:&str= "./file_path_here";
+
+        let remote_cloud_file_manager = RemoteCloudFileClient {
+            bucket_orchestration_client: Box::new(BucketOrchestrationMock {})
+        };
+
+        println!("begin upload from file_path: {:?}", file_path);
+        let details = RemoteCloudBucketDetails {
+            object_hash: String::from("123"),
+            prefix: String::from("loRA"),
+            suffix: String::from("safetensors")
+        };
+        let result = remote_cloud_file_manager.download_file(details,file_path.to_string()).await;
+        
+        match result {
+            Ok(file_meta_data) => {
+                println!("file_meta_data: {:?}", file_meta_data);
+            },
+            Err(e) => {
+                println!("error: {:?}", e);
+            }
+        }
+    }
+
+    #[tokio::test]
+    async fn remote_file_manager_upload_existing_file() {
+        use super::*;
+
+        env_logger::init();
+        // Replace with a test file.
+        let weight_path:&str= "/home/tensor/code/storyteller/storyteller-rust/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs";
+
+        let remote_cloud_file_manager = RemoteCloudFileClient {
+            bucket_orchestration_client: Box::new(BucketOrchestrationMock {})
+        };
+
+        println!("begin upload from weight_path: {:?}", weight_path);
+
+        let result = remote_cloud_file_manager.upload_file(Box::new(WeightsLoRADescriptor {}),weight_path).await;
+
+        match result {
+            Ok(file_meta_data) => {
+                println!("file_meta_data: {:?}", file_meta_data);
+            },
+            Err(e) => {
+                println!("error: {:?}", e);
+            }
+        }
+    }
+}
@@ -0,0 +1,172 @@
+use super::file_descriptor::FileDescriptor;
+
+pub struct WeightsLoRADescriptor {}
+
+const REMOTE_FILE_DIRECTORY: &str = "/weights";
+
+impl FileDescriptor for WeightsLoRADescriptor {
+    fn remote_directory_path(&self) -> &str {
+        return REMOTE_FILE_DIRECTORY;
+    }
+    // this will be the type of file peroid is handled by the file formatter
+    // e.g safetensors bin jpg
+    fn get_suffix(&self)->String {
+       return "safetensors".to_string();
+    }
+    // This will be the prefix of the media type or the weights type.
+    // name of the weights or the name of the media type
+    // vall-e_prompt, loRA, sd15, sdxl when implmenting add to the end 
+    fn get_prefix(&self)->String {
+        return "loRA".to_string();
+    }
+
+    // This will be ensure that the right bucket is picked
+    fn is_public(&self) -> bool {
+      true
+    }
+}
+
+pub struct WeightsSD15Descriptor {}
+
+impl FileDescriptor for WeightsSD15Descriptor {
+    fn remote_directory_path(&self) -> &str {
+        return REMOTE_FILE_DIRECTORY;
+    }
+    // this will be the type of file peroid is handled by the file formatter
+    // e.g safetensors bin jpg
+    fn get_suffix(&self)->String {
+       return "safetensors".to_string();
+    }
+    // This will be the prefix of the media type or the weights type.
+    // name of the weights or the name of the media type
+    // vall-e_prompt, SD15, sd15, sdxl when implmenting add to the end 
+    fn get_prefix(&self)->String {
+        return "sd15".to_string();
+    }
+
+    // This will be ensure that the right bucket is picked
+    fn is_public(&self) -> bool {
+      true
+    }
+}
+
+
+pub struct WeightsSDXLDescriptor {}
+
+impl FileDescriptor for WeightsSDXLDescriptor {
+    fn remote_directory_path(&self) -> &str {
+        return REMOTE_FILE_DIRECTORY;
+    }
+    // this will be the type of file peroid is handled by the file formatter
+    // e.g safetensors bin jpg
+    fn get_suffix(&self)->String {
+       return "safetensors".to_string();
+    }
+    // This will be the prefix of the media type or the weights type.
+    // name of the weights or the name of the media type
+    // vall-e_prompt, SD15, sd15, sdxl when implmenting add to the end 
+    fn get_prefix(&self)->String {
+        return "sdxl".to_string();
+    }
+
+    // This will be ensure that the right bucket is picked
+    fn is_public(&self) -> bool {
+      true
+    }
+}
+
+pub struct WeightsSVCDescriptor {}
+
+impl FileDescriptor for crate::remote_file_manager::weights_descriptor::WeightsSVCDescriptor {
+    fn remote_directory_path(&self) -> &str {
+        return REMOTE_FILE_DIRECTORY;
+    }
+    // this will be the type of file peroid is handled by the file formatter
+    // e.g safetensors bin jpg
+    fn get_suffix(&self)->String {
+        return "safetensors".to_string();
+    }
+    // This will be the prefix of the media type or the weights type.
+    // name of the weights or the name of the media type
+    // vall-e_prompt, SD15, sd15, sdxl when implmenting add to the end
+    fn get_prefix(&self)->String {
+        return "svc".to_string();
+    }
+
+    // This will be ensure that the right bucket is picked
+    fn is_public(&self) -> bool {
+        true
+    }
+}
+
+pub struct WeightsRVCDescriptor {}
+
+impl FileDescriptor for crate::remote_file_manager::weights_descriptor::WeightsRVCDescriptor {
+    fn remote_directory_path(&self) -> &str {
+        return REMOTE_FILE_DIRECTORY;
+    }
+    // this will be the type of file peroid is handled by the file formatter
+    // e.g safetensors bin jpg
+    fn get_suffix(&self)->String {
+        return "pth".to_string();
+    }
+    // This will be the prefix of the media type or the weights type.
+    // name of the weights or the name of the media type
+    // vall-e_prompt, SD15, sd15, sdxl when implmenting add to the end
+    fn get_prefix(&self)->String {
+        return "rvc".to_string();
+    }
+
+    // This will be ensure that the right bucket is picked
+    fn is_public(&self) -> bool {
+        true
+    }
+}
+
+pub struct WeightsRVCIndexDescriptor {}
+
+impl FileDescriptor for crate::remote_file_manager::weights_descriptor::WeightsRVCIndexDescriptor {
+    fn remote_directory_path(&self) -> &str {
+        return REMOTE_FILE_DIRECTORY;
+    }
+    // this will be the type of file peroid is handled by the file formatter
+    // e.g safetensors bin jpg
+    fn get_suffix(&self)->String {
+        return "index".to_string();
+    }
+    // This will be the prefix of the media type or the weights type.
+    // name of the weights or the name of the media type
+    // vall-e_prompt, SD15, sd15, sdxl when implmenting add to the end
+    fn get_prefix(&self)->String {
+        return "rvc".to_string();
+    }
+
+    // This will be ensure that the right bucket is picked
+    fn is_public(&self) -> bool {
+        true
+    }
+}
+
+pub struct WeightsVallePromptDescriptor {}
+
+impl FileDescriptor for crate::remote_file_manager::weights_descriptor::WeightsVallePromptDescriptor {
+    fn remote_directory_path(&self) -> &str {
+        return REMOTE_FILE_DIRECTORY;
+    }
+    // this will be the type of file peroid is handled by the file formatter
+    // e.g safetensors bin jpg
+    fn get_suffix(&self)->String {
+        return "safetensors".to_string();
+    }
+    // This will be the prefix of the media type or the weights type.
+    // name of the weights or the name of the media type
+    // vall-e_prompt, SD15, sd15, sdxl when implmenting add to the end
+    fn get_prefix(&self)->String {
+        return "valle_prompt".to_string();
+    }
+
+    // This will be ensure that the right bucket is picked
+    fn is_public(&self) -> bool {
+        true
+    }
+}
@@ -0,0 +1 @@
+pub mod bucket_orchestration_mock;
@@ -177,11 +177,8 @@ impl VcModel {
        if !model.has_index_file {
          return None;
        }
-        let path = WeightFileBucketPath::from_object_hash(
-          &model.public_bucket_hash,
-          model.maybe_public_bucket_prefix.as_deref(),
-          Some(".rvc_index"));
-
+        // NB: Technically, we should read prefix/extension from DB. We keep index file extensions by convention, however.
+        let path = WeightFileBucketPath::rvc_index_file_from_object_hash(&model.public_bucket_hash);
        Some(PathBuf::from(path.get_full_object_path_str()))
      }
    }
@@ -390,7 +387,7 @@ mod tests {
      model.weights_type = WeightsType::RvcV2;
      model.has_index_file = true;
      let path = VcModel::ModelWeight(model).get_index_file_cloud_bucket_path(&BucketPathUnifier::default_paths());
-      assert_eq!(path, Some(PathBuf::from("/weights/h/a/s/hash/hash.rvc_index")));
+      assert_eq!(path, Some(PathBuf::from("/weights/h/a/s/hash/rvc_hash.index")));
    }
  }
 }
@@ -52,7 +52,7 @@ SELECT
  id,
  token,

-  creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,
+  creator_user_token,
  creator_ip_address,
  creator_set_visibility,

@@ -101,7 +101,7 @@ WHERE
          id: GenericDownloadJobId(record.id),
          download_job_token: DownloadJobToken::new(record.token),
          creator_ip_address: record.creator_ip_address,
-          creator_user_token: record.creator_user_token,
+          creator_user_token: UserToken::new_from_str(&record.creator_user_token),
          // NB: Failure case for parsing visibility - default to private
          creator_set_visibility: Visibility::from_str(&record.creator_set_visibility)
              .unwrap_or(Visibility::Private),
@@ -144,7 +144,7 @@ struct AvailableDownloadJobRawInternal {
  pub id: i64,
  pub token: String,

-  pub creator_user_token: UserToken,
+  pub creator_user_token: String,
  pub creator_ip_address: String,
  pub creator_set_visibility: String,

@@ -0,0 +1,158 @@
+use anyhow::anyhow;
+use sqlx;
+use sqlx::MySqlPool;
+
+use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
+use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
+use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
+use enums::by_table::media_files::media_file_type::MediaFileType;
+use enums::common::visibility::Visibility;
+use errors::AnyhowResult;
+use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
+use tokens::tokens::media_files::MediaFileToken;
+use tokens::tokens::users::UserToken;
+
+use crate::queries::generic_synthetic_ids::transactional_increment_generic_synthetic_id::transactional_increment_generic_synthetic_id;
+
+pub enum UploadType {
+  Filesystem,
+  DeviceCaptureApi,
+}
+
+pub struct InsertMediaFileFromUploadArgs<'a> {
+  pub pool: &'a MySqlPool,
+
+  pub maybe_creator_user_token: Option<&'a UserToken>,
+  pub maybe_creator_anonymous_visitor_token: Option<&'a AnonymousVisitorTrackingToken>,
+  pub creator_ip_address: &'a str,
+  pub creator_set_visibility: Visibility,
+
+  pub upload_type: UploadType,
+
+  pub media_file_type: MediaFileType,
+  pub maybe_mime_type: Option<&'a str>,
+  pub file_size_bytes: u64,
+  pub duration_millis: u64,
+  pub sha256_checksum: &'a str,
+
+  // TODO: Media duration.
+  //pub duration_millis: u64,
+
+  pub public_bucket_directory_hash: &'a str,
+  pub maybe_public_bucket_prefix: Option<&'a str>,
+  pub maybe_public_bucket_extension: Option<&'a str>,
+}
+
+pub async fn insert_media_file_from_file_upload(
+  args: InsertMediaFileFromUploadArgs<'_>
+) -> AnyhowResult<(MediaFileToken, u64)>
+{
+  let token = MediaFileToken::generate();
+
+  let origin_category = match args.upload_type {
+    UploadType::Filesystem => MediaFileOriginCategory::Upload,
+    UploadType::DeviceCaptureApi => MediaFileOriginCategory::DeviceApi,
+  };
+
+  let mut maybe_creator_file_synthetic_id : Option<u64> = None;
+  let mut maybe_creator_category_synthetic_id : Option<u64> = None;
+
+  let mut transaction = args.pool.begin().await?;
+
+  if let Some(user_token) = args.maybe_creator_user_token.as_deref() {
+
+    let next_media_file_id = transactional_increment_generic_synthetic_id(
+      &user_token,
+      IdCategory::MediaFile,
+      &mut transaction
+    ).await?;
+
+    let next_voice_conversion_id = transactional_increment_generic_synthetic_id(
+      &user_token,
+      IdCategory::FileUpload,
+      &mut transaction
+    ).await?;
+
+    maybe_creator_file_synthetic_id = Some(next_media_file_id);
+    maybe_creator_category_synthetic_id = Some(next_voice_conversion_id);
+  }
+
+  const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::Unknown;
+
+  let record_id = {
+    let query_result = sqlx::query!(
+        r#"
+INSERT INTO media_files
+SET
+  token = ?,
+
+  origin_category = ?,
+  origin_product_category = ?,
+
+  maybe_origin_model_type = NULL,
+  maybe_origin_model_token = NULL,
+
+  media_type = ?,
+  maybe_mime_type = ?,
+  file_size_bytes = ?,
+
+  checksum_sha2 = ?,
+
+  public_bucket_directory_hash = ?,
+  maybe_public_bucket_prefix = ?,
+  maybe_public_bucket_extension = ?,
+
+  maybe_creator_user_token = ?,
+  maybe_creator_anonymous_visitor_token = ?,
+  creator_ip_address = ?,
+
+  creator_set_visibility = ?,
+
+  maybe_creator_file_synthetic_id = ?,
+  maybe_creator_category_synthetic_id = ?
+        "#,
+      token.as_str(),
+
+      origin_category.to_str(),
+      ORIGIN_PRODUCT_CATEGORY.to_str(),
+
+      args.media_file_type.to_str(),
+      args.maybe_mime_type,
+      args.file_size_bytes,
+
+      args.sha256_checksum,
+
+      args.public_bucket_directory_hash,
+      args.maybe_public_bucket_prefix,
+      args.maybe_public_bucket_extension,
+
+      args.maybe_creator_user_token,
+      args.maybe_creator_anonymous_visitor_token,
+      args.creator_ip_address,
+
+      args.creator_set_visibility.to_str(),
+
+      maybe_creator_file_synthetic_id,
+      maybe_creator_category_synthetic_id,
+    )
+        .execute(&mut *transaction)
+        .await;
+
+    let record_id = match query_result {
+      Ok(res) => {
+        res.last_insert_id()
+      },
+      Err(err) => {
+        // TODO: handle better
+        //transaction.rollback().await?;
+        return Err(anyhow!("Mysql error: {:?}", err));
+      }
+    };
+
+    record_id
+  };
+
+  transaction.commit().await?;
+
+  Ok((token, record_id))
+}
@@ -0,0 +1,7 @@
+pub mod insert_media_file_from_cli_tool;
+pub mod insert_media_file_from_face_animation;
+pub mod insert_media_file_from_file_upload;
+pub mod insert_media_file_from_rerender;
+pub mod insert_media_file_from_tacotron2;
+pub mod insert_media_file_from_voice_conversion;
+pub mod insert_media_file_from_zero_shot_tts;
@@ -44,6 +44,9 @@ pub struct MediaFileListItem {

  pub creator_set_visibility: Visibility,

+  pub comment_count: u64,
+  pub favorite_count: u64,
+
  pub created_at: DateTime<Utc>,
  pub updated_at: DateTime<Utc>,
 }
@@ -100,6 +103,8 @@ pub async fn list_media_files(args: ListMediaFilesArgs<'_>) -> AnyhowResult<Medi
          maybe_creator_display_name: record.maybe_creator_display_name,
          maybe_creator_gravatar_hash: record.maybe_creator_gravatar_hash,
          creator_set_visibility: record.creator_set_visibility,
+          comment_count: record.comment_count as u64,
+          favorite_count: record.favorite_count as u64,
          created_at: record.created_at,
          updated_at: record.updated_at,
        }
@@ -148,14 +153,22 @@ SELECT

  m.creator_set_visibility,
  m.created_at,
-  m.updated_at
+  m.updated_at,
+
+  COUNT(f.id) as favorite_count,
+  COUNT(c.id) as comment_count

 FROM media_files AS m
+
 LEFT OUTER JOIN users AS u
    ON m.maybe_creator_user_token = u.token
-
-WHERE m.user_deleted_at IS NULL
-AND m.mod_deleted_at IS NULL
+LEFT OUTER JOIN favorites as f
+    ON f.entity_type = 'media_file' AND f.entity_token = m.token
+LEFT OUTER JOIN comments as c
+    ON c.entity_type = 'media_file' AND c.entity_token  = c.token
+WHERE
+    m.user_deleted_at IS NULL
+    AND m.mod_deleted_at IS NULL
    "#
  );

@@ -186,6 +199,9 @@ AND m.mod_deleted_at IS NULL
    }
  }

+
+  query_builder.push(" GROUP BY m.id");
+
  if cursor_is_reversed {
    query_builder.push(" ORDER BY m.id ASC ");
  } else {
@@ -218,6 +234,9 @@ struct MediaFileListItemInternal {

  creator_set_visibility: Visibility,

+  comment_count: i64,
+  favorite_count: i64,
+
  created_at: DateTime<Utc>,
  updated_at: DateTime<Utc>,
 }
@@ -257,6 +276,8 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal {
      creator_set_visibility: Visibility::try_from_mysql_row(row, "creator_set_visibility")?,
      created_at: row.try_get("created_at")?,
      updated_at: row.try_get("updated_at")?,
+      comment_count: row.try_get("comment_count")?,
+      favorite_count: row.try_get("favorite_count")?,
    })
  }
 }
@@ -51,13 +51,12 @@ pub struct ListMediaFileForUserArgs<'a> {
  pub maybe_filter_media_type: Option<MediaFileType>,
  pub page_size: usize,
  pub page_index: usize,
-  pub cursor_is_reversed: bool,
+  pub sort_ascending: bool,
  pub view_as: ViewAs,
  pub mysql_pool: &'a MySqlPool,
 }

 pub async fn list_media_files_for_user(args: ListMediaFileForUserArgs<'_>) -> AnyhowResult<MediaFileListPage> {
-
  /// Let's figure out how many results we could have returned total
  let count_fields = select_total_count_field();
  let mut count_query_builder = query_builder(
@@ -66,16 +65,13 @@ pub async fn list_media_files_for_user(args: ListMediaFileForUserArgs<'_>) -> An
    false,
    0,
    0,
-    args.cursor_is_reversed,
+    args.sort_ascending,
    args.view_as,
    count_fields.as_str(),
  );

  let row_count_query = count_query_builder.build_query_scalar::<i64>();
  let row_count_result = row_count_query.fetch_one(args.mysql_pool).await?;
-  /// Figure out limit start and end based on page size and indexes as requested
-  let limit_start = args.page_size * args.page_index;
-  let limit_end = limit_start + args.page_size;

  /// Now fetch the actual results with all the fields
  let result_fields = select_result_fields();
@@ -83,9 +79,9 @@ pub async fn list_media_files_for_user(args: ListMediaFileForUserArgs<'_>) -> An
    args.maybe_filter_media_type,
    args.username,
    true,
-    limit_start,
-    limit_end,
-    args.cursor_is_reversed,
+    args.page_index,
+    args.page_size,
+    args.sort_ascending,
    args.view_as,
    result_fields.as_str(),
  );
@@ -115,7 +111,7 @@ pub async fn list_media_files_for_user(args: ListMediaFileForUserArgs<'_>) -> An

  Ok(MediaFileListPage {
    records: results,
-    sort_ascending: !args.cursor_is_reversed,
+    sort_ascending: args.sort_ascending,
    current_page: args.page_index,
    total_page_count: number_of_pages,
  })
@@ -157,9 +153,9 @@ fn query_builder<'a>(
  maybe_filter_media_type: Option<MediaFileType>,
  username: &'a str,
  enforce_limits: bool,
-  limit_start: usize,
-  limit_end: usize,
-  cursor_is_reversed: bool,
+  page_index: usize,
+  page_size: usize,
+  sort_ascending: bool,
  view_as: ViewAs,
  select_fields: &'a str,
 ) -> QueryBuilder<'a, MySql> {
@@ -201,18 +197,15 @@ WHERE m.user_deleted_at IS NULL
    }
  }

-  if cursor_is_reversed {
-    query_builder.push(" ORDER BY m.id ASC ");
+  if sort_ascending {
+    query_builder.push(" ORDER BY m.created_at ASC ");
  } else {
-    query_builder.push(" ORDER BY m.id DESC ");
+    query_builder.push(" ORDER BY m.created_at DESC ");
  }

  if enforce_limits {
-    if cursor_is_reversed {
-      query_builder.push(format!(" LIMIT {limit_start}, {limit_end} "));
-    } else {
-      query_builder.push(format!(" LIMIT {limit_end}, {limit_start} "));
-    }
+    let offset = page_index * page_size;
+    query_builder.push(format!(" LIMIT {page_size} OFFSET {offset} "));
  }

  query_builder
@@ -0,0 +1,3 @@
+pub mod list_media_files;
+pub mod list_media_files_by_tokens;
+pub mod list_media_files_for_user;
@@ -1,12 +1,5 @@
+pub mod create;
 pub mod delete_media_file;
 pub mod get_media_file;
-pub mod insert_media_file_from_cli_tool;
-pub mod insert_media_file_from_face_animation;
-pub mod insert_media_file_from_rerender;
-pub mod insert_media_file_from_tacotron2;
-pub mod insert_media_file_from_voice_conversion;
-pub mod insert_media_file_from_zero_shot_tts;
-pub mod list_media_files;
-pub mod list_media_files_by_tokens;
-pub mod list_media_files_for_user;
+pub mod list;
 pub mod update_media_file;
@@ -21,6 +21,7 @@ pub struct CreateModelWeightArgs<'a> {
  pub original_download_url: &'a str,
  pub original_filename: &'a str,
  pub file_size_bytes: u64,
+  pub file_checksum_sha2: &'a str,

  pub creator_user_token: &'a UserToken,
  pub creator_ip_address: &'a str,
@@ -72,15 +73,15 @@ SET
  original_download_url = ?,
  original_filename = ?,
  file_size_bytes = ?,
-  file_checksum_sha2 = "TODO",
+  file_checksum_sha2 = ?,

  creator_user_token = ?,
  creator_ip_address = ?,
  creator_set_visibility = ?,

-  private_bucket_hash = ?,
-  maybe_private_bucket_prefix = ?,
-  maybe_private_bucket_extension = ?,
+  public_bucket_hash = ?,
+  maybe_public_bucket_prefix = ?,
+  maybe_public_bucket_extension = ?,

  cached_user_ratings_total_count = 0,
  cached_user_ratings_positive_count = 0,
@@ -98,6 +99,7 @@ SET
      args.original_download_url,
      args.original_filename,
      args.file_size_bytes,
+      args.file_checksum_sha2,

      args.creator_user_token,
      args.creator_ip_address,
@@ -24,9 +24,9 @@ pub struct CreateModelWeightsArgs<'a> {
    pub original_filename: Option<String>,
    pub file_size_bytes: i32,
    pub file_checksum_sha2: String,
-    pub private_bucket_hash: String,
-    pub maybe_private_bucket_prefix: Option<String>,
-    pub maybe_private_bucket_extension: Option<String>,
+    pub public_bucket_hash: String,
+    pub maybe_public_bucket_prefix: Option<String>,
+    pub maybe_public_bucket_extension: Option<String>,
    pub cached_user_ratings_total_count: u32,
    pub cached_user_ratings_positive_count: u32,
    pub cached_user_ratings_negative_count: u32,
@@ -58,9 +58,9 @@ pub async fn create_weight(args: CreateModelWeightsArgs<'_>) -> AnyhowResult<Mod
          original_filename = ?,
          file_size_bytes = ?,
          file_checksum_sha2 = ?,
-          private_bucket_hash = ?,
-          maybe_private_bucket_prefix = ?,
-          maybe_private_bucket_extension = ?,
+          public_bucket_hash = ?,
+          maybe_public_bucket_prefix = ?,
+          maybe_public_bucket_extension = ?,
          cached_user_ratings_total_count = ?,
          cached_user_ratings_positive_count = ?,
          cached_user_ratings_negative_count = ?,
@@ -82,9 +82,9 @@ pub async fn create_weight(args: CreateModelWeightsArgs<'_>) -> AnyhowResult<Mod
            args.original_filename,
            args.file_size_bytes,
            args.file_checksum_sha2,
-            args.private_bucket_hash,
-            args.maybe_private_bucket_prefix,
-            args.maybe_private_bucket_extension,
+            args.public_bucket_hash,
+            args.maybe_public_bucket_prefix,
+            args.maybe_public_bucket_extension,
            args.cached_user_ratings_total_count,
            args.cached_user_ratings_positive_count,
            args.cached_user_ratings_negative_count,
@@ -1 +1,2 @@
-pub mod create_model_weight_from_voice_conversion_download_job;
+pub mod create_model_weight_from_voice_conversion_download_job;
+pub mod create_weight;
@@ -0,0 +1,2 @@
+pub mod set_model_weight_avatar;
+pub mod update_weight;
@@ -0,0 +1,32 @@
+use sqlx::MySqlPool;
+
+use errors::AnyhowResult;
+use tokens::tokens::media_files::MediaFileToken;
+use tokens::tokens::model_weights::ModelWeightToken;
+
+pub struct UpdateArgs<'a> {
+  pub model_weight_token: &'a ModelWeightToken,
+  pub maybe_avatar_media_file_token: Option<&'a MediaFileToken>,
+  //pub update_ip_address: &'a str,
+  pub mysql_pool: &'a MySqlPool
+}
+
+pub async fn set_model_weight_avatar(args: UpdateArgs<'_>) -> AnyhowResult<()>{
+  let transaction = args.mysql_pool.begin().await?;
+
+  let query_result = sqlx::query!(
+        r#"
+        UPDATE model_weights
+        SET
+            maybe_avatar_media_file_token = ?
+        WHERE token = ?
+        LIMIT 1
+        "#,
+        args.maybe_avatar_media_file_token,
+        args.model_weight_token,
+    ).execute(args.mysql_pool).await;
+
+  transaction.commit().await?;
+
+  Ok(())
+}
@@ -1,22 +1,20 @@
-use container_common::anyhow_result::AnyhowResult;
-
-use sqlx::{ MySqlPool, MySql };
-use sqlx::pool::PoolConnection;
 use anyhow::anyhow;
-use log::{ error };
+use chrono::{DateTime, Utc};
+use log::error;
+use sqlx::{MySql, MySqlPool};
+use sqlx::pool::PoolConnection;

-use enums::by_table::model_weights::weights_types::WeightsType;
+use container_common::anyhow_result::AnyhowResult;
 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::{ users::UserToken, model_weights::ModelWeightToken };
-use chrono::{ DateTime, Utc };
+use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken};

-// Notes ensure that Enums have sqlx::Type 
+// Notes ensure that Enums have sqlx::Type
 //  'weights_type: enums::by_table::model_weights::weights_types::WeightsType' use this to map
 // Retrieved Model Weight can be constrained to the fields that are needed

-pub struct RetrivedModelWeight {
+pub struct RetrievedModelWeight {
    pub token: ModelWeightToken,
    pub title: String,
    pub weights_type: WeightsType,
@@ -24,17 +22,28 @@ pub struct RetrivedModelWeight {
    pub maybe_thumbnail_token: Option<String>,
    pub description_markdown: String,
    pub description_rendered_html: String,
+
    pub creator_user_token: UserToken,
+    pub creator_username: String,
+    pub creator_display_name: String,
+    pub creator_gravatar_hash: String,
+
    pub creator_ip_address: String,
    pub creator_set_visibility: Visibility,
+
    pub maybe_last_update_user_token: Option<UserToken>,
    pub original_download_url: Option<String>,
    pub original_filename: Option<String>,
    pub file_size_bytes: i32,
    pub file_checksum_sha2: String,
-    pub private_bucket_hash: String,
-    pub maybe_private_bucket_prefix: Option<String>, // TODO crossproduct rename these to public thx ^-^
-    pub maybe_private_bucket_extension: Option<String>,
+    pub public_bucket_hash: String,
+    pub maybe_public_bucket_prefix: Option<String>,
+    pub maybe_public_bucket_extension: Option<String>,
+
+    pub maybe_avatar_public_bucket_hash: Option<String>,
+    pub maybe_avatar_public_bucket_prefix: Option<String>,
+    pub maybe_avatar_public_bucket_extension: Option<String>,
+
    pub cached_user_ratings_negative_count: u32,
    pub cached_user_ratings_positive_count: u32,
    pub cached_user_ratings_total_count: u32,
@@ -51,7 +60,7 @@ pub async fn get_weight_by_token(
    weight_token: &ModelWeightToken,
    can_see_deleted: bool,
    mysql_pool: &MySqlPool
-) -> AnyhowResult<Option<RetrivedModelWeight>> {
+) -> AnyhowResult<Option<RetrievedModelWeight>> {
    let mut connection = mysql_pool.acquire().await?;
    get_weights_by_token_with_connection(weight_token, can_see_deleted, &mut connection).await
 }
@@ -60,7 +69,7 @@ pub async fn get_weights_by_token_with_connection(
    weight_token: &ModelWeightToken,
    can_see_deleted: bool,
    mysql_connection: &mut PoolConnection<MySql>
-) -> AnyhowResult<Option<RetrivedModelWeight>> {
+) -> AnyhowResult<Option<RetrievedModelWeight>> {
    let maybe_result = if can_see_deleted {
        select_include_deleted(weight_token, mysql_connection).await
    } else {
@@ -81,7 +90,7 @@ pub async fn get_weights_by_token_with_connection(
    // unwrap the result

    Ok(
-        Some(RetrivedModelWeight {
+        Some(RetrievedModelWeight {
            token: record.token,
            title: record.title,
            weights_type: record.weights_type,
@@ -90,6 +99,9 @@ pub async fn get_weights_by_token_with_connection(
            description_markdown: record.description_markdown,
            description_rendered_html: record.description_rendered_html,
            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,
            creator_ip_address: record.creator_ip_address,
            creator_set_visibility: record.creator_set_visibility,
            maybe_last_update_user_token: record.maybe_last_update_user_token,
@@ -97,9 +109,12 @@ pub async fn get_weights_by_token_with_connection(
            original_filename: record.original_filename,
            file_size_bytes: record.file_size_bytes,
            file_checksum_sha2: record.file_checksum_sha2,
-            private_bucket_hash: record.private_bucket_hash,
-            maybe_private_bucket_prefix: record.maybe_private_bucket_prefix,
-            maybe_private_bucket_extension: record.maybe_private_bucket_extension,
+            public_bucket_hash: record.public_bucket_hash,
+            maybe_public_bucket_prefix: record.maybe_public_bucket_prefix,
+            maybe_public_bucket_extension: record.maybe_public_bucket_extension,
+            maybe_avatar_public_bucket_hash: record.maybe_avatar_public_bucket_hash,
+            maybe_avatar_public_bucket_prefix: record.maybe_avatar_public_bucket_prefix,
+            maybe_avatar_public_bucket_extension: record.maybe_avatar_public_bucket_extension,
            cached_user_ratings_negative_count: record.cached_user_ratings_negative_count,
            cached_user_ratings_positive_count: record.cached_user_ratings_positive_count,
            cached_user_ratings_total_count: record.cached_user_ratings_total_count,
@@ -130,7 +145,12 @@ async fn select_include_deleted(
        wt.maybe_thumbnail_token,
        wt.description_markdown,
        wt.description_rendered_html,
+
        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,
+        users.username as creator_username,
+        users.display_name as creator_display_name,
+        users.email_gravatar_hash AS creator_gravatar_hash,
+
        wt.creator_ip_address,
        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,
@@ -138,9 +158,14 @@ async fn select_include_deleted(
        wt.original_filename,
        wt.file_size_bytes,
        wt.file_checksum_sha2,
-        wt.private_bucket_hash,
-        wt.maybe_private_bucket_prefix,
-        wt.maybe_private_bucket_extension,
+        wt.public_bucket_hash,
+        wt.maybe_public_bucket_prefix,
+        wt.maybe_public_bucket_extension,
+
+        avatar.public_bucket_directory_hash as maybe_avatar_public_bucket_hash,
+        avatar.maybe_public_bucket_prefix as maybe_avatar_public_bucket_prefix,
+        avatar.maybe_public_bucket_extension as maybe_avatar_public_bucket_extension,
+
        wt.cached_user_ratings_negative_count,
        wt.cached_user_ratings_positive_count,
        wt.cached_user_ratings_total_count,
@@ -152,6 +177,10 @@ async fn select_include_deleted(
        wt.user_deleted_at,
        wt.mod_deleted_at
        FROM model_weights as wt
+        JOIN users
+            ON users.token = wt.creator_user_token
+        LEFT OUTER JOIN media_files as avatar
+            ON avatar.token = wt.maybe_avatar_media_file_token
        WHERE
            wt.token = ?
            "#,
@@ -178,17 +207,27 @@ async fn select_without_deleted(
        wt.maybe_thumbnail_token,
        wt.description_markdown,
        wt.description_rendered_html,
-        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,
        wt.creator_ip_address,
        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
+
+        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,
+        users.username as creator_username,
+        users.display_name as creator_display_name,
+        users.email_gravatar_hash AS creator_gravatar_hash,
+
        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,
        wt.original_download_url,
        wt.original_filename,
        wt.file_size_bytes,
        wt.file_checksum_sha2,
-        wt.private_bucket_hash,
-        wt.maybe_private_bucket_prefix,
-        wt.maybe_private_bucket_extension,
+        wt.public_bucket_hash,
+        wt.maybe_public_bucket_prefix,
+        wt.maybe_public_bucket_extension,
+
+        avatar.public_bucket_directory_hash as maybe_avatar_public_bucket_hash,
+        avatar.maybe_public_bucket_prefix as maybe_avatar_public_bucket_prefix,
+        avatar.maybe_public_bucket_extension as maybe_avatar_public_bucket_extension,
+
        wt.cached_user_ratings_negative_count,
        wt.cached_user_ratings_positive_count,
        wt.cached_user_ratings_total_count,
@@ -200,6 +239,10 @@ async fn select_without_deleted(
        wt.user_deleted_at,
        wt.mod_deleted_at
        FROM model_weights as wt
+        JOIN users
+            ON users.token = wt.creator_user_token
+        LEFT OUTER JOIN media_files as avatar
+            ON avatar.token = wt.maybe_avatar_media_file_token
        WHERE
            wt.token = ?
            AND wt.user_deleted_at IS NULL
@@ -220,7 +263,12 @@ pub struct RawWeight {
    pub maybe_thumbnail_token: Option<String>,
    pub description_markdown: String,
    pub description_rendered_html: String,
+
    pub creator_user_token: UserToken,
+    pub creator_username: String,
+    pub creator_display_name: String,
+    pub creator_gravatar_hash: String,
+
    pub creator_ip_address: String,
    pub creator_set_visibility: Visibility,
    pub maybe_last_update_user_token: Option<UserToken>,
@@ -228,9 +276,14 @@ pub struct RawWeight {
    pub original_filename: Option<String>,
    pub file_size_bytes: i32,
    pub file_checksum_sha2: String,
-    pub private_bucket_hash: String,
-    pub maybe_private_bucket_prefix: Option<String>,
-    pub maybe_private_bucket_extension: Option<String>,
+    pub public_bucket_hash: String,
+    pub maybe_public_bucket_prefix: Option<String>,
+    pub maybe_public_bucket_extension: Option<String>,
+
+    pub maybe_avatar_public_bucket_hash: Option<String>,
+    pub maybe_avatar_public_bucket_prefix: Option<String>,
+    pub maybe_avatar_public_bucket_extension: Option<String>,
+
    pub cached_user_ratings_negative_count: u32,
    pub cached_user_ratings_positive_count: u32,
    pub cached_user_ratings_total_count: u32,
@@ -65,9 +65,9 @@ SELECT
    w.title,
    vc.has_index_file,

-    w.private_bucket_hash,
-    w.maybe_private_bucket_prefix,
-    w.maybe_private_bucket_extension,
+    w.public_bucket_hash,
+    w.maybe_public_bucket_prefix,
+    w.maybe_public_bucket_extension,

    w.created_at,
    w.updated_at,
@@ -111,9 +111,9 @@ WHERE w.token = ?
    weights_type: model.weights_type,
    title: model.title,
    has_index_file: i8_to_bool(model.has_index_file),
-    public_bucket_hash: model.private_bucket_hash,
-    maybe_public_bucket_prefix: model.maybe_private_bucket_prefix,
-    maybe_public_bucket_extension: model.maybe_private_bucket_extension,
+    public_bucket_hash: model.public_bucket_hash,
+    maybe_public_bucket_prefix: model.maybe_public_bucket_prefix,
+    maybe_public_bucket_extension: model.maybe_public_bucket_extension,
    created_at: model.created_at,
    updated_at: model.updated_at,
    mod_deleted_at: model.mod_deleted_at,
@@ -129,9 +129,9 @@ struct InternalRecord {

  has_index_file: i8,

-  private_bucket_hash: String,
-  maybe_private_bucket_prefix: Option<String>,
-  maybe_private_bucket_extension: Option<String>,
+  public_bucket_hash: String,
+  maybe_public_bucket_prefix: Option<String>,
+  maybe_public_bucket_extension: Option<String>,

  created_at: DateTime<Utc>,
  updated_at: DateTime<Utc>,
@@ -27,9 +27,9 @@ pub struct WeightsByTokensRecord {
  pub creator_display_name: String,
  pub creator_email_gravatar_hash: String,

-  pub private_bucket_hash: String,
-  pub maybe_private_bucket_prefix: Option<String>,
-  pub maybe_private_bucket_extension: Option<String>,
+  pub public_bucket_hash: String,
+  pub maybe_public_bucket_prefix: Option<String>,
+  pub maybe_public_bucket_extension: Option<String>,

  pub cached_user_ratings_total_count: u32,
  pub cached_user_ratings_positive_count: u32,
@@ -76,9 +76,9 @@ async fn get_raw_weights_by_tokens(
          users.username as creator_username,
          users.display_name as creator_display_name,
          users.email_gravatar_hash as creator_email_gravatar_hash,
-          mw.private_bucket_hash,
-          mw.maybe_private_bucket_prefix,
-          mw.maybe_private_bucket_extension,
+          mw.public_bucket_hash,
+          mw.maybe_public_bucket_prefix,
+          mw.maybe_public_bucket_extension,
          mw.cached_user_ratings_negative_count,
          mw.cached_user_ratings_positive_count,
          mw.cached_user_ratings_total_count,
@@ -109,9 +109,9 @@ async fn get_raw_weights_by_tokens(
          users.username as creator_username,
          users.display_name as creator_display_name,
          users.email_gravatar_hash as creator_email_gravatar_hash,
-          mw.private_bucket_hash,
-          mw.maybe_private_bucket_prefix,
-          mw.maybe_private_bucket_extension,
+          mw.public_bucket_hash,
+          mw.maybe_public_bucket_prefix,
+          mw.maybe_public_bucket_extension,
          mw.cached_user_ratings_negative_count,
          mw.cached_user_ratings_positive_count,
          mw.cached_user_ratings_total_count,
@@ -170,9 +170,9 @@ fn map_to_weights(dataset:Vec<RawWeightJoinUser>) -> Vec<WeightsByTokensRecord>
          creator_display_name:dataset.creator_display_name,
          creator_email_gravatar_hash:dataset.creator_email_gravatar_hash,

-          private_bucket_hash: dataset.private_bucket_hash,
-          maybe_private_bucket_prefix: dataset.maybe_private_bucket_prefix,
-          maybe_private_bucket_extension: dataset.maybe_private_bucket_extension,
+          public_bucket_hash: dataset.public_bucket_hash,
+          maybe_public_bucket_prefix: dataset.maybe_public_bucket_prefix,
+          maybe_public_bucket_extension: dataset.maybe_public_bucket_extension,

          cached_user_ratings_negative_count: dataset.cached_user_ratings_negative_count,
          cached_user_ratings_positive_count: dataset.cached_user_ratings_positive_count,
@@ -207,9 +207,9 @@ fn map_to_weights(dataset:Vec<RawWeightJoinUser>) -> Vec<WeightsByTokensRecord>
    pub creator_display_name: String,
    pub creator_email_gravatar_hash: String,

-    pub private_bucket_hash: String,
-    pub maybe_private_bucket_prefix: Option<String>,
-    pub maybe_private_bucket_extension: Option<String>,
+    pub public_bucket_hash: String,
+    pub maybe_public_bucket_prefix: Option<String>,
+    pub maybe_public_bucket_extension: Option<String>,
    
    pub cached_user_ratings_total_count: u32,
    pub cached_user_ratings_positive_count: u32,
@@ -247,9 +247,9 @@ impl FromRow<'_, MySqlRow> for RawWeightJoinUser {
      creator_username: row.try_get("creator_username")?,
      creator_display_name: row.try_get("creator_display_name")?,
      creator_email_gravatar_hash: row.try_get("creator_email_gravatar_hash")?,
-      private_bucket_hash: row.try_get("private_bucket_hash")?,
-      maybe_private_bucket_prefix: row.try_get("maybe_private_bucket_prefix")?,
-      maybe_private_bucket_extension: row.try_get("maybe_private_bucket_extension")?,
+      public_bucket_hash: row.try_get("public_bucket_hash")?,
+      maybe_public_bucket_prefix: row.try_get("maybe_public_bucket_prefix")?,
+      maybe_public_bucket_extension: row.try_get("maybe_public_bucket_extension")?,
      cached_user_ratings_total_count: row.try_get("cached_user_ratings_total_count")?,
      cached_user_ratings_positive_count: row.try_get("cached_user_ratings_positive_count")?,
      cached_user_ratings_negative_count: row.try_get("cached_user_ratings_negative_count")?,
@@ -0,0 +1,347 @@
+use chrono::{DateTime, Utc};
+use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row};
+use sqlx::mysql::MySqlRow;
+
+use enums::by_table::model_weights::{
+  weights_category::WeightsCategory,
+  weights_types::WeightsType,
+};
+use enums::common::visibility::Visibility;
+use enums::traits::mysql_from_row::MySqlFromRow;
+use errors::AnyhowResult;
+use tokens::tokens::model_weights::ModelWeightToken;
+use tokens::tokens::users::UserToken;
+
+pub struct WeightsForUserListPage {
+  pub records: Vec<WeightsJoinUserRecord>,
+
+  pub sort_ascending: bool,
+
+  pub current_page: usize,
+  pub total_page_count: usize,
+}
+
+
+#[derive(Serialize)]
+pub struct WeightsJoinUserRecord {
+    pub token: ModelWeightToken,
+
+    pub weights_type: WeightsType,
+    pub weights_category: WeightsCategory,
+    
+    pub title: String,
+    
+    pub maybe_thumbnail_token: Option<String>,
+    
+    pub description_markdown: String,
+    pub description_rendered_html: String,
+    
+    pub creator_user_token: UserToken,
+    pub creator_ip_address: String,
+    pub creator_set_visibility: Visibility,
+    
+    pub maybe_last_update_user_token: Option<UserToken>,
+    
+    pub original_download_url: Option<String>,
+    pub original_filename: Option<String>,
+    
+    pub file_size_bytes: i32,
+    pub file_checksum_sha2: String,
+    
+    pub public_bucket_hash: String,
+    pub maybe_public_bucket_prefix: Option<String>,
+    pub maybe_public_bucket_extension: Option<String>,
+    
+    pub cached_user_ratings_total_count: u32,
+    pub cached_user_ratings_positive_count: u32,
+    pub cached_user_ratings_negative_count: u32,
+    pub maybe_cached_user_ratings_ratio: Option<f32>,
+    pub cached_user_ratings_last_updated_at: DateTime<Utc>,
+    
+    pub version: i32,
+    
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    
+    pub user_deleted_at: Option<DateTime<Utc>>,
+    pub mod_deleted_at: Option<DateTime<Utc>>,
+    
+    pub creator_username: String,
+    pub creator_display_name: String,
+    pub creator_email_gravatar_hash: String,
+}
+
+pub struct ListWeightsForUserArgs<'a> {
+  pub creator_username: &'a str,
+  pub page_size: usize,
+  pub page_index: usize,
+  pub sort_ascending: bool,
+  pub can_see_deleted: bool,
+  pub mysql_pool: &'a MySqlPool,
+}
+
+pub async fn list_weights_by_creator_username(args: ListWeightsForUserArgs<'_>) -> AnyhowResult<WeightsForUserListPage> {
+    let count_fields = select_total_count_field();
+    let mut count_query_builder = query_builder(
+        args.creator_username,
+        false,
+        0,
+        0,
+        args.sort_ascending,
+        count_fields.as_str(),
+        args.can_see_deleted,
+    );
+
+    let row_count_query = count_query_builder.build_query_scalar::<i64>();
+    let row_count_result = row_count_query.fetch_one(args.mysql_pool).await?;
+
+    /// Now fetch the actual results with all the fields
+    let result_fields = select_result_fields();
+    let mut query = query_builder(
+        args.creator_username,
+        true,
+        args.page_index,
+        args.page_size,
+        args.sort_ascending,
+        result_fields.as_str(),
+        args.can_see_deleted,
+    );
+
+    let query = query.build_query_as::<RawWeightJoinUser>();
+    let results = query.fetch_all(args.mysql_pool).await?;
+
+    let number_of_pages = (row_count_result / args.page_size as i64) as usize;
+
+
+
+    let weights_records: Vec<WeightsJoinUserRecord> = map_to_weights(results).await;
+
+
+    Ok(WeightsForUserListPage {
+        records: weights_records,
+        sort_ascending: args.sort_ascending,
+        current_page: args.page_index,
+        total_page_count: number_of_pages,
+    })
+}
+
+fn select_total_count_field() -> String {
+    r#"
+    COUNT(mw.id) AS total_count
+  "#
+        .to_string()
+}
+
+fn select_result_fields() -> String {
+    r#"
+                mw.token,
+                mw.title,
+                mw.weights_type,
+                mw.weights_category,
+                mw.maybe_thumbnail_token,
+                mw.description_markdown,
+                mw.description_rendered_html,
+                u.token as creator_user_token,
+                u.username as creator_username,
+                u.display_name as creator_display_name,
+                u.email_gravatar_hash as creator_email_gravatar_hash,
+                mw.creator_ip_address,
+                mw.creator_set_visibility,
+                mw.maybe_last_update_user_token,
+                mw.original_download_url,
+                mw.original_filename,
+                mw.file_size_bytes,
+                mw.file_checksum_sha2,
+                mw.public_bucket_hash,
+                mw.maybe_public_bucket_prefix,
+                mw.maybe_public_bucket_extension,
+                mw.cached_user_ratings_negative_count,
+                mw.cached_user_ratings_positive_count,
+                mw.cached_user_ratings_total_count,
+                mw.maybe_cached_user_ratings_ratio,
+                mw.cached_user_ratings_last_updated_at,
+                mw.version,
+                mw.created_at,
+                mw.updated_at,
+                mw.user_deleted_at,
+                mw.mod_deleted_at
+                "#.to_string()
+}
+
+fn query_builder<'a>(
+    username: &'a str,
+    enforce_limits: bool,
+    page_index: usize,
+    page_size: usize,
+    sort_ascending: bool,
+    select_fields: &'a str,
+    can_see_deleted: bool,
+) -> QueryBuilder<'a, MySql> {
+
+    // NB: Query cannot be statically checked by sqlx
+    let mut query_builder: QueryBuilder<MySql> = QueryBuilder::new(
+        format!(r#"
+SELECT
+     {select_fields}
+FROM model_weights as mw
+JOIN users as u
+    ON u.token = mw.creator_user_token
+    "#
+        ));
+
+    if !can_see_deleted {
+       query_builder.push(" WHERE mw.user_deleted_at IS NULL AND mw.mod_deleted_at IS NULL ");
+    }
+
+    query_builder.push(" AND u.username = ");
+    query_builder.push_bind(username);
+
+
+    if sort_ascending {
+        query_builder.push(" ORDER BY mw.created_at ASC ");
+    } else {
+        query_builder.push(" ORDER BY mw.created_at DESC ");
+    }
+
+    if enforce_limits {
+        let offset = page_index * page_size;
+        query_builder.push(format!(" LIMIT {page_size} OFFSET {offset} "));
+    }
+
+    query_builder
+}
+
+
+async fn map_to_weights(dataset:Vec<RawWeightJoinUser>) -> Vec<WeightsJoinUserRecord> {
+    let weights: Vec<WeightsJoinUserRecord> = dataset
+        .into_iter()
+        .map(|dataset: RawWeightJoinUser| {
+            WeightsJoinUserRecord {
+                token: dataset.token,
+                title: dataset.title,
+                weights_type: dataset.weights_type,
+                weights_category: dataset.weights_category,
+                maybe_thumbnail_token: dataset.maybe_thumbnail_token,
+                description_markdown: dataset.description_markdown,
+                description_rendered_html: dataset.description_rendered_html,
+
+                creator_user_token: dataset.creator_user_token,
+                creator_ip_address: dataset.creator_ip_address,
+                creator_set_visibility: dataset.creator_set_visibility,
+
+                maybe_last_update_user_token: dataset.maybe_last_update_user_token,
+                original_download_url: dataset.original_download_url,
+                original_filename: dataset.original_filename,
+                file_size_bytes: dataset.file_size_bytes,
+                file_checksum_sha2: dataset.file_checksum_sha2,
+                public_bucket_hash: dataset.public_bucket_hash,
+                maybe_public_bucket_prefix: dataset.maybe_public_bucket_prefix,
+                maybe_public_bucket_extension: dataset.maybe_public_bucket_extension,
+
+                cached_user_ratings_negative_count: dataset.cached_user_ratings_negative_count,
+                cached_user_ratings_positive_count: dataset.cached_user_ratings_positive_count,
+                cached_user_ratings_total_count: dataset.cached_user_ratings_total_count,
+
+                maybe_cached_user_ratings_ratio: dataset.maybe_cached_user_ratings_ratio,
+                cached_user_ratings_last_updated_at: dataset.cached_user_ratings_last_updated_at,
+                version: dataset.version,
+                created_at: dataset.created_at,
+                updated_at: dataset.updated_at,
+                user_deleted_at: dataset.user_deleted_at,
+                mod_deleted_at: dataset.mod_deleted_at,
+
+                creator_username:dataset.creator_username,
+                creator_display_name:dataset.creator_display_name,
+                creator_email_gravatar_hash:dataset.creator_email_gravatar_hash
+            }
+        }).collect();
+
+        weights
+}
+
+
+  pub struct RawWeightJoinUser {
+    pub token: ModelWeightToken,
+
+    pub weights_type: WeightsType,
+    pub weights_category: WeightsCategory,
+    
+    pub title: String,
+    
+    pub maybe_thumbnail_token: Option<String>,
+    
+    pub description_markdown: String,
+    pub description_rendered_html: String,
+    
+    pub creator_user_token: UserToken,
+    pub creator_ip_address: String,
+    pub creator_set_visibility: Visibility,
+    
+    pub maybe_last_update_user_token: Option<UserToken>,
+    
+    pub original_download_url: Option<String>,
+    pub original_filename: Option<String>,
+    
+    pub file_size_bytes: i32,
+    pub file_checksum_sha2: String,
+    
+    pub public_bucket_hash: String,
+    pub maybe_public_bucket_prefix: Option<String>,
+    pub maybe_public_bucket_extension: Option<String>,
+    
+    pub cached_user_ratings_total_count: u32,
+    pub cached_user_ratings_positive_count: u32,
+    pub cached_user_ratings_negative_count: u32,
+    pub maybe_cached_user_ratings_ratio: Option<f32>,
+    pub cached_user_ratings_last_updated_at: DateTime<Utc>,
+    
+    pub version: i32,
+    
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    
+    pub user_deleted_at: Option<DateTime<Utc>>,
+    pub mod_deleted_at: Option<DateTime<Utc>>,
+    
+    pub creator_username: String,
+    pub creator_display_name: String,
+    pub creator_email_gravatar_hash: String,
+}
+
+impl FromRow<'_, MySqlRow> for RawWeightJoinUser {
+    fn from_row(row: &MySqlRow) -> std::result::Result<Self, sqlx::Error> {
+        Ok(Self {
+            token: row.try_get("token")?,
+            weights_type: row.try_get("weights_type")?,
+            weights_category: row.try_get("weights_category")?,
+            title: row.try_get("title")?,
+            maybe_thumbnail_token: row.try_get("maybe_thumbnail_token")?,
+            description_markdown: row.try_get("description_markdown")?,
+            description_rendered_html: row.try_get("description_rendered_html")?,
+            creator_user_token: row.try_get("creator_user_token")?,
+            creator_ip_address: row.try_get("creator_ip_address")?,
+            creator_set_visibility: Visibility::try_from_mysql_row(row, "creator_set_visibility")?,
+            maybe_last_update_user_token: row.try_get("maybe_last_update_user_token")?,
+            original_download_url: row.try_get("original_download_url")?,
+            original_filename: row.try_get("original_filename")?,
+            file_size_bytes: row.try_get("file_size_bytes")?,
+            file_checksum_sha2: row.try_get("file_checksum_sha2")?,
+            public_bucket_hash: row.try_get("public_bucket_hash")?,
+            maybe_public_bucket_prefix: row.try_get("maybe_public_bucket_prefix")?,
+            maybe_public_bucket_extension: row.try_get("maybe_public_bucket_extension")?,
+            cached_user_ratings_total_count: row.try_get("cached_user_ratings_total_count")?,
+            cached_user_ratings_positive_count: row.try_get("cached_user_ratings_positive_count")?,
+            cached_user_ratings_negative_count: row.try_get("cached_user_ratings_negative_count")?,
+            maybe_cached_user_ratings_ratio: row.try_get("maybe_cached_user_ratings_ratio")?,
+            cached_user_ratings_last_updated_at: row.try_get("cached_user_ratings_last_updated_at")?,
+            version: row.try_get("version")?,
+            created_at: row.try_get("created_at")?,
+            updated_at: row.try_get("updated_at")?,
+            user_deleted_at: row.try_get("user_deleted_at")?,
+            mod_deleted_at: row.try_get("mod_deleted_at")?,
+            creator_username: row.try_get("creator_username")?,
+            creator_display_name: row.try_get("creator_display_name")?,
+            creator_email_gravatar_hash: row.try_get("creator_email_gravatar_hash")?,
+        })
+    }
+}
@@ -2,20 +2,18 @@
 #![forbid(unused_mut)]
 #![forbid(unused_variables)]

-use chrono::{ DateTime, Utc };
-
+use chrono::{DateTime, Utc};
 use sqlx::MySqlPool;

 use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE;
+use enums::by_table::model_weights::{
+    weights_category::WeightsCategory,
+    weights_types::WeightsType,
+};
 use enums::common::visibility::Visibility;
 use errors::AnyhowResult;
-use tokens::tokens::users::UserToken;
 use tokens::tokens::model_weights::ModelWeightToken;
-
-use enums::by_table::model_weights::{
-    weights_types::WeightsType,
-    weights_category::WeightsCategory,
-};
+use tokens::tokens::users::UserToken;

 #[derive(Serialize)]
 pub struct WeightsPage {
@@ -55,10 +53,9 @@ pub struct WeightJoinUser {
    pub file_size_bytes: i32,
    pub file_checksum_sha2: String,

-    pub private_bucket_hash: String,
-
-    pub maybe_private_bucket_prefix: Option<String>,
-    pub maybe_private_bucket_extension: Option<String>,
+    pub public_bucket_hash: String,
+    pub maybe_public_bucket_prefix: Option<String>,
+    pub maybe_public_bucket_extension: Option<String>,

    pub cached_user_ratings_total_count: u32,
    pub cached_user_ratings_positive_count: u32,
@@ -234,9 +231,9 @@ impl ListWeightsQueryBuilder {
                    original_filename: record.original_filename,
                    file_size_bytes: record.file_size_bytes,
                    file_checksum_sha2: record.file_checksum_sha2,
-                    private_bucket_hash: record.private_bucket_hash,
-                    maybe_private_bucket_prefix: record.maybe_private_bucket_prefix,
-                    maybe_private_bucket_extension: record.maybe_private_bucket_extension,
+                    public_bucket_hash: record.public_bucket_hash,
+                    maybe_public_bucket_prefix: record.maybe_public_bucket_prefix,
+                    maybe_public_bucket_extension: record.maybe_public_bucket_extension,
                    cached_user_ratings_total_count: record.cached_user_ratings_total_count,
                    cached_user_ratings_positive_count: record.cached_user_ratings_positive_count,
                    cached_user_ratings_negative_count: record.cached_user_ratings_negative_count,
@@ -282,9 +279,9 @@ impl ListWeightsQueryBuilder {
            model_weights.original_filename,
            model_weights.file_size_bytes,
            model_weights.file_checksum_sha2,
-            model_weights.private_bucket_hash,
-            model_weights.maybe_private_bucket_prefix,
-            model_weights.maybe_private_bucket_extension,
+            model_weights.public_bucket_hash,
+            model_weights.maybe_public_bucket_prefix,
+            model_weights.maybe_public_bucket_extension,
            model_weights.cached_user_ratings_total_count,
            model_weights.cached_user_ratings_positive_count,
            model_weights.cached_user_ratings_negative_count,
@@ -442,10 +439,9 @@ struct RawWeightJoinUser {
    pub file_size_bytes: i32,
    pub file_checksum_sha2: String,

-    pub private_bucket_hash: String,
-
-    pub maybe_private_bucket_prefix: Option<String>,
-    pub maybe_private_bucket_extension: Option<String>,
+    pub public_bucket_hash: String,
+    pub maybe_public_bucket_prefix: Option<String>,
+    pub maybe_public_bucket_extension: Option<String>,

    pub cached_user_ratings_total_count: u32,
    pub cached_user_ratings_positive_count: u32,
@@ -468,12 +464,13 @@ struct RawWeightJoinUser {

 #[cfg(test)]
 mod tests {
-    use crate::queries::model_weights::list_weights_query_builder::ListWeightsQueryBuilder;
    use enums::by_table::model_weights::{
-        weights_types::WeightsType,
        weights_category::WeightsCategory,
+        weights_types::WeightsType,
    };

+    use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder;
+
    #[test]
    fn predicates_without_scoping() {
        let query_builder = ListWeightsQueryBuilder::new();
@@ -1 +1,4 @@
-pub mod list_model_weights_for_voice_conversion;
+pub mod list_model_weights_for_voice_conversion;
+pub mod list_weights_by_tokens;
+pub mod list_weights_by_user;
+pub mod list_weights_query_builder;
@@ -1,276 +0,0 @@
-use chrono::{DateTime, Utc};
-use sqlx::{Acquire, MySqlConnection, MySqlPool};
-
-use enums::by_table::model_weights::{
-  weights_category::WeightsCategory,
-  weights_types::WeightsType,
-};
-use enums::common::visibility::Visibility;
-use errors::AnyhowResult;
-use tokens::tokens::model_weights::ModelWeightToken;
-use tokens::tokens::users::UserToken;
-
-#[derive(Serialize)]
-pub struct WeightsJoinUserRecord {
-    pub token: ModelWeightToken,
-
-    pub weights_type: WeightsType,
-    pub weights_category: WeightsCategory,
-    
-    pub title: String,
-    
-    pub maybe_thumbnail_token: Option<String>,
-    
-    pub description_markdown: String,
-    pub description_rendered_html: String,
-    
-    pub creator_user_token: UserToken,
-    pub creator_ip_address: String,
-    pub creator_set_visibility: Visibility,
-    
-    pub maybe_last_update_user_token: Option<UserToken>,
-    
-    pub original_download_url: Option<String>,
-    pub original_filename: Option<String>,
-    
-    pub file_size_bytes: i32,
-    pub file_checksum_sha2: String,
-    
-    pub private_bucket_hash: String,
-    
-    pub maybe_private_bucket_prefix: Option<String>,
-    pub maybe_private_bucket_extension: Option<String>,
-    
-    pub cached_user_ratings_total_count: u32,
-    pub cached_user_ratings_positive_count: u32,
-    pub cached_user_ratings_negative_count: u32,
-    pub maybe_cached_user_ratings_ratio: Option<f32>,
-    pub cached_user_ratings_last_updated_at: DateTime<Utc>,
-    
-    pub version: i32,
-    
-    pub created_at: DateTime<Utc>,
-    pub updated_at: DateTime<Utc>,
-    
-    pub user_deleted_at: Option<DateTime<Utc>>,
-    pub mod_deleted_at: Option<DateTime<Utc>>,
-    
-    pub creator_username: String,
-    pub creator_display_name: String,
-    pub creator_email_gravatar_hash: String,
-}
-
-pub async fn list_weights_by_creator_username(
-    mysql_pool: &MySqlPool,
-    creator_username: &str,
-    can_see_deleted: bool
-) -> AnyhowResult<Vec<WeightsJoinUserRecord>> {
-    
-    let mut connection = mysql_pool.acquire().await?;
-
-    let raw_weights: Vec<RawWeightJoinUser> = get_raw_weights_by_creator_username(&mut connection, creator_username, can_see_deleted).await?;
-    let weights_records: Vec<WeightsJoinUserRecord> = map_to_weights(raw_weights).await;
-
-    Ok(weights_records)
-}
-
-async fn get_raw_weights_by_creator_username(
-    connection: &mut MySqlConnection,
-    creator_username: &str,
-    can_see_deleted: bool
-) -> AnyhowResult<Vec<RawWeightJoinUser>> {
-
-    let connection = connection.acquire().await?;
-    
-    if can_see_deleted {
-        let raw_weights: Vec<RawWeightJoinUser> = sqlx::query_as!(
-            RawWeightJoinUser,
-            r#"
-            SELECT              
-                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,
-                mw.title,
-                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,
-                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,
-                mw.maybe_thumbnail_token,
-                mw.description_markdown,
-                mw.description_rendered_html,
-                users.token as `creator_user_token: tokens::tokens::users::UserToken`,
-                users.username as creator_username,
-                users.display_name as creator_display_name,
-                users.email_gravatar_hash as creator_email_gravatar_hash,
-                mw.creator_ip_address,
-                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
-                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,
-                mw.original_download_url,
-                mw.original_filename,
-                mw.file_size_bytes,
-                mw.file_checksum_sha2,
-                mw.private_bucket_hash,
-                mw.maybe_private_bucket_prefix,
-                mw.maybe_private_bucket_extension,
-                mw.cached_user_ratings_negative_count,
-                mw.cached_user_ratings_positive_count,
-                mw.cached_user_ratings_total_count,
-                mw.maybe_cached_user_ratings_ratio,
-                mw.cached_user_ratings_last_updated_at,
-                mw.version,
-                mw.created_at,
-                mw.updated_at,
-                mw.user_deleted_at,
-                mw.mod_deleted_at
-            FROM model_weights as mw
-            JOIN users
-                ON users.token = mw.creator_user_token
-            WHERE
-                users.username = ?
-            "#,
-            creator_username).fetch_all(connection)
-        .await?;
-        Ok(raw_weights)
-    } else {
-        let raw_weights: Vec<RawWeightJoinUser> = sqlx::query_as!(
-            RawWeightJoinUser,
-            r#"
-            SELECT
-                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,
-                mw.title,
-                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,
-                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,
-                mw.maybe_thumbnail_token,
-                mw.description_markdown,
-                mw.description_rendered_html,
-                users.token as `creator_user_token: tokens::tokens::users::UserToken`,
-                users.username as creator_username,
-                users.display_name as creator_display_name,
-                users.email_gravatar_hash as creator_email_gravatar_hash,
-                mw.creator_ip_address,
-                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
-                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,
-                mw.original_download_url,
-                mw.original_filename,
-                mw.file_size_bytes,
-                mw.file_checksum_sha2,
-                mw.private_bucket_hash,
-                mw.maybe_private_bucket_prefix,
-                mw.maybe_private_bucket_extension,
-                mw.cached_user_ratings_negative_count,
-                mw.cached_user_ratings_positive_count,
-                mw.cached_user_ratings_total_count,
-                mw.maybe_cached_user_ratings_ratio,
-                mw.cached_user_ratings_last_updated_at,
-                mw.version,
-                mw.created_at,
-                mw.updated_at,
-                mw.user_deleted_at,
-                mw.mod_deleted_at
-            FROM model_weights as mw
-            JOIN users
-                ON users.token = mw.creator_user_token
-            WHERE
-                users.username = ?
-                AND mw.user_deleted_at IS NULL
-                AND mw.mod_deleted_at IS NULL
-            "#,
-            creator_username).fetch_all(connection).await?;
-
-        Ok(raw_weights)
-    }
-}
-
-async fn map_to_weights(dataset:Vec<RawWeightJoinUser>) -> Vec<WeightsJoinUserRecord> {
-    let weights: Vec<WeightsJoinUserRecord> = dataset
-        .into_iter()
-        .map(|dataset: RawWeightJoinUser| {
-            WeightsJoinUserRecord {
-                token: dataset.token,
-                title: dataset.title,
-                weights_type: dataset.weights_type,
-                weights_category: dataset.weights_category,
-                maybe_thumbnail_token: dataset.maybe_thumbnail_token,
-                description_markdown: dataset.description_markdown,
-                description_rendered_html: dataset.description_rendered_html,
-
-                creator_user_token: dataset.creator_user_token,
-                creator_ip_address: dataset.creator_ip_address,
-                creator_set_visibility: dataset.creator_set_visibility,
-
-                maybe_last_update_user_token: dataset.maybe_last_update_user_token,
-                original_download_url: dataset.original_download_url,
-                original_filename: dataset.original_filename,
-                file_size_bytes: dataset.file_size_bytes,
-                file_checksum_sha2: dataset.file_checksum_sha2,
-                private_bucket_hash: dataset.private_bucket_hash,
-                maybe_private_bucket_prefix: dataset.maybe_private_bucket_prefix,
-                maybe_private_bucket_extension: dataset.maybe_private_bucket_extension,
-
-                cached_user_ratings_negative_count: dataset.cached_user_ratings_negative_count,
-                cached_user_ratings_positive_count: dataset.cached_user_ratings_positive_count,
-                cached_user_ratings_total_count: dataset.cached_user_ratings_total_count,
-
-                maybe_cached_user_ratings_ratio: dataset.maybe_cached_user_ratings_ratio,
-                cached_user_ratings_last_updated_at: dataset.cached_user_ratings_last_updated_at,
-                version: dataset.version,
-                created_at: dataset.created_at,
-                updated_at: dataset.updated_at,
-                user_deleted_at: dataset.user_deleted_at,
-                mod_deleted_at: dataset.mod_deleted_at,
-
-                creator_username:dataset.creator_username,
-                creator_display_name:dataset.creator_display_name,
-                creator_email_gravatar_hash:dataset.creator_email_gravatar_hash
-            }
-        }).collect();
-
-        weights
-}
-
-
-  #[derive(Serialize)]
-  pub struct RawWeightJoinUser {
-    pub token: ModelWeightToken,
-
-    pub weights_type: WeightsType,
-    pub weights_category: WeightsCategory,
-    
-    pub title: String,
-    
-    pub maybe_thumbnail_token: Option<String>,
-    
-    pub description_markdown: String,
-    pub description_rendered_html: String,
-    
-    pub creator_user_token: UserToken,
-    pub creator_ip_address: String,
-    pub creator_set_visibility: Visibility,
-    
-    pub maybe_last_update_user_token: Option<UserToken>,
-    
-    pub original_download_url: Option<String>,
-    pub original_filename: Option<String>,
-    
-    pub file_size_bytes: i32,
-    pub file_checksum_sha2: String,
-    
-    pub private_bucket_hash: String,
-    
-    pub maybe_private_bucket_prefix: Option<String>,
-    pub maybe_private_bucket_extension: Option<String>,
-    
-    pub cached_user_ratings_total_count: u32,
-    pub cached_user_ratings_positive_count: u32,
-    pub cached_user_ratings_negative_count: u32,
-    pub maybe_cached_user_ratings_ratio: Option<f32>,
-    pub cached_user_ratings_last_updated_at: DateTime<Utc>,
-    
-    pub version: i32,
-    
-    pub created_at: DateTime<Utc>,
-    pub updated_at: DateTime<Utc>,
-    
-    pub user_deleted_at: Option<DateTime<Utc>>,
-    pub mod_deleted_at: Option<DateTime<Utc>>,
-    
-    pub creator_username: String,
-    pub creator_display_name: String,
-    pub creator_email_gravatar_hash: String,
-}
@@ -1,6 +1,7 @@
 use anyhow::anyhow;
 use sqlx::{MySql, MySqlPool, Transaction};

+use buckets::public::weight_files::bucket_file_path::WeightFileBucketPath;
 use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::by_table::model_weights::weights_types::WeightsType;
 use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
@@ -9,6 +10,11 @@ use tokens::tokens::model_weights::ModelWeightToken;

 use crate::queries::voice_conversion::migration::list_whole_voice_conversion_models_using_cursor::WholeVoiceConversionModelRecord;

+pub struct CopiedFileData {
+  pub bucket_path: WeightFileBucketPath,
+  pub file_sha_hash: String,
+}
+
 /// Migrate `voice_conversion_models` records to `model_weights` + `model_weights_extension_voice_conversion_details` records.
 /// This is designed to be idempotent and re-runnable. Any time we re-run the query, we should get the same result.
 /// This will enable us to perfect the query and get the write flows online and switched over.
@@ -16,17 +22,17 @@ use crate::queries::voice_conversion::migration::list_whole_voice_conversion_mod
 pub async fn upsert_model_weight_from_voice_conversion_model(
  record: &WholeVoiceConversionModelRecord,
  mysql_pool: &MySqlPool,
+  copied_data: &CopiedFileData,
 ) -> AnyhowResult<()> {
-  //let mut connection = mysql_pool.acquire().await?;
+
  let mut transaction = mysql_pool.begin().await?;

  let model_weight_token = create_or_generate_token(record);

-  upsert_model_weights_record(record, &model_weight_token, &mut transaction).await?;
+  upsert_model_weights_record(record, &model_weight_token, copied_data, &mut transaction).await?;
  upsert_model_weights_extension_record(record, &model_weight_token, &mut transaction).await?;

-  // TODO: Don't update source record with new token *unless* we're backfilling the same database.
-  // update_original_record(record, &model_weight_token, &mut transaction).await?;
+  update_original_record(record, &model_weight_token, &mut transaction).await?;

  transaction.commit().await?;

@@ -43,7 +49,8 @@ pub fn create_or_generate_token(record: &WholeVoiceConversionModelRecord) -> Mod
 pub async fn upsert_model_weights_record(
  record: &WholeVoiceConversionModelRecord,
  model_weight_token: &ModelWeightToken,
-  mut transaction: &mut Transaction<'_, MySql>
+  copied_data: &CopiedFileData,
+  mut transaction: &mut Transaction<'_, MySql>,
 ) -> AnyhowResult<()> {

  let weights_type = match record.model_type {
@@ -56,9 +63,8 @@ pub async fn upsert_model_weights_record(

  // NB: Not setting a few fields (for now)
  // maybe_last_update_user_token - seems like bad design
-  // TODO(bt): OBVIOUSLY COPY THE BUCKET FILES !
  // TODO(bt): file checksum
-  // TODO(bt): rename maybe_private_bucket_extension to maybe_private_bucket_suffix (!!!)
+  // TODO(bt): rename maybe_public_bucket_extension to maybe_public_bucket_suffix (!!!)
  // TODO(bt): do we need model_weights.ip_address_last_update without audit logs?
  // TODO(bt): rename creator_ip_address to ip_address_creation (and add ip_address_last_update)
  // TODO(bt): Check model_weights column integer types - signed vs unsigned
@@ -83,11 +89,11 @@ SET
  original_download_url = ?,
  original_filename = ?,
  file_size_bytes = ?,
-  file_checksum_sha2 = "TODO",
+  file_checksum_sha2 = ?,

-  private_bucket_hash = "TODO",
-  maybe_private_bucket_prefix = "TODO",
-  maybe_private_bucket_extension = "TODO",
+  public_bucket_hash = ?,
+  maybe_public_bucket_prefix = ?,
+  maybe_public_bucket_extension = ?,
  cached_user_ratings_total_count = 0,
  cached_user_ratings_positive_count = 0,
  cached_user_ratings_negative_count = 0,
@@ -117,10 +123,10 @@ ON DUPLICATE KEY UPDATE
  original_download_url = ?,
  original_filename = ?,
  file_size_bytes = ?,
-  file_checksum_sha2 = "TODO",
-  private_bucket_hash = "TODO",
-  maybe_private_bucket_prefix = "TODO",
-  maybe_private_bucket_extension = "TODO",
+  file_checksum_sha2 = ?,
+  public_bucket_hash = ?,
+  maybe_public_bucket_prefix = ?,
+  maybe_public_bucket_extension = ?,
  cached_user_ratings_total_count = 0,
  cached_user_ratings_positive_count = 0,
  cached_user_ratings_negative_count = 0,
@@ -147,6 +153,11 @@ ON DUPLICATE KEY UPDATE
    record.original_filename,
    record.file_size_bytes,

+    copied_data.file_sha_hash,
+    copied_data.bucket_path.get_object_hash(),
+    copied_data.bucket_path.get_optional_prefix(),
+    copied_data.bucket_path.get_optional_extension(),
+
    record.token.as_str(),
    record.version,
    record.created_at,
@@ -166,6 +177,12 @@ ON DUPLICATE KEY UPDATE
    record.original_download_url,
    record.original_filename,
    record.file_size_bytes,
+
+    copied_data.file_sha_hash,
+    copied_data.bucket_path.get_object_hash(),
+    copied_data.bucket_path.get_optional_prefix(),
+    copied_data.bucket_path.get_optional_extension(),
+
    record.token.as_str(),
    record.version,
    record.created_at,
@@ -208,6 +225,18 @@ pub async fn update_original_record(
  model_weight_token: &ModelWeightToken,
  transaction: &mut Transaction<'_, MySql>
 ) -> AnyhowResult<()> {
+  let query = sqlx::query!(
+        r#"
+UPDATE voice_conversion_models
+SET
+  maybe_migration_new_model_weights_token = ?
+WHERE token = ?
+        "#,
+      model_weight_token,
+      record.token,
+    );
+
+  let _r = query.execute(&mut **transaction).await?;

  Ok(())
 }
@@ -1,13 +1,9 @@
 pub mod create;
-pub mod create_weight;
 pub mod delete_weights;
+pub mod edit;
 pub mod get_weight;
 pub mod inference;
 pub mod list;
-pub mod list_weights_by_tokens;
-pub mod list_weights_by_user;
-pub mod list_weights_query_builder;
 pub mod migration;
 pub mod model_weight_info_lite;
 pub mod tests;
-pub mod update_weight;
@@ -19,9 +19,9 @@ CREATE TABLE model_weights (
  original_filename VARCHAR(255) DEFAULT NULL,
  file_size_bytes INT(10) NOT NULL DEFAULT 0,
  file_checksum_sha2 CHAR(64) NOT NULL,
-  private_bucket_hash  VARCHAR(32) NOT NULL,
-  maybe_private_bucket_prefix VARCHAR(16) DEFAULT NULL,
-  maybe_private_bucket_extension VARCHAR(16) DEFAULT NULL,
+  public_bucket_hash  VARCHAR(32) NOT NULL,
+  maybe_public_bucket_prefix VARCHAR(16) DEFAULT NULL,
+  maybe_public_bucket_extension VARCHAR(16) DEFAULT NULL,
  cached_user_ratings_total_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
  cached_user_ratings_positive_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
  cached_user_ratings_negative_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
@@ -3,8 +3,8 @@ mod tests {
    use anyhow::Ok;
    use rand::Rng;
    use serial_test::serial;
-    use sqlx::MySqlPool;
    use sqlx::mysql::MySqlPoolOptions;
+    use sqlx::MySqlPool;
    use tokio;

    use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
@@ -17,8 +17,8 @@ mod tests {
    use enums::common::visibility::Visibility;
    use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken};

-    use crate::queries::model_weights::create_weight::create_weight;
-    use crate::queries::model_weights::create_weight::CreateModelWeightsArgs;
+    use crate::queries::model_weights::create::create_weight::create_weight;
+    use crate::queries::model_weights::create::create_weight::CreateModelWeightsArgs;
    use crate::queries::model_weights::delete_weights::{
        delete_weights_as_mod,
        delete_weights_as_user,
@@ -26,8 +26,8 @@ mod tests {
        undelete_weights_as_user,
    };
    use crate::queries::model_weights::get_weight::get_weight_by_token;
-    use crate::queries::model_weights::list_weights_by_user::list_weights_by_creator_username;
-    use crate::queries::model_weights::list_weights_query_builder::ListWeightsQueryBuilder;
+    use crate::queries::model_weights::list::list_weights_by_user::{list_weights_by_creator_username, ListWeightsForUserArgs};
+    use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder;
    use crate::queries::users::user::get_user_token_by_username::get_user_token_by_username;

    async fn setup() -> sqlx::Pool<sqlx::MySql> {
@@ -76,9 +76,9 @@ mod tests {
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1024,
            file_checksum_sha2: "checksum1".to_string(),
-            private_bucket_hash: "bucket_hash1".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("rvc".to_string()),
+            public_bucket_hash: "bucket_hash1".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("rvc".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -112,9 +112,9 @@ mod tests {
        assert_eq!(result.original_filename, Some("filename1.txt".to_string()));
        assert_eq!(result.file_size_bytes, 1024);
        assert_eq!(result.file_checksum_sha2, "checksum1".to_string());
-        assert_eq!(result.private_bucket_hash, "bucket_hash1".to_string());
-        assert_eq!(result.maybe_private_bucket_prefix, Some("_fake".to_string()));
-        assert_eq!(result.maybe_private_bucket_extension, Some("rvc".to_string()));
+        assert_eq!(result.public_bucket_hash, "bucket_hash1".to_string());
+        assert_eq!(result.maybe_public_bucket_prefix, Some("_fake".to_string()));
+        assert_eq!(result.maybe_public_bucket_extension, Some("rvc".to_string()));
        assert_eq!(result.cached_user_ratings_total_count, 10);
        assert_eq!(result.cached_user_ratings_positive_count, 9);
        assert_eq!(result.cached_user_ratings_negative_count, 1);
@@ -151,9 +151,9 @@ mod tests {
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1024,
            file_checksum_sha2: "checksum1".to_string(),
-            private_bucket_hash: "bucket_hash1".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("rvc".to_string()),
+            public_bucket_hash: "bucket_hash1".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("rvc".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -228,9 +228,9 @@ mod tests {
            original_filename: Some("filename1.txt".to_string()),
            file_size_bytes: 1024,
            file_checksum_sha2: "checksum1".to_string(),
-            private_bucket_hash: "bucket_hash1".to_string(),
-            maybe_private_bucket_prefix: Some("_fake".to_string()),
-            maybe_private_bucket_extension: Some("rvc".to_string()),
+            public_bucket_hash: "bucket_hash1".to_string(),
+            maybe_public_bucket_prefix: Some("_fake".to_string()),
+            maybe_public_bucket_extension: Some("rvc".to_string()),
            cached_user_ratings_total_count: 10,
            cached_user_ratings_positive_count: 9,
            cached_user_ratings_negative_count: 1,
@@ -290,16 +290,19 @@ mod tests {
            &creator_username
        ).await?;

-        let weights_by_username = list_weights_by_creator_username(
-            &pool,
-            &creator_username,
-            can_see_deleted
-        ).await?;
-        for weight in weights_by_username.iter() {
+        let weights_by_username = list_weights_by_creator_username(ListWeightsForUserArgs {
+            creator_username: &creator_username,
+            page_size: 0,
+            page_index: 0,
+            sort_ascending: false,
+            can_see_deleted,
+            mysql_pool: &pool,
+        }).await?;
+        for weight in weights_by_username.records.iter() {
            // print weight
            println!("weight: {:?}", weight.creator_username);
        }
-        assert_eq!(weights_by_username.len(), 5);
+        assert_eq!(weights_by_username.records.len(), 5);

        Ok(())
    }
@@ -340,9 +343,9 @@ mod tests {
                original_filename: Some(format!("filename {}.txt", i)),
                file_size_bytes: 1024,
                file_checksum_sha2: format!("checksum{}", i),
-                private_bucket_hash: format!("bucket_hash{}", i),
-                maybe_private_bucket_prefix: Some("_fake".to_string()),
-                maybe_private_bucket_extension: Some("rvc".to_string()),
+                public_bucket_hash: format!("bucket_hash{}", i),
+                maybe_public_bucket_prefix: Some("_fake".to_string()),
+                maybe_public_bucket_extension: Some("rvc".to_string()),
                cached_user_ratings_total_count: 10,
                cached_user_ratings_positive_count: 9,
                cached_user_ratings_negative_count: 1,
@@ -583,9 +586,9 @@ mod tests {
                original_filename: Some(format!("filename {}.txt", i)),
                file_size_bytes: 1024,
                file_checksum_sha2: format!("checksum{}", i),
-                private_bucket_hash: format!("bucket_hash{}", i),
-                maybe_private_bucket_prefix: Some("_fake".to_string()),
-                maybe_private_bucket_extension: Some("rvc".to_string()),
+                public_bucket_hash: format!("bucket_hash{}", i),
+                maybe_public_bucket_prefix: Some("_fake".to_string()),
+                maybe_public_bucket_extension: Some("rvc".to_string()),
                cached_user_ratings_total_count: 10,
                cached_user_ratings_positive_count: 9,
                cached_user_ratings_negative_count: 1,
@@ -0,0 +1,339 @@
+use anyhow::anyhow;
+use chrono::{DateTime, Utc};
+use log::warn;
+use sqlx::{MySql, MySqlPool};
+use sqlx::pool::PoolConnection;
+
+use enums::by_table::tts_models::tts_model_type::TtsModelType;
+use enums::common::visibility::Visibility;
+use errors::AnyhowResult;
+use tokens::tokens::model_weights::ModelWeightToken;
+use tokens::tokens::tts_models::TtsModelToken;
+use tokens::tokens::users::UserToken;
+use tokens::tokens::vocoder_models::VocoderModelToken;
+
+use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool};
+
+/// This is meant to be the entire table
+#[derive(Debug)]
+pub struct WholeTtsModelRecord {
+  pub id: i64,
+  pub token: TtsModelToken,
+
+  pub tts_model_type: TtsModelType,
+  pub text_pipeline_type: Option<String>,
+
+  pub has_self_contained_vocoder: bool,
+  pub has_self_contained_duration_model: bool,
+  pub has_self_contained_pitch_model: bool,
+
+  pub text_preprocessing_algorithm: Option<String>,
+
+  pub use_default_mel_multiply_factor: bool,
+  pub maybe_custom_mel_multiply_factor: Option<f64>,
+
+  pub maybe_default_pretrained_vocoder: Option<String>,
+  pub maybe_custom_vocoder_token: Option<VocoderModelToken>,
+
+  pub ietf_language_tag: String,
+  pub ietf_primary_language_subtag: String,
+
+  pub title: String,
+  pub description_markdown: String,
+  pub description_rendered_html: String,
+
+  pub voice_name: Option<String>,
+  pub actor_name: Option<String>,
+  pub characteristic: Option<String>,
+  pub version_string: Option<String>,
+
+  pub is_front_page_featured: bool,
+  pub is_twitch_featured: bool,
+
+  pub maybe_suggested_unique_bot_command: Option<String>,
+
+  pub original_download_url: Option<String>,
+  pub original_filename: Option<String>,
+  pub file_size_bytes: i32,
+
+  pub creator_user_token: UserToken,
+
+  pub creator_ip_address_creation: String,
+  pub creator_ip_address_last_update: String,
+
+  pub creator_set_visibility: Visibility,
+
+  pub private_bucket_hash: String,
+  pub private_bucket_object_name: String,
+
+  pub private_bucket_object_is_archive: bool,
+
+  pub user_ratings_total_count: u32,
+  pub user_ratings_positive_count: u32,
+  pub user_ratings_negative_count: u32,
+
+  pub is_public_listing_approved: Option<bool>,
+  pub is_locked_from_user_modification: bool,
+  pub is_locked_from_use: bool,
+
+  pub maybe_mod_comments: Option<String>,
+  pub maybe_mod_user_token: Option<UserToken>,
+
+  pub maybe_migration_new_model_weights_token: Option<ModelWeightToken>,
+
+  pub version: i32,
+
+  pub created_at: DateTime<Utc>,
+  pub updated_at: DateTime<Utc>,
+
+  pub user_deleted_at: Option<DateTime<Utc>>,
+  pub mod_deleted_at: Option<DateTime<Utc>>,
+}
+
+pub async fn list_whole_tts_models_using_cursor(
+  mysql_pool: &MySqlPool,
+  page_size: u64,
+  cursor: u64,
+) -> AnyhowResult<Vec<WholeTtsModelRecord>> {
+  let mut connection = mysql_pool.acquire().await?;
+
+  let maybe_models
+      = list_whole_voice_conversion_models(&mut connection, page_size, cursor)
+        .await;
+
+  let models : Vec<RawRecord> = match maybe_models {
+    Ok(models) => models,
+    Err(err) => {
+      match err {
+        RowNotFound => {
+          return Ok(Vec::new());
+        },
+        _ => {
+          warn!("vc model list query error: {:?}", err);
+          return Err(anyhow!("vc model list query error"));
+        }
+      }
+    }
+  };
+
+  Ok(models.into_iter()
+    .map(|model| {
+      WholeTtsModelRecord {
+        id: model.id,
+        token: model.token,
+        tts_model_type: model.tts_model_type,
+        text_pipeline_type: model.text_pipeline_type,
+        has_self_contained_vocoder: i8_to_bool(model.has_self_contained_vocoder),
+        has_self_contained_duration_model: i8_to_bool(model.has_self_contained_duration_model),
+        has_self_contained_pitch_model: i8_to_bool(model.has_self_contained_pitch_model),
+        text_preprocessing_algorithm: model.text_preprocessing_algorithm,
+        use_default_mel_multiply_factor: i8_to_bool(model.use_default_mel_multiply_factor),
+        maybe_custom_mel_multiply_factor: model.maybe_custom_mel_multiply_factor,
+        maybe_default_pretrained_vocoder: model.maybe_default_pretrained_vocoder,
+        title: model.title,
+        description_markdown: model.description_markdown,
+        description_rendered_html: model.description_rendered_html,
+        voice_name: model.voice_name,
+        actor_name: model.actor_name,
+        characteristic: model.characteristic,
+        ietf_language_tag: model.ietf_language_tag,
+        ietf_primary_language_subtag: model.ietf_primary_language_subtag,
+        is_front_page_featured: i8_to_bool(model.is_front_page_featured),
+        is_twitch_featured: i8_to_bool(model.is_twitch_featured),
+        maybe_suggested_unique_bot_command: model.maybe_suggested_unique_bot_command,
+        original_download_url: model.original_download_url,
+        original_filename: model.original_filename,
+        file_size_bytes: model.file_size_bytes,
+        creator_user_token: model.creator_user_token,
+        creator_ip_address_creation: model.creator_ip_address_creation,
+        creator_ip_address_last_update: model.creator_ip_address_last_update,
+        creator_set_visibility: model.creator_set_visibility,
+        private_bucket_hash: model.private_bucket_hash,
+        private_bucket_object_name: model.private_bucket_object_name,
+        private_bucket_object_is_archive: i8_to_bool(model.private_bucket_object_is_archive),
+        user_ratings_total_count: model.user_ratings_total_count,
+        user_ratings_positive_count: model.user_ratings_positive_count,
+        user_ratings_negative_count: model.user_ratings_negative_count,
+        is_public_listing_approved: nullable_i8_to_optional_bool(model.is_public_listing_approved),
+        is_locked_from_user_modification: i8_to_bool(model.is_locked_from_user_modification),
+        is_locked_from_use: i8_to_bool(model.is_locked_from_use),
+        maybe_mod_comments: model.maybe_mod_comments,
+        maybe_mod_user_token: model.maybe_mod_user_token,
+        maybe_migration_new_model_weights_token: model.maybe_migration_new_model_weights_token,
+        version: model.version,
+        created_at: model.created_at,
+        updated_at: model.updated_at,
+        user_deleted_at: model.user_deleted_at,
+        mod_deleted_at: model.mod_deleted_at,
+        maybe_custom_vocoder_token: model.maybe_custom_vocoder_token,
+        version_string: model.version_string
+      }
+    })
+    .collect::<Vec<WholeTtsModelRecord>>())
+}
+
+async fn list_whole_voice_conversion_models(
+  mysql_connection: &mut PoolConnection<MySql>,
+  page_size: u64,
+  cursor: u64,
+) -> AnyhowResult<Vec<RawRecord>> {
+  Ok(sqlx::query_as!(
+      RawRecord,
+        r#"
+SELECT
+    id,
+    token as `token: tokens::tokens::tts_models::TtsModelToken`,
+
+    tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,
+
+    text_pipeline_type,
+    has_self_contained_vocoder,
+    has_self_contained_duration_model,
+    has_self_contained_pitch_model,
+    text_preprocessing_algorithm,
+
+    use_default_mel_multiply_factor,
+    maybe_custom_mel_multiply_factor,
+    maybe_default_pretrained_vocoder,
+    maybe_custom_vocoder_token as `maybe_custom_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,
+
+    ietf_language_tag,
+    ietf_primary_language_subtag,
+
+    title,
+    description_markdown,
+    description_rendered_html,
+
+    voice_name,
+    actor_name,
+    characteristic,
+    version_string,
+
+    is_front_page_featured,
+    is_twitch_featured,
+
+    maybe_suggested_unique_bot_command,
+
+    original_download_url,
+    original_filename,
+    file_size_bytes,
+
+    creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,
+
+    creator_ip_address_creation,
+    creator_ip_address_last_update,
+
+    creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
+
+    private_bucket_hash,
+    private_bucket_object_name,
+
+    private_bucket_object_is_archive,
+
+    user_ratings_total_count,
+    user_ratings_positive_count,
+    user_ratings_negative_count,
+
+    is_public_listing_approved,
+    is_locked_from_user_modification,
+    is_locked_from_use,
+
+    maybe_mod_comments,
+    maybe_mod_user_token as `maybe_mod_user_token: tokens::tokens::users::UserToken`,
+
+    maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,
+
+    version,
+
+    created_at,
+    updated_at,
+
+    user_deleted_at,
+    mod_deleted_at
+
+FROM tts_models
+WHERE
+  id > ?
+ORDER BY id ASC
+LIMIT ?
+        "#,
+      cursor,
+      page_size
+  )
+      .fetch_all(&mut **mysql_connection)
+      .await?)
+}
+
+struct RawRecord {
+  pub id: i64,
+  pub token: TtsModelToken,
+
+  pub tts_model_type: TtsModelType,
+  pub text_pipeline_type: Option<String>,
+
+  pub has_self_contained_vocoder: i8, // bool
+  pub has_self_contained_duration_model: i8, // bool
+  pub has_self_contained_pitch_model: i8, // bool
+
+  pub text_preprocessing_algorithm: Option<String>,
+
+  pub use_default_mel_multiply_factor: i8, // bool
+  pub maybe_custom_mel_multiply_factor: Option<f64>,
+
+  pub maybe_default_pretrained_vocoder: Option<String>,
+  pub maybe_custom_vocoder_token: Option<VocoderModelToken>,
+
+  pub ietf_language_tag: String,
+  pub ietf_primary_language_subtag: String,
+
+  pub title: String,
+  pub description_markdown: String,
+  pub description_rendered_html: String,
+
+  pub voice_name: Option<String>,
+  pub actor_name: Option<String>,
+  pub characteristic: Option<String>,
+  pub version_string: Option<String>,
+
+  pub is_front_page_featured: i8, // bool
+  pub is_twitch_featured: i8, // bool
+
+  pub maybe_suggested_unique_bot_command: Option<String>,
+
+  pub original_download_url: Option<String>,
+  pub original_filename: Option<String>,
+  pub file_size_bytes: i32,
+
+  pub creator_user_token: UserToken,
+
+  pub creator_ip_address_creation: String,
+  pub creator_ip_address_last_update: String,
+
+  pub creator_set_visibility: Visibility,
+
+  pub private_bucket_hash: String,
+  pub private_bucket_object_name: String,
+
+  pub private_bucket_object_is_archive: i8, // bool
+
+  pub user_ratings_total_count: u32,
+  pub user_ratings_positive_count: u32,
+  pub user_ratings_negative_count: u32,
+
+  pub is_public_listing_approved: Option<i8>, // bool
+  pub is_locked_from_user_modification: i8, // bool
+  pub is_locked_from_use: i8, // bool
+
+  pub maybe_mod_comments: Option<String>,
+  pub maybe_mod_user_token: Option<UserToken>,
+
+  pub maybe_migration_new_model_weights_token: Option<ModelWeightToken>,
+
+  pub version: i32,
+
+  pub created_at: DateTime<Utc>,
+  pub updated_at: DateTime<Utc>,
+
+  pub user_deleted_at: Option<DateTime<Utc>>,
+  pub mod_deleted_at: Option<DateTime<Utc>>,
+}
@@ -0,0 +1 @@
+pub mod list_whole_tts_models_using_cursor;
@@ -9,3 +9,4 @@ pub mod get_tts_model_for_inference_improved;
 pub mod insert_tts_model_from_download_job;
 pub mod list_all_tts_model_tokens;
 pub mod list_tts_models;
+pub mod migration;
@@ -16,6 +16,7 @@ path = "src/main.rs"

 # Internal
 bootstrap = { path = "../../../lib/bootstrap" }
+buckets = { path = "../../../_types/buckets" }
 cloud_storage = { path = "../../../lib/api_clients/cloud_storage" }
 concurrency = { path = "../../../lib/concurrency" }
 config = { path = "../../../lib/deprecated/config" }
@@ -33,7 +33,9 @@ pub struct JobState {

  pub redis_pool: r2d2::Pool<RedisConnectionManager>,

-  pub bucket_client: BucketClient,
+  pub public_bucket_client: BucketClient,
+  pub private_bucket_client: BucketClient,
+
  pub firehose_publisher: FirehosePublisher,
  pub badge_granter: BadgeGranter,

@@ -85,7 +85,7 @@ pub async fn process_tacotron_model<'a, 'b>(

  // TODO(bt,2023-11-27): This method of uploading model files is super deprecated.
  //  Try to standardize on something resembling media_files going forward.
-  if let Err(e) = job_state.bucket_client.upload_filename(&model_bucket_path, &file_path).await {
+  if let Err(e) = job_state.private_bucket_client.upload_filename(&model_bucket_path, &file_path).await {
    safe_delete_temp_file(&output_metadata_fs_path);
    safe_delete_temp_file(&file_path);
    safe_delete_temp_directory(&temp_dir);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Chung	30127e19e9	Fixed added weights type by request.	2023-12-23 23:25:43 -05:00
Michael Chung	c50a2b36aa	Add missing data in response get weight endpoint to have updated_at (the list weight has but the single weight doesnt) profile weight list endpoint weights_category is missing from the response, i need it for rendering the cards by what type of weight it is.	2023-12-23 14:46:45 -05:00
ArEnSc	49796c69e3	Merge pull request #239 from storytold/feature/weights_files Feature/weights files	2023-12-21 20:51:39 -05:00
ArEnSc	08f59a1989	Update .env	2023-12-21 19:53:07 -05:00
Michael Chung	15c218286f	Bucket Orchestration work complete.	2023-12-21 19:51:32 -05:00
Brandon Thomas	268346f662	delete more easily	2023-12-21 19:40:33 -05:00
Brandon Thomas	7897ef730e	refactor, fix tests	2023-12-21 19:04:56 -05:00
Brandon Thomas	43da5c91ad	fix compile error	2023-12-21 18:47:28 -05:00
Brandon Thomas	71360879f3	cleanup	2023-12-21 18:43:18 -05:00
ArEnSc	7f80e106bd	Merge pull request #238 from storytold/dec-21-mithoo use public pagination for profile weights list endpoint	2023-12-21 14:30:17 -05:00
Kasisnu	58181b32cf	use public pagination for profile weights list endpoint	2023-12-22 00:45:24 +05:30
Michael Chung	0efe2d8177	Working Tests	2023-12-21 12:38:04 -05:00
ArEnSc	62c5d86584	Merge pull request #237 from storytold/dec-21-mithoo Document user bookmarks endpoints	2023-12-21 12:34:48 -05:00
Brooks Palin	cbb950cb40	Update general_setup.md Fixed path for for storyteller-web	2023-12-21 10:30:36 -07:00
Kasisnu	64be9e49af	Document user bookmarks endpoints	2023-12-21 19:52:44 +05:30
Brandon Thomas	bd688703df	Merge pull request #236 from storytold/brandon-creator-details add creator details	2023-12-21 04:29:36 -05:00
Brandon Thomas	c627c13e2d	add creator details	2023-12-21 04:28:55 -05:00
Brandon Thomas	84104d91ac	Merge pull request #235 from storytold/brandon-model-weight-avatars model weight avatars	2023-12-21 04:13:58 -05:00
Brandon Thomas	64806135c5	model weight avatars	2023-12-21 04:13:44 -05:00
Brandon Thomas	5e48a6193a	reorganize modules	2023-12-21 02:57:00 -05:00
Brandon Thomas	11c17f0a1d	fix lints	2023-12-21 02:37:29 -05:00
Michael Chung	ed97cdbb0d	Ok builds again going to run unit tests.	2023-12-21 02:25:20 -05:00
Brandon Thomas	cd91a25c3d	Merge pull request #219 from storytold/dec-18-mithoo document media files list endpoints, fix public page offset bug	2023-12-21 02:11:19 -05:00
Kasisnu	c52d197717	sort user media file results by creation date	2023-12-21 12:35:44 +05:30
kasisnu	79d64c51ad	fix bug with page offsets for public pagination	2023-12-21 12:35:44 +05:30
kasisnu	3e8d7be00e	add remaining media files endpoints to openapispec	2023-12-21 12:35:42 +05:30
kasisnu	3a5b765e51	send favorite/comment counts with media file list endpoint	2023-12-21 12:33:04 +05:30
Brandon Thomas	6df4804e2a	Merge pull request #228 from storytold/dec-19-mithoo fail voice conversion jobs after model deleted	2023-12-21 02:02:17 -05:00
Michael Chung	6b2d4ffdce	Adding the mocks	2023-12-21 01:58:43 -05:00
Brandon Thomas	e6ac364622	Merge pull request #234 from storytold/brandon-rename-model-weights-bucket-fields rename model_weights bucket fields: private -> public	2023-12-21 01:31:28 -05:00
Brandon Thomas	0cff684e97	rename model_weights bucket fields: private -> public	2023-12-21 01:30:10 -05:00
Michael Chung	86c80fdf19	Things build again editor works well.	2023-12-21 01:01:35 -05:00
Michael Chung	eca8b01f14	Missed 1 file.	2023-12-21 00:42:22 -05:00
Michael Chung	1bddb21e9f	Missed 1 file.	2023-12-21 00:41:26 -05:00
Michael Chung	20b950794c	Ok it builds need to test it using a mock.	2023-12-21 00:40:17 -05:00
Brandon Thomas	d698168f9e	Merge pull request #233 from storytold/brandon-upload-media-file media file upload	2023-12-21 00:40:02 -05:00
Brandon Thomas	dd41c268e4	media file upload	2023-12-21 00:38:04 -05:00
Brandon Thomas	d5280964bc	Merge pull request #232 from storytold/brandon-fix-download-job-and-api Fix download-job; fix Victor's API issue	2023-12-20 21:38:48 -05:00
Brandon Thomas	c715d6795c	Fix download-job; fix Victor's API issue	2023-12-20 21:37:48 -05:00
Brandon Thomas	4159191d68	Merge pull request #231 from storytold/brandon-tts-migration work on tts model migration	2023-12-20 18:18:14 -05:00
Brandon Thomas	5e04cc6c2f	work on tts model migration	2023-12-20 18:15:05 -05:00
Michael Chung	0d58176f0f	Minor bug fixes then testing.	2023-12-20 02:23:45 -05:00
Michael Chung	57f383612f	Now testing time!	2023-12-20 02:20:44 -05:00
Michael Chung	ab3a312898	Ok so it actually compiles right now.	2023-12-20 00:13:02 -05:00
Michael Chung	a2aa71e8a6	builds properly now working on the download aspect.	2023-12-19 23:25:18 -05:00
Brandon Thomas	c49ec5af2f	Merge pull request #230 from storytold/brandon-run-rvc-svc-migration migration cleanup	2023-12-19 23:23:20 -05:00
Brandon Thomas	44d75baeec	update old record with token	2023-12-19 22:26:04 -05:00
Brandon Thomas	922e76eeb1	migration fix wip	2023-12-19 21:53:04 -05:00
Brandon Thomas	3b2f386cdb	Merge pull request #229 from storytold/brandon-paths-fix fix/cleanup some paths, fix tests	2023-12-19 20:44:35 -05:00
Brandon Thomas	61f30618b0	fix/cleanup some paths, fix tests	2023-12-19 20:43:27 -05:00
Michael Chung	3e02d791af	Merge branch 'master' into feature/weights_files	2023-12-19 17:44:39 -05:00
Michael Chung	70694ce330	Need to replace the hashing function with a new one and merge master.	2023-12-19 17:43:24 -05:00
Brandon Thomas	5093621995	Merge pull request #227 from storytold/brandon-migration-fixes migration fixes (tested locally)	2023-12-19 05:53:43 -05:00
Brandon Thomas	44056ee956	revert testing changes, re-codegen	2023-12-19 05:51:59 -05:00
Brandon Thomas	70e4af2b4c	fix rvc index	2023-12-19 05:36:29 -05:00
Brandon Thomas	fd28585e13	download to new public buckets for weights	2023-12-19 05:30:15 -05:00
Brandon Thomas	0e8aefce5c	download job should also save sha	2023-12-19 04:53:49 -05:00
Brandon Thomas	0549e8eb6a	migrate shasum	2023-12-19 04:48:02 -05:00
Brandon Thomas	0c35dc5068	fix inference job bucket client choice	2023-12-19 04:15:34 -05:00
Brandon Thomas	987d983051	download / upload models	2023-12-19 03:53:42 -05:00
Brandon Thomas	0144c969bc	DO NOT MERGE - migration fixes Don't land the LEFT OUTER JOIN to users !!!!!! !!!!! !!!!	2023-12-19 03:10:26 -05:00
Michael Chung	775d867add	Ok fixed compilation issues.	2023-12-19 03:05:39 -05:00
Michael Chung	da62443522	Fixed some issues using a box	2023-12-19 02:48:41 -05:00
Michael Chung	1ae2df8fa7	working on the file manager for uploads and downloads	2023-12-19 02:40:42 -05:00
Michael Chung	2e6d7d96e4	Merge branch 'master' into feature/weights_files	2023-12-18 21:18:01 -05:00
Michael Chung	39bae02259	Merge branch 'feature/weights_files' of https://github.com/storytold/storyteller-rust into feature/weights_files	2023-12-18 09:26:42 -05:00
Michael Chung	7755a5683b	Working on file descriptors though gotta learn some rust things, quickly for boiler plate.	2023-12-18 09:26:12 -05:00
				`@@ -0,0 +1 @@`
				`pub mod list_whole_tts_models_using_cursor;`