RustのブロッキングAPIを実装 (#702)

Cargo.toml

@@ -33,7 +33,7 @@ fs-err = "2.9.0"
 futures = "0.3.26"
 futures-core = "0.3.25"
 futures-util = "0.3.25"
-heck = "0.4.0"
+heck = "0.4.1"
 humansize = "2.1.2"
 indexmap = "2.0.0"
 indicatif = "0.17.3"
@@ -49,6 +49,7 @@ ndarray = "0.15.6"
 ndarray-stats = "0.5.1"
 octocrab = { version = "0.19.0", default-features = false }
 once_cell = "1.18.0"
+ouroboros = "0.18.0"
 parse-display = "0.8.2"
 pretty_assertions = "1.3.0"
 proc-macro2 = "1.0.69"

crates/voicevox_core/Cargo.toml

@@ -28,6 +28,8 @@ ndarray.workspace = true
 once_cell.workspace = true
 onnxruntime.workspace = true
 open_jtalk.workspace = true
+ouroboros.workspace = true
+rayon.workspace = true
 regex.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
@@ -37,6 +39,7 @@ tokio = { workspace = true, features = ["rt"] }
 tracing.workspace = true
 uuid = { workspace = true, features = ["v4", "serde"] }
 voicevox_core_macros = { path = "../voicevox_core_macros" }
+zip.workspace = true
 
 [dev-dependencies]
 heck.workspace = true

crates/voicevox_core/src/__internal/doctest_fixtures.rs

@@ -1,19 +1,19 @@
 use std::path::Path;
 
-use crate::{AccelerationMode, InitializeOptions, OpenJtalk, Synthesizer, VoiceModel};
+use crate::{AccelerationMode, InitializeOptions};
 
 pub async fn synthesizer_with_sample_voice_model(
     open_jtalk_dic_dir: impl AsRef<Path>,
-) -> anyhow::Result<Synthesizer<OpenJtalk>> {
-    let syntesizer = Synthesizer::new(
-        OpenJtalk::new(open_jtalk_dic_dir).await?,
+) -> anyhow::Result<crate::tokio::Synthesizer<crate::tokio::OpenJtalk>> {
+    let syntesizer = crate::tokio::Synthesizer::new(
+        crate::tokio::OpenJtalk::new(open_jtalk_dic_dir).await?,
         &InitializeOptions {
             acceleration_mode: AccelerationMode::Cpu,
             ..Default::default()
         },
     )?;
 
-    let model = &VoiceModel::from_path(concat!(
+    let model = &crate::tokio::VoiceModel::from_path(concat!(
         env!("CARGO_MANIFEST_DIR"),
         "/../../model/sample.vvm",
     ))

crates/voicevox_core/src/blocking.rs

@@ -0,0 +1,6 @@
+//! ブロッキング版API。
+
+pub use crate::{
+    engine::open_jtalk::blocking::OpenJtalk, synthesizer::blocking::Synthesizer,
+    user_dict::dict::blocking::UserDict, voice_model::blocking::VoiceModel,
+};

crates/voicevox_core/src/engine/full_context_label.rs

@@ -1,7 +1,8 @@
 use std::collections::HashMap;
 
-use super::*;
-use crate::engine::open_jtalk::OpenjtalkFunctionError;
+use crate::engine::open_jtalk::FullcontextExtractor;
+use derive_getters::Getters;
+use derive_new::new;
 use once_cell::sync::Lazy;
 use regex::Regex;
 
@@ -11,7 +12,7 @@ use regex::Regex;
 pub(crate) struct FullContextLabelError {
     context: ErrorKind,
     #[source]
-    source: Option<OpenjtalkFunctionError>,
+    source: Option<anyhow::Error>,
 }
 
 #[derive(derive_more::Display, Debug)]
@@ -316,16 +317,15 @@ impl Utterance {
     }
 
     pub(crate) fn extract_full_context_label(
-        open_jtalk: &open_jtalk::OpenJtalk,
+        open_jtalk: &impl FullcontextExtractor,
         text: impl AsRef<str>,
     ) -> Result<Self> {
-        let labels =
-            open_jtalk
-                .extract_fullcontext(text)
-                .map_err(|source| FullContextLabelError {
-                    context: ErrorKind::OpenJtalk,
-                    source: Some(source),
-                })?;
+        let labels = open_jtalk
+            .extract_fullcontext(text.as_ref())
+            .map_err(|source| FullContextLabelError {
+                context: ErrorKind::OpenJtalk,
+                source: Some(source),
+            })?;
 
         labels
             .into_iter()

crates/voicevox_core/src/engine/mod.rs

@@ -3,13 +3,11 @@ mod full_context_label;
 mod kana_parser;
 mod model;
 mod mora_list;
-mod open_jtalk;
-
-use super::*;
+pub(crate) mod open_jtalk;
 
 pub use self::acoustic_feature_extractor::*;
 pub use self::full_context_label::*;
 pub use self::kana_parser::*;
 pub use self::model::*;
 pub(crate) use self::mora_list::mora2text;
-pub use self::open_jtalk::OpenJtalk;
+pub use self::open_jtalk::FullcontextExtractor;