From 6e76f3755224b0bd26200d32f909be319cbcfdae Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Mon, 22 Jun 2020 05:45:06 -0400
Subject: [PATCH] fixed deployment and deployed models

---
 deployment.yaml                  |  4 ++--
 tts_service/deployed_models.toml | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/deployment.yaml b/deployment.yaml
index 59d1f4ad27..5f27900eb2 100644
--- a/deployment.yaml
+++ b/deployment.yaml
@@ -31,7 +31,7 @@ spec:
       labels:
         app: tts
       annotations:
-        bump: '2'
+        bump: '1'
     spec:
       terminationGracePeriodSeconds: 60
       imagePullSecrets:
@@ -86,7 +86,7 @@ spec:
         # LSpeech model that sounds 100% amazing
         # image: docker.pkg.github.com/echelon/voder/tts-service:6b5c22567614
         #
-        image: docker.pkg.github.com/ml-applications/voder/tts-service:42f51ecd18e2
+        image: docker.pkg.github.com/ml-applications/voder/tts-service:74d8d1d90c45
         resources:
           limits:
             # 4 GiB (4096 MiB)
diff --git a/tts_service/deployed_models.toml b/tts_service/deployed_models.toml
index 8c71195896..cb9f18a7cc 100644
--- a/tts_service/deployed_models.toml
+++ b/tts_service/deployed_models.toml
@@ -53,16 +53,31 @@ speaker_id = 4
 model_type = "ArpabetGlowTts"
 base_directory = "/data/downloads/downloaded/models/glow-tts-jaywalnut/"
 
+[[model_locations]]
+model_type = "ArpabetGlowTtsMultiSpeaker"
+base_directory = "/data/downloads/downloaded/models/glow-tts-jaywalnut-multispeaker/"
+
 [[model_locations]]
 model_type = "Melgan"
 base_directory = "/data/downloads/downloaded/models/melgan-swpark/"
 
+# ---------------- Tacotron ----------------
+
+[[tacotron]]
+file_path = "DELETE_ME" # NB: The service crashes without this currently
+description = "DELETE_ME"
 
 # ---------------- Glow TTS----------------
 
 [[glow_tts]]
 file_path = "glow_tts_ljs_txlearn_arpabet_2020-06-01_G_1689-2.torchjit"
-description = "First experiments in glow-tts (continued); the '-2' is longer JIT tracing input"
+description = "First single-speaker experiments in glow-tts (continued); the '-2' is longer JIT tracing input"
+
+# ---------------- Glow TTS Multi-speaker ----------------
+
+[[glow_tts_multi_speaker]]
+file_path = "glow_tts_multispeaker_8-speaker_256-gin_ljs_txlearn_2020.06.19_experiment-5_chkpt-7466.torchjit"
+description = "First multi-speaker model in glow-tts"
 
 # ---------------- Melgan ----------------
 
@@ -73,3 +88,4 @@ description = "Trump steno data"
 [[melgan]]
 file_path = "melgan_vocodes1.0_multispeaker_2020.06.19_12d5838_experiment-2_chkpt-10400.torchjit"
 description = "First round of multi-speaker experiments for glow-tts"
+