fix warning

Cargo.lock

@@ -74,12 +74,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -99,7 +93,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -110,7 +104,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -561,12 +555,40 @@ dependencies = [
  "vsimd",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.64.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 1.0.109",
+ "which",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -582,12 +604,6 @@ version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
-[[package]]
-name = "bytemuck"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
-
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -619,12 +635,32 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "clang-sys"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "clap"
 version = "4.4.6"
@@ -656,7 +692,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -747,21 +783,22 @@ version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
-[[package]]
-name = "encoding_rs"
-version = "0.8.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.0.1"
@@ -806,7 +843,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -863,6 +900,12 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "h2"
 version = "0.3.21"
@@ -946,10 +989,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "hound"
-version = "3.5.1"
+name = "home"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys",
+]
 
 [[package]]
 name = "http"
@@ -1076,12 +1122,34 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
 [[package]]
 name = "libc"
 version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -1120,6 +1188,12 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -1140,6 +1214,16 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -1235,6 +1319,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.0"
@@ -1258,7 +1348,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1315,7 +1405,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1327,17 +1417,15 @@ dependencies = [
  "aws-sdk-polly",
  "aws-sdk-transcribestreaming",
  "aws-sdk-translate",
- "bytes",
  "clap",
  "futures-util",
- "hound",
  "poem",
  "serde",
  "serde_json",
- "symphonia",
  "tokio",
  "tokio-stream",
  "tracing-subscriber",
+ "whisper-rs",
 ]
 
 [[package]]
