Feat/zipvoice1 (#116)

* Update sherpa-rs and sherpa-rs-sys to version 0.6.8 in Cargo.toml and Cargo.lock

* add zipvoice

* Remove sherpa-onnx-zipvoice-distill-zh-en-emilia folder from Git tracking

* update sherpa

* fmt

* fix warnings

* clippy

* update dist.json to version v1.12.15

Author: thewh1teagle

.gitignore

@@ -32,3 +32,4 @@ matcha-*
 crates/sherpa-rs-sys/sherpa-onnx/scripts/
 kokoro-multi-lang-v1_0/
 kitten-nano-en-*/
+sherpa-onnx-zipvoice-*/

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sherpa-rs-sys"
-version = "0.6.7"
+version = "0.6.8"
 edition = "2021"
 authors = ["thewh1teagle"]
 homepage = "https://github.com/thewh1teagle/sherpa-rs"

crates/sherpa-rs-sys/Cargo.toml

@@ -33,12 +33,12 @@ lazy_static::lazy_static! {
 fn link_lib(lib: &str, is_dynamic: bool) {
     let lib_kind = if is_dynamic { "dylib" } else { "static" };
     debug_log!("cargo:rustc-link-lib={}={}", lib_kind, lib);
-    println!("cargo:rustc-link-lib={}={}", lib_kind, lib);
+    println!("cargo:rustc-link-lib={lib_kind}={lib}");
 }
 
 fn link_framework(framework: &str) {
     debug_log!("cargo:rustc-link-lib=framework={}", framework);
-    println!("cargo:rustc-link-lib=framework={}", framework);
+    println!("cargo:rustc-link-lib=framework={framework}");
 }
 
 fn add_search_path<P: AsRef<Path>>(path: P) {
@@ -141,7 +141,7 @@ fn extract_lib_names(out_dir: &Path, is_dynamic: bool, target_os: &str) -> Vec<S
                 };
                 lib_names.push(lib_name.to_string());
             }
-            Err(e) => println!("cargo:warning=error={}", e),
+            Err(e) => println!("cargo:warning=error={e}"),
         }
     }
     lib_names
@@ -166,7 +166,7 @@ fn extract_lib_assets(out_dir: &Path, target_os: &str) -> Vec<PathBuf> {
             Ok(path) => {
                 files.push(path);
             }
-            Err(e) => eprintln!("cargo:warning=error={}", e),
+            Err(e) => eprintln!("cargo:warning=error={e}"),
         }
     }
 
