refactor(rust): crate::engineの大半をcrate::engine::talkに (#1074)

Rust APIの`crate::engine`にあるアイテムを、`acoustic_feature_extractor`
と`audio_file`を除いて`crate::engine::talk`に移動する。

`acoustic_feature_extractor`や`OjtPhoneme`という名前が微妙になりつつある
が、考えるのは今後ということにする。
#1074 (comment)

Refs: #1073
See-also: #1065

Author: qryxip

crates/voicevox_core/src/__internal.rs

@@ -1,7 +1,7 @@
 pub mod doctest_fixtures;
 pub mod interop;
 
-use crate::engine::user_dict;
+use crate::engine::talk::user_dict;
 
 // VOICEVOX CORE内のラッパー向けの実装
 // FIXME: 要議論: https://github.com/VOICEVOX/voicevox_core/issues/595

crates/voicevox_core/src/__internal/interop.rs

@@ -3,7 +3,7 @@ pub mod raii;
 pub use crate::{
     convert::ToJsonValue,
     core::metas::merge as merge_metas,
-    engine::user_dict::{DEFAULT_PRIORITY, DEFAULT_WORD_TYPE},
+    engine::talk::user_dict::{DEFAULT_PRIORITY, DEFAULT_WORD_TYPE},
     synthesizer::{
         blocking::PerformInference, BlockingTextAnalyzerExt, NonblockingTextAnalyzerExt,
         DEFAULT_CPU_NUM_THREADS, DEFAULT_ENABLE_INTERROGATIVE_UPSPEAK,

crates/voicevox_core/src/blocking.rs

@@ -4,7 +4,7 @@ pub use crate::{
     core::{
         infer::runtimes::onnxruntime::blocking::Onnxruntime, voice_model::blocking::VoiceModelFile,
     },
-    engine::{
+    engine::talk::{
         open_jtalk::blocking::OpenJtalk, text_analyzer::blocking::TextAnalyzer,
         user_dict::dict::blocking::UserDict,
     },

crates/voicevox_core/src/engine.rs

@@ -2,20 +2,7 @@
 
 mod acoustic_feature_extractor;
 mod audio_file;
-mod full_context_label;
-mod interpret_query;
-mod kana_parser;
-mod model;
-mod mora_list;
-pub(crate) mod open_jtalk;
-pub(crate) mod text_analyzer;
-pub(crate) mod user_dict;
+pub(crate) mod talk;
 
-pub(crate) use self::acoustic_feature_extractor::OjtPhoneme;
-pub(crate) use self::audio_file::to_s16le_pcm;
 pub use self::audio_file::wav_from_s16le;
-pub(crate) use self::full_context_label::extract_full_context_label;
-pub(crate) use self::interpret_query::{initial_process, split_mora, DecoderFeature};
-pub(crate) use self::kana_parser::{create_kana, parse_kana, KanaParseError};
-pub use self::model::{AccentPhrase, AudioQuery, Mora};
-pub(crate) use self::mora_list::mora2text;
+pub(crate) use self::{acoustic_feature_extractor::OjtPhoneme, audio_file::to_s16le_pcm};

crates/voicevox_core/src/engine/acoustic_feature_extractor.rs

@@ -82,7 +82,7 @@ impl OjtPhoneme {
         }
     }
 
-    pub(crate) fn convert(phonemes: &[OjtPhoneme]) -> Vec<OjtPhoneme> {
+    pub(super) fn convert(phonemes: &[OjtPhoneme]) -> Vec<OjtPhoneme> {
         let mut phonemes = phonemes.to_owned();
         if let Some(first_phoneme) = phonemes.first_mut() {
             if first_phoneme.phoneme.contains("sil") {

crates/voicevox_core/src/engine/audio_file.rs

@@ -1,6 +1,6 @@
 use std::io::{Cursor, Write as _};
 
-use super::AudioQuery;
+use super::talk::AudioQuery;
 
 pub(crate) fn to_s16le_pcm<const BASE_SAMPLING_RATE: u32>(
     wave: &[f32],

crates/voicevox_core/src/engine/talk.rs

@@ -0,0 +1,14 @@
+mod full_context_label;
+mod interpret_query;
+mod kana_parser;
+mod model;
+mod mora_list;
+pub(crate) mod open_jtalk;
+pub(crate) mod text_analyzer;
+pub(crate) mod user_dict;
+
+pub(crate) use self::full_context_label::extract_full_context_label;
+pub(crate) use self::interpret_query::{initial_process, split_mora, DecoderFeature};
+pub(crate) use self::kana_parser::{create_kana, parse_kana, KanaParseError};
+pub use self::model::{AccentPhrase, AudioQuery, Mora};
+pub(crate) use self::mora_list::mora2text;

crates/voicevox_core/src/engine/full_context_label.rs renamed to crates/voicevox_core/src/engine/talk/full_context_label.rs

@@ -1,12 +1,12 @@
 use std::str::FromStr;
 
-use crate::{
-    engine::{self, open_jtalk::FullcontextExtractor},
-    AccentPhrase,
-};
 use jlabel::Label;
 use smallvec::SmallVec;
 
+use crate::AccentPhrase;
+
+use super::open_jtalk::FullcontextExtractor;
+
 #[derive(thiserror::Error, Debug)]
 #[error("入力テキストからのフルコンテキストラベル抽出に失敗しました: {context}")]
 pub(crate) struct FullContextLabelError {
@@ -173,27 +173,25 @@ pub fn mora_to_text(consonant: Option<&str>, vowel: &str) -> String {
         }
     );
     // もしカタカナに変換できなければ、引数で与えた文字列がそのまま返ってくる
-    engine::mora2text(&mora_text).to_string()
+    super::mora2text(&mora_text).to_string()
 }
 
 #[cfg(test)]
 mod tests {
-    use rstest_reuse::*;
+    use std::str::FromStr;
 
     use ::test_util::OPEN_JTALK_DIC_DIR;
+    use jlabel::Label;
     use rstest::rstest;
+    use rstest_reuse::*;
 
-    use std::str::FromStr;
+    use crate::AccentPhrase;
 
-    use crate::{
-        engine::{
-            full_context_label::{extract_full_context_label, generate_accent_phrases},
-            open_jtalk::FullcontextExtractor,
-            Mora,
-        },
-        AccentPhrase,
+    use super::super::{
+        full_context_label::{extract_full_context_label, generate_accent_phrases},
+        open_jtalk::FullcontextExtractor,
+        Mora,
     };
-    use jlabel::Label;
 
     fn mora(text: &str, consonant: Option<&str>, vowel: &str) -> Mora {
         Mora {

crates/voicevox_core/src/engine/interpret_query.rs renamed to crates/voicevox_core/src/engine/talk/interpret_query.rs

@@ -1,6 +1,6 @@
 //! [`AudioQuery`]から特徴量を取り出す処理を集めたもの。
 
-use super::{full_context_label::mora_to_text, AccentPhrase, AudioQuery, Mora, OjtPhoneme};
+use super::{super::OjtPhoneme, full_context_label::mora_to_text, AccentPhrase, AudioQuery, Mora};
 
 pub(crate) fn initial_process(accent_phrases: &[AccentPhrase]) -> (Vec<Mora>, Vec<OjtPhoneme>) {
     let flatten_moras = to_flatten_moras(accent_phrases);

crates/voicevox_core/src/engine/kana_parser.rs renamed to crates/voicevox_core/src/engine/talk/kana_parser.rs

@@ -1,7 +1,6 @@
-use std::collections::HashMap;
-use std::sync::LazyLock;
+use std::{collections::HashMap, sync::LazyLock};
 
-use crate::engine::{
+use super::{
     model::{AccentPhrase, Mora},
     mora_list::MORA_LIST_MINIMUM,
 };
@@ -197,10 +196,11 @@ pub(crate) fn create_kana(accent_phrases: &[AccentPhrase]) -> String {
 
 #[cfg(test)]
 mod tests {
-    use crate::engine::mora_list::MORA_LIST_MINIMUM;
     use pretty_assertions::assert_eq;
     use rstest::rstest;
 
+    use super::super::mora_list::MORA_LIST_MINIMUM;
+
     #[rstest]
     #[case(Some("da"), "ダ")]
     #[case(Some("N"), "ン")]