From 9fedbcd9670eb7f43381dab721c555bdb95163ac Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 27 May 2020 00:23:13 -0400 Subject: [PATCH] refactor frontend into directories by mode --- tts_frontend/src/components/MainComponent.tsx | 4 ++-- .../advanced_mode}/DropdownArpabetTacotron.tsx | 0 .../advanced_mode}/DropdownMelgan.tsx | 0 .../advanced_mode}/ModelPickerDropdownComponent.tsx | 0 .../{model_picker => modes/advanced_mode}/ModelResponse.ts | 0 .../components/{ => modes/advanced_mode}/TextAudioTrack.tsx | 2 +- .../src/components/{ => modes/advanced_mode}/TextInput.tsx | 4 ++-- .../src/components/{ => modes/advanced_mode}/TrackList.tsx | 2 +- tts_service/models.toml | 6 +++--- 9 files changed, 9 insertions(+), 9 deletions(-) rename tts_frontend/src/components/{model_picker => modes/advanced_mode}/DropdownArpabetTacotron.tsx (100%) rename tts_frontend/src/components/{model_picker => modes/advanced_mode}/DropdownMelgan.tsx (100%) rename tts_frontend/src/components/{model_picker => modes/advanced_mode}/ModelPickerDropdownComponent.tsx (100%) rename tts_frontend/src/components/{model_picker => modes/advanced_mode}/ModelResponse.ts (100%) rename tts_frontend/src/components/{ => modes/advanced_mode}/TextAudioTrack.tsx (94%) rename tts_frontend/src/components/{ => modes/advanced_mode}/TextInput.tsx (95%) rename tts_frontend/src/components/{ => modes/advanced_mode}/TrackList.tsx (92%) diff --git a/tts_frontend/src/components/MainComponent.tsx b/tts_frontend/src/components/MainComponent.tsx index e293d8577a..a55f5236e9 100644 --- a/tts_frontend/src/components/MainComponent.tsx +++ b/tts_frontend/src/components/MainComponent.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import TextInput from './TextInput'; -import TrackList from './TrackList'; +import TextInput from './modes/advanced_mode/TextInput'; +import TrackList from './modes/advanced_mode/TrackList'; import { SpeakerModeComponent } from './modes/speaker_mode/SpeakerModeComponent'; enum Mode { diff --git a/tts_frontend/src/components/model_picker/DropdownArpabetTacotron.tsx b/tts_frontend/src/components/modes/advanced_mode/DropdownArpabetTacotron.tsx similarity index 100% rename from tts_frontend/src/components/model_picker/DropdownArpabetTacotron.tsx rename to tts_frontend/src/components/modes/advanced_mode/DropdownArpabetTacotron.tsx diff --git a/tts_frontend/src/components/model_picker/DropdownMelgan.tsx b/tts_frontend/src/components/modes/advanced_mode/DropdownMelgan.tsx similarity index 100% rename from tts_frontend/src/components/model_picker/DropdownMelgan.tsx rename to tts_frontend/src/components/modes/advanced_mode/DropdownMelgan.tsx diff --git a/tts_frontend/src/components/model_picker/ModelPickerDropdownComponent.tsx b/tts_frontend/src/components/modes/advanced_mode/ModelPickerDropdownComponent.tsx similarity index 100% rename from tts_frontend/src/components/model_picker/ModelPickerDropdownComponent.tsx rename to tts_frontend/src/components/modes/advanced_mode/ModelPickerDropdownComponent.tsx diff --git a/tts_frontend/src/components/model_picker/ModelResponse.ts b/tts_frontend/src/components/modes/advanced_mode/ModelResponse.ts similarity index 100% rename from tts_frontend/src/components/model_picker/ModelResponse.ts rename to tts_frontend/src/components/modes/advanced_mode/ModelResponse.ts diff --git a/tts_frontend/src/components/TextAudioTrack.tsx b/tts_frontend/src/components/modes/advanced_mode/TextAudioTrack.tsx similarity index 94% rename from tts_frontend/src/components/TextAudioTrack.tsx rename to tts_frontend/src/components/modes/advanced_mode/TextAudioTrack.tsx index 1695563076..1792990550 100644 --- a/tts_frontend/src/components/TextAudioTrack.tsx +++ b/tts_frontend/src/components/modes/advanced_mode/TextAudioTrack.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import Howl from 'howler'; -import {makeTtsRequest} from '../TtsService' +import {makeTtsRequest} from '../../../TtsService' interface Props { text: String, diff --git a/tts_frontend/src/components/TextInput.tsx b/tts_frontend/src/components/modes/advanced_mode/TextInput.tsx similarity index 95% rename from tts_frontend/src/components/TextInput.tsx rename to tts_frontend/src/components/modes/advanced_mode/TextInput.tsx index 0534218de5..4848ed1cce 100644 --- a/tts_frontend/src/components/TextInput.tsx +++ b/tts_frontend/src/components/modes/advanced_mode/TextInput.tsx @@ -1,7 +1,7 @@ import React from 'react'; import Howl from 'howler'; -import {TextAudioPair }from './MainComponent' -import { ModelPickerDropdownComponent } from './model_picker/ModelPickerDropdownComponent'; +import {TextAudioPair }from '../../MainComponent' +import { ModelPickerDropdownComponent } from './ModelPickerDropdownComponent'; interface Props { appendUtteranceCallback: (utterance: TextAudioPair) => void diff --git a/tts_frontend/src/components/TrackList.tsx b/tts_frontend/src/components/modes/advanced_mode/TrackList.tsx similarity index 92% rename from tts_frontend/src/components/TrackList.tsx rename to tts_frontend/src/components/modes/advanced_mode/TrackList.tsx index 58c5f37a18..9f36c24c16 100644 --- a/tts_frontend/src/components/TrackList.tsx +++ b/tts_frontend/src/components/modes/advanced_mode/TrackList.tsx @@ -1,6 +1,6 @@ import React from 'react'; import Howl from 'howler'; -import { TextAudioPair } from './MainComponent'; +import { TextAudioPair } from '../../MainComponent'; import TextAudioTrack from './TextAudioTrack'; interface Props { diff --git a/tts_service/models.toml b/tts_service/models.toml index c2c55095df..b2c3d351a3 100644 --- a/tts_service/models.toml +++ b/tts_service/models.toml @@ -10,8 +10,8 @@ melgan = "melgan_trump-txlearn-2020.05.05_13675.jit" name = "High-pitched Linda Johnson" slug = "ljsh" model_pipeline = "ArpabetTacotronMelgan" -tacotron = "" -melgan = "" +tacotron = "tacotron2_ljs_high_pitch_arpabet_2020-03-28.jit" +melgan = "melgan_ljs-high-pitch_container.pt" # --------------- Model configs --------------- @@ -101,7 +101,7 @@ description = "Unknown (broken)" [[tacotron]] # TODO: Remove. This hangs forever. -file_path = "acotron_jit_model_voder_c0cac635.pt" +file_path = "tacotron_jit_model_voder_c0cac635.pt" description = "Unknown (broken)"