diff --git a/.sqlx/query-2a8ac5f5cf9d955f154ef9369eff4aff39656262147e97f3e8d8eb59497fcbd5.json b/.sqlx/query-2a8ac5f5cf9d955f154ef9369eff4aff39656262147e97f3e8d8eb59497fcbd5.json deleted file mode 100644 index 0f64b66b1e..0000000000 --- a/.sqlx/query-2a8ac5f5cf9d955f154ef9369eff4aff39656262147e97f3e8d8eb59497fcbd5.json +++ /dev/null @@ -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" -} diff --git a/.sqlx/query-4f36ec7baa9fa98cca25b5cc11f09d0eaaa2dd5797374b4c1aa103999e8e1542.json b/.sqlx/query-4f36ec7baa9fa98cca25b5cc11f09d0eaaa2dd5797374b4c1aa103999e8e1542.json new file mode 100644 index 0000000000..8d9012e798 --- /dev/null +++ b/.sqlx/query-4f36ec7baa9fa98cca25b5cc11f09d0eaaa2dd5797374b4c1aa103999e8e1542.json @@ -0,0 +1,12 @@ +{ + "db_name": "MySQL", + "query": "\nINSERT INTO model_weights\nSET\n token = ?,\n weights_type = ?,\n weights_category = ?,\n title = ?,\n maybe_thumbnail_token = NULL,\n maybe_avatar_media_file_token = NULL,\n maybe_cover_media_file_token = NULL,\n description_markdown = ?,\n description_rendered_html = ?,\n creator_user_token = ?,\n creator_ip_address = ?,\n\n creator_set_visibility = ?,\n maybe_last_update_user_token = NULL,\n original_download_url = ?,\n original_filename = ?,\n file_size_bytes = ?,\n file_checksum_sha2 = ?,\n\n private_bucket_hash = ?,\n maybe_private_bucket_prefix = ?,\n maybe_private_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 private_bucket_hash = ?,\n maybe_private_bucket_prefix = ?,\n maybe_private_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": "4f36ec7baa9fa98cca25b5cc11f09d0eaaa2dd5797374b4c1aa103999e8e1542" +} diff --git a/.sqlx/query-685839dd0d875409fc1f3262e234518760c3d5b10c46fb8daf96756746c01c81.json b/.sqlx/query-685839dd0d875409fc1f3262e234518760c3d5b10c46fb8daf96756746c01c81.json new file mode 100644 index 0000000000..0ddaa54cff --- /dev/null +++ b/.sqlx/query-685839dd0d875409fc1f3262e234518760c3d5b10c46fb8daf96756746c01c81.json @@ -0,0 +1,12 @@ +{ + "db_name": "MySQL", + "query": "\nINSERT INTO model_weights\nSET\n token = ?,\n weights_type = ?,\n weights_category = ?,\n title = ?,\n\n maybe_thumbnail_token = NULL,\n maybe_avatar_media_file_token = NULL,\n maybe_cover_media_file_token = NULL,\n description_markdown = NULL,\n description_rendered_html = NULL,\n\n maybe_last_update_user_token = NULL,\n original_download_url = ?,\n original_filename = ?,\n file_size_bytes = ?,\n file_checksum_sha2 = ?,\n\n creator_user_token = ?,\n creator_ip_address = ?,\n creator_set_visibility = ?,\n\n 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": 15 + }, + "nullable": [] + }, + "hash": "685839dd0d875409fc1f3262e234518760c3d5b10c46fb8daf96756746c01c81" +} diff --git a/.sqlx/query-fbcaa705fac9d2262a8b3ac337e30d899c8704a55999866d4cd2bce561a40065.json b/.sqlx/query-fbcaa705fac9d2262a8b3ac337e30d899c8704a55999866d4cd2bce561a40065.json deleted file mode 100644 index 76ac258cc9..0000000000 --- a/.sqlx/query-fbcaa705fac9d2262a8b3ac337e30d899c8704a55999866d4cd2bce561a40065.json +++ /dev/null @@ -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" -} diff --git a/crates/lib/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs b/crates/lib/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs index 3c6523f802..03ce303239 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs @@ -51,10 +51,10 @@ pub async fn list_model_weights_for_voice_conversion( ModelWeightForVoiceConversion { token: model.token, weight_type: model.weight_type, - creator_user_token: model.creator_user_token.unwrap_or(UserToken::new_from_str("TODO")), - creator_username: model.creator_username.unwrap_or("TODO".to_string()), - creator_display_name: model.creator_display_name.unwrap_or("TODO".to_string()), - creator_gravatar_hash: model.creator_gravatar_hash.unwrap_or("TODO".to_string()), + creator_user_token: model.creator_user_token, + creator_username: model.creator_username, + creator_display_name: model.creator_display_name, + creator_gravatar_hash: model.creator_gravatar_hash, title: model.title, ietf_language_tag: model.ietf_language_tag.unwrap_or("en".to_string()), ietf_primary_language_subtag: model.ietf_primary_language_subtag.unwrap_or("en".to_string()), @@ -89,7 +89,7 @@ SELECT FROM model_weights as w LEFT OUTER JOIN model_weights_extension_voice_conversion_details as w_extension ON w_extension.model_weights_token = w.token -LEFT OUTER JOIN users +JOIN users ON users.token = w.creator_user_token WHERE w.weights_type IN ("rvc_v2", "so_vits_svc") @@ -120,10 +120,10 @@ struct RawModelWeightForVoiceConversion { pub ietf_language_tag: Option, pub ietf_primary_language_subtag: Option, - pub creator_user_token: Option, - pub creator_username: Option, - pub creator_display_name: Option, - pub creator_gravatar_hash: Option, + pub creator_user_token: UserToken, + pub creator_username: String, + pub creator_display_name: String, + pub creator_gravatar_hash: String, pub creator_set_visibility: Visibility,