@@ -189,7 +189,7 @@ fn macos_link_search_path() -> Option<String> {
     for line in stdout.lines() {
         if line.contains("libraries: =") {
             let path = line.split('=').nth(1)?;
-            return Some(format!("{}/lib/darwin", path));
+            return Some(format!("{path}/lib/darwin"));
         }
     }
 
@@ -199,13 +199,13 @@ fn macos_link_search_path() -> Option<String> {
 
 fn rerun_on_env_changes(vars: &[&str]) {
     for env in vars {
-        println!("cargo::rerun-if-env-changed={}", env);
+        println!("cargo::rerun-if-env-changed={env}");
     }
 }
 
 fn rerun_if_changed(vars: &[&str]) {
     for var in vars {
-        println!("cargo:rerun-if-changed={}", var);
+        println!("cargo:rerun-if-changed={var}");
     }
 }
 
@@ -218,17 +218,16 @@ fn verify_checksum(actual_hash: &str, expected_hash: &str) {
     if actual_hash != expected_hash {
         panic!(
             "Checksum validation failed!\n\
-            Expected: {}\n\
-            Got:      {}\n\
+            Expected: {expected_hash}\n\
+            Got:      {actual_hash}\n\
             \n\
             This usually means the downloaded file is corrupted or has been tampered with.\n\
             \n\
             Possible solutions:\n\
             1. Try cleaning the cache and rebuilding: cargo clean && cargo build\n\
             2. Check your internet connection and try again\n\
             3. If you trust the source and want to bypass validation (NOT RECOMMENDED):\n\
-               UNSAFE_DISABLE_CHECKSUM_VALIDATION=1 cargo build",
-            expected_hash, actual_hash
+               UNSAFE_DISABLE_CHECKSUM_VALIDATION=1 cargo build"
         );
     }
 }
@@ -329,7 +328,7 @@ fn main() {
             // Explicitly set target in case we are cross-compiling.
             // See https://github.com/rust-lang/rust-bindgen/issues/1780 for context.
             debug_log!("mapped clang target: {}", clang_target);
-            bindings_builder = bindings_builder.clang_arg(format!("--target={}", clang_target));
+            bindings_builder = bindings_builder.clang_arg(format!("--target={clang_target}"));
         }
 
         debug_log!("Generating bindings...");

crates/sherpa-rs-sys/build.rs

@@ -1,5 +1,5 @@
 {
-  "tag": "v1.12.9",
+  "tag": "v1.12.15",
   "url": "https://github.com/k2-fsa/sherpa-onnx/releases/download/{tag}/{archive}",
   "targets": {
     "x86_64-pc-windows-msvc": {

crates/sherpa-rs-sys/checksum.txt

@@ -112,7 +112,7 @@ pub struct Dist {
 impl DistTable {
     fn new(content: &str) -> Self {
         let mut table: DistTable = serde_json::from_str(content)
-            .unwrap_or_else(|_| panic!("Failed to parse dist.json: {}", content));
+            .unwrap_or_else(|_| panic!("Failed to parse dist.json: {content}"));
         table.url = table.url.replace("{tag}", &table.tag);
         for value in table.targets.values_mut() {
             // expand static with {tag}
@@ -145,7 +145,7 @@ impl DistTable {
             self.targets
                 .get(target)
                 .unwrap_or_else(||
-                    panic!("Target {} not found. try to disable download-feature with --no-default-features.", target)
+                    panic!("Target {target} not found. try to disable download-feature with --no-default-features.")
                 )
         };
         debug_log!(
@@ -213,7 +213,7 @@ fn hex_str_to_bytes(c: impl AsRef<[u8]>) -> Vec<u8> {
 fn bytes_to_hex_str(bytes: Vec<u8>) -> String {
     let mut s = String::with_capacity(bytes.len() * 2);
     for byte in bytes {
-        s.push_str(&format!("{:02x}", byte));
+        s.push_str(&format!("{byte:02x}"));
     }
     s
 }

crates/sherpa-rs-sys/dist.json

@@ -1,6 +1,6 @@
 [package]
 name = "sherpa-rs"
-version = "0.6.7"
+version = "0.6.8"
 edition = "2021"
 authors = ["thewh1teagle"]
 license = "MIT"
@@ -21,7 +21,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 eyre = "0.6.12"
 hound = { version = "3.5.1" }
-sherpa-rs-sys = { path = "../sherpa-rs-sys", version = "0.6.7", default-features = false }
+sherpa-rs-sys = { path = "../sherpa-rs-sys", version = "0.6.8", default-features = false }
 tracing = "0.1.40"
 
 [dev-dependencies]
@@ -55,6 +55,11 @@ name = "tts_matcha"
 required-features = ["tts"]
 path = "../../examples/tts_matcha.rs"
 
+[[example]]
+name = "tts_zipvoice"
+required-features = ["tts"]
+path = "../../examples/tts_zipvoice.rs"
+
 [[example]]
 name = "audio_tag"
 path = "../../examples/audio_tag.rs"

crates/sherpa-rs-sys/sherpa-onnx

@@ -69,6 +69,7 @@ impl DolphinRecognizer {
                 modeling_unit: mem::zeroed::<_>(),
                 zipformer_ctc: mem::zeroed::<_>(),
                 canary: mem::zeroed::<_>(),
+                wenet_ctc: mem::zeroed::<_>(),
             }
         };