refactor: tts_pipeline サブモジュールリネーム

tarepan · Feb 21, 2024 · e0b134f · e0b134f
1 parent 1c60a67
commit e0b134f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/test/tts_pipeline/test_mora_list.py → test/tts_pipeline/test_mora_mapping.py b/test/tts_pipeline/test_mora_list.py → test/tts_pipeline/test_mora_mapping.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from voicevox_engine.tts_pipeline.mora_list import mora_phonemes_to_mora_kana
+from voicevox_engine.tts_pipeline.mora_mapping import mora_phonemes_to_mora_kana
 
 
 class TestOpenJTalkMoraList(TestCase):

diff --git a/...peline/test_acoustic_feature_extractor.py → test/tts_pipeline/test_phoneme.py b/...peline/test_acoustic_feature_extractor.py → test/tts_pipeline/test_phoneme.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from voicevox_engine.tts_pipeline.acoustic_feature_extractor import Phoneme
+from voicevox_engine.tts_pipeline.phoneme import Phoneme
 
 TRUE_NUM_PHONEME = 45
 

diff --git a/voicevox_engine/tts_pipeline/kana_converter.py b/voicevox_engine/tts_pipeline/kana_converter.py
@@ -17,8 +17,8 @@
 from typing import List, Optional
 
 from ..model import AccentPhrase, Mora, ParseKanaError, ParseKanaErrorCode
-from .acoustic_feature_extractor import Vowel
-from .mora_list import mora_kana_to_mora_phonemes
+from .mora_mapping import mora_kana_to_mora_phonemes
+from .phoneme import Vowel
 
 _LOOP_LIMIT = 300
 

diff --git a/voicevox_engine/tts_pipeline/mora_list.py → voicevox_engine/tts_pipeline/mora_mapping.py b/voicevox_engine/tts_pipeline/mora_list.py → voicevox_engine/tts_pipeline/mora_mapping.py
@@ -44,7 +44,7 @@
 
 from typing import Literal
 
-from .acoustic_feature_extractor import BaseVowel, Consonant
+from .phoneme import BaseVowel, Consonant
 
 # AquesTalk 風記法で記述されるモーラ（無声化 `_` を除く）
 _MoraKana = Literal[

diff --git a/...ts_pipeline/acoustic_feature_extractor.py → voicevox_engine/tts_pipeline/phoneme.py b/...ts_pipeline/acoustic_feature_extractor.py → voicevox_engine/tts_pipeline/phoneme.py
diff --git a/voicevox_engine/tts_pipeline/text_analyzer.py b/voicevox_engine/tts_pipeline/text_analyzer.py
@@ -6,7 +6,7 @@
 import pyopenjtalk
 
 from ..model import AccentPhrase, Mora
-from .mora_list import mora_phonemes_to_mora_kana
+from .mora_mapping import mora_phonemes_to_mora_kana
 
 OjtVowel = Literal[
     "A", "E", "I", "N", "O", "U", "a", "cl", "e", "i", "o", "pau", "sil", "u"

diff --git a/voicevox_engine/tts_pipeline/tts_engine.py b/voicevox_engine/tts_pipeline/tts_engine.py
@@ -10,9 +10,9 @@
 from ..core.core_wrapper import CoreWrapper
 from ..metas.Metas import StyleId
 from ..model import AccentPhrase, AudioQuery, FrameAudioQuery, FramePhoneme, Mora, Score
-from .acoustic_feature_extractor import Phoneme
 from .kana_converter import parse_kana
-from .mora_list import mora_kana_to_mora_phonemes, mora_phonemes_to_mora_kana
+from .mora_mapping import mora_kana_to_mora_phonemes, mora_phonemes_to_mora_kana
+from .phoneme import Phoneme
 from .text_analyzer import text_to_accent_phrases
 
 # 疑問文語尾定数