From 7c718350433afa2f5e1c92991874928fe5ef5fc2 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 23 Jul 2020 20:09:07 -0400 Subject: [PATCH] put all TTS endpoints in same module --- tts_service/src/endpoints/mod.rs | 5 +---- .../src/endpoints/{ => speak}/legacy_speak.rs | 0 .../endpoints/{tts.rs => speak/legacy_tts.rs} | 0 tts_service/src/endpoints/speak/mod.rs | 4 ++++ tts_service/src/endpoints/{ => speak}/speak.rs | 0 .../{ => speak}/speak_with_spectrogram.rs | 0 tts_service/src/main.rs | 18 +++++++++--------- tts_service/src/model/pipelines.rs | 6 +++--- 8 files changed, 17 insertions(+), 16 deletions(-) rename tts_service/src/endpoints/{ => speak}/legacy_speak.rs (100%) rename tts_service/src/endpoints/{tts.rs => speak/legacy_tts.rs} (100%) create mode 100644 tts_service/src/endpoints/speak/mod.rs rename tts_service/src/endpoints/{ => speak}/speak.rs (100%) rename tts_service/src/endpoints/{ => speak}/speak_with_spectrogram.rs (100%) diff --git a/tts_service/src/endpoints/mod.rs b/tts_service/src/endpoints/mod.rs index 1f64bfea2c..c5e7374380 100644 --- a/tts_service/src/endpoints/mod.rs +++ b/tts_service/src/endpoints/mod.rs @@ -1,12 +1,9 @@ pub mod helpers; pub mod index; -pub mod legacy_speak; pub mod liveness; pub mod models; pub mod readiness; pub mod sentences; pub mod speak; -pub mod speak_with_spectrogram; pub mod speakers; -pub mod tts; -pub mod words; \ No newline at end of file +pub mod words; diff --git a/tts_service/src/endpoints/legacy_speak.rs b/tts_service/src/endpoints/speak/legacy_speak.rs similarity index 100% rename from tts_service/src/endpoints/legacy_speak.rs rename to tts_service/src/endpoints/speak/legacy_speak.rs diff --git a/tts_service/src/endpoints/tts.rs b/tts_service/src/endpoints/speak/legacy_tts.rs similarity index 100% rename from tts_service/src/endpoints/tts.rs rename to tts_service/src/endpoints/speak/legacy_tts.rs diff --git a/tts_service/src/endpoints/speak/mod.rs b/tts_service/src/endpoints/speak/mod.rs new file mode 100644 index 0000000000..82825ece86 --- /dev/null +++ b/tts_service/src/endpoints/speak/mod.rs @@ -0,0 +1,4 @@ +pub mod legacy_speak; +pub mod legacy_tts; +pub mod speak; +pub mod speak_with_spectrogram; diff --git a/tts_service/src/endpoints/speak.rs b/tts_service/src/endpoints/speak/speak.rs similarity index 100% rename from tts_service/src/endpoints/speak.rs rename to tts_service/src/endpoints/speak/speak.rs diff --git a/tts_service/src/endpoints/speak_with_spectrogram.rs b/tts_service/src/endpoints/speak/speak_with_spectrogram.rs similarity index 100% rename from tts_service/src/endpoints/speak_with_spectrogram.rs rename to tts_service/src/endpoints/speak/speak_with_spectrogram.rs diff --git a/tts_service/src/main.rs b/tts_service/src/main.rs index a092a10fe7..3c38353338 100644 --- a/tts_service/src/main.rs +++ b/tts_service/src/main.rs @@ -30,27 +30,27 @@ use actix_web::middleware::{Logger, DefaultHeaders}; use actix_web::{App, HttpResponse, HttpServer, web, http}; use anyhow::Result as AnyhowResult; +use arpabet::Arpabet; use crate::database::connector::DatabaseConnector; use crate::endpoints::index::get_root; -use crate::endpoints::legacy_speak::legacy_get_speak; use crate::endpoints::liveness::get_liveness; use crate::endpoints::models::get_models; use crate::endpoints::readiness::get_readiness; use crate::endpoints::sentences::get_sentences; -use crate::endpoints::speak::post_speak; -use crate::endpoints::speak_with_spectrogram::post_speak_with_spectrogram; +use crate::endpoints::speak::legacy_speak::legacy_get_speak; +use crate::endpoints::speak::legacy_tts::post_tts; +use crate::endpoints::speak::speak::post_speak; +use crate::endpoints::speak::speak_with_spectrogram::post_speak_with_spectrogram; use crate::endpoints::speakers::get_speakers; -use crate::endpoints::tts::post_tts; use crate::endpoints::words::get_words; use crate::model::model_cache::ModelCache; use crate::model::model_config::ModelConfigs; -use crate::rate_limiter::redis_rate_limiter::RedisRateLimiter; -use crate::text::checker::TextChecker; -use arpabet::Arpabet; -use limitation::Limiter; -use std::time::Duration; use crate::rate_limiter::RateLimiter; use crate::rate_limiter::noop_rate_limiter::NoOpRateLimiter; +use crate::rate_limiter::redis_rate_limiter::RedisRateLimiter; +use crate::text::checker::TextChecker; +use limitation::Limiter; +use std::time::Duration; const ENV_ARPABET_EXTRAS_FILE : &'static str = "ARPABET_EXTRAS_FILE"; const ENV_ASSET_DIRECTORY: &'static str = "ASSET_DIRECTORY"; diff --git a/tts_service/src/model/pipelines.rs b/tts_service/src/model/pipelines.rs index 3c07a73f31..6043420d6b 100644 --- a/tts_service/src/model/pipelines.rs +++ b/tts_service/src/model/pipelines.rs @@ -1,4 +1,7 @@ use arpabet::Arpabet; +use crate::endpoints::speak::speak_with_spectrogram::Spectrogram; +use crate::model::arpabet_glow_tts_model::ArpabetGlowTtsModel; +use crate::model::arpabet_glow_tts_multi_speaker_model::ArpabetGlowTtsMultiSpeakerModel; use crate::model::arpabet_tacotron_model::ArpabetTacotronModel; use crate::model::melgan_model::MelganModel; use crate::model::old_model::TacoMelModel; @@ -8,9 +11,6 @@ use hound::WavSpec; use hound::WavWriter; use std::io::{Cursor, BufWriter}; use tch::Tensor; -use crate::model::arpabet_glow_tts_model::ArpabetGlowTtsModel; -use crate::model::arpabet_glow_tts_multi_speaker_model::ArpabetGlowTtsMultiSpeakerModel; -use crate::endpoints::speak_with_spectrogram::Spectrogram; // TODO: This might be useful to implement as a multi-stage // state machine struct with functions, that way you can pull out