From d53a262a6dc710c788b796149fd2a514b06ee64d Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Wed, 17 Mar 2021 04:03:42 -0400
Subject: [PATCH] MJ, Tails, Knuckles

---
 tts_service/deployed_models.toml      | 23 +++++++++++++++++++++++
 tts_service/models.toml               | 24 ++++++++++++++++++++++++
 tts_service/src/endpoints/speakers.rs |  4 ++--
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/tts_service/deployed_models.toml b/tts_service/deployed_models.toml
index a23de6e96d..287470acf0 100644
--- a/tts_service/deployed_models.toml
+++ b/tts_service/deployed_models.toml
@@ -2,8 +2,31 @@ early_access_voices = [
     "goku",
     "peter-griffin",
     "eric-cartman",
+    "tails",
+    "knuckles",
 ]
 
+[[speakers]]
+name = "Michael Jackson"
+slug = "michael-jackson"
+model_pipeline = "ArpabetGlowTtsMelgan"
+glow_tts = "glow-tts_michael-jackson_ljstx_2020.00.00_expr-1_chkpt-6400.torchjit"
+melgan = "melgan_manyvoice5.0_2020-07-23_12d5838_10760.torchjit" # TODO: Needs custom vocoder
+
+[[speakers]]
+name = "Knuckles"
+slug = "knuckles"
+model_pipeline = "ArpabetGlowTtsMelgan"
+glow_tts = "glow-tts_knuckles_ljstx_2021.03.15_expr-1_chkpt-5040.torchjit"
+melgan = "melgan_manyvoice5.0_2020-07-23_12d5838_10760.torchjit" # TODO: Needs custom vocoder
+
+[[speakers]]
+name = "Tails"
+slug = "tails"
+model_pipeline = "ArpabetGlowTtsMelgan"
+glow_tts = "glow-tts_tails_ljstx_2021.03.15_expr-1_chkpt-5020.torchjit"
+melgan = "melgan_manyvoice5.0_2020-07-23_12d5838_10760.torchjit" # TODO: Needs custom vocoder
+
 [[speakers]]
 name = "Goku"
 slug = "goku"
diff --git a/tts_service/models.toml b/tts_service/models.toml
index f042dae59a..53521a32d3 100644
--- a/tts_service/models.toml
+++ b/tts_service/models.toml
@@ -2,6 +2,8 @@ early_access_voices = [
     "goku",
     "peter-griffin",
     "eric-cartman",
+    "tails",
+    "knuckles",
 ]
 
 # --------------- Experimental Speakers ---------------
@@ -30,6 +32,28 @@ melgan = "melgan-vocodes.torchjit"
 #  #melgan = "melgan_manyvoice2.0_2020-07-08_12d5838_9330.torchjit"
 #  #melgan = "manyvoice1.0_2020-06-28_12d5838_6610.torchjit"
 
+[[speakers]]
+name = "Michael Jackson"
+slug = "michael-jackson"
+model_pipeline = "ArpabetGlowTtsMelgan"
+glow_tts = "glow-tts_michael-jackson_ljstx_2020.00.00_expr-1_chkpt-6400.torchjit"
+melgan = "melgan_manyvoice5.0_2020-07-23_12d5838_10760.torchjit" # TODO: Needs custom vocoder
+
+[[speakers]]
+name = "Knuckles"
+slug = "knuckles"
+model_pipeline = "ArpabetGlowTtsMelgan"
+glow_tts = "glow-tts_knuckles_ljstx_2021.03.15_expr-1_chkpt-5040.torchjit"
+melgan = "melgan_manyvoice5.0_2020-07-23_12d5838_10760.torchjit" # TODO: Needs custom vocoder
+
+[[speakers]]
+name = "Tails"
+slug = "tails"
+model_pipeline = "ArpabetGlowTtsMelgan"
+glow_tts = "glow-tts_tails_ljstx_2021.03.15_expr-1_chkpt-5020.torchjit"
+melgan = "melgan_manyvoice5.0_2020-07-23_12d5838_10760.torchjit" # TODO: Needs custom vocoder
+
+
 [[speakers]]
 name = "Goku"
 slug = "goku"
diff --git a/tts_service/src/endpoints/speakers.rs b/tts_service/src/endpoints/speakers.rs
index acc9c9f2d0..b7cf89918d 100644
--- a/tts_service/src/endpoints/speakers.rs
+++ b/tts_service/src/endpoints/speakers.rs
@@ -16,7 +16,7 @@ pub struct SpeakersResult {
   speakers: Vec<Speaker>,
 }
 
-#[get("/early_access_speakers")]
+#[get("/speakers")]
 pub async fn get_speakers(
   _request: HttpRequest,
   app_state: Data<Arc<AppState>>
@@ -29,7 +29,7 @@ pub async fn get_speakers(
   }))
 }
 
-#[get("/speakers")]
+#[get("/early_access_speakers")]
 pub async fn get_early_access_speakers(
   _request: HttpRequest,
   app_state: Data<Arc<AppState>>