From d30a84fb3e2675973864608edec23e5d5d7d0e35 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 30 Apr 2024 01:52:16 -0400 Subject: [PATCH] correct metadata in rvc and svc inference jobs --- .../create/insert_media_file_from_tacotron2.rs | 10 +++++++--- .../create/insert_media_file_from_voice_conversion.rs | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_tacotron2.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_tacotron2.rs index fe7a6b7edd..2f21bcbf67 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_tacotron2.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_tacotron2.rs @@ -3,6 +3,7 @@ use sqlx; use sqlx::MySqlPool; use enums::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; @@ -67,7 +68,6 @@ pub async fn insert_media_file_from_tacotron2( const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference; const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::TextToSpeech; - const MEDIA_TYPE : MediaFileType = MediaFileType::Audio; let record_id = { let query_result = sqlx::query!( @@ -76,6 +76,9 @@ INSERT INTO media_files SET token = ?, + media_class = ?, + media_type = ?, + origin_category = ?, origin_product_category = ?, @@ -84,7 +87,6 @@ SET maybe_text_transcript = ?, - media_type = ?, maybe_mime_type = ?, file_size_bytes = ?, @@ -113,6 +115,9 @@ SET "#, result_token.as_str(), + MediaFileClass::Audio.to_str(), + MediaFileType::Audio.to_str(), // TODO(bt,2024-04-30): This needs to become "wav" after a frontend migration + ORIGIN_CATEGORY.to_str(), ORIGIN_PRODUCT_CATEGORY.to_str(), @@ -121,7 +126,6 @@ SET args.job.maybe_raw_inference_text, - MEDIA_TYPE.to_str(), args.maybe_mime_type, args.file_size_bytes, diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_voice_conversion.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_voice_conversion.rs index 78f36d2713..6394be3a6f 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_voice_conversion.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_voice_conversion.rs @@ -3,6 +3,7 @@ use sqlx; use sqlx::MySqlPool; use enums::by_table::generic_synthetic_ids::id_category::IdCategory; +use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory; use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory; @@ -78,7 +79,6 @@ pub async fn insert_media_file_from_voice_conversion( const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference; const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::VoiceConversion; - const MEDIA_TYPE : MediaFileType = MediaFileType::Audio; let record_id = { let query_result = sqlx::query!( @@ -87,13 +87,15 @@ INSERT INTO media_files SET token = ?, + media_class = ?, + media_type = ?, + origin_category = ?, origin_product_category = ?, maybe_origin_model_type = ?, maybe_origin_model_token = ?, - media_type = ?, maybe_mime_type = ?, file_size_bytes = ?, @@ -119,13 +121,15 @@ SET "#, result_token.as_str(), + MediaFileClass::Audio.to_str(), + MediaFileType::Audio.to_str(), // TODO(bt,2024-04-30): This needs to become "wav" after a frontend migration + ORIGIN_CATEGORY.to_str(), ORIGIN_PRODUCT_CATEGORY.to_str(), origin_model_type.to_str(), args.job.maybe_model_token, - MEDIA_TYPE.to_str(), args.maybe_mime_type, args.file_size_bytes,