Merge branch 'main' into feat/setup-android-support

.gitignore

@@ -5,13 +5,15 @@ tokens.txt
 .DS_Store
 venv/
 vits-piper*
+sherpa-onnx/
 *.wav
 !samples/*.wav
 *.bz2
 sherpa-onnx-whisper*
 sherpa-onnx-pyannote-*
 sherpa-onnx-zipformer-*
 *.txt
+!checksum.txt
 sherpa-onnx-v*
 jniLibs
 sys/src/bindings.rs

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "sys/sherpa-onnx"]
-	path = sys/sherpa-onnx
+[submodule "crates/sherpa-rs-sys/sherpa-onnx"]
+	path = crates/sherpa-rs-sys/sherpa-onnx
 	url = https://github.com/k2-fsa/sherpa-onnx

Cargo.toml

@@ -1,44 +1,2 @@
 [workspace]
-members = ["sys"]
-
-[package]
-name = "sherpa-rs"
-version = "0.5.1"
-edition = "2021"
-authors = ["thewh1teagle"]
-license = "MIT"
-repository = "https://github.com/thewh1teagle/sherpa-rs"
-description = "Rust bindings to https://github.com/k2-fsa/sherpa-onnx"
-readme = "README.md"
-keywords = [
-    "audio",
-    "embeddings",
-    "speech-recognition",
-    "sherpa",
-    "diarization",
-]
-
-[lib]
-crate-type = ["rlib", "dylib", "staticlib"]
-
-[dependencies]
-eyre = "0.6.12"
-hound = { version = "3.5.1" }
-sherpa-rs-sys = { path = "sys", version = "0.5.1", default-features = false }
-tracing = "0.1.40"
-
-[dev-dependencies]
-clap = { version = "4.5.8", features = ["derive"] }
-
-[features]
-default = ["download-binaries", "tts"]
-download-binaries = ["sherpa-rs-sys/download-binaries"]
-static = ["sherpa-rs-sys/static"]
-sys = []
-tts = ["sherpa-rs-sys/tts"]
-cuda = ["sherpa-rs-sys/cuda"]
-directml = ["sherpa-rs-sys/directml"]
-
-[[example]]
-name = "tts"
-required-features = ["tts"]
+members = ["crates/sherpa-rs", "crates/sherpa-rs-sys"]

sys/Cargo.toml → crates/sherpa-rs-sys/Cargo.toml

@@ -47,10 +47,24 @@ bzip2 = { version = "0.4.4", optional = true, features = ["static"] }
 flate2 = { version = "1.0", optional = true }
 sha2 = { version = "0.10", optional = true }
 dirs = { version = "5.0.1", optional = true }
+serde_json = { version = "1.0.134", optional = true }
+serde = { version = "1.0.216", features = ["derive"], optional = true }
+lazy_static = { version = "1.5.0", optional = true }
+
 
 [features]
 default = ["download-binaries"]
-download-binaries = ["ureq", "tar", "bzip2", "flate2", "sha2", "dirs"]
+download-binaries = [
+    "dep:ureq",
+    "dep:tar",
+    "dep:bzip2",
+    "dep:flate2",
+    "dep:sha2",
+    "dep:dirs",
+    "dep:serde_json",
+    "dep:serde",
+    "dep:lazy_static",
+]
 static = []
 tts = []
 cuda = []