From a485666b1c4efcc757fe726bff37bc3f0d427a96 Mon Sep 17 00:00:00 2001 From: Michael Chung Date: Tue, 10 Oct 2023 16:03:27 -0400 Subject: [PATCH] Test pass! Payload delivered and picked up. Need to ensure the job now runs locally. --- .../generic_inference_args/generic_inference_args.rs | 5 +---- .../src/payloads/generic_inference_args/tts_payload.rs | 2 -- .../voice_designer/inference/enqueue_tts_request.rs | 7 +++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs index 5dea92e626..6355bd7a68 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs +++ b/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs @@ -147,14 +147,11 @@ mod tests { assert!(json.len() < 1000); } - - // TODO FIX THIS TEST! MICHAEL #[test] fn typical_tts_args_serialize() { let args = GenericInferenceArgs { inference_category: Some(InferenceCategoryAbbreviated::TextToSpeech), args: Some(PolymorphicInferenceArgs::Tts(TTSArgs { - text: "hello world".to_string(), voice_token: "token".to_string(), })), }; @@ -162,7 +159,7 @@ mod tests { let json = serde_json::ser::to_string(&args).unwrap(); // NB: Assert the serialized form. If this changes and the test breaks, be careful about migrating. - assert_eq!(json, r#"{"cat":"tts","args":{"Tts":{"t":"hello world","e":"token"}}}"#.to_string()); + assert_eq!(json, r#"{"cat":"tts","args":{"Tts":{"e":"token"}}}"#.to_string()); // NB: Make sure we don't overflow the DB field capacity (TEXT column). assert!(json.len() < 1000); diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/tts_payload.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/tts_payload.rs index 482a72813c..4a0269f70a 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/tts_payload.rs +++ b/crates/lib/mysql_queries/src/payloads/generic_inference_args/tts_payload.rs @@ -1,8 +1,6 @@ #[derive(Clone, Debug, Serialize, Deserialize)] pub struct TTSArgs { - #[serde(rename = "t")] - pub text: String, #[serde(rename = "e")] pub voice_token: String // varchar 32 } diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs index 6cb7eb4ab7..16fa00c50c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs @@ -127,7 +127,6 @@ let ip_address = get_request_ip(&http_request); // package as larger component args should always have an embedding token .. let inference_args = TTSArgs { - text: request.text.clone(), voice_token: request.voice_token.clone() }; @@ -139,9 +138,9 @@ let query_result = insert_generic_inference_job(InsertGenericInferenceArgs { inference_category: InferenceCategory::TextToSpeech, maybe_model_type: Some(InferenceModelType::VallEX), // NB: Model is static during inference maybe_model_token: None, // NB: Model is static during inference - maybe_input_source_token: None, // TODO: Introduce a second foreign key ? - maybe_input_source_token_type: None, // TODO: Introduce a second foreign key ? - maybe_raw_inference_text: None, // No text + maybe_input_source_token: None, + maybe_input_source_token_type: None, + maybe_raw_inference_text: Some(&request.text), maybe_inference_args: Some(GenericInferenceArgs { inference_category: Some(InferenceCategoryAbbreviated::TextToSpeech), args: Some(PolymorphicInferenceArgs::Tts(inference_args)),