@@ -1416,7 +1504,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -1478,6 +1566,12 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -1487,6 +1581,19 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
+dependencies = [
+ "bitflags 2.4.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustls"
 version = "0.21.7"
@@ -1567,7 +1674,7 @@ version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -1607,7 +1714,7 @@ checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1664,6 +1771,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -1727,135 +1840,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
-name = "symphonia"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941"
-dependencies = [
- "lazy_static",
- "symphonia-bundle-flac",
- "symphonia-codec-adpcm",
- "symphonia-codec-pcm",
- "symphonia-codec-vorbis",
- "symphonia-core",
- "symphonia-format-mkv",
- "symphonia-format-ogg",
- "symphonia-format-wav",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-bundle-flac"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f23b0482a7cb18fcdf9981ab0b78df800ef0080187d294650023c462439058d"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-codec-adpcm"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870e7dc1865d818c7b6318879d060553a73a3b2a3b8443dff90910f10ac41150"
-dependencies = [
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-codec-pcm"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47f1fbd220a06a641c8ce2ddad10f5ef6ee5cc0c54d9044d25d43b0d3119deaa"
-dependencies = [
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-codec-vorbis"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3953397e3506aa01350c4205817e4f95b58d476877a42f0458d07b665749e203"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-core"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142"
-dependencies = [
- "arrayvec",
- "bitflags",
- "bytemuck",
- "lazy_static",
- "log",
-]
-
-[[package]]
-name = "symphonia-format-mkv"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c61dfc851ad25d4043d8c231d8617e8f7cd02a6cc0edad21ade21848d58895"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-ogg"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bf1a00ccd11452d44048a0368828040f778ae650418dbd9d8765b7ee2574c8d"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-wav"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da76614728fa27c003bdcdfbac51396bd8fcbf94c95fe8e62f1d2bac58ef03a4"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-metadata"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0"
-dependencies = [
- "encoding_rs",
- "lazy_static",
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-utils-xiph"
-version = "0.5.3"
+name = "syn"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a450ca645b80d69aff8b35576cbfdc7f20940b29998202aab910045714c951f8"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "symphonia-core",
- "symphonia-metadata",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -1886,7 +1878,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1969,7 +1961,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2084,7 +2076,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2287,7 +2279,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
@@ -2309,7 +2301,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2330,6 +2322,37 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "whisper-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c950fb18ad556b053ba615b88fd4d01ed6020be740c3371eb0fc4aec64a0639"
+dependencies = [
+ "whisper-rs-sys",
+]
+
+[[package]]
+name = "whisper-rs-sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "094a5bd86f6f52562bbc74c28f27cd80197e54656cfb7213cf4ba37b5246cc9e"
+dependencies = [
+ "bindgen",
+ "cfg-if",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"

Cargo.toml

@@ -3,26 +3,20 @@ name = "polyhedron"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 aws-config= { version = "0.56.1" }
 aws-sdk-transcribestreaming= { version = "0.33.0" }
 aws-sdk-translate = "0.33.0"
 aws-sdk-polly = "0.33.0"
 clap = { version = "4.4.6" , features = ["derive"]}
-hound = "3.5.1"
 tokio = {  version = "1.33.0" , features = ["full"] }
 tokio-stream = "0.1.14"
-bytes = "1.0.1"
 async-stream = "0.3.5"
 tracing-subscriber = "0.3.17"
 futures-util = "0.3.28"
-#symphonia-codec-pcm = "0.5.3"
-#symphonia-format-mkv = "0.5.3"
-symphonia = { version = "0.5.3", features = ["mkv", "pcm"] }
 serde = { version = "1.0.189", features = ["derive"] }
 serde_json = { version = "1.0.107", features = [] }
+whisper-rs = {  version = "0.8.0" , features = ["coreml"] }
 
 [dependencies.poem]
 version = "1.3.58"

src/lesson.rs

@@ -1,6 +1,8 @@
 use std::sync::{Arc, Weak};
 use tokio::sync::RwLock;
 use std::collections::BTreeMap;
+use std::error::Error;
+use std::fmt::{Display, Formatter};
 use std::io::BufRead;
 use async_stream::stream;
 use aws_config::SdkConfig;
@@ -9,13 +11,11 @@ use aws_sdk_polly::types::{Engine, OutputFormat, SpeechMarkType, VoiceId};
 use aws_sdk_transcribestreaming::operation::start_stream_transcription::StartStreamTranscriptionOutput;
 use aws_sdk_transcribestreaming::primitives::Blob;
 use aws_sdk_transcribestreaming::types::{AudioEvent, AudioStream, LanguageCode, MediaEncoding, TranscriptResultStream};
-use clap::builder::TypedValueParser;
 use futures_util::{Stream, StreamExt, TryStreamExt};
 use futures_util::future::try_join;
 use serde::{Deserialize, Serialize};
 
-use tokio::{select, try_join};
-use crate::StreamTranscriptionError;
+use tokio::select;
 
 #[derive(Clone, Debug)]
 pub struct LessonsManager {
@@ -42,7 +42,7 @@ impl LessonsManager {
                                       id: u32,
                                       speaker_lang: LanguageCode) -> Lesson {
         let mut map = self.lessons.write().await;
-        let lesson: Lesson = InnerLesson::new(self.clone(), id, speaker_lang).into();
+        let lesson: Lesson = InnerLesson::new(self.clone(), speaker_lang).into();
         map.insert(id, lesson.clone());
         lesson
     }
@@ -101,7 +101,6 @@ impl From<InnerLesson> for Lesson {
 #[derive(Debug)]
 struct InnerLesson {
     parent: LessonsManager,
-    id: u32,
     speaker_lang: LanguageCode,
     speaker_voice_channel: tokio::sync::mpsc::Sender<Vec<u8>>,
     speaker_transcript: tokio::sync::broadcast::Sender<String>,
@@ -112,7 +111,6 @@ struct InnerLesson {
 impl InnerLesson {
     fn new(
         parent: LessonsManager,
-        id: u32,
         speaker_lang: LanguageCode
     ) -> InnerLesson {
         let (speaker_transcript, _) = tokio::sync::broadcast::channel::<String>(128);
@@ -137,16 +135,16 @@ impl InnerLesson {
                     .audio_stream(input_stream.into())
                     .send()
                     .await
-                    .map_err(|e| crate::StreamTranscriptionError::EstablishStreamError(Box::new(e)))?;
+                    .map_err(|e| StreamTranscriptionError::EstablishStreamError(Box::new(e)))?;
 
-                let mut output_stream = to_stream(output);
+                let output_stream = to_stream(output);
                 output_stream
                     .try_for_each(|text| async {
                         let _ = shared_speaker_transcript.send(text);
                         Ok(())
                     })
                     .await?;
-                Ok(()) as Result<(), crate::StreamTranscriptionError>
+                Ok(()) as Result<(), StreamTranscriptionError>
             };
             select! {
                 res = fut => {
@@ -160,10 +158,9 @@ impl InnerLesson {
 
         InnerLesson {
             parent,
-            id,
             speaker_lang,
             speaker_voice_channel,
-            speaker_transcript: speaker_transcript,
+            speaker_transcript,
             lang_lessons: RwLock::new(BTreeMap::new()),
             drop_handler: Some(drop_handler),
         }
@@ -181,12 +178,19 @@ impl Drop for InnerLesson {
 
 struct InnerLangLesson {
     parent: Lesson,
-    lang: String,
     translated_tx: tokio::sync::broadcast::Sender<String>,
     voice_lessons: RwLock<BTreeMap<VoiceId, Weak<InnerVoiceLesson>>>,
     drop_handler: Option<tokio::sync::oneshot::Sender<Signal>>,
 }
 
+impl Drop for InnerLangLesson {
+    fn drop(&mut self) {
+        if let Some(tx) = self.drop_handler.take() {
+            let _ = tx.send(Signal::Stop);
+        }
+    }
+}
+
 #[derive(Clone)]
 pub(crate) struct LangLesson {
     inner: Arc<InnerLangLesson>
@@ -219,7 +223,7 @@ impl LangLesson {
         parent: Lesson,
         lang: String,
     ) -> Self {
-        let shared_lang = lang.clone();;
+        let shared_lang = lang.clone();
         let shared_speaker_lang = parent.inner.speaker_lang.clone();
         let (translated_tx, _) = tokio::sync::broadcast::channel::<String>(128);
         let shared_translated_tx = translated_tx.clone();
@@ -245,7 +249,6 @@ impl LangLesson {
                         Err(e) => {
                             return Err(e);
                         }
-                        _ => {}
                     }
                 }
                 Ok(())
@@ -262,7 +265,6 @@ impl LangLesson {
         });
         InnerLangLesson {
             parent,
-            lang,
             translated_tx,
             voice_lessons: RwLock::new(BTreeMap::new()),
             drop_handler: Some(drop_handler),
@@ -325,8 +327,6 @@ impl From<Arc<InnerVoiceLesson>> for VoiceLesson {
 }
 
 struct InnerVoiceLesson {
-    parent: LangLesson,
-    voice: VoiceId,
     lip_sync_tx: tokio::sync::broadcast::Sender<Vec<Viseme>>,
     voice_lesson: tokio::sync::broadcast::Sender<Vec<u8>>,
     drop_handler: Option<tokio::sync::oneshot::Sender<Signal>>,
@@ -381,8 +381,6 @@ impl InnerVoiceLesson {
         });
 
         InnerVoiceLesson {
-            parent,
-            voice,
             lip_sync_tx,
             voice_lesson,
             drop_handler: Some(tx),
@@ -417,7 +415,7 @@ fn to_stream(mut output: StartStreamTranscriptionOutput) -> impl Stream<Item=Res
                         }
                     }
                 }
-                otherwise => yield Err(StreamTranscriptionError::Unknown),
+                _ => yield Err(StreamTranscriptionError::Unknown),
             }
         }
     }
@@ -465,3 +463,32 @@ async fn synthesize_speech(client: &aws_sdk_polly::Client,
     Ok((parsed, audio.audio_stream))
 }
 
+
+#[derive(Debug)]
+enum StreamTranscriptionError {
+    EstablishStreamError(Box<dyn Error + Send + Sync>),
+    TranscriptResultStreamError(Box<dyn Error + Send + Sync>),
+    Unknown
+}
+
+
+impl Display for StreamTranscriptionError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            StreamTranscriptionError::EstablishStreamError(e) => write!(f, "EstablishStreamError: {}", e),
+            StreamTranscriptionError::TranscriptResultStreamError(e) => write!(f, "TranscriptResultStreamError: {}", e),
+            StreamTranscriptionError::Unknown => write!(f, "Unknown"),
+        }
+    }
+}
+
+impl Error for StreamTranscriptionError {
+    fn source(&self) -> Option<&(dyn Error + 'static)> {
+        match self {
+            StreamTranscriptionError::EstablishStreamError(e) => Some(e.as_ref()),
+            StreamTranscriptionError::TranscriptResultStreamError(e) => Some(e.as_ref()),
+            StreamTranscriptionError::Unknown => None,
+        }
+    }
+}
+

src/main.rs

@@ -6,24 +6,20 @@
 #![allow(clippy::result_large_err)]
 
 use std::default::Default;
-use std::error::Error;
-use std::fmt::{Debug, Display, Formatter};
-use std::future::Future;
-use async_stream::stream;
 use aws_config::meta::region::RegionProviderChain;
 use aws_sdk_transcribestreaming::{config::Region, meta::PKG_VERSION};
 use clap::Parser;
 
-use poem::{Endpoint, EndpointExt, get, handler, IntoResponse, listener::TcpListener, Route, Server};
-use futures_util::{Sink, SinkExt, TryFutureExt, TryStreamExt};
+use poem::{EndpointExt, get, handler, IntoResponse, listener::TcpListener, Route, Server};
+use futures_util::{SinkExt};
 use poem::endpoint::{StaticFileEndpoint, StaticFilesEndpoint};
 use poem::web::websocket::{Message, WebSocket};
 use futures_util::stream::StreamExt;
 use poem::web::{Data, Query};
 
 use tokio::select;
-use tokio_stream::Stream;
 use serde::{Deserialize, Serialize};
+use whisper_rs::WhisperContext;
 use lesson::{LessonsManager};
 use crate::lesson::Viseme;
 
@@ -45,13 +41,6 @@ struct Opt {
     verbose: bool,
 }
 
-#[derive(Clone)]
-enum ReplyEvent {
-    Transcribed(String),
-    Translated(String),
-    Synthesized(Vec<u8>),
-}
-
 #[derive(Clone)]
 struct Context {
     lessons_manager: LessonsManager,
@@ -60,6 +49,9 @@ struct Context {
 #[tokio::main]
 async fn main() -> Result<(), std::io::Error> {
     tracing_subscriber::fmt::init();
+    let wc = WhisperContext::new("/Users/famer.me/Downloads/ggml-base.bin");
+    let wc = wc.expect("failed to load whisper context");
+    let _ = wc.create_state().expect("failed to create state");
 
     let Opt {
         region,
@@ -224,35 +216,3 @@ async fn stream_listener(ctx: Data<&Context>, query: Query<LessonListenerQuery>,
         }
     })
 }
-
-#[derive(Debug)]
-enum StreamTranscriptionError {
-    EstablishStreamError(Box<dyn Error + Send + Sync>),
-    TranscriptResultStreamError(Box<dyn Error + Send + Sync>),
-    Shutdown,
-    Unknown
-}
-
-
-impl Display for StreamTranscriptionError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            StreamTranscriptionError::EstablishStreamError(e) => write!(f, "EstablishStreamError: {}", e),
-            StreamTranscriptionError::TranscriptResultStreamError(e) => write!(f, "TranscriptResultStreamError: {}", e),
-            StreamTranscriptionError::Shutdown => write!(f, "Shutdown"),
-            StreamTranscriptionError::Unknown => write!(f, "Unknown"),
-        }
-    }
-}
-
-impl Error for StreamTranscriptionError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        match self {
-            StreamTranscriptionError::EstablishStreamError(e) => Some(e.as_ref()),
-            StreamTranscriptionError::TranscriptResultStreamError(e) => Some(e.as_ref()),
-            StreamTranscriptionError::Shutdown => None,
-            StreamTranscriptionError::Unknown => None,
-        }
-    }
-}
-