From af8fb020780c03b4150654cd4cd3b403f0c327fa Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 23 Jan 2024 12:50:06 -0500 Subject: [PATCH] comments --- .../src/migrations/tts_models_to_weights/migrate.rs | 6 ++++-- .../migration/list_whole_tts_models_using_cursor.rs | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/crates/cli/migration-tool/src/migrations/tts_models_to_weights/migrate.rs b/crates/cli/migration-tool/src/migrations/tts_models_to_weights/migrate.rs index b08f1b7bbe..6da87298f4 100644 --- a/crates/cli/migration-tool/src/migrations/tts_models_to_weights/migrate.rs +++ b/crates/cli/migration-tool/src/migrations/tts_models_to_weights/migrate.rs @@ -21,6 +21,7 @@ const PAGE_SIZE: u64 = 10; pub async fn migrate_tts_to_weights(deps: &Deps) -> AnyhowResult<()> { let mut cursor = 0; + let mut counter = 0; loop { info!("Querying {PAGE_SIZE} models at cursor = {cursor}"); @@ -34,15 +35,16 @@ pub async fn migrate_tts_to_weights(deps: &Deps) -> AnyhowResult<()> { } for result in results.iter() { - println!("\n\nmigrating over result {:?} : {:?} ...", result.token, result); + println!("\n\nmigrating over (counter: {counter}, id: {}, token: {:?}) : {:?} ...", result.id, result.token, result); copy_model_record_and_bucket_files(result, &deps).await?; + counter += 1; } if let Some(last_id) = results.last().map(|result| result.id) { cursor = last_id as u64; } - thread::sleep(Duration::from_secs(2)); + thread::sleep(Duration::from_millis(500)); } Ok(()) diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs index 051e35416c..90138b424a 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs @@ -29,9 +29,11 @@ pub struct WholeTtsModelRecord { pub text_preprocessing_algorithm: Option, + // Weird mel multiplication hack pub use_default_mel_multiply_factor: bool, - pub maybe_custom_mel_multiply_factor: Option, + pub maybe_custom_mel_multiply_factor: Option, // 10 + // Vocoder pub maybe_default_pretrained_vocoder: Option, pub maybe_custom_vocoder_token: Option, @@ -44,7 +46,7 @@ pub struct WholeTtsModelRecord { pub voice_name: Option, pub actor_name: Option, - pub characteristic: Option, + pub characteristic: Option, // 20 pub version_string: Option, pub is_front_page_featured: bool, @@ -59,7 +61,7 @@ pub struct WholeTtsModelRecord { pub creator_user_token: UserToken, pub creator_ip_address_creation: String, - pub creator_ip_address_last_update: String, + pub creator_ip_address_last_update: String, // 30 pub creator_set_visibility: Visibility, @@ -74,7 +76,7 @@ pub struct WholeTtsModelRecord { pub is_public_listing_approved: Option, pub is_locked_from_user_modification: bool, - pub is_locked_from_use: bool, + pub is_locked_from_use: bool, // 40 pub maybe_mod_comments: Option, pub maybe_mod_user_token: Option, @@ -87,7 +89,7 @@ pub struct WholeTtsModelRecord { pub updated_at: DateTime, pub user_deleted_at: Option>, - pub mod_deleted_at: Option>, + pub mod_deleted_at: Option>, // 48 fields total } pub async fn list_whole_tts_models_using_cursor(