From b2555bc7569a0f5966f6983b159d4a66bdfefb2e Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 18 Dec 2023 21:37:31 -0500 Subject: [PATCH] populate "new token" --- .../dev-database-seed/src/seeding/voice_conversion.rs | 1 + .../insert_voice_conversion_model_from_download_job.rs | 9 +++++++-- .../models/list_voice_conversion_models.rs | 10 ---------- .../voice_conversion/rvc_v2/process_rvc_v2_model.rs | 1 + .../so_vits_svc/process_so_vits_svc_model.rs | 1 + .../voice_conversion/softvc/process_softvc_model.rs | 1 + 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/crates/cli/dev-database-seed/src/seeding/voice_conversion.rs b/crates/cli/dev-database-seed/src/seeding/voice_conversion.rs index 13ff2f72a3..fdc7fd6aca 100644 --- a/crates/cli/dev-database-seed/src/seeding/voice_conversion.rs +++ b/crates/cli/dev-database-seed/src/seeding/voice_conversion.rs @@ -44,6 +44,7 @@ async fn create_rvc_model( insert_voice_conversion_model_from_download_job(InsertVoiceConversionModelArgs { model_type: VoiceConversionModelType::RvcV2, + maybe_new_weights_token: None, title, original_download_url: "https://example.com", original_filename: "unknown.zip", diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs index df199c754a..f5c5fe04c9 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs @@ -6,12 +6,15 @@ use sqlx::MySqlPool; use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; +use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; pub struct InsertVoiceConversionModelArgs<'a, P: AsRef> { pub model_type: VoiceConversionModelType, + pub maybe_new_weights_token: Option<&'a ModelWeightToken>, + pub title: &'a str, pub original_download_url: &'a str, @@ -60,7 +63,8 @@ SET has_index_file = ?, private_bucket_hash = ?, private_bucket_object_name = ?, - file_size_bytes = ? + file_size_bytes = ?, + maybe_migration_new_model_weights_token = ? "#, &model_token, args.model_type.to_str(), @@ -72,7 +76,8 @@ SET args.has_index_file, args.private_bucket_hash, private_bucket_object_name, - args.file_size_bytes + args.file_size_bytes, + args.maybe_new_weights_token, ) .execute(args.mysql_pool) .await; diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs index 8c3635245a..ace368acc0 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs @@ -29,11 +29,6 @@ pub struct VoiceConversionModelRecordForList { pub is_front_page_featured: bool, - // TODO(bt, 2023-04-18): Need columns for ratings - //pub user_ratings_positive_count: u32, - //pub user_ratings_negative_count: u32, - //pub user_ratings_total_count: u32, // NB: Does not include "neutral" ratings. - pub creator_set_visibility: Visibility, pub created_at: DateTime, @@ -183,11 +178,6 @@ struct RawVoiceConversionModelRecord { pub is_front_page_featured: i8, // bool - // TODO(bt, 2023-04-18): Need columns for ratings - //pub user_ratings_positive_count: u32, - //pub user_ratings_negative_count: u32, - //pub user_ratings_total_count: u32, // NB: Does not include "neutral" ratings. - pub creator_set_visibility: Visibility, pub created_at: DateTime, diff --git a/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs b/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs index f625647358..979298ea93 100644 --- a/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs +++ b/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs @@ -164,6 +164,7 @@ pub async fn process_rvc_v2_model<'a, 'b>( let (_id, voice_conversion_model_token) = insert_voice_conversion_model_from_download_job(InsertVoiceConversionModelArgs { model_type: VoiceConversionModelType::RvcV2, + maybe_new_weights_token: Some(&model_weights_token), title: &job.title, original_download_url: &job.download_url, original_filename: &download_filename, diff --git a/crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs b/crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs index 6502bdbeb6..cf6366dd62 100644 --- a/crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs +++ b/crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs @@ -109,6 +109,7 @@ pub async fn process_so_vits_svc_model<'a, 'b>( let (_id, voice_conversion_model_token) = insert_voice_conversion_model_from_download_job(InsertVoiceConversionModelArgs { model_type: VoiceConversionModelType::SoVitsSvc, + maybe_new_weights_token: Some(&model_weights_token), title: &job.title, original_download_url: &job.download_url, original_filename: &download_filename, diff --git a/crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs b/crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs index ea656c8dab..223a428145 100644 --- a/crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs +++ b/crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs @@ -100,6 +100,7 @@ pub async fn process_softvc_model<'a, 'b>( let (_id, model_token) = insert_voice_conversion_model_from_download_job(InsertVoiceConversionModelArgs { model_type: VoiceConversionModelType::SoftVc, + maybe_new_weights_token: None, title: &job.title, original_download_url: &job.download_url, original_filename: &download_filename,