From 69186282a0a2a3eebd11d172ad5ce35f031ace25 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 31 Jan 2022 04:35:22 -0500 Subject: [PATCH] inserts pending job --- .../src/tts/insert_tts_inference_job.rs | 6 ++++-- .../threads/twitch_pubsub_user_subscriber_thread.rs | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/crates/lib/database_queries/src/tts/insert_tts_inference_job.rs b/crates/lib/database_queries/src/tts/insert_tts_inference_job.rs index 3e3b20ba21..c54900b0a0 100644 --- a/crates/lib/database_queries/src/tts/insert_tts_inference_job.rs +++ b/crates/lib/database_queries/src/tts/insert_tts_inference_job.rs @@ -47,7 +47,8 @@ impl TtsInferenceJobInsertBuilder { uuid_idempotency_token: Some(idempotency_token), maybe_creator_user_token: None, creator_ip_address: Some("127.0.0.1".to_string()), - creator_set_visibility: Some("public".to_string()), + // hidden | public | ... + creator_set_visibility: Some("hidden".to_string()), } } @@ -57,7 +58,7 @@ impl TtsInferenceJobInsertBuilder { } pub fn set_model_token(mut self, value: &str) -> Self { - self.job_token = Some(value.to_string()); + self.model_token = Some(value.to_string()); self } @@ -87,6 +88,7 @@ impl TtsInferenceJobInsertBuilder { } pub async fn insert(&mut self, mysql_pool: &MySqlPool) -> AnyhowResult<()> { + // TODO: These should be custom error types with a custom macro to make this easy. let job_token = self.job_token .clone() .ok_or(anyhow!("no job_token"))?; diff --git a/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs b/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs index 96f38c725e..c316dbfa55 100644 --- a/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs +++ b/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs @@ -8,6 +8,7 @@ use crate::twitch::oauth::oauth_token_refresher::OauthTokenRefresher; use crate::twitch::pubsub::build_pubsub_topics_for_user::build_pubsub_topics_for_user; use crate::twitch::twitch_user_id::TwitchUserId; use crate::twitch::websocket_client::TwitchWebsocketClient; +use database_queries::tts::insert_tts_inference_job::TtsInferenceJobInsertBuilder; use database_queries::twitch_oauth::find::{TwitchOauthTokenRecord, TwitchOauthTokenFinder}; use database_queries::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; use database_queries::twitch_pubsub::insert_bits::TwitchPubsubBitsInsertBuilder; @@ -284,6 +285,7 @@ impl TwitchPubsubUserSubscriberThreadStageTwo { Some(e) => e, }; match error { + "" => {}, // No-op "ERR_BADAUTH" => { warn!("Invalid token. Bad auth. Need to refresh"); let token_record = self.refresh_twitch_oauth_token().await?; @@ -551,6 +553,14 @@ impl TwitchPubsubUserSubscriberThreadStageTwo { async fn write_tts_inference_event(&mut self, tts_text: &str) -> AnyhowResult<()> { let sanitized_text = remove_cheers(tts_text); + let model_token = "TM:7wbtjphx8h8v"; // "Mario *" voice. + + let mut builder = TtsInferenceJobInsertBuilder::new_for_internal_tts() + .set_job_token("todo") + .set_model_token(model_token) + .set_raw_inference_text(&sanitized_text); + + let _r = builder.insert(&self.mysql_pool).await?; Ok(()) } }