refactor: Rust APIのSynthesizerのメソッドをビルダースタイルに

VOICEVOX · Dec 26, 2024 · 2f2cd05 · 2f2cd05
1 parent babb3b7
commit 2f2cd05
Show file tree

Hide file tree

Showing 12 changed files with 574 additions and 403 deletions.
diff --git a/crates/voicevox_core/src/__internal/doctest_fixtures.rs b/crates/voicevox_core/src/__internal/doctest_fixtures.rs
@@ -2,7 +2,7 @@ use std::{ffi::OsString, path::Path};
 
 use camino::Utf8Path;
 
-use crate::{AccelerationMode, InitializeOptions};
+use crate::AccelerationMode;
 
 pub use crate::synthesizer::nonblocking::IntoBlocking;
 
@@ -13,20 +13,18 @@ pub async fn synthesizer_with_sample_voice_model(
     >,
     open_jtalk_dic_dir: impl AsRef<Utf8Path>,
 ) -> anyhow::Result<crate::nonblocking::Synthesizer<crate::nonblocking::OpenJtalk>> {
-    let syntesizer = crate::nonblocking::Synthesizer::new(
+    let syntesizer = crate::nonblocking::Synthesizer::builder(
         #[cfg(feature = "load-onnxruntime")]
         crate::nonblocking::Onnxruntime::load_once()
             .filename(onnxruntime_dylib_path)
             .exec()
             .await?,
         #[cfg(feature = "link-onnxruntime")]
         crate::nonblocking::Onnxruntime::init_once().await?,
-        crate::nonblocking::OpenJtalk::new(open_jtalk_dic_dir).await?,
-        &InitializeOptions {
-            acceleration_mode: AccelerationMode::Cpu,
-            ..Default::default()
-        },
-    )?;
+    )
+    .open_jtalk(crate::nonblocking::OpenJtalk::new(open_jtalk_dic_dir).await?)
+    .acceleration_mode(AccelerationMode::Cpu)
+    .build()?;
 
     let model = &crate::nonblocking::VoiceModelFile::open(voice_model_path).await?;
     syntesizer.load_voice_model(model).await?;

diff --git a/crates/voicevox_core/src/__internal/interop.rs b/crates/voicevox_core/src/__internal/interop.rs
@@ -2,5 +2,8 @@ pub mod raii;
 
 pub use crate::{
     metas::merge as merge_metas,
-    synthesizer::{blocking::PerformInference, MARGIN},
+    synthesizer::{
+        blocking::PerformInference, DEFAULT_CPU_NUM_THREADS, DEFAULT_ENABLE_INTERROGATIVE_UPSPEAK,
+        MARGIN,
+    },
 };
diff --git a/crates/voicevox_core/src/blocking.rs b/crates/voicevox_core/src/blocking.rs
@@ -11,3 +11,10 @@ pub mod onnxruntime {
     #[cfg_attr(docsrs, doc(cfg(feature = "load-onnxruntime")))]
     pub use crate::infer::runtimes::onnxruntime::blocking::LoadOnce;
 }
+
+pub mod synthesizer {
+    pub use crate::synthesizer::blocking::{Builder, Synthesis, Tts, TtsFromKana};
+
+    // TODO: 後で封印する
+    pub use crate::synthesizer::blocking::PrecomputeRender;
+}
diff --git a/crates/voicevox_core/src/lib.rs b/crates/voicevox_core/src/lib.rs
@@ -90,7 +90,7 @@ pub use self::{
         VoiceModelMeta,
     },
     result::Result,
-    synthesizer::{AccelerationMode, InitializeOptions, SynthesisOptions, TtsOptions},
+    synthesizer::AccelerationMode,
     user_dict::{UserDictWord, UserDictWordType},
     version::VERSION,
     voice_model::{RawVoiceModelId, VoiceModelId},

diff --git a/crates/voicevox_core/src/nonblocking.rs b/crates/voicevox_core/src/nonblocking.rs
@@ -15,7 +15,7 @@
 //! [blocking]: https://docs.rs/crate/blocking
 //! [pollster]: https://docs.rs/crate/pollster
 //! [VOICEVOX/voicevox_core#902]: https://github.com/VOICEVOX/voicevox_core/issues/902
-//! [`cpu_num_threads`]: crate::InitializeOptions::cpu_num_threads
+//! [`cpu_num_threads`]: crate::nonblocking::synthesizer::Builder::cpu_num_threads
 
 pub use crate::{
     engine::open_jtalk::nonblocking::OpenJtalk,
@@ -28,3 +28,7 @@ pub mod onnxruntime {
     #[cfg_attr(docsrs, doc(cfg(feature = "load-onnxruntime")))]
     pub use crate::infer::runtimes::onnxruntime::nonblocking::LoadOnce;
 }
+
+pub mod synthesizer {
+    pub use crate::synthesizer::nonblocking::{Builder, Synthesis, Tts, TtsFromKana};
+}